Move to snapshot narya for circular dependency fixes.