Fixes 1751.  Many codesniffer violations cleared out.