Post-consolidation cleaning up of the build system

I think this is the last round of the post-consolidation cleaning up of the build system. I'm removing some now-redundant checks, aligning to more common calling practice, and speeding up the hg status check (which was becoming more urgent as the repo grow in size).