More tweaks to integerRangeSubpattern()