Update Grid for immutable ranges (split out 0.2 branch)