diff --git a/ruamoko/qwaq/builtins/curses.c b/ruamoko/qwaq/builtins/curses.c
index 976a15ee7..045ab9ae7 100644
--- a/ruamoko/qwaq/builtins/curses.c
+++ b/ruamoko/qwaq/builtins/curses.c
@@ -1436,7 +1436,7 @@ static void
 bi_get_event (progs_t *pr)
 {
 	qwaq_resources_t *res = PR_Resources_Find (pr, "qwaq");
-	qwaq_event_t *event = &G_STRUCT (pr, qwaq_event_t, P_INT (pr, 0));
+	qwaq_event_t *event = &P_STRUCT (pr, qwaq_event_t, 0);
 
 	R_INT (pr) = get_event (res, event);
 }
diff --git a/ruamoko/qwaq/builtins/debug.c b/ruamoko/qwaq/builtins/debug.c
index 741bd8a91..fe6796b46 100644
--- a/ruamoko/qwaq/builtins/debug.c
+++ b/ruamoko/qwaq/builtins/debug.c
@@ -363,7 +363,7 @@ qdb_get_event (progs_t *pr)
 	__auto_type debug = PR_Resources_Find (pr, "qwaq-debug");
 	pointer_t   handle = P_INT (pr, 0);
 	qwaq_target_t *target = get_target (debug, __FUNCTION__, handle);
-	__auto_type event = &G_STRUCT (pr, qdb_event_t, P_INT (pr, 1));
+	__auto_type event = &P_STRUCT (pr, qdb_event_t, 1);
 
 	memset (event, 0, sizeof (*event));
 	event->what = target->event;