Small DefinitionContext rework