Continue refactoring.

Everything works with the clean clone.