Rename variables to work aroung a GCC bug on Solaris

Fixes #175.