Bring stack into EvalContext
Merge pull request #388 from sigurdteigen/cleanup/stack-context

Bring stack into EvalContext