Minor refactor in evolve_gp()