Fixes based on CodeSniffer inspection.