Fixes https://github.com/cython/cython/issues/3647

At least one (in ModuleNode) is a real bug. The others are just
getting the code compatible with Cython again`