Github issue #105: fix causes GCC warnings -- reverted

Reverted commit 2326337984644b6b3626e6d3f8f1a93d1e93f6c4
and commit 0c7916ffbffc14437ea192631d392bf1b1d4513b.
They cases GCC warnings about undeclared variables.