Better handling of generators+closures
Fixes