Fix token parents in statement grouping