Minor cleanup in dialog_wizard