use yield*

The test coverage stuff was added in a separate PR, revert these changes from this branch/PR.