Changed GenericDialog variables to be macro accessible.