The filter check does not make sense in the context of bereq
and the macros became overloaded with two different cases.

Motivated by and in preparation of #3826