Backport #3574: More column integer conversions