Match refactoring in "vanilla": org.Object.intrinsifiable folded into org.ObjectLayout