Stop relying on yapa to keep track of context.