Minor state changes.
Merge.