MDL-37037 Assignment Some minor refactoring of the previous patch