* Fix SF #1257731. Make __contains__(), remove(), and discard() only do

a frozenset conversion when the initial search attempt fails with a
  TypeError and the key is some type of set.  Add a testcase.

* Eliminate a duplicate if-stmt.