Fixing interpolation state transition
Refactoring state transitions
Moving collections definitions
Changing precedence of conditionals to be equal to primary expressions