Cleaner use of animal sniffer plugin.

The phases are the defaults.
Merge branch 'master' into feature/OptionOrder