Small changes to parser to go to new style.