Don't bother passing default arguments.
Merge pull request #3144 from ADmad/3.0-config-merge

Don't bother passing default arguments.