Nditer remove empty

This is the followup to that "kludge" discussion. I did not really check much if there might be something going awefully wrong, though on the other hand it is hard to imagine something too bad.

-

There are certainly more kludges to remove here assuming that it works. So should check for those first.