diff --git a/common/cogl-handle.h b/common/cogl-handle.h
index 1cbb8a013..79deb7f8c 100644
--- a/common/cogl-handle.h
+++ b/common/cogl-handle.h
@@ -57,12 +57,6 @@
 
 #define COGL_HANDLE_DEFINE(TypeName, type_name, handle_array)	\
 								\
-  static CoglHandle *					        \
-  _cogl_##type_name##_handle_from_pointer (Cogl##TypeName *obj)	\
-  {								\
-    return (CoglHandle)obj;				        \
-  }								\
-								\
   static gint							\
   _cogl_##type_name##_handle_find (CoglHandle handle)		\
   {								\
diff --git a/common/cogl-material.c b/common/cogl-material.c
index 925e77af6..0623a50bd 100644
--- a/common/cogl-material.c
+++ b/common/cogl-material.c
@@ -373,8 +373,8 @@ cogl_material_set_blend_factors (CoglHandle handle,
  */
 static CoglMaterialLayer *
 _cogl_material_get_layer (CoglMaterial *material,
-			  gint index,
-			  gboolean create_if_not_found)
+			  gint          index_,
+			  gboolean      create_if_not_found)
 {
   CoglMaterialLayer *layer;
   GList		    *tmp;
@@ -384,12 +384,12 @@ _cogl_material_get_layer (CoglMaterial *material,
     {
       layer =
 	_cogl_material_layer_pointer_from_handle ((CoglHandle)tmp->data);
-      if (layer->index == index)
+      if (layer->index == index_)
 	return layer;
 
       /* The layers are always sorted, so at this point we know this layer
        * doesn't exist */
-      if (layer->index > index)
+      if (layer->index > index_)
 	break;
     }
   /* NB: if we now insert a new layer before tmp, that will maintain order.
@@ -401,7 +401,7 @@ _cogl_material_get_layer (CoglMaterial *material,
   layer = g_new0 (CoglMaterialLayer, 1);
 
   layer->ref_count = 1;
-  layer->index = index;
+  layer->index = index_;
   layer->flags = COGL_MATERIAL_LAYER_FLAG_DEFAULT_COMBINE;
   layer->texture = COGL_INVALID_HANDLE;
 
@@ -630,8 +630,7 @@ cogl_material_remove_layer (CoglHandle material_handle,
       layer = tmp->data;
       if (layer->index == layer_index)
 	{
-	  CoglHandle handle =
-	    _cogl_material_layer_handle_from_pointer (layer);
+	  CoglHandle handle = (CoglHandle) layer;
 	  cogl_material_layer_unref (handle);
 	  material->layers = g_list_remove (material->layers, layer);
 	  continue;
diff --git a/gl/cogl-context.c b/gl/cogl-context.c
index 252f3d294..fc2728921 100644
--- a/gl/cogl-context.c
+++ b/gl/cogl-context.c
@@ -144,22 +144,22 @@ cogl_create_context ()
     cogl_texture_new_from_data (1, /* width */
                                 1, /* height */
                                 -1, /* max waste */
-                                FALSE, /* auto mipmap */
+                                COGL_TEXTURE_NONE, /* flags */
                                 COGL_PIXEL_FORMAT_RGBA_8888, /* data format */
                                 /* internal format */
                                 COGL_PIXEL_FORMAT_RGBA_8888,
                                 0, /* auto calc row stride */
-                                &default_texture_data);
+                                default_texture_data);
   _context->default_gl_texture_rect_tex =
     cogl_texture_new_from_data (1, /* width */
                                 1, /* height */
                                 -1, /* max waste */
-                                FALSE, /* auto mipmap */
+                                COGL_TEXTURE_NONE, /* flags */
                                 COGL_PIXEL_FORMAT_RGBA_8888, /* data format */
                                 /* internal format */
                                 COGL_PIXEL_FORMAT_RGBA_8888,
                                 0, /* auto calc row stride */
-                                &default_texture_data);
+                                default_texture_data);
 
   cogl_set_source (_context->default_material);
   cogl_material_flush_gl_state (_context->source_material, NULL);
diff --git a/gl/cogl-texture.c b/gl/cogl-texture.c
index e1c73260f..90680bb3f 100644
--- a/gl/cogl-texture.c
+++ b/gl/cogl-texture.c
@@ -2665,13 +2665,11 @@ _cogl_rectangles_with_multitexture_coords (
                                                 rects[i].tex_coords,
                                                 rects[i].tex_coords_len))
         {
-          const GList *layers;
-          CoglHandle   tex_handle;
+          CoglHandle   first_layer, tex_handle;
           CoglTexture *texture;
 
-          layers = cogl_material_get_layers (material);
-          tex_handle =
-            cogl_material_layer_get_texture ((CoglHandle)layers->data);
+          first_layer = cogl_material_get_layers (material)->data;
+          tex_handle = cogl_material_layer_get_texture (first_layer);
           texture = _cogl_texture_pointer_from_handle (tex_handle);
           _cogl_texture_sliced_quad (texture,
                                      material,