Getting cross references right.