Got rid of AndNewContainWord, OrNewContainWord stuff by merging or renaming
to the same name without "New."