Deal with state changes in a more consistent manner