Minor consistency changes with other rolls' build process.