Rename with_comparisons to with_operators, part 2

Oops!!!! These should have been included in 47bacad.