Reduced calls to toURI when we only change the offset and length
All field access on locs now use new methods
Now all the updates are also using the new kind of locations