--- ray/src/ot/bbox.c	1989/02/02 10:33:00	1.1
+++ ray/src/ot/bbox.c	1989/10/24 13:59:20	1.3
@@ -27,10 +27,9 @@ add2bbox(o, bbmin, bbmax)		/* expand bounding box to f
 register OBJREC  *o;
 FVECT  bbmin, bbmax;
 {
-#define  co	((CONE *)osp)
-#define  fo	((FACE *)osp)
-#define  io	((INSTANCE *)osp)
-	register char  *osp;
+	CONE  *co;
+	FACE  *fo;
+	INSTANCE  *io;
 	FVECT  v;
 	register int  i, j;
 
@@ -64,7 +63,7 @@ FVECT  bbmin, bbmax;
 		circle2bbox(CO_P1(co), co->ad, CO_R1(co), bbmin, bbmax);
 		break;
 	case OBJ_INSTANCE:
-		io = getinstance(o, GET_BOUNDS);
+		io = getinstance(o, IO_BOUNDS);
 		for (j = 0; j < 8; j++) {
 			for (i = 0; i < 3; i++) {
 				v[i] = io->obj->scube.cuorg[i];
@@ -76,9 +75,6 @@ FVECT  bbmin, bbmax;
 		}
 		break;
 	}
-#undef  co
-#undef  fo
-#undef  io
 }