Finish removing references to snares.
Merge pull request #4285 from ianestrachan/totally-remove-snares

Finish removing references to snares.