Update generic visitors.
Remove old filter syntax.