Bug 1024527 - search strings

The first commit is the necessary commit.  The second is a hygiene commit that I always intended to arrange but haven't had a chance to actually push.