Clean up obsolete code. Rename Filter to Expression.
Add support for performing a raw query.