Implement the fix in Cython so we don't lose any speed (we actually benchmark a bit faster).

Fixes #1318 and fixes #1319