More robust dealing with custodian job modifications.