Corrected cross-reference support.