Adjust to EffectiveSchemaContext movement