Subrange fixes.