Further DBRef cleanup.