Remove unnecessary module loads.
A bit more build cleanup.  Normalize contents of version.mk.