WYCS: a fair amount of refactoring.