More state fixes, removed support for "updateing" pre-existing variable
as that is a too complex use-case.