Do not automatically augment subclass with superclass statics
Intermin work
Move some things around and get rid of some cruft