Use Object#yield instead of delegating to tap.