Move #where and #order into QueryMethods and test for immutability