Make PartialVariableCollecction attempt to pull enumeration types out.

When the single argument constructor was used, PartialVariableCollection
made the assumption that no enumeration types were used, which made the
unit tests harder to write as they had to explicitly deal with the extraction.
Since the two argument constructor is an optimization, make the single
argument constructor attempt to pull out the enumeration types from the given
variables, making unit tests easier.