Update { and } mappings to fix multiple uses