Minor clean-ups to build.py