Repair accidentally broken support for comparing non-trivial objects (e.g. NumPy arrays) to integer constants.
Closes #2444.