A few cleanups and minor improvements to typeck#54591

bors merged 1 commit intorust-lang:masterrust-lang/rust:masterfrom

ljedrz:cleanup_typeck_restljedrz/rust-1:cleanup_typeck_restCopy head branch name to clipboard