Refinements to XREF handling and added handling for non-XREF href processing.