Index: trunk/src/draw.c
===================================================================
--- trunk/src/draw.c	(revision 28080)
+++ trunk/src/draw.c	(revision 28081)
@@ -359,7 +359,7 @@
 	lvly.top_fab = -1;
 	lvly.top_assy = lvly.bot_assy = -1;
 	for (ngroups = 0, i = 0; i < pcb_max_layer; i++) {
-		pcb_layer_t *l = LAYER_ON_STACK(i);
+		pcb_layer_t *l = PCB_STACKLAYER(PCB, i);
 		pcb_layergrp_id_t group = pcb_layer_get_group(PCB, pcb_layer_stack[i]);
 		pcb_layergrp_t *grp = pcb_get_layergrp(PCB, group);
 		unsigned int gflg = 0;
Index: trunk/src/layer.h
===================================================================
--- trunk/src/layer.h	(revision 28080)
+++ trunk/src/layer.h	(revision 28081)
@@ -186,8 +186,7 @@
 
 /************ OLD API - new code should not use these **************/
 
-#define LAYER_ON_STACK(n)   (&PCB->Data->Layer[pcb_layer_stack[(n)]])
-#define CURRENT             (LAYER_ON_STACK(0))
+#define CURRENT             (&PCB->Data->Layer[pcb_layer_stack[0]])
 #define INDEXOFCURRENT      (pcb_layer_stack[0])
 
 #define LAYER_LOOP(data, ml) \
Index: trunk/src/search.c
===================================================================
--- trunk/src/search.c	(revision 28080)
+++ trunk/src/search.c	(revision 28081)
@@ -1257,7 +1257,7 @@
 		int found;
 		if (pcb_layer_flags(PCB, i) & PCB_LYT_SILK) /* special order: silks are searched before/after this loop, if we meet them elsewhere, skip */
 			continue;
-		SearchLayer = LAYER_ON_STACK(i);
+		SearchLayer = PCB_STACKLAYER(PCB, i);
 
 		found = pcb_search_obj_by_loc_layer(Type, Result1, Result2, Result3, req_flag, SearchLayer, HigherAvail, HigherBound, objst);
 		if (found < 0)
Index: trunk/src_plugins/lib_hid_pcbui/layersel.c
===================================================================
--- trunk/src_plugins/lib_hid_pcbui/layersel.c	(revision 28080)
+++ trunk/src_plugins/lib_hid_pcbui/layersel.c	(revision 28081)
@@ -352,7 +352,7 @@
 	ls_layer_t *lys;
 	int repeat = 0;
 
-	ly = LAYER_ON_STACK(0);
+	ly = PCB_CURRLAYER(PCB);
 	if ((ly == NULL) || (ly->meta.real.vis))
 		return;