     uris.concat(wesabe._getUrisForParts(parts[0...parts.length-1], scheme, true, false))
 
   #
-  # All the Uris loaded by _loadUri.
-  # @private
-  #
-  _loadedUris: []
-
-  #
-  # File offset in number of lines.
-  #
-  _locOffset: null
-
-  #
-  # The line number of the eval statement in this file.
-  #
-  _evalOffset: null
-
-  #
-  # Returns the file and line number that the evaled code at a given line is from.
-  #
-  fileAndLineFromEvalLine: (lineno) ->
-    for uri in wesabe._loadedUris
-      if lineno > uri.offset and lineno <= uri.offset+uri.loc
-        return file: uri.file, lineno: lineno-uri.offset
-
-  #
   # Loads (and evals) the JS file at +uri+. Returns true on success.
   # @method _loadUri
   # @param uri {String} The uri to the JS file to load and eval.
   # @private
   #
   _loadUri: (uri, module) ->
-    if wesabe._loadedUris[uri]
+    if loadedContent[uri]
       return true
 
-    contents = wesabe._getEvalText(uri)
+    contents = getEvalContent uri
     return false unless contents
 
-    # figure out LOC offset and EVAL offset
-    if wesabe._locOffset is null
-      lines = wesabe._getEvalText(wesabe.getMyURI()).split(/\n/)
-      for line, i in lines
-        # can't actually use the same value we're looking for, or this'll be found first
-        if /_{2}EVAL_{2}/.test(lines[i])
-          wesabe._evalOffset = i
-          break
-
-      wesabe._locOffset = lines.length
-      wesabe._loadedUris[wesabe.getMyURI()] =
-        offset: 0
-        loc: lines.length
-        file: wesabe.getMyURI()
-
-      wesabe._loadedUris.push wesabe._loadedUris[wesabe.getMyURI()]
-
-    loc = contents.split(/\n/).length
-
-    wesabe._loadedUris[uri] =
-      offset: wesabe._locOffset
-      loc: loc
-      file: uri
-
-    wesabe._loadedUris.push wesabe._loadedUris[uri]
-
-    __FILE__ = uri
-    padding = new Array(wesabe._locOffset-wesabe._evalOffset+1).join('\n')
-    wesabe._locOffset += loc
+    loadedContent[uri] = true
+    loadedContent.push loadedContent[uri]
+
+    #padding = new Array(wesabe._locOffset-wesabe._evalOffset+1).join('\n')
 
     try
+      __FILE__ = uri
       _exportsOriginal = module.exports
       exports = module.exports
       require = wesabe.CommonJSRequire

    dump "uncaught exception: #{error}"


wesabe =
  #
  # Creates nested modules as given by the module.

      name: module
      parts: parts

    return result

  baseUrlForScheme: (scheme) ->
