Just tidying up some messyness left in the build system.