Refactor generator invocation to just invoke call rather than new(..).call. More flexible.