Sorry -- was having trouble following what was being tested.

I just noticed you were bringing in the expl_leapfrog integrator and thought there was some interaction going on.

I think you're right -- leaving it this way will be a lot simpler.