Clean up internals to make 'em easier to follow
Optional loading of class on demand. Experimental.

And deliberately undocumented