If we specify the state machines independently from prop#340, everything ends up cleaner.
This came out of discussions with @jnewsome
Cc: @dgoulet