I'd appreciate a close look at this. It seems like we can get away with a filter here instead of using `without`. I ran the tests and they were ok but I don't trust them.