SERVER-15707 Fix C++11'ism and a long line