Merge "Simplify instance reference offsets."