Further performance enhancements. Still has bugs in PostFilter.