Removed the use of 'auto' to move back from C++11 features.