simplify EH filtering logic a bit more