more work on Edef/Istream