Highlight state considation

This builds on #1729 and makes our language a lot more consistent. For my sanity.
> There are lots of other ways that this interaction could be written. 

True - but this change (which has nothing to do with the stated goals of the PR) does not improve it, just removes it.