Fix def@ for latest changes.