Removed a few places that used method/field.class_type just to look up the class object and replaced it with the reference to the class file that is now stored directly in those objects.