Cleaning up decoupling of EM/Viterbi