begin to replace hard coded oid and type fields with macros