Code sniffer updates.  Minor tweaks.