Code Sniffer fixes.