Bugfixes.

- Fixed #6649.
- Fixed #7330.
Might as well handle CLONE, TOX, and whatever else while you're at it.