Make corrections to long-false comments.
Remove unused macros.