move column escaping down into the table iterator

see #641