Some more cleanup, obsoleted more stuff, added more ctor overloads for simplicity.