Issue #2499981 by nedjo: Further round of manual fixes for Coder-detected and other coding and documentation standards.