Clean up Classes a little

Don't use the fully-qualified method name when we can get away with it.