More clean-up on the data model and the wizard.