Refactor some winnow business

Seems to workish?