Since this only happens for bootstrap-salt, and those files are used for make_master, yes. Good call on moving the other arguments in here.