This commit includes manual fixes to resolve the rest of the coding-standards errors identified by PHPCS.