Start simplifying the dialog construction and destruction a bit