Code sniff cleanups.