More systematic m4 argument quoting.