* Add case for ending a braced variable

This catch-all branch will always grab `}`, which is a valid ending to a
braced variable.

* Add test for braced variables

* Move ending brace logic to separate branch