Agree on the first point, but not the second.

RemoveFilterRunner should have the check so the callers of this function don't each have to test the condition