Small code cleanup.
Small code cleanup.
Proc.Collapse:  Consolidated some proc traversals.

No need to traverse twice to transform OName in two ways.