The fixed parser is now properly integrated -- no more workarounds