Simplify osha/tno buildouts.