Str lingering

cc @kdodia 

We shouldn't check for just `str` types as this doesn't include `unicode` in Python 2.6.  We're usually pretty good about this.  Sometimes we get sloppy.