You could just have an optional argument on `switch_to_` for the substring matching, rather than two methods.