Update from parser code review