diff --git a/lib/OpenLayers.js b/lib/OpenLayers.js
index 5d05dc1ab9..613bb23f7f 100644
--- a/lib/OpenLayers.js
+++ b/lib/OpenLayers.js
@@ -65,6 +65,7 @@
       */
     if(!singleFile) {
         var jsfiles = new Array(
+            "OpenLayers/Util.js",
             "OpenLayers/BaseTypes.js",
             "OpenLayers/BaseTypes/Class.js",
             "OpenLayers/BaseTypes/Bounds.js",
@@ -72,7 +73,6 @@
             "OpenLayers/BaseTypes/LonLat.js",
             "OpenLayers/BaseTypes/Pixel.js",
             "OpenLayers/BaseTypes/Size.js",
-            "OpenLayers/Util.js",
             "OpenLayers/Console.js",
             "Rico/Corner.js",
             "Rico/Color.js",
diff --git a/lib/OpenLayers/Ajax.js b/lib/OpenLayers/Ajax.js
index e15fa1e13c..f4b35c6068 100644
--- a/lib/OpenLayers/Ajax.js
+++ b/lib/OpenLayers/Ajax.js
@@ -258,23 +258,14 @@ OpenLayers.Ajax.Base.prototype = {
     }
 };
 
+
 /**
  * Class: OpenLayers.Ajax.Request
  *
  * Inherit:
  *  - <OpenLayers.Ajax.Base>
  */
-OpenLayers.Ajax.Request = OpenLayers.Class.create();
-
-/** 
- * Property: Events
- * {Array(String)}
- */
-OpenLayers.Ajax.Request.Events =
-  ['Uninitialized', 'Loading', 'Loaded', 'Interactive', 'Complete'];
-
-OpenLayers.Ajax.Request.prototype = 
-  OpenLayers.Class.inherit( OpenLayers.Ajax.Base, {
+OpenLayers.Ajax.Request = OpenLayers.Class(OpenLayers.Ajax.Base, {
       
       /**
        * Constructor: OpenLayers.Ajax.Request
@@ -487,6 +478,13 @@ OpenLayers.Ajax.Request.prototype =
     
 });
 
+/** 
+ * Property: Events
+ * {Array(String)}
+ */
+OpenLayers.Ajax.Request.Events =
+  ['Uninitialized', 'Loading', 'Loaded', 'Interactive', 'Complete'];
+
 /**
  * Function: getElementsByTagNameNS
  * 
diff --git a/lib/OpenLayers/BaseTypes/Bounds.js b/lib/OpenLayers/BaseTypes/Bounds.js
index dea0f65ad3..47446e0d70 100644
--- a/lib/OpenLayers/BaseTypes/Bounds.js
+++ b/lib/OpenLayers/BaseTypes/Bounds.js
@@ -7,8 +7,7 @@
  * Instances of this class represent bounding boxes.  Data stored as left,
  * bottom, right, top floats
  */
-OpenLayers.Bounds = OpenLayers.Class.create();
-OpenLayers.Bounds.prototype = {
+OpenLayers.Bounds = OpenLayers.Class({
 
     /**
      * Property: left
@@ -457,7 +456,7 @@ OpenLayers.Bounds.prototype = {
     
     /** @final @type String */
     CLASS_NAME: "OpenLayers.Bounds"
-};
+});
 
 /** 
  * APIFunction: fromString
diff --git a/lib/OpenLayers/BaseTypes/Class.js b/lib/OpenLayers/BaseTypes/Class.js
index 16b238bcf8..172a10c79b 100644
--- a/lib/OpenLayers/BaseTypes/Class.js
+++ b/lib/OpenLayers/BaseTypes/Class.js
@@ -3,65 +3,93 @@
  * for the full text of the license. */
 
 /**
- * Namespace: OpenLayers.Class
- * Contains functions to create OpenLayers style classes.
- */ 
-OpenLayers.Class = {
-    isPrototype: function () {}, // magic anonymous value
-
-    /**
-     * APIFunction: create
-     * Create an OpenLayers style class
-     *
-     * Return:
-     * An OpenLayers class
-     */
-    create: function() {
-        return function() {
-            if (arguments && arguments[0] != OpenLayers.Class.isPrototype)
-                this.initialize.apply(this, arguments);
+ * Constructor: OpenLayers.Class
+ * Base class used to construct all other classes. Includes support for 
+ *     multiple inheritance. 
+ *     
+ * This constructor is new in OpenLayers 2.5.  At OpenLayers 3.0, the old 
+ *     syntax for creating classes and dealing with inheritance 
+ *     will be removed.
+ * 
+ * To create a new OpenLayers-style class, use the following syntax:
+ * > var MyClass = OpenLayers.Class(prototype);
+ *
+ * To create a new OpenLayers-style class with multiple inheritance, use the
+ *     following syntax:
+ * > var MyClass = OpenLayers.Class(Class1, Class2, prototype);
+ *
+ */
+OpenLayers.Class = function() {
+    var Class = function() {
+        /**
+         * This following condition can be removed at 3.0 - this is only for
+         * backwards compatibility while the Class.inherit method is still
+         * in use.  So at 3.0, the following three lines would be replaced with
+         * simply:
+         * this.initialize.apply(this, arguments);
+         */
+        if (arguments && arguments[0] != OpenLayers.Class.isPrototype) {
+            this.initialize.apply(this, arguments);
         }
-    },
- 
-    /**
-     * APIFunction: inherit
-     * Inherit from one or more OpenLayers style classes
-     *
-     * Parameters:
-     * class - One or more classes can be provided as arguments
-     *
-     * Return:
-     * An object prototype
-     */
-    inherit: function () {
-        var superClass = arguments[0];
-        var proto = new superClass(OpenLayers.Class.isPrototype);
-        for (var i = 1; i < arguments.length; i++) {
-            if (typeof arguments[i] == "function") {
-                var mixin = arguments[i];
-                arguments[i] = new mixin(OpenLayers.Class.isPrototype);
-            }
-            OpenLayers.Util.extend(proto, arguments[i]);
-
-            // This is a hack for IE see
-            // http://trac.openlayers.org/attachment/ticket/552
-            // 
-            // The problem is that ie doesnt recognize toString as a property
-            //  so the util.extend() doesnt copy it over. we do it manually.
-            // 
-            // to be revisited in 3.0
-            //
-            if((arguments[i].hasOwnProperty && arguments[i].hasOwnProperty('toString')) ||
-               (!arguments[i].hasOwnProperty && arguments[i].toString)) {
-                proto.toString = arguments[i].toString;
-            }
-        }
-        return proto;
     }
-};
+    var extended = new Object();
+    var parent;
+    for(var i=0; i<arguments.length; ++i) {
+        if(typeof arguments[i] == "function") {
+            // get the prototype of the superclass
+            parent = arguments[i].prototype;
+        } else {
+            // in this case we're extending with the prototype
+            parent = arguments[i];
+        }
+        OpenLayers.Util.extend(extended, parent);
+    }
+    Class.prototype = extended;
+    return Class;
+}
 
-/*
-    OpenLayers.Class.inherit( OpenLayers.Layer.Grid, OpenLayers.Layer.HTTPRequest, {
-        some stuff
-    });
-*/
\ No newline at end of file
+/**
+ * Property: isPrototype
+ * *Deprecated*.  This is no longer needed and will be removed at 3.0.
+ */
+OpenLayers.Class.isPrototype = function () {};
+
+/**
+ * APIFunction: OpenLayers.create
+ * *Deprecated*.  Old method to create an OpenLayers style class.  Use the
+ *     <OpenLayers.Class> constructor instead.
+ *
+ * Return:
+ * An OpenLayers class
+ */
+OpenLayers.Class.create = function() {
+    return function() {
+        if (arguments && arguments[0] != OpenLayers.Class.isPrototype)
+            this.initialize.apply(this, arguments);
+    }
+}
+
+
+/**
+ * APIFunction: inherit
+ * *Deprecated*.  Old method to inherit from one or more OpenLayers style
+ *     classes.  Use the <OpenLayers.Class> constructor instead.
+ *
+ * Parameters:
+ * class - One or more classes can be provided as arguments
+ *
+ * Return:
+ * An object prototype
+ */
+OpenLayers.Class.inherit = function () {
+    var superClass = arguments[0];
+    var proto = new superClass(OpenLayers.Class.isPrototype);
+    for (var i = 1; i < arguments.length; i++) {
+        if (typeof arguments[i] == "function") {
+            var mixin = arguments[i];
+            arguments[i] = new mixin(OpenLayers.Class.isPrototype);
+        }
+        OpenLayers.Util.extend(proto, arguments[i]);
+    }
+    return proto;
+}
diff --git a/lib/OpenLayers/BaseTypes/LonLat.js b/lib/OpenLayers/BaseTypes/LonLat.js
index bc1b4955d2..c762bf6c1a 100644
--- a/lib/OpenLayers/BaseTypes/LonLat.js
+++ b/lib/OpenLayers/BaseTypes/LonLat.js
@@ -6,8 +6,7 @@
  * Class: OpenLayers.LonLat
  * This class represents a longitude and latitude pair
  */
-OpenLayers.LonLat = OpenLayers.Class.create();
-OpenLayers.LonLat.prototype = {
+OpenLayers.LonLat = OpenLayers.Class({
 
     /** 
      * APIProperty: lon
@@ -146,7 +145,7 @@ OpenLayers.LonLat.prototype = {
     
     /** @final @type String */
     CLASS_NAME: "OpenLayers.LonLat"
-};
+});
 
 /** 
  * Function: fromString
diff --git a/lib/OpenLayers/BaseTypes/Pixel.js b/lib/OpenLayers/BaseTypes/Pixel.js
index 171b88bcad..f5e454fcda 100644
--- a/lib/OpenLayers/BaseTypes/Pixel.js
+++ b/lib/OpenLayers/BaseTypes/Pixel.js
@@ -6,8 +6,7 @@
  * Class: OpenLayers.Pixel
  * This class represents a screen coordinate, in x and y coordinates
  */
-OpenLayers.Pixel = OpenLayers.Class.create();
-OpenLayers.Pixel.prototype = {
+OpenLayers.Pixel = OpenLayers.Class({
     
     /**
      * APIProperty: x
@@ -119,4 +118,4 @@ OpenLayers.Pixel.prototype = {
     
     /** @final @type str */
     CLASS_NAME: "OpenLayers.Pixel"
-};
\ No newline at end of file
+});
\ No newline at end of file
diff --git a/lib/OpenLayers/BaseTypes/Size.js b/lib/OpenLayers/BaseTypes/Size.js
index c9d1995ca3..8cb7146535 100644
--- a/lib/OpenLayers/BaseTypes/Size.js
+++ b/lib/OpenLayers/BaseTypes/Size.js
@@ -6,8 +6,7 @@
  * Class: OpenLayers.Size
  * Instances of this class represent a width/height pair
  */
-OpenLayers.Size = OpenLayers.Class.create();
-OpenLayers.Size.prototype = {
+OpenLayers.Size = OpenLayers.Class({
 
     /**
      * APIProperty: w
@@ -83,4 +82,4 @@ OpenLayers.Size.prototype = {
     
     /** @final @type String */
     CLASS_NAME: "OpenLayers.Size"
-};
\ No newline at end of file
+});
\ No newline at end of file
diff --git a/lib/OpenLayers/Control.js b/lib/OpenLayers/Control.js
index e00d9dfb47..204e1d63b8 100644
--- a/lib/OpenLayers/Control.js
+++ b/lib/OpenLayers/Control.js
@@ -49,13 +49,7 @@
  * > map.addControl(control);
  * 
  */
-OpenLayers.Control = OpenLayers.Class.create();
-
-OpenLayers.Control.TYPE_BUTTON = 1;
-OpenLayers.Control.TYPE_TOGGLE = 2;
-OpenLayers.Control.TYPE_TOOL   = 3;
-
-OpenLayers.Control.prototype = {
+OpenLayers.Control = OpenLayers.Class({
 
     /** 
      * Property: id 
@@ -241,4 +235,8 @@ OpenLayers.Control.prototype = {
     
     /** @final @type String */
     CLASS_NAME: "OpenLayers.Control"
-};
+});
+
+OpenLayers.Control.TYPE_BUTTON = 1;
+OpenLayers.Control.TYPE_TOGGLE = 2;
+OpenLayers.Control.TYPE_TOOL   = 3;
diff --git a/lib/OpenLayers/Control/ArgParser.js b/lib/OpenLayers/Control/ArgParser.js
index 02edc9b898..0da6410876 100644
--- a/lib/OpenLayers/Control/ArgParser.js
+++ b/lib/OpenLayers/Control/ArgParser.js
@@ -11,9 +11,7 @@
  * Inherits from:
  *  - <OpenLayers.Control>
  */
-OpenLayers.Control.ArgParser = OpenLayers.Class.create();
-OpenLayers.Control.ArgParser.prototype = 
-  OpenLayers.Class.inherit( OpenLayers.Control, {
+OpenLayers.Control.ArgParser = OpenLayers.Class(OpenLayers.Control, {
 
     /**
      * Parameter: center
diff --git a/lib/OpenLayers/Control/DragPan.js b/lib/OpenLayers/Control/DragPan.js
index 9cdb3d2077..20c2bd9a66 100644
--- a/lib/OpenLayers/Control/DragPan.js
+++ b/lib/OpenLayers/Control/DragPan.js
@@ -12,9 +12,7 @@
  * Inherits from:
  *  - <OpenLayers.Control>
  */
-OpenLayers.Control.DragPan = OpenLayers.Class.create();
-OpenLayers.Control.DragPan.prototype = 
-  OpenLayers.Class.inherit( OpenLayers.Control, {
+OpenLayers.Control.DragPan = OpenLayers.Class(OpenLayers.Control, {
 
     /** 
      * Property: type
diff --git a/lib/OpenLayers/Control/DrawFeature.js b/lib/OpenLayers/Control/DrawFeature.js
index 194febfaf5..3f60c6d7a2 100644
--- a/lib/OpenLayers/Control/DrawFeature.js
+++ b/lib/OpenLayers/Control/DrawFeature.js
@@ -13,9 +13,7 @@
  * Inherits from:
  *  - <OpenLayers.Control>
  */
-OpenLayers.Control.DrawFeature = OpenLayers.Class.create();
-OpenLayers.Control.DrawFeature.prototype = 
-  OpenLayers.Class.inherit(OpenLayers.Control, {
+OpenLayers.Control.DrawFeature = OpenLayers.Class(OpenLayers.Control, {
     
     /**
      * Property: layer
diff --git a/lib/OpenLayers/Control/EditingToolbar.js b/lib/OpenLayers/Control/EditingToolbar.js
index dbc8ff4a0d..59e778a565 100644
--- a/lib/OpenLayers/Control/EditingToolbar.js
+++ b/lib/OpenLayers/Control/EditingToolbar.js
@@ -10,9 +10,8 @@
  * Class: OpenLayers.Control.EditingToolbar
  
  */
-OpenLayers.Control.EditingToolbar = OpenLayers.Class.create();
-OpenLayers.Control.EditingToolbar.prototype = 
-  OpenLayers.Class.inherit( OpenLayers.Control.Panel, {
+OpenLayers.Control.EditingToolbar = OpenLayers.Class(
+  OpenLayers.Control.Panel, {
 
     /**
      * Constructor: OpenLayers.Control.EditingToolbar
diff --git a/lib/OpenLayers/Control/KeyboardDefaults.js b/lib/OpenLayers/Control/KeyboardDefaults.js
index b21562dbc2..65d061de5c 100644
--- a/lib/OpenLayers/Control/KeyboardDefaults.js
+++ b/lib/OpenLayers/Control/KeyboardDefaults.js
@@ -12,9 +12,7 @@
  * Inherits from:
  *  - <OpenLayers.Control>
  */
-OpenLayers.Control.KeyboardDefaults = OpenLayers.Class.create();
-OpenLayers.Control.KeyboardDefaults.prototype = 
-  OpenLayers.Class.inherit( OpenLayers.Control, {
+OpenLayers.Control.KeyboardDefaults = OpenLayers.Class(OpenLayers.Control, {
 
     /**
      * APIProperty: slideFactor
diff --git a/lib/OpenLayers/Control/LayerSwitcher.js b/lib/OpenLayers/Control/LayerSwitcher.js
index 61df7e0e02..584b59fd8b 100644
--- a/lib/OpenLayers/Control/LayerSwitcher.js
+++ b/lib/OpenLayers/Control/LayerSwitcher.js
@@ -10,9 +10,7 @@
  * Inherits from:
  *  - <OpenLayers.Control>
  */
-OpenLayers.Control.LayerSwitcher = OpenLayers.Class.create();
-OpenLayers.Control.LayerSwitcher.prototype = 
-  OpenLayers.Class.inherit( OpenLayers.Control, {
+OpenLayers.Control.LayerSwitcher = OpenLayers.Class(OpenLayers.Control, {
 
     /**  
      * Property: activeColor
diff --git a/lib/OpenLayers/Control/MouseDefaults.js b/lib/OpenLayers/Control/MouseDefaults.js
index 1838f5766d..7e435bca63 100644
--- a/lib/OpenLayers/Control/MouseDefaults.js
+++ b/lib/OpenLayers/Control/MouseDefaults.js
@@ -10,9 +10,7 @@
  * Inherits from:
  *  - <OpenLayers.Control>
  */
-OpenLayers.Control.MouseDefaults = OpenLayers.Class.create();
-OpenLayers.Control.MouseDefaults.prototype = 
-  OpenLayers.Class.inherit( OpenLayers.Control, {
+OpenLayers.Control.MouseDefaults = OpenLayers.Class(OpenLayers.Control, {
 
     /** WARNING WARNING WARNING!!!
         This class is DEPRECATED in 2.4 and will be removed by 3.0.
diff --git a/lib/OpenLayers/Control/MousePosition.js b/lib/OpenLayers/Control/MousePosition.js
index af7a3a8329..aef27c888b 100644
--- a/lib/OpenLayers/Control/MousePosition.js
+++ b/lib/OpenLayers/Control/MousePosition.js
@@ -8,9 +8,7 @@
  * 
  * Class: OpenLayers.Control.MousePosition
  */
-OpenLayers.Control.MousePosition = OpenLayers.Class.create();
-OpenLayers.Control.MousePosition.prototype = 
-  OpenLayers.Class.inherit( OpenLayers.Control, {
+OpenLayers.Control.MousePosition = OpenLayers.Class(OpenLayers.Control, {
     
     /** 
      * Property: element
diff --git a/lib/OpenLayers/Control/MouseToolbar.js b/lib/OpenLayers/Control/MouseToolbar.js
index 1e7db425e4..67eeccccd3 100644
--- a/lib/OpenLayers/Control/MouseToolbar.js
+++ b/lib/OpenLayers/Control/MouseToolbar.js
@@ -11,11 +11,8 @@
  * This class is DEPRECATED in 2.4 and will be removed by 3.0.
  * If you need this functionality, use Control.NavToolbar instead!!! 
  */
-OpenLayers.Control.MouseToolbar = OpenLayers.Class.create();
-OpenLayers.Control.MouseToolbar.X = 6;
-OpenLayers.Control.MouseToolbar.Y = 300;
-OpenLayers.Control.MouseToolbar.prototype = 
-  OpenLayers.Class.inherit( OpenLayers.Control.MouseDefaults, {
+OpenLayers.Control.MouseToolbar = OpenLayers.Class(
+                                            OpenLayers.Control.MouseDefaults, {
     
     /**
      * Property: mode
@@ -384,3 +381,5 @@ OpenLayers.Control.MouseToolbar.prototype =
     }
 });
 
+OpenLayers.Control.MouseToolbar.X = 6;
+OpenLayers.Control.MouseToolbar.Y = 300;
diff --git a/lib/OpenLayers/Control/NavToolbar.js b/lib/OpenLayers/Control/NavToolbar.js
index d0a8bf1fd9..8aa4374b17 100644
--- a/lib/OpenLayers/Control/NavToolbar.js
+++ b/lib/OpenLayers/Control/NavToolbar.js
@@ -9,9 +9,7 @@
  *
  * Class: OpenLayers.Control.NavToolbar
  */
-OpenLayers.Control.NavToolbar = OpenLayers.Class.create();
-OpenLayers.Control.NavToolbar.prototype = 
-  OpenLayers.Class.inherit( OpenLayers.Control.Panel, {
+OpenLayers.Control.NavToolbar = OpenLayers.Class(OpenLayers.Control.Panel, {
 
     /**
      * Constructor: OpenLayers.Control.NavToolbar 
diff --git a/lib/OpenLayers/Control/Navigation.js b/lib/OpenLayers/Control/Navigation.js
index 9d0f8b9175..584a8754de 100644
--- a/lib/OpenLayers/Control/Navigation.js
+++ b/lib/OpenLayers/Control/Navigation.js
@@ -19,9 +19,7 @@
  * Inherits:
  *  - <OpenLayers.Control>
  */
-OpenLayers.Control.Navigation = OpenLayers.Class.create();
-OpenLayers.Control.Navigation.prototype = 
-  OpenLayers.Class.inherit( OpenLayers.Control, {
+OpenLayers.Control.Navigation = OpenLayers.Class(OpenLayers.Control, {
 
     /** 
      * Property: dragPan
diff --git a/lib/OpenLayers/Control/OverviewMap.js b/lib/OpenLayers/Control/OverviewMap.js
index f1211b10ce..0c55067661 100644
--- a/lib/OpenLayers/Control/OverviewMap.js
+++ b/lib/OpenLayers/Control/OverviewMap.js
@@ -15,9 +15,7 @@
  * Inerits from:
  *  - <OpenLayers.Control>
  */
-OpenLayers.Control.OverviewMap = OpenLayers.Class.create();
-OpenLayers.Control.OverviewMap.prototype = 
-  OpenLayers.Class.inherit( OpenLayers.Control, {
+OpenLayers.Control.OverviewMap = OpenLayers.Class(OpenLayers.Control, {
 
     /**
      * Property: id
diff --git a/lib/OpenLayers/Control/PanZoom.js b/lib/OpenLayers/Control/PanZoom.js
index 1fcdb9fe1b..a0b02363a7 100644
--- a/lib/OpenLayers/Control/PanZoom.js
+++ b/lib/OpenLayers/Control/PanZoom.js
@@ -11,11 +11,7 @@
  * Inherits from:
  *  - <OpenLayers.Control>
  */
-OpenLayers.Control.PanZoom = OpenLayers.Class.create();
-OpenLayers.Control.PanZoom.X = 4;
-OpenLayers.Control.PanZoom.Y = 4;
-OpenLayers.Control.PanZoom.prototype = 
-  OpenLayers.Class.inherit( OpenLayers.Control, {
+OpenLayers.Control.PanZoom = OpenLayers.Class(OpenLayers.Control, {
 
     /** 
      * APIProperty: slideFactor
@@ -182,3 +178,6 @@ OpenLayers.Control.PanZoom.prototype =
     /** @final @type String */
     CLASS_NAME: "OpenLayers.Control.PanZoom"
 });
+
+OpenLayers.Control.PanZoom.X = 4;
+OpenLayers.Control.PanZoom.Y = 4;
diff --git a/lib/OpenLayers/Control/PanZoomBar.js b/lib/OpenLayers/Control/PanZoomBar.js
index 6aaff259d8..3451d058b6 100644
--- a/lib/OpenLayers/Control/PanZoomBar.js
+++ b/lib/OpenLayers/Control/PanZoomBar.js
@@ -12,9 +12,7 @@
  *  - <OpenLayers.Control.PanZoom>
  *  - <OpenLayers.Control>
  */
-OpenLayers.Control.PanZoomBar = OpenLayers.Class.create();
-OpenLayers.Control.PanZoomBar.prototype = 
-  OpenLayers.Class.inherit( OpenLayers.Control.PanZoom, {
+OpenLayers.Control.PanZoomBar = OpenLayers.Class(OpenLayers.Control.PanZoom, {
 
     /** 
      * APIProperty: zoomStopWidth
diff --git a/lib/OpenLayers/Control/Panel.js b/lib/OpenLayers/Control/Panel.js
index b3ce1cc301..9703f691ea 100644
--- a/lib/OpenLayers/Control/Panel.js
+++ b/lib/OpenLayers/Control/Panel.js
@@ -10,9 +10,7 @@
  * Inherits from:
  *  - <OpenLayers.Control>
  */
-OpenLayers.Control.Panel = OpenLayers.Class.create();
-OpenLayers.Control.Panel.prototype = 
-  OpenLayers.Class.inherit( OpenLayers.Control, {
+OpenLayers.Control.Panel = OpenLayers.Class(OpenLayers.Control, {
     /**
      * Property: controls
      * Array({<OpenLayers.Control>})
diff --git a/lib/OpenLayers/Control/Permalink.js b/lib/OpenLayers/Control/Permalink.js
index 31463d3611..03b321fe72 100644
--- a/lib/OpenLayers/Control/Permalink.js
+++ b/lib/OpenLayers/Control/Permalink.js
@@ -11,9 +11,7 @@
  * Inherits from:
  *  - <OpenLayers.Control>
  */
-OpenLayers.Control.Permalink = OpenLayers.Class.create();
-OpenLayers.Control.Permalink.prototype = 
-  OpenLayers.Class.inherit( OpenLayers.Control, {
+OpenLayers.Control.Permalink = OpenLayers.Class(OpenLayers.Control, {
 
     /** 
      * Property: element 
diff --git a/lib/OpenLayers/Control/Scale.js b/lib/OpenLayers/Control/Scale.js
index ad381d7755..bcaa21f581 100644
--- a/lib/OpenLayers/Control/Scale.js
+++ b/lib/OpenLayers/Control/Scale.js
@@ -11,9 +11,7 @@
  * Inherits from:
  *  - <OpenLayers.Control>
  */
-OpenLayers.Control.Scale = OpenLayers.Class.create();
-OpenLayers.Control.Scale.prototype = 
-  OpenLayers.Class.inherit( OpenLayers.Control, {
+OpenLayers.Control.Scale = OpenLayers.Class(OpenLayers.Control, {
     
     /**
      * Parameter: element
diff --git a/lib/OpenLayers/Control/SelectFeature.js b/lib/OpenLayers/Control/SelectFeature.js
index 9c9b6ea7a6..2f74212b1d 100644
--- a/lib/OpenLayers/Control/SelectFeature.js
+++ b/lib/OpenLayers/Control/SelectFeature.js
@@ -13,9 +13,7 @@
  * Inherits from:
  *  - <OpenLayers.Control>
  */
-OpenLayers.Control.SelectFeature = OpenLayers.Class.create();
-OpenLayers.Control.SelectFeature.prototype = 
-  OpenLayers.Class.inherit(OpenLayers.Control, {
+OpenLayers.Control.SelectFeature = OpenLayers.Class(OpenLayers.Control, {
     
     /**
      * APIProperty: multiple
diff --git a/lib/OpenLayers/Control/ZoomBox.js b/lib/OpenLayers/Control/ZoomBox.js
index fe18447582..3e1fd327a3 100644
--- a/lib/OpenLayers/Control/ZoomBox.js
+++ b/lib/OpenLayers/Control/ZoomBox.js
@@ -11,9 +11,7 @@
  * Inherits from:
  *  - <OpenLayers.Control>
  */
-OpenLayers.Control.ZoomBox = OpenLayers.Class.create();
-OpenLayers.Control.ZoomBox.prototype = 
-  OpenLayers.Class.inherit( OpenLayers.Control, {
+OpenLayers.Control.ZoomBox = OpenLayers.Class(OpenLayers.Control, {
     /**
      * Property: type
      * {OpenLayers.Control.TYPE}
diff --git a/lib/OpenLayers/Control/ZoomToMaxExtent.js b/lib/OpenLayers/Control/ZoomToMaxExtent.js
index 1bac1adf6f..7ebab25144 100644
--- a/lib/OpenLayers/Control/ZoomToMaxExtent.js
+++ b/lib/OpenLayers/Control/ZoomToMaxExtent.js
@@ -12,9 +12,7 @@
  * Inherits from:
  *  - <OpenLayers.Control>
  */
-OpenLayers.Control.ZoomToMaxExtent = OpenLayers.Class.create();
-OpenLayers.Control.ZoomToMaxExtent.prototype = 
-  OpenLayers.Class.inherit( OpenLayers.Control, {
+OpenLayers.Control.ZoomToMaxExtent = OpenLayers.Class(OpenLayers.Control, {
     /**
      * Property: type
      * TYPE_BUTTON.
diff --git a/lib/OpenLayers/Events.js b/lib/OpenLayers/Events.js
index 35a4d34797..05100c5df2 100644
--- a/lib/OpenLayers/Events.js
+++ b/lib/OpenLayers/Events.js
@@ -334,8 +334,7 @@ if (window.Event) {
 /**
  * Class: OpenLayers.Events
  */
-OpenLayers.Events = OpenLayers.Class.create();
-OpenLayers.Events.prototype = {
+OpenLayers.Events = OpenLayers.Class({
 
     /** 
      * Constant: BROWSER_EVENTS
@@ -666,4 +665,4 @@ OpenLayers.Events.prototype = {
 
     /** @final @type String */
     CLASS_NAME: "OpenLayers.Events"
-};
+});
diff --git a/lib/OpenLayers/Feature.js b/lib/OpenLayers/Feature.js
index 4de1e1a213..54a6058f24 100644
--- a/lib/OpenLayers/Feature.js
+++ b/lib/OpenLayers/Feature.js
@@ -11,8 +11,7 @@
  * Features are combinations of geography and attributes. The OpenLayers.Feature
  * class specifically combines a marker and a lonlat.
  */
-OpenLayers.Feature = OpenLayers.Class.create();
-OpenLayers.Feature.prototype= {
+OpenLayers.Feature = OpenLayers.Class({
 
     /** 
      * Property: events 
@@ -203,4 +202,4 @@ OpenLayers.Feature.prototype= {
     
     /** @final @type String */
     CLASS_NAME: "OpenLayers.Feature"
-};
+});
diff --git a/lib/OpenLayers/Feature/Vector.js b/lib/OpenLayers/Feature/Vector.js
index 920c922e72..50746c55b1 100644
--- a/lib/OpenLayers/Feature/Vector.js
+++ b/lib/OpenLayers/Feature/Vector.js
@@ -24,9 +24,7 @@ OpenLayers.State = {
  * Inherits from:
  *  - <OpenLayers.Feature>
  */
-OpenLayers.Feature.Vector = OpenLayers.Class.create();
-OpenLayers.Feature.Vector.prototype =
-  OpenLayers.Class.inherit( OpenLayers.Feature, {
+OpenLayers.Feature.Vector = OpenLayers.Class(OpenLayers.Feature, {
 
     /** 
      * Property: fid 
diff --git a/lib/OpenLayers/Feature/WFS.js b/lib/OpenLayers/Feature/WFS.js
index 87709c7424..b4eb6a25b5 100644
--- a/lib/OpenLayers/Feature/WFS.js
+++ b/lib/OpenLayers/Feature/WFS.js
@@ -14,9 +14,7 @@
  * Inherits from:
  *  - <OpenLayers.Feature>
  */
-OpenLayers.Feature.WFS = OpenLayers.Class.create();
-OpenLayers.Feature.WFS.prototype = 
-  OpenLayers.Class.inherit( OpenLayers.Feature, {
+OpenLayers.Feature.WFS = OpenLayers.Class(OpenLayers.Feature, {
       
     /** 
      * Constructor: OpenLayers.Feature.WFS
diff --git a/lib/OpenLayers/Format.js b/lib/OpenLayers/Format.js
index 8df8abf178..f6aa0dcd5b 100644
--- a/lib/OpenLayers/Format.js
+++ b/lib/OpenLayers/Format.js
@@ -9,8 +9,7 @@
  * Base class for format reading/writing a variety of formats.  Subclasses
  * of OpenLayers.Format are expected to have read and write methods.
  */
-OpenLayers.Format = OpenLayers.Class.create();
-OpenLayers.Format.prototype = {
+OpenLayers.Format = OpenLayers.Class({
     
     /**
      * Constructor: OpenLayers.Format
@@ -59,4 +58,4 @@ OpenLayers.Format.prototype = {
     /** @final @type String */
     CLASS_NAME: "OpenLayers.Format"
 
-};     
+});     
diff --git a/lib/OpenLayers/Format/GML.js b/lib/OpenLayers/Format/GML.js
index cef0b26785..1474e3000a 100644
--- a/lib/OpenLayers/Format/GML.js
+++ b/lib/OpenLayers/Format/GML.js
@@ -15,9 +15,7 @@
  * Inherits from:
  *  - <OpenLayers.Format>
  */
-OpenLayers.Format.GML = OpenLayers.Class.create();
-OpenLayers.Format.GML.prototype = 
-  OpenLayers.Class.inherit( OpenLayers.Format, {
+OpenLayers.Format.GML = OpenLayers.Class(OpenLayers.Format, {
     
     /*
      * APIProperty: featureNS
diff --git a/lib/OpenLayers/Format/GeoRSS.js b/lib/OpenLayers/Format/GeoRSS.js
index 072081da7e..888a5a5425 100644
--- a/lib/OpenLayers/Format/GeoRSS.js
+++ b/lib/OpenLayers/Format/GeoRSS.js
@@ -12,9 +12,7 @@
  * Inherits from:
  *  - <OpenLayers.Format>
  */
-OpenLayers.Format.GeoRSS = OpenLayers.Class.create();
-OpenLayers.Format.GeoRSS.prototype = 
-  OpenLayers.Class.inherit( OpenLayers.Format, {
+OpenLayers.Format.GeoRSS = OpenLayers.Class(OpenLayers.Format, {
     
     /**
      * APIProperty: rssns
diff --git a/lib/OpenLayers/Format/KML.js b/lib/OpenLayers/Format/KML.js
index cb98d82e65..65fc62fb98 100644
--- a/lib/OpenLayers/Format/KML.js
+++ b/lib/OpenLayers/Format/KML.js
@@ -15,9 +15,7 @@
  * Inherits from:
  *  - <OpenLayers.Format>
  */
-OpenLayers.Format.KML = OpenLayers.Class.create();
-OpenLayers.Format.KML.prototype = 
-  OpenLayers.Class.inherit( OpenLayers.Format, {
+OpenLayers.Format.KML = OpenLayers.Class(OpenLayers.Format, {
     
     /**
      * APIProperty: kmlns
diff --git a/lib/OpenLayers/Format/WFS.js b/lib/OpenLayers/Format/WFS.js
index 0b53c6793b..0a44aa7725 100644
--- a/lib/OpenLayers/Format/WFS.js
+++ b/lib/OpenLayers/Format/WFS.js
@@ -8,9 +8,7 @@
  * Class: OpenLayers.Format.WFS
  * Read/Write WFS. 
  */
-OpenLayers.Format.WFS = OpenLayers.Class.create();
-OpenLayers.Format.WFS.prototype = 
-  OpenLayers.Class.inherit( OpenLayers.Format.GML, {
+OpenLayers.Format.WFS = OpenLayers.Class(OpenLayers.Format.GML, {
     
     /** 
      * Property: layer
diff --git a/lib/OpenLayers/Format/WKT.js b/lib/OpenLayers/Format/WKT.js
index 0a09e7b06e..e746cb2c75 100644
--- a/lib/OpenLayers/Format/WKT.js
+++ b/lib/OpenLayers/Format/WKT.js
@@ -12,9 +12,7 @@
  * Inherits from:
  *  - <OpenLayers.Format>
  */
-OpenLayers.Format.WKT = OpenLayers.Class.create();
-OpenLayers.Format.WKT.prototype = 
-  OpenLayers.Class.inherit(OpenLayers.Format, {
+OpenLayers.Format.WKT = OpenLayers.Class(OpenLayers.Format, {
     
     /**
      * Constructor: OpenLayers.Format.WKT
diff --git a/lib/OpenLayers/Geometry.js b/lib/OpenLayers/Geometry.js
index cf9cadcc3a..4aa02cfb78 100644
--- a/lib/OpenLayers/Geometry.js
+++ b/lib/OpenLayers/Geometry.js
@@ -11,8 +11,7 @@
  * this class with the <OpenLayers.Geometry> constructor.  This is a base class,
  * typical geometry types are described by subclasses of this class.
  */
-OpenLayers.Geometry = OpenLayers.Class.create();
-OpenLayers.Geometry.prototype = {
+OpenLayers.Geometry = OpenLayers.Class({
 
     /**
      * Property: id
@@ -189,4 +188,4 @@ OpenLayers.Geometry.prototype = {
 
     /** @final @type String*/
     CLASS_NAME: "OpenLayers.Geometry"
-};
+});
diff --git a/lib/OpenLayers/Geometry/Collection.js b/lib/OpenLayers/Geometry/Collection.js
index 859515f811..5959497500 100644
--- a/lib/OpenLayers/Geometry/Collection.js
+++ b/lib/OpenLayers/Geometry/Collection.js
@@ -22,9 +22,7 @@
  * Inerhits from:
  *  - <OpenLayers.Geometry> 
  */
-OpenLayers.Geometry.Collection = OpenLayers.Class.create();
-OpenLayers.Geometry.Collection.prototype = 
-  OpenLayers.Class.inherit( OpenLayers.Geometry, {
+OpenLayers.Geometry.Collection = OpenLayers.Class(OpenLayers.Geometry, {
 
     /**
      * APIProperty: components
diff --git a/lib/OpenLayers/Geometry/Curve.js b/lib/OpenLayers/Geometry/Curve.js
index 567fb90270..986a92aa9f 100644
--- a/lib/OpenLayers/Geometry/Curve.js
+++ b/lib/OpenLayers/Geometry/Curve.js
@@ -13,9 +13,7 @@
  * Inherits: 
  *  - <OpenLayers.Geometry.MultiPoint>
  */
-OpenLayers.Geometry.Curve = OpenLayers.Class.create();
-OpenLayers.Geometry.Curve.prototype = 
-  OpenLayers.Class.inherit(OpenLayers.Geometry.MultiPoint, {
+OpenLayers.Geometry.Curve = OpenLayers.Class(OpenLayers.Geometry.MultiPoint, {
 
     /**
      * Property: componentTypes
diff --git a/lib/OpenLayers/Geometry/LineString.js b/lib/OpenLayers/Geometry/LineString.js
index 105b82de7f..6d747e6bc6 100644
--- a/lib/OpenLayers/Geometry/LineString.js
+++ b/lib/OpenLayers/Geometry/LineString.js
@@ -12,9 +12,7 @@
  * Inherits from:
  *  - <OpenLayers.Geometry.Curve>
  */
-OpenLayers.Geometry.LineString = OpenLayers.Class.create();
-OpenLayers.Geometry.LineString.prototype =
-    OpenLayers.Class.inherit(OpenLayers.Geometry.Curve, {
+OpenLayers.Geometry.LineString = OpenLayers.Class(OpenLayers.Geometry.Curve, {
 
     /**
      * Constructor: OpenLayers.Geometry.LineString
diff --git a/lib/OpenLayers/Geometry/LinearRing.js b/lib/OpenLayers/Geometry/LinearRing.js
index 94cdc58237..0174c2a588 100644
--- a/lib/OpenLayers/Geometry/LinearRing.js
+++ b/lib/OpenLayers/Geometry/LinearRing.js
@@ -17,9 +17,8 @@
  * Inherits:
  *  - <OpenLayers.Geometry.LineString>
  */
-OpenLayers.Geometry.LinearRing = OpenLayers.Class.create();
-OpenLayers.Geometry.LinearRing.prototype = 
-    OpenLayers.Class.inherit(OpenLayers.Geometry.LineString, {
+OpenLayers.Geometry.LinearRing = OpenLayers.Class(
+  OpenLayers.Geometry.LineString, {
 
     /**
      * Property: componentTypes
diff --git a/lib/OpenLayers/Geometry/MultiLineString.js b/lib/OpenLayers/Geometry/MultiLineString.js
index 2de8e32db1..a609c237c2 100644
--- a/lib/OpenLayers/Geometry/MultiLineString.js
+++ b/lib/OpenLayers/Geometry/MultiLineString.js
@@ -13,9 +13,8 @@
  *  - <OpenLayers.Geometry.Collection>
  *  - <OpenLayers.Geometry> 
  */
-OpenLayers.Geometry.MultiLineString = OpenLayers.Class.create();
-OpenLayers.Geometry.MultiLineString.prototype =
-    OpenLayers.Class.inherit(OpenLayers.Geometry.Collection, {
+OpenLayers.Geometry.MultiLineString = OpenLayers.Class(
+  OpenLayers.Geometry.Collection, {
 
     /**
      * Property: componentTypes
diff --git a/lib/OpenLayers/Geometry/MultiPoint.js b/lib/OpenLayers/Geometry/MultiPoint.js
index 5bcad22f89..aeda64e235 100644
--- a/lib/OpenLayers/Geometry/MultiPoint.js
+++ b/lib/OpenLayers/Geometry/MultiPoint.js
@@ -13,9 +13,8 @@
  *  - <OpenLayers.Geometry.Collection>
  *  - <OpenLayers.Geometry>
  */
-OpenLayers.Geometry.MultiPoint = OpenLayers.Class.create();
-OpenLayers.Geometry.MultiPoint.prototype =
-    OpenLayers.Class.inherit(OpenLayers.Geometry.Collection, {
+OpenLayers.Geometry.MultiPoint = OpenLayers.Class(
+  OpenLayers.Geometry.Collection, {
 
     /**
      * Property: componentTypes
diff --git a/lib/OpenLayers/Geometry/MultiPolygon.js b/lib/OpenLayers/Geometry/MultiPolygon.js
index 6adce94430..20e2e2fec7 100644
--- a/lib/OpenLayers/Geometry/MultiPolygon.js
+++ b/lib/OpenLayers/Geometry/MultiPolygon.js
@@ -13,9 +13,8 @@
  * Inherits from:
  *  - <OpenLayers.Geometry.Collection>
  */
-OpenLayers.Geometry.MultiPolygon = OpenLayers.Class.create();
-OpenLayers.Geometry.MultiPolygon.prototype =
-    OpenLayers.Class.inherit(OpenLayers.Geometry.Collection, {
+OpenLayers.Geometry.MultiPolygon = OpenLayers.Class(
+  OpenLayers.Geometry.Collection, {
 
     /**
      * Property: componentTypes
diff --git a/lib/OpenLayers/Geometry/Point.js b/lib/OpenLayers/Geometry/Point.js
index e66cb33c1f..9869a9fd3a 100644
--- a/lib/OpenLayers/Geometry/Point.js
+++ b/lib/OpenLayers/Geometry/Point.js
@@ -11,9 +11,7 @@
  * Inherits from:
  *  - <OpenLayers.Geometry> 
  */
-OpenLayers.Geometry.Point = OpenLayers.Class.create();
-OpenLayers.Geometry.Point.prototype =
-    OpenLayers.Class.inherit(OpenLayers.Geometry, {
+OpenLayers.Geometry.Point = OpenLayers.Class(OpenLayers.Geometry, {
 
     /** 
      * APIProperty: x 
diff --git a/lib/OpenLayers/Geometry/Polygon.js b/lib/OpenLayers/Geometry/Polygon.js
index 745791994f..f00d57ff83 100644
--- a/lib/OpenLayers/Geometry/Polygon.js
+++ b/lib/OpenLayers/Geometry/Polygon.js
@@ -12,9 +12,8 @@
  *  - <OpenLayers.Geometry.Collection> 
  *  - <OpenLayers.Geometry> 
  */
-OpenLayers.Geometry.Polygon = OpenLayers.Class.create();
-OpenLayers.Geometry.Polygon.prototype =
-    OpenLayers.Class.inherit(OpenLayers.Geometry.Collection, {
+OpenLayers.Geometry.Polygon = OpenLayers.Class(
+  OpenLayers.Geometry.Collection, {
 
     /**
      * Property: componentTypes
diff --git a/lib/OpenLayers/Geometry/Rectangle.js b/lib/OpenLayers/Geometry/Rectangle.js
index 9b4a596b53..70b522ff41 100644
--- a/lib/OpenLayers/Geometry/Rectangle.js
+++ b/lib/OpenLayers/Geometry/Rectangle.js
@@ -14,9 +14,7 @@
  *  - <OpenLayers.Geometry>
  */
 
-OpenLayers.Geometry.Rectangle = OpenLayers.Class.create();
-OpenLayers.Geometry.Rectangle.prototype = 
-  OpenLayers.Class.inherit(OpenLayers.Geometry, {
+OpenLayers.Geometry.Rectangle = OpenLayers.Class(OpenLayers.Geometry, {
 
     /** 
      * Property: x
diff --git a/lib/OpenLayers/Geometry/Surface.js b/lib/OpenLayers/Geometry/Surface.js
index bf39e05595..699a58f863 100644
--- a/lib/OpenLayers/Geometry/Surface.js
+++ b/lib/OpenLayers/Geometry/Surface.js
@@ -7,9 +7,7 @@
  * 
  * Class: OpenLayers.Geometry.Surface
  */
-OpenLayers.Geometry.Surface = OpenLayers.Class.create();
-OpenLayers.Geometry.Surface.prototype =
-    OpenLayers.Class.inherit(OpenLayers.Geometry, {
+OpenLayers.Geometry.Surface = OpenLayers.Class(OpenLayers.Geometry, {
 
     /**
      * Constructor: OpenLayers.Geometry.Surface
diff --git a/lib/OpenLayers/Handler.js b/lib/OpenLayers/Handler.js
index 7fd6523785..62d69d066a 100644
--- a/lib/OpenLayers/Handler.js
+++ b/lib/OpenLayers/Handler.js
@@ -26,33 +26,8 @@
  *     themselves may make temporary changes, but in general are expected to
  *     return the application in the same state that they found it.
  */
-OpenLayers.Handler = OpenLayers.Class.create();
+OpenLayers.Handler = OpenLayers.Class({
 
-/**
- * Constant: OpenLayers.Handler.MOD_NONE
- * If set as the <keyMask>, <checkModifiers> returns false if any key is down.
- */
-OpenLayers.Handler.MOD_NONE  = 0;
-
-/**
- * Constant: OpenLayers.Handler.MOD_SHIFT
- * If set as the <keyMask>, <checkModifiers> returns false if Shift is down.
- */
-OpenLayers.Handler.MOD_SHIFT = 1;
-
-/**
- * Constant: OpenLayers.Handler.MOD_CTRL
- * If set as the <keyMask>, <checkModifiers> returns false if Ctrl is down.
- */
-OpenLayers.Handler.MOD_CTRL  = 2;
-
-/**
- * Constant: OpenLayers.Handler.MOD_ALT
- * If set as the <keyMask>, <checkModifiers> returns false if Alt is down.
- */
-OpenLayers.Handler.MOD_ALT   = 4;
-
-OpenLayers.Handler.prototype = {
     /**
      * Property: id
      * {String}
@@ -245,4 +220,29 @@ OpenLayers.Handler.prototype = {
 
     /** @final @type String */
     CLASS_NAME: "OpenLayers.Handler"
-};
+});
+
+/**
+ * Constant: OpenLayers.Handler.MOD_NONE
+ * If set as the <keyMask>, <checkModifiers> returns false if any key is down.
+ */
+OpenLayers.Handler.MOD_NONE  = 0;
+
+/**
+ * Constant: OpenLayers.Handler.MOD_SHIFT
+ * If set as the <keyMask>, <checkModifiers> returns false if Shift is down.
+ */
+OpenLayers.Handler.MOD_SHIFT = 1;
+
+/**
+ * Constant: OpenLayers.Handler.MOD_CTRL
+ * If set as the <keyMask>, <checkModifiers> returns false if Ctrl is down.
+ */
+OpenLayers.Handler.MOD_CTRL  = 2;
+
+/**
+ * Constant: OpenLayers.Handler.MOD_ALT
+ * If set as the <keyMask>, <checkModifiers> returns false if Alt is down.
+ */
+OpenLayers.Handler.MOD_ALT   = 4;
+
diff --git a/lib/OpenLayers/Handler/Box.js b/lib/OpenLayers/Handler/Box.js
index 2fcf0b2635..b0a5538ecd 100644
--- a/lib/OpenLayers/Handler/Box.js
+++ b/lib/OpenLayers/Handler/Box.js
@@ -13,8 +13,8 @@
  * Inherits from:
  *  - <OpenLayers.Handler> 
  */
-OpenLayers.Handler.Box = OpenLayers.Class.create();
-OpenLayers.Handler.Box.prototype = OpenLayers.Class.inherit( OpenLayers.Handler, {
+OpenLayers.Handler.Box = OpenLayers.Class(OpenLayers.Handler, {
+
     /** 
      * Property: dragHandler 
      * {<OpenLayers.Handler.Drag>} 
diff --git a/lib/OpenLayers/Handler/Drag.js b/lib/OpenLayers/Handler/Drag.js
index 714391ef86..1942494a62 100644
--- a/lib/OpenLayers/Handler/Drag.js
+++ b/lib/OpenLayers/Handler/Drag.js
@@ -23,9 +23,7 @@
  * Inherits from:
  *  - <OpenLayers.Handler>
  */
-OpenLayers.Handler.Drag = OpenLayers.Class.create();
-OpenLayers.Handler.Drag.prototype = 
-  OpenLayers.Class.inherit( OpenLayers.Handler, {
+OpenLayers.Handler.Drag = OpenLayers.Class(OpenLayers.Handler, {
   
     /** 
      * Property: started
diff --git a/lib/OpenLayers/Handler/Feature.js b/lib/OpenLayers/Handler/Feature.js
index 0a68c2c995..17a74cc712 100644
--- a/lib/OpenLayers/Handler/Feature.js
+++ b/lib/OpenLayers/Handler/Feature.js
@@ -11,9 +11,7 @@
  * Callbacks will be called for over, move, out, up, and down (corresponding
  * to the equivalent mouse events).
  */
-OpenLayers.Handler.Feature = OpenLayers.Class.create();
-OpenLayers.Handler.Feature.prototype =
-  OpenLayers.Class.inherit(OpenLayers.Handler, {
+OpenLayers.Handler.Feature = OpenLayers.Class(OpenLayers.Handler, {
     
     /**
      * Property: layerIndex
diff --git a/lib/OpenLayers/Handler/Keyboard.js b/lib/OpenLayers/Handler/Keyboard.js
index 9ddfb70cf3..57bdcd7aaa 100644
--- a/lib/OpenLayers/Handler/Keyboard.js
+++ b/lib/OpenLayers/Handler/Keyboard.js
@@ -11,8 +11,7 @@
  * Inherits from:
  *  - <OpenLayers.Handler> 
  */
-OpenLayers.Handler.Keyboard = OpenLayers.Class.create();
-OpenLayers.Handler.Keyboard.prototype = OpenLayers.Class.inherit( OpenLayers.Handler, {
+OpenLayers.Handler.Keyboard = OpenLayers.Class(OpenLayers.Handler, {
 
     /* http://www.quirksmode.org/js/keys.html explains key x-browser
         key handling quirks in pretty nice detail */
diff --git a/lib/OpenLayers/Handler/MouseWheel.js b/lib/OpenLayers/Handler/MouseWheel.js
index fabf84a485..2895f2b306 100644
--- a/lib/OpenLayers/Handler/MouseWheel.js
+++ b/lib/OpenLayers/Handler/MouseWheel.js
@@ -11,8 +11,7 @@
  * Inherits from:
  *  - <OpenLayers.Handler>
  */
-OpenLayers.Handler.MouseWheel = OpenLayers.Class.create();
-OpenLayers.Handler.MouseWheel.prototype = OpenLayers.Class.inherit( OpenLayers.Handler, {
+OpenLayers.Handler.MouseWheel = OpenLayers.Class(OpenLayers.Handler, {
     /** 
      * Property: wheelListener 
      * {function} 
diff --git a/lib/OpenLayers/Handler/Path.js b/lib/OpenLayers/Handler/Path.js
index 5d421bbf97..6d3f31c6ed 100644
--- a/lib/OpenLayers/Handler/Path.js
+++ b/lib/OpenLayers/Handler/Path.js
@@ -15,9 +15,7 @@
  * Inherits from:
  *  - <OpenLayers.Handler.Point>
  */
-OpenLayers.Handler.Path = OpenLayers.Class.create();
-OpenLayers.Handler.Path.prototype = 
-  OpenLayers.Class.inherit(OpenLayers.Handler.Point, {
+OpenLayers.Handler.Path = OpenLayers.Class(OpenLayers.Handler.Point, {
     
     /**
      * Property: line
diff --git a/lib/OpenLayers/Handler/Point.js b/lib/OpenLayers/Handler/Point.js
index c9bbae9369..ddcce71cfc 100644
--- a/lib/OpenLayers/Handler/Point.js
+++ b/lib/OpenLayers/Handler/Point.js
@@ -16,9 +16,7 @@
  * Inherits from:
  *  - <OpenLayers.Handler>
  */
-OpenLayers.Handler.Point = OpenLayers.Class.create();
-OpenLayers.Handler.Point.prototype = 
-  OpenLayers.Class.inherit(OpenLayers.Handler, {
+OpenLayers.Handler.Point = OpenLayers.Class(OpenLayers.Handler, {
     
     /**
      * Property: point
diff --git a/lib/OpenLayers/Handler/Polygon.js b/lib/OpenLayers/Handler/Polygon.js
index 1249bbe97d..9b9c7626bb 100644
--- a/lib/OpenLayers/Handler/Polygon.js
+++ b/lib/OpenLayers/Handler/Polygon.js
@@ -15,9 +15,7 @@
  *  - <OpenLayers.Handler.Path>
  *  - <OpenLayers.Handler>
  */
-OpenLayers.Handler.Polygon = OpenLayers.Class.create();
-OpenLayers.Handler.Polygon.prototype = 
-  OpenLayers.Class.inherit(OpenLayers.Handler.Path, {
+OpenLayers.Handler.Polygon = OpenLayers.Class(OpenLayers.Handler.Path, {
     
     /**
      * Parameter: polygon
diff --git a/lib/OpenLayers/Icon.js b/lib/OpenLayers/Icon.js
index c02f5a0334..0097a685a7 100644
--- a/lib/OpenLayers/Icon.js
+++ b/lib/OpenLayers/Icon.js
@@ -15,8 +15,7 @@
  * the desired offset. 
  * 
  */
-OpenLayers.Icon = OpenLayers.Class.create();
-OpenLayers.Icon.prototype = {
+OpenLayers.Icon = OpenLayers.Class({
     
     /** 
      * Property: url 
@@ -182,4 +181,4 @@ OpenLayers.Icon.prototype = {
     
     /** @final @type String */
     CLASS_NAME: "OpenLayers.Icon"
-};
+});
diff --git a/lib/OpenLayers/Layer.js b/lib/OpenLayers/Layer.js
index d80fc104a3..1bfd21dea5 100644
--- a/lib/OpenLayers/Layer.js
+++ b/lib/OpenLayers/Layer.js
@@ -8,8 +8,7 @@
  * 
  * Class: OpenLayers.Layer
  */
-OpenLayers.Layer = OpenLayers.Class.create();
-OpenLayers.Layer.prototype = {
+OpenLayers.Layer = OpenLayers.Class({
 
     /**
      * APIProperty: id
@@ -860,4 +859,4 @@ OpenLayers.Layer.prototype = {
 
     /** @final @type String */
     CLASS_NAME: "OpenLayers.Layer"
-};
+});
diff --git a/lib/OpenLayers/Layer/Boxes.js b/lib/OpenLayers/Layer/Boxes.js
index 4f55f83c18..268fc6cb2f 100644
--- a/lib/OpenLayers/Layer/Boxes.js
+++ b/lib/OpenLayers/Layer/Boxes.js
@@ -13,9 +13,7 @@
  * Inherits from:
  *  - <OpenLayers.Layer.Markers>
  */
-OpenLayers.Layer.Boxes = OpenLayers.Class.create();
-OpenLayers.Layer.Boxes.prototype = 
-    OpenLayers.Class.inherit( OpenLayers.Layer.Markers, {
+OpenLayers.Layer.Boxes = OpenLayers.Class(OpenLayers.Layer.Markers, {
 
     /**
      * Constructor: OpenLayers.Layer.Boxes
diff --git a/lib/OpenLayers/Layer/EventPane.js b/lib/OpenLayers/Layer/EventPane.js
index 9641b95368..d5fc5986ee 100644
--- a/lib/OpenLayers/Layer/EventPane.js
+++ b/lib/OpenLayers/Layer/EventPane.js
@@ -14,9 +14,7 @@
  * Inherits from:
  *  - <OpenLayers.Layer>
  */
-OpenLayers.Layer.EventPane = OpenLayers.Class.create();
-OpenLayers.Layer.EventPane.prototype = 
-  OpenLayers.Class.inherit( OpenLayers.Layer, {
+OpenLayers.Layer.EventPane = OpenLayers.Class(OpenLayers.Layer, {
 
     /**
      * Property: isBaseLayer
diff --git a/lib/OpenLayers/Layer/FixedZoomLevels.js b/lib/OpenLayers/Layer/FixedZoomLevels.js
index 245e146ef3..1a3a2fc634 100644
--- a/lib/OpenLayers/Layer/FixedZoomLevels.js
+++ b/lib/OpenLayers/Layer/FixedZoomLevels.js
@@ -45,8 +45,7 @@
  *  API that you might be working from.
  *
  */
-OpenLayers.Layer.FixedZoomLevels = OpenLayers.Class.create();
-OpenLayers.Layer.FixedZoomLevels.prototype = {
+OpenLayers.Layer.FixedZoomLevels = OpenLayers.Class({
       
   /********************************************************/
   /*                                                      */
@@ -249,5 +248,5 @@ OpenLayers.Layer.FixedZoomLevels.prototype = {
 
     /** @final @type String */
     CLASS_NAME: "FixedZoomLevels.js"
-};
+});
 
diff --git a/lib/OpenLayers/Layer/GML.js b/lib/OpenLayers/Layer/GML.js
index 78314ace44..34081305f2 100644
--- a/lib/OpenLayers/Layer/GML.js
+++ b/lib/OpenLayers/Layer/GML.js
@@ -13,9 +13,7 @@
  * Inherits from:
  *  - <OpenLayers.Layer.Vector>
  */
-OpenLayers.Layer.GML = OpenLayers.Class.create();
-OpenLayers.Layer.GML.prototype = 
-  OpenLayers.Class.inherit( OpenLayers.Layer.Vector, {
+OpenLayers.Layer.GML = OpenLayers.Class(OpenLayers.Layer.Vector, {
     
     /**
       * Property: loaded
diff --git a/lib/OpenLayers/Layer/GeoRSS.js b/lib/OpenLayers/Layer/GeoRSS.js
index fee3a0fe08..3126583d4a 100644
--- a/lib/OpenLayers/Layer/GeoRSS.js
+++ b/lib/OpenLayers/Layer/GeoRSS.js
@@ -14,9 +14,7 @@
  *  - <OpenLayers.Layer.Markers>
  *  - <OpenLayers.Layer>
  */
-OpenLayers.Layer.GeoRSS = OpenLayers.Class.create();
-OpenLayers.Layer.GeoRSS.prototype = 
-  OpenLayers.Class.inherit( OpenLayers.Layer.Markers, {
+OpenLayers.Layer.GeoRSS = OpenLayers.Class(OpenLayers.Layer.Markers, {
 
     /** 
      * Property: location 
diff --git a/lib/OpenLayers/Layer/Google.js b/lib/OpenLayers/Layer/Google.js
index e449a56b20..fa76eeb4ed 100644
--- a/lib/OpenLayers/Layer/Google.js
+++ b/lib/OpenLayers/Layer/Google.js
@@ -13,10 +13,8 @@
  *  - <OpenLayers.Layer.EventPane>
  *  - <OpenLayers.Layer.FixedZoomLevels>
  */
-OpenLayers.Layer.Google = OpenLayers.Class.create();
-OpenLayers.Layer.Google.prototype =
-  OpenLayers.Class.inherit( OpenLayers.Layer.EventPane, 
-                            OpenLayers.Layer.FixedZoomLevels, {
+OpenLayers.Layer.Google = OpenLayers.Class(OpenLayers.Layer.EventPane, 
+                                           OpenLayers.Layer.FixedZoomLevels, {
     
     /** 
      * Constant: MIN_ZOOM_LEVEL
diff --git a/lib/OpenLayers/Layer/Grid.js b/lib/OpenLayers/Layer/Grid.js
index ed9fff327c..6aecd905dd 100644
--- a/lib/OpenLayers/Layer/Grid.js
+++ b/lib/OpenLayers/Layer/Grid.js
@@ -13,9 +13,7 @@
  * Inherits from:
  *  - <OpenLayers.Layer.HTTPRequest>
  */
-OpenLayers.Layer.Grid = OpenLayers.Class.create();
-OpenLayers.Layer.Grid.prototype = 
-  OpenLayers.Class.inherit( OpenLayers.Layer.HTTPRequest, {
+OpenLayers.Layer.Grid = OpenLayers.Class(OpenLayers.Layer.HTTPRequest, {
     
     /**
      * APIProperty: tileSize
diff --git a/lib/OpenLayers/Layer/HTTPRequest.js b/lib/OpenLayers/Layer/HTTPRequest.js
index b9d9fa6b29..caf23ae964 100644
--- a/lib/OpenLayers/Layer/HTTPRequest.js
+++ b/lib/OpenLayers/Layer/HTTPRequest.js
@@ -11,9 +11,7 @@
  * Inherits: 
  *  - OpenLayers.Layer
  */
-OpenLayers.Layer.HTTPRequest = OpenLayers.Class.create();
-OpenLayers.Layer.HTTPRequest.prototype = 
-  OpenLayers.Class.inherit( OpenLayers.Layer, {
+OpenLayers.Layer.HTTPRequest = OpenLayers.Class(OpenLayers.Layer, {
 
     /** 
      * Constant: URL_HASH_FACTOR
diff --git a/lib/OpenLayers/Layer/Image.js b/lib/OpenLayers/Layer/Image.js
index 018da00d3e..6c7c49bc09 100644
--- a/lib/OpenLayers/Layer/Image.js
+++ b/lib/OpenLayers/Layer/Image.js
@@ -11,9 +11,7 @@
  * accessible image as a map layer.  Create a new image layer with the
  * <OpenLayers.Layer.Image> constructor.  Inherits from <OpenLayers.Layer>.
  */
-OpenLayers.Layer.Image = OpenLayers.Class.create();
-OpenLayers.Layer.Image.prototype = 
-  OpenLayers.Class.inherit(OpenLayers.Layer, {
+OpenLayers.Layer.Image = OpenLayers.Class(OpenLayers.Layer, {
 
     /**
      * Property: isBaseLayer
diff --git a/lib/OpenLayers/Layer/KaMap.js b/lib/OpenLayers/Layer/KaMap.js
index 0c199d223c..c294a72952 100644
--- a/lib/OpenLayers/Layer/KaMap.js
+++ b/lib/OpenLayers/Layer/KaMap.js
@@ -11,9 +11,7 @@
  * Inherits:
  *  - <OpenLayers.Layer.Grid>
  */
-OpenLayers.Layer.KaMap = OpenLayers.Class.create();
-OpenLayers.Layer.KaMap.prototype = 
-  OpenLayers.Class.inherit( OpenLayers.Layer.Grid, {
+OpenLayers.Layer.KaMap = OpenLayers.Class(OpenLayers.Layer.Grid, {
 
     /** 
      * APIProperty: isBaseLayer
diff --git a/lib/OpenLayers/Layer/MapServer.js b/lib/OpenLayers/Layer/MapServer.js
index 90f6f81d72..dfe9352806 100644
--- a/lib/OpenLayers/Layer/MapServer.js
+++ b/lib/OpenLayers/Layer/MapServer.js
@@ -12,9 +12,7 @@
  * Inherits from:
  *  - <OpenLayers.Layer.Grid>
  */
-OpenLayers.Layer.MapServer = OpenLayers.Class.create();
-OpenLayers.Layer.MapServer.prototype =
-  OpenLayers.Class.inherit( OpenLayers.Layer.Grid, {
+OpenLayers.Layer.MapServer = OpenLayers.Class(OpenLayers.Layer.Grid, {
 
     /**
      * Constant: DEFAULT_PARAMS
diff --git a/lib/OpenLayers/Layer/MapServer/Untiled.js b/lib/OpenLayers/Layer/MapServer/Untiled.js
index c308244d7c..8343161727 100644
--- a/lib/OpenLayers/Layer/MapServer/Untiled.js
+++ b/lib/OpenLayers/Layer/MapServer/Untiled.js
@@ -11,9 +11,8 @@
  * Inherits from:
  *  - <OpenLayers.Layer.HTTPRequest> 
  */
-OpenLayers.Layer.MapServer.Untiled = OpenLayers.Class.create();
-OpenLayers.Layer.MapServer.Untiled.prototype = 
-  OpenLayers.Class.inherit( OpenLayers.Layer.HTTPRequest, {
+OpenLayers.Layer.MapServer.Untiled = OpenLayers.Class(
+  OpenLayers.Layer.HTTPRequest, {
 
     /**
      * Constant: default_params
diff --git a/lib/OpenLayers/Layer/Markers.js b/lib/OpenLayers/Layer/Markers.js
index 56e47d8be9..f95229b254 100644
--- a/lib/OpenLayers/Layer/Markers.js
+++ b/lib/OpenLayers/Layer/Markers.js
@@ -11,9 +11,7 @@
  * Inherits from:
  *  - <OpenLayers.Layer> 
  */
-OpenLayers.Layer.Markers = OpenLayers.Class.create();
-OpenLayers.Layer.Markers.prototype = 
-  OpenLayers.Class.inherit( OpenLayers.Layer, {
+OpenLayers.Layer.Markers = OpenLayers.Class(OpenLayers.Layer, {
     
     /** 
      * APIProperty: isBaseLayer 
diff --git a/lib/OpenLayers/Layer/MultiMap.js b/lib/OpenLayers/Layer/MultiMap.js
index 42836bf942..054ddb0c6c 100644
--- a/lib/OpenLayers/Layer/MultiMap.js
+++ b/lib/OpenLayers/Layer/MultiMap.js
@@ -12,10 +12,8 @@
  *  - <OpenLayers.Layers.EventPane>
  *  - <OpenLayers.Layers.FixedZoomLevels>
  */
-OpenLayers.Layer.MultiMap = OpenLayers.Class.create();
-OpenLayers.Layer.MultiMap.prototype =
-  OpenLayers.Class.inherit( OpenLayers.Layer.EventPane, 
-                            OpenLayers.Layer.FixedZoomLevels, {
+OpenLayers.Layer.MultiMap = OpenLayers.Class(
+  OpenLayers.Layer.EventPane, OpenLayers.Layer.FixedZoomLevels, {
     
     /** 
      * Constant: MIN_ZOOM_LEVEL
diff --git a/lib/OpenLayers/Layer/TMS.js b/lib/OpenLayers/Layer/TMS.js
index 4324c7278d..d3ba9128f0 100644
--- a/lib/OpenLayers/Layer/TMS.js
+++ b/lib/OpenLayers/Layer/TMS.js
@@ -11,9 +11,7 @@
  * Inherits:
  *  - <OpenLayers.Layer.Grid>
  */
-OpenLayers.Layer.TMS = OpenLayers.Class.create();
-OpenLayers.Layer.TMS.prototype = 
-  OpenLayers.Class.inherit( OpenLayers.Layer.Grid, {
+OpenLayers.Layer.TMS = OpenLayers.Class(OpenLayers.Layer.Grid, {
 
     /**
      * APIProperty: reproject
diff --git a/lib/OpenLayers/Layer/Text.js b/lib/OpenLayers/Layer/Text.js
index e1a8128465..254b3024d0 100644
--- a/lib/OpenLayers/Layer/Text.js
+++ b/lib/OpenLayers/Layer/Text.js
@@ -12,9 +12,7 @@
  * Inherits from;
  *  - <OpenLayers.Layer.Markers>
  */
-OpenLayers.Layer.Text = OpenLayers.Class.create();
-OpenLayers.Layer.Text.prototype = 
-  OpenLayers.Class.inherit( OpenLayers.Layer.Markers, {
+OpenLayers.Layer.Text = OpenLayers.Class(OpenLayers.Layer.Markers, {
 
     /**
      * APIProperty: location 
diff --git a/lib/OpenLayers/Layer/TileCache.js b/lib/OpenLayers/Layer/TileCache.js
index 214cdbb0ce..745e319a81 100644
--- a/lib/OpenLayers/Layer/TileCache.js
+++ b/lib/OpenLayers/Layer/TileCache.js
@@ -14,9 +14,7 @@
  * Inherits from:
  *  - <OpenLayers.Layer.Grid>
  */
-OpenLayers.Layer.TileCache = OpenLayers.Class.create();
-OpenLayers.Layer.TileCache.prototype = 
-  OpenLayers.Class.inherit( OpenLayers.Layer.Grid, {
+OpenLayers.Layer.TileCache = OpenLayers.Class(OpenLayers.Layer.Grid, {
 
     /** 
      * APIProperty: reproject
diff --git a/lib/OpenLayers/Layer/Vector.js b/lib/OpenLayers/Layer/Vector.js
index 50397566dc..2ecaf5e9a8 100644
--- a/lib/OpenLayers/Layer/Vector.js
+++ b/lib/OpenLayers/Layer/Vector.js
@@ -15,9 +15,7 @@
  * Inherits from:
  *  - <OpenLayers.Layer>
  */
-OpenLayers.Layer.Vector = OpenLayers.Class.create();
-OpenLayers.Layer.Vector.prototype =
-  OpenLayers.Class.inherit(OpenLayers.Layer, {
+OpenLayers.Layer.Vector = OpenLayers.Class(OpenLayers.Layer, {
 
     /**
      * APIProperty: isBaseLayer
diff --git a/lib/OpenLayers/Layer/VirtualEarth.js b/lib/OpenLayers/Layer/VirtualEarth.js
index 73a3e7cc9c..87cafdae36 100644
--- a/lib/OpenLayers/Layer/VirtualEarth.js
+++ b/lib/OpenLayers/Layer/VirtualEarth.js
@@ -13,10 +13,8 @@
  *  - <OpenLayers.Layer.EventPane>
  *  - <OpenLayers.Layer.FixedZoomLevels>
  */
-OpenLayers.Layer.VirtualEarth = OpenLayers.Class.create();
-OpenLayers.Layer.VirtualEarth.prototype =
-  OpenLayers.Class.inherit( OpenLayers.Layer.EventPane, 
-                            OpenLayers.Layer.FixedZoomLevels, {
+OpenLayers.Layer.VirtualEarth = OpenLayers.Class(
+  OpenLayers.Layer.EventPane, OpenLayers.Layer.FixedZoomLevels, {
     
     /** 
      * Constant: MIN_ZOOM_LEVEL
diff --git a/lib/OpenLayers/Layer/WFS.js b/lib/OpenLayers/Layer/WFS.js
index 1515fa1911..be91c26583 100644
--- a/lib/OpenLayers/Layer/WFS.js
+++ b/lib/OpenLayers/Layer/WFS.js
@@ -13,10 +13,8 @@
  *  - <OpenLayers.Layer.Vector>
  *  - <OpenLayers.Layer.Markers>
  */
-OpenLayers.Layer.WFS = OpenLayers.Class.create();
-OpenLayers.Layer.WFS.prototype = 
-  OpenLayers.Class.inherit( OpenLayers.Layer.Vector, 
-                            OpenLayers.Layer.Markers, {
+OpenLayers.Layer.WFS = OpenLayers.Class(
+  OpenLayers.Layer.Vector, OpenLayers.Layer.Markers, {
 
     /**
      * APIProperty: isBaseLayer
diff --git a/lib/OpenLayers/Layer/WMS.js b/lib/OpenLayers/Layer/WMS.js
index 9e986714e1..3f5853ed37 100644
--- a/lib/OpenLayers/Layer/WMS.js
+++ b/lib/OpenLayers/Layer/WMS.js
@@ -15,9 +15,7 @@
  * Inherits from:
  *  - <OpenLayers.Layer.Grid>
  */
-OpenLayers.Layer.WMS = OpenLayers.Class.create();
-OpenLayers.Layer.WMS.prototype = 
-  OpenLayers.Class.inherit( OpenLayers.Layer.Grid, {
+OpenLayers.Layer.WMS = OpenLayers.Class(OpenLayers.Layer.Grid, {
 
     /**
      * Constant: DEFAULT_PARAMS
diff --git a/lib/OpenLayers/Layer/WMS/Untiled.js b/lib/OpenLayers/Layer/WMS/Untiled.js
index bae4544fce..4beeca61e6 100644
--- a/lib/OpenLayers/Layer/WMS/Untiled.js
+++ b/lib/OpenLayers/Layer/WMS/Untiled.js
@@ -13,9 +13,7 @@
  * Inherits from: 
  *  - <OpenLayers.Layer.WMS>
  */
-OpenLayers.Layer.WMS.Untiled = OpenLayers.Class.create();
-OpenLayers.Layer.WMS.Untiled.prototype = 
-  OpenLayers.Class.inherit( OpenLayers.Layer.WMS, {
+OpenLayers.Layer.WMS.Untiled = OpenLayers.Class(OpenLayers.Layer.WMS, {
 
     /**
      * APIProperty: singleTile
diff --git a/lib/OpenLayers/Layer/WorldWind.js b/lib/OpenLayers/Layer/WorldWind.js
index fe5bfcfaf2..f62667af65 100644
--- a/lib/OpenLayers/Layer/WorldWind.js
+++ b/lib/OpenLayers/Layer/WorldWind.js
@@ -11,9 +11,7 @@
  * Inherits from:
  *  - <OpenLayers.Layer.Grid>
  */
-OpenLayers.Layer.WorldWind = OpenLayers.Class.create();
-OpenLayers.Layer.WorldWind.prototype = 
-  OpenLayers.Class.inherit( OpenLayers.Layer.Grid, {
+OpenLayers.Layer.WorldWind = OpenLayers.Class(OpenLayers.Layer.Grid, {
     
     DEFAULT_PARAMS: {
     },
diff --git a/lib/OpenLayers/Layer/Yahoo.js b/lib/OpenLayers/Layer/Yahoo.js
index f42ce53363..389662fc14 100644
--- a/lib/OpenLayers/Layer/Yahoo.js
+++ b/lib/OpenLayers/Layer/Yahoo.js
@@ -13,10 +13,8 @@
  *  - <OpenLayers.Layer.EventPane>
  *  - <OpenLayers.Layer.FixedZoomLevels>v
  */
-OpenLayers.Layer.Yahoo = OpenLayers.Class.create();
-OpenLayers.Layer.Yahoo.prototype =
-  OpenLayers.Class.inherit( OpenLayers.Layer.EventPane, 
-                            OpenLayers.Layer.FixedZoomLevels, {
+OpenLayers.Layer.Yahoo = OpenLayers.Class(
+  OpenLayers.Layer.EventPane, OpenLayers.Layer.FixedZoomLevels, {
     
     /** 
      * Constant: MIN_ZOOM_LEVEL
diff --git a/lib/OpenLayers/Map.js b/lib/OpenLayers/Map.js
index a9f46e5e02..e8183fd886 100644
--- a/lib/OpenLayers/Map.js
+++ b/lib/OpenLayers/Map.js
@@ -15,18 +15,7 @@
  * it's necessary to add controls (<OpenLayers.Control>) and 
  * layers (<OpenLayers.Layer>) to the map. 
  */
-OpenLayers.Map = OpenLayers.Class.create();
-/**
- * Constant: TILE_WIDTH
- * {Integer} 256 Default tile width (unless otherwise specified)
- */
-OpenLayers.Map.TILE_WIDTH = 256;
-/**
- * Constant: TILE_HEIGHT
- * {Integer} 256 Default tile height (unless otherwise specified)
- */
-OpenLayers.Map.TILE_HEIGHT = 256;
-OpenLayers.Map.prototype = {
+OpenLayers.Map = OpenLayers.Class({
     
     /**
      * Constant: Z_INDEX_BASE
@@ -1625,4 +1614,15 @@ OpenLayers.Map.prototype = {
 
     /** @final @type String */
     CLASS_NAME: "OpenLayers.Map"
-};
+});
+
+/**
+ * Constant: TILE_WIDTH
+ * {Integer} 256 Default tile width (unless otherwise specified)
+ */
+OpenLayers.Map.TILE_WIDTH = 256;
+/**
+ * Constant: TILE_HEIGHT
+ * {Integer} 256 Default tile height (unless otherwise specified)
+ */
+OpenLayers.Map.TILE_HEIGHT = 256;
diff --git a/lib/OpenLayers/Marker.js b/lib/OpenLayers/Marker.js
index b7f376bdfd..b0ef31ee9d 100644
--- a/lib/OpenLayers/Marker.js
+++ b/lib/OpenLayers/Marker.js
@@ -26,8 +26,7 @@
  *
  * (end)
  */
-OpenLayers.Marker = OpenLayers.Class.create();
-OpenLayers.Marker.prototype = {
+OpenLayers.Marker = OpenLayers.Class({
     
     /** 
      * Property: icon 
@@ -171,7 +170,7 @@ OpenLayers.Marker.prototype = {
     
     /** @final @type String */
     CLASS_NAME: "OpenLayers.Marker"
-};
+});
 
 
 /**
diff --git a/lib/OpenLayers/Marker/Box.js b/lib/OpenLayers/Marker/Box.js
index 2de2944d3e..2eb9be23af 100644
--- a/lib/OpenLayers/Marker/Box.js
+++ b/lib/OpenLayers/Marker/Box.js
@@ -11,9 +11,7 @@
  * Inherits from:
  *  - <OpenLayers.Marker> 
  */
-OpenLayers.Marker.Box = OpenLayers.Class.create();
-OpenLayers.Marker.Box.prototype = 
-  OpenLayers.Class.inherit( OpenLayers.Marker, {
+OpenLayers.Marker.Box = OpenLayers.Class(OpenLayers.Marker, {
 
     /** 
      * Property: bounds 
diff --git a/lib/OpenLayers/Popup.js b/lib/OpenLayers/Popup.js
index 2fbd0fee44..5634d5f0b5 100644
--- a/lib/OpenLayers/Popup.js
+++ b/lib/OpenLayers/Popup.js
@@ -23,15 +23,7 @@
  * map.addPopup(popup);
  * (end)
  */
-OpenLayers.Popup = OpenLayers.Class.create();
-
-OpenLayers.Popup.WIDTH = 200;
-OpenLayers.Popup.HEIGHT = 200;
-OpenLayers.Popup.COLOR = "white";
-OpenLayers.Popup.OPACITY = 1;
-OpenLayers.Popup.BORDER = "0px";
-
-OpenLayers.Popup.prototype = {
+OpenLayers.Popup = OpenLayers.Class({
 
     /** 
      * Property: events  
@@ -494,4 +486,10 @@ OpenLayers.Popup.prototype = {
 
     /** @final @type String */
     CLASS_NAME: "OpenLayers.Popup"
-};
+});
+
+OpenLayers.Popup.WIDTH = 200;
+OpenLayers.Popup.HEIGHT = 200;
+OpenLayers.Popup.COLOR = "white";
+OpenLayers.Popup.OPACITY = 1;
+OpenLayers.Popup.BORDER = "0px";
diff --git a/lib/OpenLayers/Popup/Anchored.js b/lib/OpenLayers/Popup/Anchored.js
index 8baa7f299e..617fe46fc7 100644
--- a/lib/OpenLayers/Popup/Anchored.js
+++ b/lib/OpenLayers/Popup/Anchored.js
@@ -11,9 +11,7 @@
  * Inherits from:
  *  - <OpenLayers.Popup>
  */
-OpenLayers.Popup.Anchored = OpenLayers.Class.create();
-OpenLayers.Popup.Anchored.prototype =
-   OpenLayers.Class.inherit( OpenLayers.Popup, {
+OpenLayers.Popup.Anchored = OpenLayers.Class(OpenLayers.Popup, {
 
     /** 
      * Parameter: relativePosition
diff --git a/lib/OpenLayers/Popup/AnchoredBubble.js b/lib/OpenLayers/Popup/AnchoredBubble.js
index f44d48bab6..ecf71e1241 100644
--- a/lib/OpenLayers/Popup/AnchoredBubble.js
+++ b/lib/OpenLayers/Popup/AnchoredBubble.js
@@ -11,16 +11,7 @@
  * Inherits from: 
  *  - <OpenLayers.Popup.Anchored>
  */
-OpenLayers.Popup.AnchoredBubble = OpenLayers.Class.create();
-
-/**
- * Constant: CORNER_SIZE
- * {Integer} 5. Border space for the RICO corners
- */
-OpenLayers.Popup.AnchoredBubble.CORNER_SIZE = 5;
-
-OpenLayers.Popup.AnchoredBubble.prototype =
-   OpenLayers.Class.inherit( OpenLayers.Popup.Anchored, {
+OpenLayers.Popup.AnchoredBubble = OpenLayers.Class(OpenLayers.Popup.Anchored, {
 
     /**
      * Property: rounded
@@ -193,3 +184,10 @@ OpenLayers.Popup.AnchoredBubble.prototype =
     /** @final @type String */
     CLASS_NAME: "OpenLayers.Popup.AnchoredBubble"
 });
+
+/**
+ * Constant: CORNER_SIZE
+ * {Integer} 5. Border space for the RICO corners
+ */
+OpenLayers.Popup.AnchoredBubble.CORNER_SIZE = 5;
+
diff --git a/lib/OpenLayers/Renderer.js b/lib/OpenLayers/Renderer.js
index 84ba350de0..d083eab352 100644
--- a/lib/OpenLayers/Renderer.js
+++ b/lib/OpenLayers/Renderer.js
@@ -19,9 +19,8 @@
  *  cacheing system.
  *
  */
-OpenLayers.Renderer = OpenLayers.Class.create();
-OpenLayers.Renderer.prototype = 
-{
+OpenLayers.Renderer = OpenLayers.Class({
+
     /** 
      * Property: container
      * {DOMElement} 
@@ -210,4 +209,4 @@ OpenLayers.Renderer.prototype =
         
     /** @final @type String */
     CLASS_NAME: "OpenLayers.Renderer"
-};
+});
diff --git a/lib/OpenLayers/Renderer/Elements.js b/lib/OpenLayers/Renderer/Elements.js
index 3bf38ceaa9..dce961f043 100644
--- a/lib/OpenLayers/Renderer/Elements.js
+++ b/lib/OpenLayers/Renderer/Elements.js
@@ -19,9 +19,7 @@
  * Inherits:
  *  - <OpenLayers.Renderer>
  */
-OpenLayers.Renderer.Elements = OpenLayers.Class.create();
-OpenLayers.Renderer.Elements.prototype = 
-  OpenLayers.Class.inherit(OpenLayers.Renderer, {
+OpenLayers.Renderer.Elements = OpenLayers.Class(OpenLayers.Renderer, {
 
     /**
      * Property: rendererRoot
diff --git a/lib/OpenLayers/Renderer/SVG.js b/lib/OpenLayers/Renderer/SVG.js
index ed22f87ecc..87b54691d3 100644
--- a/lib/OpenLayers/Renderer/SVG.js
+++ b/lib/OpenLayers/Renderer/SVG.js
@@ -10,9 +10,7 @@
  * Inherits:
  *  - <OpenLayers.Renderer.Elements>
  */
-OpenLayers.Renderer.SVG = OpenLayers.Class.create();
-OpenLayers.Renderer.SVG.prototype = 
-  OpenLayers.Class.inherit(OpenLayers.Renderer.Elements, {
+OpenLayers.Renderer.SVG = OpenLayers.Class(OpenLayers.Renderer.Elements, {
 
     /** 
      * Property: xmlns
diff --git a/lib/OpenLayers/Renderer/VML.js b/lib/OpenLayers/Renderer/VML.js
index 7796da376b..66dca2d675 100644
--- a/lib/OpenLayers/Renderer/VML.js
+++ b/lib/OpenLayers/Renderer/VML.js
@@ -16,9 +16,7 @@
  * Inherits from:
  *  - <OpenLayers.Renderer.Elements>
  */
-OpenLayers.Renderer.VML = OpenLayers.Class.create();
-OpenLayers.Renderer.VML.prototype = 
-  OpenLayers.Class.inherit(OpenLayers.Renderer.Elements, {
+OpenLayers.Renderer.VML = OpenLayers.Class(OpenLayers.Renderer.Elements, {
 
     /**
      * Property: xmlns
diff --git a/lib/OpenLayers/Tile.js b/lib/OpenLayers/Tile.js
index 2c9d1bb0e1..6a8830d66f 100644
--- a/lib/OpenLayers/Tile.js
+++ b/lib/OpenLayers/Tile.js
@@ -17,8 +17,7 @@
  * TBD 3.0 - remove reference to url in above paragraph
  * 
  */
-OpenLayers.Tile = OpenLayers.Class.create();
-OpenLayers.Tile.prototype = {
+OpenLayers.Tile = OpenLayers.Class({
     
     /** 
      * Constant: EVENT_TYPES
@@ -230,4 +229,4 @@ OpenLayers.Tile.prototype = {
 
     /** @final @type String */
     CLASS_NAME: "OpenLayers.Tile"
-};
+});
diff --git a/lib/OpenLayers/Tile/Image.js b/lib/OpenLayers/Tile/Image.js
index fa5adc55a8..b8751bcc26 100644
--- a/lib/OpenLayers/Tile/Image.js
+++ b/lib/OpenLayers/Tile/Image.js
@@ -14,9 +14,7 @@
  * Inherits from:
  *  - <OpenLayers.Tile>
  */
-OpenLayers.Tile.Image = OpenLayers.Class.create();
-OpenLayers.Tile.Image.prototype = 
-  OpenLayers.Class.inherit( OpenLayers.Tile, {
+OpenLayers.Tile.Image = OpenLayers.Class(OpenLayers.Tile, {
 
     /** 
      * Property: url
diff --git a/lib/OpenLayers/Tile/WFS.js b/lib/OpenLayers/Tile/WFS.js
index e83351648b..b9730a4c19 100644
--- a/lib/OpenLayers/Tile/WFS.js
+++ b/lib/OpenLayers/Tile/WFS.js
@@ -14,9 +14,7 @@
  * Inherits from:
  *  - <OpenLayers.Tile>
  */
-OpenLayers.Tile.WFS = OpenLayers.Class.create();
-OpenLayers.Tile.WFS.prototype = 
-  OpenLayers.Class.inherit( OpenLayers.Tile, {
+OpenLayers.Tile.WFS = OpenLayers.Class(OpenLayers.Tile, {
 
     /** 
      * Property: features 
diff --git a/lib/Rico/Color.js b/lib/Rico/Color.js
index ec7d23dc80..0d4bf30e48 100644
--- a/lib/Rico/Color.js
+++ b/lib/Rico/Color.js
@@ -1,6 +1,4 @@
-OpenLayers.Rico.Color = OpenLayers.Class.create();
-
-OpenLayers.Rico.Color.prototype = {
+OpenLayers.Rico.Color = OpenLayers.Class({
 
    initialize: function(red, green, blue) {
       this.rgb = { r: red, g : green, b : blue };
@@ -87,7 +85,7 @@ OpenLayers.Rico.Color.prototype = {
       return this.asHex();
    }
 
-};
+});
 
 OpenLayers.Rico.Color.createFromHex = function(hexCode) {
   if(hexCode.length==4) {
diff --git a/tests/BaseTypes/test_Class.html b/tests/BaseTypes/test_Class.html
index dd3f366a5f..ecb7662b1b 100644
--- a/tests/BaseTypes/test_Class.html
+++ b/tests/BaseTypes/test_Class.html
@@ -2,8 +2,171 @@
 <head>
   <script src="../../lib/OpenLayers.js"></script>
   <script type="text/javascript"><!--
+    // remove this next line at 3.0
     var isMozilla = (navigator.userAgent.indexOf("compatible") == -1);
+
+    function test_Class(t) {
+        t.plan(1);
+        var MyClass = OpenLayers.Class({
+            initialize: function () {
+                t.ok(false, "initialize should not be called");
+            }
+        });
+        t.ok(true,
+             "defining a class does not call the constructor for the class");
+    }
+
+    function test_Class_constructor(t) {
+        t.plan(7);
+        
+        var MyClass = OpenLayers.Class({
+            prop: null,
+            classProp: {'bad': 'practice'},
+            initialize: function(a1, a2) {
+                this.prop = "instance property";
+                t.ok(true,
+                     "initialize is called when a new instance is created");
+                t.eq(a1, arg1,
+                     "initialize is called with the proper first argument");
+                t.eq(a2, arg2,
+                     "initialize is called with the proper second argument");
+            },
+            CLASS_NAME: "MyClass"
+        });
+
+        var arg1 = "anArg";
+        var arg2 = {"another": "arg"};
+        var myObj = new MyClass(arg1, arg2);
+        t.eq(MyClass.prop, null,
+             "creating a new instance doesn't modify the class");
+        t.eq(myObj.prop, "instance property",
+             "the new instance is assigned a property in the constructor");
+        t.eq(myObj["CLASS_NAME"], "MyClass",
+             "the new object is an instance of MyClass");
+
+        // allow for modification of class properties
+        MyClass.prototype.classProp.bad = "good";
+        t.eq(myObj.classProp.bad, "good",
+             "modifying a class property modifies properties of the instance");
+    }
+
+    function test_Class_inheritance(t) {
+        t.plan(4);
+        
+        var BaseClass = OpenLayers.Class({
+            prop: "base",
+            initialize: function() {
+                t.ok(false,
+                     "base class constructor is not called during inheritance");
+            },
+            toString: function() {
+                return "toString inherited";
+            },
+            CLASS_NAME: "BaseClass"
+        });
+        
+        var ChildClass = OpenLayers.Class(BaseClass, {
+            initialize: function() {
+                t.ok(true,
+                     "child class constructor is called in creating an instance");
+            },
+            CLASS_NAME: "ChildClass"
+        });
+        
+        var child = new ChildClass();
+        t.eq(child.prop, "base",
+             "instance of child inherits properties from base");
+        t.eq(child.toString(), "toString inherited",
+             "instance of child inherits toString method from base");
+        t.eq(child["CLASS_NAME"],
+             "ChildClass",
+             "new object is an instance of the child class");
+    }
     
+    function test_Class_multiple_inheritance(t) {
+        t.plan(7);
+        var BaseClass1 = OpenLayers.Class({
+            override: "base1",
+            prop: "base1",
+            variable: null,
+            initialize: function() {
+                t.ok(true,
+                     "only called when an instance of this class is created");
+            },
+            CLASS_NAME: "BaseClass1"
+        });
+
+        var BaseClass2 = OpenLayers.Class({
+            override: "base2",
+            initialize: function() {
+                t.ok(false,
+                     "base class constructor is not called during inheritance");
+            },
+            CLASS_NAME: "BaseClass1"
+        });
+        
+        var ChildClass = OpenLayers.Class(BaseClass1, BaseClass2, {
+            initialize: function(arg) {
+                if(this.prop == "base1") {
+                    this.variable = "child";
+                }
+                t.ok(true,
+                     "only child class constructor is called on initialization");
+            },
+            CLASS_NAME: "ChildClass"
+        });
+        
+        var arg = "child";
+        var child = new ChildClass(arg);
+        t.eq(child.variable, arg,
+             "inheritance works before construction");
+        t.eq(child.prop, "base1",
+             "properties are inherited with multiple classes")
+        t.eq(child.override, "base2",
+             "properties are inherited in the expected order");
+        t.eq(child["CLASS_NAME"],
+             "ChildClass",
+             "object is an instance of child class");
+        
+        var base1 = new BaseClass1();
+        t.eq(base1.override, "base1",
+             "inheritance doesn't mess with parents");
+
+    }
+    
+    // Remove this at 3.0
+    function test_Class_backwards(t) {
+        t.plan(4);
+        // test that a new style class supports old style inheritance
+        var NewClass = OpenLayers.Class({
+            newProp: "new",
+            initialize: function() {
+                t.ok(false, "the base class is never instantiated");
+            },
+            toString: function() {
+                return "new style";
+            }
+        });
+        
+        var OldClass = OpenLayers.Class.create();
+        OldClass.prototype = OpenLayers.Class.inherit(NewClass, {
+            oldProp: "old",
+            initialize: function() {
+                t.ok(true, "only the child class constructor is called");
+            }
+        });
+        
+        var oldObj = new OldClass();
+        t.eq(oldObj.oldProp, "old",
+             "old style classes can still be instantiated");
+        t.eq(oldObj.newProp, "new",
+             "old style inheritance of properties works with new style base");
+        t.eq(oldObj.toString(), "new style",
+             "toString inheritance works with backwards style");
+        
+    }
+
+    // Remove this at 3.0
     function test_01_Class_create (t) {
         t.plan( 3 );
         var cls = OpenLayers.Class.create();
@@ -25,6 +188,7 @@
             t.ok(true, "this test doesn't work in IE");
     }
 
+    // Remove this at 3.0
     function test_02_Class_inherit (t) {
         t.plan( 20 );
         var A = OpenLayers.Class.create();
diff --git a/tests/Control/test_Panel.html b/tests/Control/test_Panel.html
index e6e217be96..3beaf61a63 100644
--- a/tests/Control/test_Panel.html
+++ b/tests/Control/test_Panel.html
@@ -14,14 +14,12 @@
 		    var map = new OpenLayers.Map('map');
 		    var panel = new OpenLayers.Control.Panel();
 		    var toolControl = new OpenLayers.Control.ZoomBox();
-		    var AnotherToolControl = OpenLayers.Class.create();
-		    AnotherToolControl.prototype = OpenLayers.Class.inherit(OpenLayers.Control, {
+		    var AnotherToolControl = OpenLayers.Class(OpenLayers.Control, {
 		  				CLASS_NAME: 'mbControl.TestTool',
 		  				type: OpenLayers.Control.TYPE_TOOL
 		  	});
 		   	var anotherToolControl = new AnotherToolControl();
-				var ToggleControl = OpenLayers.Class.create();
-				ToggleControl.prototype = OpenLayers.Class.inherit(OpenLayers.Control, {
+				var ToggleControl = OpenLayers.Class(OpenLayers.Control, {
 							CLASS_NAME: 'mbControl.TestToggle',
 							type: OpenLayers.Control.TYPE_TOGGLE
 				});