Optimize out redundant state changes
0.1.3