Factored out combinator from withType calls
Resolved merge conflict