More systematic m4 quoting and indentation.