Minor type change and temporarily reexpose cycgraph