Refine AA changes for SPPM integrator