diff --git a/ruamoko/qwaq/event.h b/ruamoko/qwaq/event.h
index 9eca5158e..28ddccf59 100644
--- a/ruamoko/qwaq/event.h
+++ b/ruamoko/qwaq/event.h
@@ -29,7 +29,7 @@ typedef struct qwaq_event_s {
 		int         key;
 		qwaq_mevent_t mouse;
 		qwaq_message_t message;
-	} e;
+	};
 } qwaq_event_t;
 
 #ifdef __QFCC__	// don't want C gcc to see this :)
diff --git a/ruamoko/qwaq/qwaq-app.r b/ruamoko/qwaq/qwaq-app.r
index ed6339faf..12280d2b3 100644
--- a/ruamoko/qwaq/qwaq-app.r
+++ b/ruamoko/qwaq/qwaq-app.r
@@ -71,14 +71,14 @@ arp_end (void)
 -handleEvent: (qwaq_event_t *) event
 {
 	[screen handleEvent: event];
-	if (event.event_type == qe_key && event.e.key == '\x18') {
+	if (event.event_type == qe_key && event.key == '\x18') {
 		event.event_type = qe_command;
-		event.e.message.command = qc_exit;
+		event.message.command = qc_exit;
 	}
 	if (event.event_type == qe_command
-		&& (event.e.message.command == qc_exit
-			|| event.e.message.command == qc_error)) {
-		endState = event.e.message.command;
+		&& (event.message.command == qc_exit
+			|| event.message.command == qc_error)) {
+		endState = event.message.command;
 	}
 	return self;
 }
diff --git a/ruamoko/qwaq/qwaq-curses.c b/ruamoko/qwaq/qwaq-curses.c
index c03a38542..3d8098ea7 100644
--- a/ruamoko/qwaq/qwaq-curses.c
+++ b/ruamoko/qwaq/qwaq-curses.c
@@ -629,9 +629,9 @@ mouse_event (qwaq_resources_t *res, MEVENT *mevent)
 {
 	qwaq_event_t event = {};
 	event.event_type = qe_mouse;
-	event.e.mouse.x = mevent->x;
-	event.e.mouse.y = mevent->y;
-	event.e.mouse.buttons = mevent->bstate;
+	event.mouse.x = mevent->x;
+	event.mouse.y = mevent->y;
+	event.mouse.buttons = mevent->bstate;
 	add_event (res, &event);
 }
 
@@ -640,7 +640,7 @@ key_event (qwaq_resources_t *res, int key)
 {
 	qwaq_event_t event = {};
 	event.event_type = qe_key;
-	event.e.key = key;
+	event.key = key;
 	add_event (res, &event);
 }
 
diff --git a/ruamoko/qwaq/qwaq-screen.r b/ruamoko/qwaq/qwaq-screen.r
index 0c8573a83..4e68cae30 100644
--- a/ruamoko/qwaq/qwaq-screen.r
+++ b/ruamoko/qwaq/qwaq-screen.r
@@ -65,7 +65,7 @@
 				withObject: (id) event];
 			break;
 		case qe_mouse:
-			Point p = { event.e.mouse.x, event.e.mouse.y };
+			Point p = { event.mouse.x, event.mouse.y };
 			for (int i = [mouse_handler_rects count]; i-->0; ) {
 				//if (rectContainsPoint((Rect*)mouse_handler_rects._objs[i], &p)) {
 				//	[mouse_handlers._objs[i] handleEvent: event];
diff --git a/ruamoko/qwaq/qwaq-window.r b/ruamoko/qwaq/qwaq-window.r
index 7e201aa9a..af53a6546 100644
--- a/ruamoko/qwaq/qwaq-window.r
+++ b/ruamoko/qwaq/qwaq-window.r
@@ -29,10 +29,10 @@
 	switch (event.event_type) {
 		case qe_mouse:
 			mvwprintf(window, 0, 3, "%2d %2d %08x",
-					  event.e.mouse.x, event.e.mouse.y, event.e.mouse.buttons);
+					  event.mouse.x, event.mouse.y, event.mouse.buttons);
 			[self redraw];
-			point.x = event.e.mouse.x;
-			point.y = event.e.mouse.y;
+			point.x = event.mouse.x;
+			point.y = event.mouse.y;
 			for (int i = [views count]; i--> 0; ) {
 				View       *v = [views objectAtIndex: i];
 				if (rectContainsPoint (&v.absRect, &point)) {