Cleanup evaluate filter syntax

This contains some syntax-only cleanups.