Revert "Use yamlify_arg() in more places"

This reverts commit 663176ac87aaff634ec46956d4161bbf0921a911.