Minor restructure some of the builtin library processing code

bin/main.cc

Index: bin/main.cc
===================================================================
--- bin/main.cc	(revision 8133)
+++ bin/main.cc	(working copy)
@@ -367,19 +367,21 @@
   if (is_dart_scheme_url) {
     ASSERT(tag == kImportTag);
     // Handle imports of other built-in libraries present in the SDK.
+    Builtin::BuiltinLibraryId id;
     if (DartUtils::IsDartCryptoLibURL(url_string)) {
-      return Builtin::LoadLibrary(Builtin::kCryptoLibrary);
+      id = Builtin::kCryptoLibrary;
     } else if (DartUtils::IsDartIOLibURL(url_string)) {
-      return Builtin::LoadLibrary(Builtin::kIOLibrary);
+      id = Builtin::kIOLibrary;
     } else if (DartUtils::IsDartJsonLibURL(url_string)) {
-      return Builtin::LoadLibrary(Builtin::kJsonLibrary);
+      id = Builtin::kJsonLibrary;
     } else if (DartUtils::IsDartUriLibURL(url_string)) {
-      return Builtin::LoadLibrary(Builtin::kUriLibrary);
+      id = Builtin::kUriLibrary;
     } else if (DartUtils::IsDartUtfLibURL(url_string)) {
-      return Builtin::LoadLibrary(Builtin::kUtfLibrary);
+      id = Builtin::kUtfLibrary;
     } else {
       return Dart_Error("Do not know how to load '%s'", url_string);
     }
+    return Builtin::LoadLibrary(id);
   } else {
     // Get the file path out of the url.
     Dart_Handle builtin_lib = Builtin::LoadLibrary(Builtin::kBuiltinLibrary);