Fixed recently merged code for C++11 changes.