Still a lot of repetition here just to update either `old` or `old + "-cleanup"`.