Some cleanup and better use of variables

We need to reload the variables for each instance to keep from using
information from a previously generated instance.  This still needs to
be improved to keep catalog searches to a minimum whilst loading the
correct info for the current provider instance.