Fixing up the cpplint violations in the current codebase.