More refactoring of download/build split.