oid_madness: Further cleanup

Change-Id: I51070383c8903823264f2d4b10e84b0fd9e17a5d