fix other build error
Add non-indenting indenter for C++

Fix a bunch of bugs that none of me noticed before.