Shift 'resolve' variables out of GraphManager