FINALLY fixed the pyparsing-on-py33-bug (and more coverage)