Fix OSR inside closures and generators

Nothing major was wrong, but was trying to double-pass the
generator/closure arguments.
wip