Upgrade to latest parser (4.0.7)