Misc. fixes sitting around locally.
Some initial fumbling around with reducing include dependencies.
Merge bugfixes and dependency disenganglement from Bdragon.
Remove commented out code.