Removed more cloning that doesn't cause test failures.