Revert "Fix some new lint warnings."

These lint errors actually only appear with older versions of cpplint. I've updated mine and asked RenZO to update his too, so we should be fine.

This reverts commit e3be16a28a37eed3426830f98f59a8109c558984.