-#define E_FLOAT(e,o) (((float*)&e->v)[o])
-#define E_INT(e,o) (*(int *)&((float*)&e->v)[o])
-#define E_VECTOR(e,o) (&((float*)&e->v)[o])
-#define E_STRING(e,o) (pr_strings + *(string_t *)&((float*)&e->v)[o])
+// FIXME: make these go away?
+#define E_FLOAT(e,o) (((float*)e->v)[o])
+//#define E_INT(e,o) (((int*)e->v)[o])
+//#define E_VECTOR(e,o) (&((float*)e->v)[o])
+#define E_STRING(e,o) (PR_GetString(*(string_t *)&((float*)e->v)[o]))