Coherent switching with decay of mixing: an improved treatment of electronic coherence for non-Born-Oppenheimer trajectories.