Cleaned up wizard public interfaces.