Changes towards nanobind compatiblity that also work for pybind11