upgradeWorkerFactory refactored to upgradeWorkerContext

Somewhat cleaner.