Work around code sniff errors