...update the condioned-out code to at least make sense with the current versions of the data structures.
