Address some FIXMEs left over from #91475#91577

bors merged 2 commits intorust-lang:masterrust-lang/rust:masterfrom

ecstatic-morse:mir-pass-manager-cleanupecstatic-morse/rust:mir-pass-manager-cleanupCopy head branch name to clipboard