Some more build cleanup.