Merge request for formatting changes.

Note that strings are marked up with double quotes, while field names or attribute names are with single quotes.