Remove block argument in favor of yield