More list comprehension stuff -- slight API change, too
Part of the updated API
Reordered filter priority to hopefully increase speed