Straightens out a number of weird relationships, names, and and antipatterns.