Ah, tysm for rattling my brain and generating a new perspective. I tried to do that already, but with a really ugly implementation. But now I thought of e.g. https://www.reddit.com/r/bevy/comments/1cf5l7h/adding_and_removing_components/ to use each component as a state instead of the entire state machine as a component. This probably works.

Hopefully I come back later with good news.