id_make_local and later remapping are supposed to handle that already, and in a much much saner and more complete way.