Fix constructor/member cross-referencing.