Simplify API, remove support for generator block arg