[1585] Testing and fixing, also overcoming Rascal's problems with set matching
[1615] Correct prettyprinting with grouping