Improve cross-reference and citation handling.