Modified HMC and diagnostics type to allow saving leapfrog steps (so as to ultimately implement Rao-Blackwellized HMC)