Started flagging state variables as constant