I'd suggest that we do the addition of the Reference type as a separable workitem.

The initial round of cleanup is more or less a large collection of re-names and other "trivial" transforms.  Adding Reference is going to be a little less trivial.

--dave