Wizard: Several design changes and code cleanups.