Getting rid of varbrace

[Daniel J. <dan...@gm...>]

The following two patches remove varbrace from the build and fix some
compilation errors due to that removal. My configuration built with those
two patches works fine (according to make check).

I didn't do an exhaustive test of different configurations, so this
definitively needs more testing. Also the patches:

- Contain no comment what the #define var does and why its there.
- Don't mention any change in the change log.
- Remove an (hopefully!) unused variable. This should probably be a
separate commit.
- Manually add a pairs of braces at two places; I couldn't figure out what
exactly the code there does, so I went the safe route.
- Don't remove the varbrace util yet; it's just not built / used.

Most of the compilation errors complained about having only a declaration
following an (goto) label. I solved this by adding a semicolon behind each
such label ("label:" becomse "label:;").

Is this a viable approach at getting rid of varbrace soon? If so then I can
"polish" those patches further.