Minor cleanup of SkipScanFilter code