[PATCH 04/12] Minor code cleanups in filtering code.