Simplify code by using a column mapper wrapper instead of Either

EBD-11848