Refactor peering into separate context alongside data context.