Time has passed since these changes were made.  It looks like I analysed how references were tracked, and corrected it.