Summary: Check for overflow cases in range checks and collapse it if we can.
Reviewed-by: jrose, iveresov