Fix naked use of C++11 auto