This draft change removes reliance on the current company identifier in evaluation context handling. This is an internal cleanup intended to make company-related behavior more consistent and reduce future maintenance risk.