Explicitly clear out lep_dxy/dz (should not have caused problem, though).
Replace kludge with simpler kludge.
Merge branch 'master' into ntuplev14