Continued refactoring to move all stages to new fields.