Use less generic names for variables.

These are generic enough that in libcxx, they get expanded into
functions which also have variables named the same thing (__x, __y)
and that then leads to a buggy libcxx.
Merge pull request #942 from waywardmonkeys/fix-typeof-decls

Use less generic names for variables.