Address review comments from a previous CL.

vm/object.h

 // Copyright (c) 2012, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
 #ifndef VM_OBJECT_H_
 #define VM_OBJECT_H_
 
 #include "include/dart_api.h"
 #include "platform/assert.h"
 #include "platform/utils.h"
@@ skipping 124 matching lines @@
   OBJECT_IMPLEMENTATION(object, super);                                        \
   Raw##object* raw_ptr() const {                                               \
     ASSERT(raw() != null());                                                   \
     return raw()->ptr();                                                       \
   }                                                                            \
   SNAPSHOT_READER_SUPPORT(object)                                              \
   friend class StackFrame;                                                     \
 
 class Object {
  public:
-  // Index for Singleton internal VM classes,
-  // this index is used in snapshots to refer to these classes directly.
+  // Index for Singleton internal objects,
+  // this index is used in snapshots to refer to these objects directly.
   enum {
-    kNullObject = 0,
+    kNullObject = kNumPredefinedKinds,
     kSentinelObject,
-    kClassClass,
-    kNullClass,
-    kDynamicClass,
-    kVoidClass,
-    kUnresolvedClassClass,
-    kTypeClass,
-    kTypeParameterClass,
-    kTypeArgumentsClass,
-    kInstantiatedTypeArgumentsClass,
-    kFunctionClass,
-    kFieldClass,
-    kLiteralTokenClass,
-    kTokenStreamClass,
-    kScriptClass,
-    kLibraryClass,
-    kLibraryPrefixClass,
-    kCodeClass,
-    kInstructionsClass,
-    kPcDescriptorsClass,
-    kStackmapClass,
-    kLocalVarDescriptorsClass,
-    kExceptionHandlersClass,
-    kContextClass,
-    kContextScopeClass,
-    kICDataClass,
-    kSubtypeTestCacheClass,
-    kApiErrorClass,
-    kLanguageErrorClass,
-    kUnhandledExceptionClass,
-    kUnwindErrorClass,
     kMaxId,
     kInvalidIndex = -1,
   };
 
   virtual ~Object() { }
 
   RawObject* raw() const { return raw_; }
   void operator=(RawObject* value) { SetRaw(value); }
 
   void set_tags(intptr_t value) const {
@@ skipping 122 matching lines @@
   static RawClass* context_scope_class() { return context_scope_class_; }
   static RawClass* api_error_class() { return api_error_class_; }
   static RawClass* language_error_class() { return language_error_class_; }
   static RawClass* unhandled_exception_class() {
     return unhandled_exception_class_;
   }
   static RawClass* unwind_error_class() { return unwind_error_class_; }
   static RawClass* icdata_class() { return icdata_class_; }
   static RawClass* subtypetestcache_class() { return subtypetestcache_class_; }
 
-  static int GetSingletonClassIndex(const RawClass* raw_class);
-  static RawClass* GetSingletonClass(int index);
+  static int GetSingletonClassIndex(const RawObject* raw_object);
   static const char* GetSingletonClassName(int index);
 
   static RawClass* CreateAndRegisterInterface(const char* cname,
                                               const Script& script,
                                               const Library& lib);
   static void RegisterClass(const Class& cls,
                             const char* cname,
                             const Script& script,
                             const Library& lib);
 
@@ skipping 4876 matching lines @@
     if (this->CharAt(i) != str.CharAt(begin_index + i)) {
       return false;
     }
   }
   return true;
 }
 
 }  // namespace dart
 
 #endif  // VM_OBJECT_H_