Further automating cross-refs (Xref). Small fixes to Consult.