#5598: Touch up the patch.