Simplifying in preparation for BuildStep-Job branch.