ws
Reorganize ExpandingMapIterator::readOriginalRow()

Now doesn't fill the unchanged columns for an original row that
yields no data, since that's wasteful.
Remove unnecessary try-finally block