Simplify modulefile use.
Use canonical modulefile/roll-test build files.