Second part of big deployer refactor.