Change named producer handling to satisfy new warnings