rearrange transition probabilities.  REGRESSION TEST NOT RUN.

I couldn't get a regression test to pass before this.
Use pattern matching on Model (please cherry pick this commit)