Fixes for Vasu's bug report. Strategy extractor now does not depend on the order of the elements in the VariableType ENUM any more