Support pyparsing << 2.0