Fix conflation of ContainSubstring and MatchRegexp