Some more cleanup in WINNER