Highlight state considation

This builds on #1729 and makes our language a lot more consistent. For my sanity.