Re-merged in Wil's transition diagram changes that somehow got lost.  This is the candidate version for the 10 draft.