Add variable value expansion via Monad.State