Major refactoring of parser to remove out node parameters.