style: fix style errors cpplint finds; annotate the ones it's wrong about