Fix some stragglers from the Beverage change.