C++11 fix after merge.