Bring back some filtering functions that got clobbered on a previous commit.