Things had gotten pretty messy here, apparently mostly but not
entirely the fault of the multirange patch.  No functional changes.