Clean up in cython following discussion with jlec on bugzilla. 0.20.1 in main tree.

Package-Manager: portage-2.2.8-r1