Some minor cleaning up.
Fixed an issue with states being recomputed when they shouldn't have (closes #234).