Return `type` alongside the `yield`, too