Some more tidying up of obj-identify