Rollup merge of #81865 - bugadani:typeck2, r=jyn514
Rollup merge of #81865 - bugadani:typeck2, r=jyn514

Clean up weird Option mapping

aidancully/rust,graydon/rust,graydon/rust,aidancully/rust,aidancully/rust,graydon/rust,aidancully/rust,aidancully/rust,graydon/rust,graydon/rust,aidancully/rust,graydon/rust