Centralised all Predicate and Transform functions into type specific MethodFactories, then moved commonality up to base class. Actual Query objects now contain less logic, and becoming mostly structural, which is nice.