Fix a couple more files that accidentally use C++11 auto variables.