Reapply plerohellec's fix and re-SWIG.