More SWIG refactor.