Fix some context_reset() calls being missed.