Further improvements of the parsing/cst