Fix argument handling for HMC