Updating repo so we don't need to modify SWIG-generated C code