Move subrange constraints from invariants to assertions