Re-integrate class & extras.

They are now treated the same, except for where they aren't.
Don't need that anymore.