Use the exported OID support functions internally. Move OID support functions and stubs to a separate file.
Juan Lang