Fix two regressions introduced by #11072.

(#11072)

There, concrete evidence that I shouldn't try doing such things at 1:30am.