Even more cleanup bits for oid madness.

Change-Id: Ie6da82f92eeaec93c99cec70c94f792dc8c5b8c6