Nits and spacing.
Allow C++11 braced initializers in tvars (untested).
Generate correct line numbers for initializers.