Dead stores
Fixes .c -> .cpp in comments. For doxygen.
Merge pull request #1317 from pullreq/cpp

Fixup filenames in comments; remove dead code found with scan-build.