More DEFSTRUCT cleanup.