Fixup syntax parser impelementation.