Toward a Resolution of the Bump and Beat Cepheid Mass Discrepancies