Use inclusive offsets consistently