Improve grouping of expressions (targets #23).