More list comprehension stuff -- slight API change, too. Also reordered filter priority to hopefully increase speed