Smush the braces in various places (hey, that rhymes) to avoid undo key=value splitting surprises
in new template system.