Fix some remaining instances of "not X in Y" -> "X not in Y"

These had been obscured by some changes-in-progress in my working copy.
Merge pull request #4844 from hulu/more-not-in-fixes

Fix some remaining instances of "not X in Y" -> "X not in Y"