BUG: Fix a couple of NameErrors. Fix equality comparisons (via __contains__) that should be identity comparisons.
BUG: Fix a couple of NameErrors. Fix equality comparisons (via __contains__) that should be identity comparisons.

burnpanck/traits,burnpanck/traits