Debug cleanup
Fix evaluation order bug in state updates
Additional part of previous fix
Cleanup debug info