Cleaned up "filter list" code and other misc refactorings.