alterations to support build without cython