Moderate cleanup.
Fix broken build.