[MAT-387] Break cycles in FuzzyCompareOGTerminalContainer with a weak_ptr
[MAT-387] Reinstate deleted delete[]s