A sprinkling of enforceargs with associated fixes
Merge pull request #70 from rlamy/enforceargs

A sprinkling of enforceargs with associated fixes