More refactoring
Ensure that resume is done when Enumerator is really at its end (it is possible that multiple feeds happen before suspend is active)