Cleanups, kill VERSION declarations
add UserObj/PeerObj types
cleanups, more Defaults::Modern