Bug 6723: Deep clone fix.