temporary work-around to fix #2089.

The real issue is that line iteration is now yielding empty lines
in certain circumstances. Issue to be filed...