Simplify fix for scan+take dispose. Simplify take

- [ ] Needs a unit test

Fix #41