Various build cleanups not related to actual code execution.