Reduce use of named arguments.
Merge pull request #636 from ESwordTheCat/34813612

Reduce use of named arguments.