More fixes to CreateBindings.
Remove some cyclic dependencies in swig modules.