fix and within or

I refactored the and/or handling and wrote a test for this.  I suspect there were several other broken "or" cases (at least theoretical ones) that this may have fixed.