A sprinkling of enforceargs with associated fixes