Get rid of third-party XHP since it's actually part of the parser