More cpplint stuff