Minor tweaks to xrefgen handling in accordance with specs set forth in test suite.