Simplify rql terms and remove rql_methods.