Remove block parameter support from #set_or_return