When working on the constexpr machinery for gcc 6, I noticed a couple of cleanup 
opportunities.

1) cxx_bind_parameters_in_call contains 'if (cond) goto x; ... x:;', which can 
easily be rewritten to 'if (!cond) { ...}'

2) a which vs that grammar error.

applied to trunk.

nathan