Fix "unused variable" warnings (errors) detected with GCC 4.7.0 - leftover changes