Bring some more sense into chooseObjectType()