sort
statechart: don't start timer in unstable state
No functional changes, just some model element renames...