Compare and merge Erin's changes with Cython

[Eric Harper]

Not much changed, but need to make sure all the changes are correctly applied since this is a pre-cythonized change to an already cythonized module

[Eric Harper]

Should have included in commit, but this is done.