Speed-up of the WPI parsers.