Second part of fixes. The parser is now fixed and updated to 5.4.7 17956.