refactoring. making takeTillB and manyTillB make more sense, also having their func sigs match since they are very similar