Update to latest swig with nested blocks