Highlight state considation

This builds on #1729 and makes our language a lot more consistent. For my sanity.
We don't use this feature and I don't particularly like that the caller is responsible for dispatching an event.