Refactor away 'do yields exit' check

creating them if they not