Clean up Arguments somewhat
Merge pull request #83 from DouweM/patch-8

Clean up Arguments somewhat