CPython: 2nd half of partial fix for #67