Adjust when_any to follow the latest proposal changes, drop when_any_back