Minor refactoring in EngineBlockContext