Style change: Allow more than 1 argument per line

This is only migrating some places, others will be migrated as they are
touched.