Continued refactoring to Mixed.