AST related updates to support parsec based parsing of tokenised stream