Use yamlify_arg() in more places

Just a small DRY fix.  Could probably be taken further (those two spots are *almost* the same with the if-elif clauses) but it might hurt readability.  *shrugs*