Further tidy up and removal of now redundant code. Almost everything is now based on filter expressions.

Handle vpath, colPath in filters. FilterBuilder now used internally by the expression parser.

Also undo some incompatible changes imported from 3.10