Update: just sent you a PR that reduces the amount of code by ~70% while increasing the speed by ~30% for the Fortran version.