update code to match recent parse conventions