Improve RewindableGenerator