and a wizard with one page is just a dialog, so make
that simplification and conversion too

Change-Id: I9f6335007609893308d57d693a18a313bcbb9244