Further changes to ParseNode