Adjust for updated extract format

The data extract format was updated so that the double VisitDate on
the preenrollment table has been removed (and replaced with a CreateDate).
That necessitates these small tweaks.