Tidy switches, remove underused implicits

This removes the need for a duplicate switch list, and tidies our Collection implicit.