Use of merged maps when assembling arguments.
Keywordified arguments.
Merge pull request #1 from cassiel/master

Rewriting...