Fix fallout from PR middle-end/15700: