First step towards fixing PR18967 - simplify the ComputeThisOffset interface