GenericSniffer improvements.