CQL grammar: simplify a bit WRT relations