Move dispersion correction call to do_force()