Remove more instances of "def references" and normal sets of attributes.