Better support for single state changes.