Cosmetic changes to make cpplint happy.