BUG-4638: Split out Number comparator