(simplify and) work-around 1.8 delegator.rb not passing blocks around