Improve error reporting for all things braced. Closes #667