Adjust substrings in cm-substitution-string

After the changes in acb4807, the string returned by thing-at-point does
not include the curly braces anymore.