diff --git a/src/java/org/lwjgl/opengl/GLChecks.java b/src/java/org/lwjgl/opengl/GLChecks.java
index 38f30803..f9596a6a 100644
--- a/src/java/org/lwjgl/opengl/GLChecks.java
+++ b/src/java/org/lwjgl/opengl/GLChecks.java
@@ -65,22 +65,6 @@ class GLChecks {
 	private GLChecks() {
 	}
 
-	static int getBufferObjectSize(ContextCapabilities caps, int buffer_enum) {
-		return glGetBufferParameteri(buffer_enum, GL_BUFFER_SIZE);
-	}
-
-	static int getBufferObjectSizeARB(ContextCapabilities caps, int buffer_enum) {
-		return glGetBufferParameteriARB(buffer_enum, GL_BUFFER_SIZE_ARB);
-	}
-
-	static int getBufferObjectSizeATI(ContextCapabilities caps, int buffer) {
-		return glGetObjectBufferiATI(buffer, GL_OBJECT_BUFFER_SIZE_ATI);
-	}
-
-	static int getNamedBufferObjectSize(ContextCapabilities caps, int buffer) {
-		return glGetNamedBufferParameterEXT(buffer, GL_BUFFER_SIZE);
-	}
-
 	/** Helper method to ensure that array buffer objects are disabled. If they are enabled, we'll throw an OpenGLException */
 	static void ensureArrayVBOdisabled(ContextCapabilities caps) {
 		if ( LWJGLUtil.CHECKS && StateTracker.getReferences(caps).arrayBuffer != 0 )
diff --git a/src/java/org/lwjgl/opengles/GLChecks.java b/src/java/org/lwjgl/opengles/GLChecks.java
index a7463e4d..c67e94d1 100644
--- a/src/java/org/lwjgl/opengles/GLChecks.java
+++ b/src/java/org/lwjgl/opengles/GLChecks.java
@@ -57,11 +57,7 @@ class GLChecks {
 	/** Static methods only! */
 	private GLChecks() {
 	}
-
-	static int getBufferObjectSize(int buffer_enum) {
-		return glGetBufferParameteri(buffer_enum, GLES20.GL_BUFFER_SIZE);
-	}
-
+	
 	/** Helper method to ensure that array buffer objects are disabled. If they are enabled, we'll throw an OpenGLException */
 	static void ensureArrayVBOdisabled() {
 		if ( LWJGLUtil.CHECKS && StateTracker.getTracker().arrayBuffer != 0 )
diff --git a/src/templates/org/lwjgl/opengl/ARB_buffer_object.java b/src/templates/org/lwjgl/opengl/ARB_buffer_object.java
index 85fac712..c6abd554 100644
--- a/src/templates/org/lwjgl/opengl/ARB_buffer_object.java
+++ b/src/templates/org/lwjgl/opengl/ARB_buffer_object.java
@@ -134,7 +134,7 @@ public interface ARB_buffer_object {
 	 */
 	@CachedResult
 	@GLvoid
-	@AutoSize("GLChecks.getBufferObjectSizeARB(caps, target)")
+	@AutoSize("glGetBufferParameteriARB(target, GL_BUFFER_SIZE_ARB)")
 	ByteBuffer glMapBufferARB(@GLenum int target, @GLenum int access);
 
 	boolean glUnmapBufferARB(@GLenum int target);
@@ -156,6 +156,6 @@ public interface ARB_buffer_object {
 	void glGetBufferParameterivARB3(@GLenum int target, @GLenum int pname, @OutParameter IntBuffer params);
 
 	@StripPostfix("pointer")
-	@AutoSize("GLChecks.getBufferObjectSizeARB(caps, target)")
+	@AutoSize("glGetBufferParameteriARB(target, GL_BUFFER_SIZE_ARB)")
 	void glGetBufferPointervARB(@GLenum int target, @GLenum int pname, @Result @GLvoid ByteBuffer pointer);
 }
diff --git a/src/templates/org/lwjgl/opengl/ATI_map_object_buffer.java b/src/templates/org/lwjgl/opengl/ATI_map_object_buffer.java
index 4e66dd4d..0ba163b0 100644
--- a/src/templates/org/lwjgl/opengl/ATI_map_object_buffer.java
+++ b/src/templates/org/lwjgl/opengl/ATI_map_object_buffer.java
@@ -64,7 +64,7 @@ public interface ATI_map_object_buffer {
 	 */
 	@CachedResult
 	@GLvoid
-	@AutoSize("GLChecks.getBufferObjectSizeATI(caps, buffer)")
+	@AutoSize("ATIVertexArrayObject.glGetObjectBufferiATI(buffer, ATIVertexArrayObject.GL_OBJECT_BUFFER_SIZE_ATI)")
 	ByteBuffer glMapObjectBufferATI(@GLuint int buffer);
 
 	void glUnmapObjectBufferATI(@GLuint int buffer);
diff --git a/src/templates/org/lwjgl/opengl/EXT_direct_state_access.java b/src/templates/org/lwjgl/opengl/EXT_direct_state_access.java
index d6402991..6d141a34 100644
--- a/src/templates/org/lwjgl/opengl/EXT_direct_state_access.java
+++ b/src/templates/org/lwjgl/opengl/EXT_direct_state_access.java
@@ -906,7 +906,7 @@ public interface EXT_direct_state_access {
 	@Dependent("OpenGL15")
 	@CachedResult
 	@GLvoid
-	@AutoSize("GLChecks.getNamedBufferObjectSize(caps, buffer)")
+	@AutoSize("glGetNamedBufferParameterEXT(buffer, GL15.GL_BUFFER_SIZE)")
 	ByteBuffer glMapNamedBufferEXT(@GLuint int buffer, @GLenum int access);
 
 	@Dependent("OpenGL15")
@@ -924,7 +924,7 @@ public interface EXT_direct_state_access {
 
 	@Dependent("OpenGL15")
 	@StripPostfix("params")
-	@AutoSize("GLChecks.getNamedBufferObjectSize(caps, buffer)")
+	@AutoSize("glGetNamedBufferParameterEXT(buffer, GL15.GL_BUFFER_SIZE)")
 	void glGetNamedBufferPointervEXT(@GLuint int buffer, @GLenum int pname, @OutParameter @Result @GLvoid ByteBuffer params);
 
 	@Dependent("OpenGL15")
diff --git a/src/templates/org/lwjgl/opengl/GL15.java b/src/templates/org/lwjgl/opengl/GL15.java
index 55d242d8..05b6c9c7 100644
--- a/src/templates/org/lwjgl/opengl/GL15.java
+++ b/src/templates/org/lwjgl/opengl/GL15.java
@@ -158,7 +158,7 @@ public interface GL15 {
 	 */
 	@CachedResult
 	@GLvoid
-	@AutoSize("GLChecks.getBufferObjectSize(caps, target)")
+	@AutoSize("glGetBufferParameteri(target, GL_BUFFER_SIZE)")
 	ByteBuffer glMapBuffer(@GLenum int target, @GLenum int access);
 
 	boolean glUnmapBuffer(@GLenum int target);
@@ -180,7 +180,7 @@ public interface GL15 {
 	void glGetBufferParameteriv3(@GLenum int target, @GLenum int pname, @OutParameter IntBuffer params);
 
 	@StripPostfix("pointer")
-	@AutoSize("GLChecks.getBufferObjectSize(caps, target)")
+	@AutoSize("glGetBufferParameteri(target, GL_BUFFER_SIZE)")
 	void glGetBufferPointerv(@GLenum int target, @GLenum int pname, @OutParameter @Result @GLvoid ByteBuffer pointer);
 
 	// -----------------------------------------------------------------
diff --git a/src/templates/org/lwjgl/opengles/GLES30.java b/src/templates/org/lwjgl/opengles/GLES30.java
index e2b0e373..e99cff52 100644
--- a/src/templates/org/lwjgl/opengles/GLES30.java
+++ b/src/templates/org/lwjgl/opengles/GLES30.java
@@ -427,7 +427,7 @@ public interface GLES30 {
 	boolean glUnmapBuffer(@GLenum int target);
 
 	@StripPostfix("pointer")
-	@AutoSize("GLChecks.getBufferObjectSize(target)")
+	@AutoSize("GLES20.glGetBufferParameteri(target, GLES20.GL_BUFFER_SIZE)")
 	void glGetBufferPointerv(@GLenum int target, @GLenum int pname, @OutParameter @Result @GLvoid ByteBuffer pointer);
 
 	void glDrawBuffers(@AutoSize("buffers") @GLsizei int size, @Const @GLenum IntBuffer buffers);
diff --git a/src/templates/org/lwjgl/opengles/OES_mapbuffer.java b/src/templates/org/lwjgl/opengles/OES_mapbuffer.java
index f25a3428..0a45b15b 100644
--- a/src/templates/org/lwjgl/opengles/OES_mapbuffer.java
+++ b/src/templates/org/lwjgl/opengles/OES_mapbuffer.java
@@ -51,7 +51,7 @@ public interface OES_mapbuffer {
 
 	@StripPostfix("pointer")
 	@CachedResult
-	@AutoSize("GLChecks.getBufferObjectSize(target)")
+	@AutoSize("GLES20.glGetBufferParameteri(target, GLES20.GL_BUFFER_SIZE)")
 	void glGetBufferPointervOES(@GLenum int target, @GLenum int pname, @OutParameter @Result @GLvoid ByteBuffer pointer);
 
 	/**
@@ -78,7 +78,7 @@ public interface OES_mapbuffer {
 	 */
 	@CachedResult
 	@GLvoid
-	@AutoSize("GLChecks.getBufferObjectSize(target)")
+	@AutoSize("GLES20.glGetBufferParameteri(target, GLES20.GL_BUFFER_SIZE)")
 	ByteBuffer glMapBufferOES(@GLenum int target, @GLenum int access);
 
 	boolean glUnmapBufferOES(@GLenum int target);