Fix some errors in src/analyzers introduced while fixing cpplint.py errors