Use block pass instead of nested yield