runtime: simplify changes more, move it all into swig