Refactoring, part 2.

It works again.