I split up valid args into two methods to make it more readable and redu...

...ce complexity.  All tests are still passing.