Target (string) renamed to Oid (32-bit signed), code simplified