Cleanup the viterbi code a well.

(It used to be commented out)