Get rid of a few more references to the DC structure.