Remove curly braces from qualified identifiers

Fixes #860