Fix some problems introduced with the previous commit for #63427.