Fix member cross-referencing.