diff --git a/lib/OpenLayers.js b/lib/OpenLayers.js
index 054f718e38..79dc2f4e19 100644
--- a/lib/OpenLayers.js
+++ b/lib/OpenLayers.js
@@ -7,7 +7,13 @@
  * @requires OpenLayers/BaseTypes.js
  * @requires OpenLayers/Lang/en.js
  * @requires OpenLayers/Console.js
- */ 
+ */
+ 
+/*
+ * TODO: In 3.0, we will stop supporting build profiles that include
+ * OpenLayers.js. This means we will not need the singleFile and scriptFile
+ * variables, because we don't have to handle the singleFile case any more.
+ */
 
 (function() {
     /**
@@ -30,8 +36,9 @@
      */
     window.OpenLayers = {
         /**
-         * Function: _getScriptLocation
-         * Return the path to this script.
+         * Method: _getScriptLocation
+         * Return the path to this script. This is also implemented in
+         * OpenLayers/SingleFile.js
          *
          * Returns:
          * {String} Path to this script
@@ -39,7 +46,8 @@
         _getScriptLocation: (function() {
             var r = new RegExp("(^|(.*?\\/))(" + scriptName + ")(\\?|$)");
             var s = document.getElementsByTagName('script');
-            var l = s[s.length-1].getAttribute("src").match(r)[1];
+            var m = s[s.length-1].getAttribute("src").match(r);
+            var l = m ? m[1] : "";
             return (function() { return l; });
         })()
     };
@@ -52,7 +60,7 @@
      * 
      * When we *are* part of a SFL build we do not dynamically include the 
      * OpenLayers library code as it will be appended at the end of this file.
-      */
+     */
     if(!singleFile) {
         var jsfiles = new Array(
             "OpenLayers/Util.js",
diff --git a/lib/OpenLayers/SingleFile.js b/lib/OpenLayers/SingleFile.js
index 55fb854e44..b07377ae7a 100644
--- a/lib/OpenLayers/SingleFile.js
+++ b/lib/OpenLayers/SingleFile.js
@@ -4,16 +4,30 @@
  * full text of the license. */
 
 var OpenLayers = {
+    /**
+     * Constant: VERSION_NUMBER
+     */
+    VERSION_NUMBER: "$Revision$",
+
+    /**
+     * Constant: singleFile
+     * TODO: remove this in 3.0 when we stop supporting build profiles that
+     * include OpenLayers.js
+     */
     singleFile: true,
+
+    /**
+     * Method: _getScriptLocation
+     * Return the path to this script. This is also implemented in
+     * OpenLayers.js
+     *
+     * Returns:
+     * {String} Path to this script
+     */
     _getScriptLocation: (function() {
         var s = document.getElementsByTagName('script');
-        var match = s[s.length-1].getAttribute("src").match(/(^|(.*?\/))(OpenLayers\.js)(\?|$)/);
-        var l = match ? match[1] : "";
+        var m = s[s.length-1].getAttribute("src").match(/(^|(.*?\/))(OpenLayers\.js)(\?|$)/);
+        var l = m ? m[1] : "";
         return (function() { return l; });
     })()
 };
-
-/**
- * Constant: VERSION_NUMBER
- */
-OpenLayers.VERSION_NUMBER="$Revision$";