resolve: cleanup using `with_rib`, etc.
resolve: cleanup using `with_rib`, etc.

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