Simplify BoundingBoxFilterPnael code and make box/polygon code paths the...

... same