Squash some cpplint warnings