Tweak column mapping a bit.