Minor fix to support primitive structure.
Automatic Py3k merge for testing