Clean up filtering.

Fixes #13.