Smarter OID handling. And, hopefully, correct.