A couple of cloning-related fixes.

Fix the mixins bug that affected various tests with the self-host.