more cif parsing magic
Automatic Py3k merge for testing