Added -- separate Xref and symbol-table munging.