Code Sniffer improvements.