What about using no filtering as default in BaseHazardCalculator, and overriding it only in the event based calculator, which is the only one using the up front filtering feature at the moment?