Some updates to the way the continuation-stack is used