SWIG refactor.