Fixed or suppressed petty cpplint warnings.