Fix wrt. deletion of CallStack.