Try to make filter more C++ friendly.