Also resolve all instances of spaces not being included before opening
braces.