[NTG-context] cross-references again