Clean up broken comments from an earlier merge failure.
Fix an unused-argument error when building with clang.
Remove folding mode comments throughout.