Fixes regression that didn't remove combo styles.
Tidies up statechart code a bit.
Lengthens default bounce out transition a bit.