C++11-oriented small change