Small improvements (C++11 style).