Use yamlify_arg() in more places
Merge pull request #5268 from basepi/argcleanup

Use yamlify_arg() in more places