Changed the parameterization code to work with Tom's new representation of variables.