fix the more troublesome problems with Python 2.7.  Tests still fail after these changes, but only for trivial output-ordering issues.