Index: uspace/lib/c/generic/io/visualizer.c
===================================================================
--- uspace/lib/c/generic/io/visualizer.c	(revision cf13b1787530fe212a0ac74399fd6d4b0f096731)
+++ uspace/lib/c/generic/io/visualizer.c	(revision 1c5c96d4230e002b6875752b4cbb87808a44b364)
@@ -33,4 +33,5 @@
  */
 
+#include <assert.h>
 #include <errno.h>
 #include <as.h>
@@ -175,9 +176,8 @@
 	sysarg_t x_offset, sysarg_t y_offset)
 {
-#ifdef __32_BITS__
+	assert(x_offset <= UINT16_MAX);
+	assert(y_offset <= UINT16_MAX);
+
 	sysarg_t offsets = ((x_offset << 16) | (y_offset & 0x0000ffff));
-#else
-	sysarg_t offsets = ((x_offset << 32) | (y_offset & 0xffffffff));
-#endif
 
 	async_exch_t *exch = async_exchange_begin(sess);
Index: uspace/lib/graph/graph.c
===================================================================
--- uspace/lib/graph/graph.c	(revision cf13b1787530fe212a0ac74399fd6d4b0f096731)
+++ uspace/lib/graph/graph.c	(revision 1c5c96d4230e002b6875752b4cbb87808a44b364)
@@ -469,11 +469,6 @@
 static void vs_update_damaged_region(visualizer_t *vs, ipc_callid_t iid, ipc_call_t *icall)
 {
-#ifdef __32_BITS__
 	sysarg_t x_offset = (IPC_GET_ARG5(*icall) >> 16);
 	sysarg_t y_offset = (IPC_GET_ARG5(*icall) & 0x0000ffff);
-#else
-	sysarg_t x_offset = (IPC_GET_ARG5(*icall) >> 32);
-	sysarg_t y_offset = (IPC_GET_ARG5(*icall) & 0xffffffff);
-#endif
 	
 	int rc = vs->ops.handle_damage(vs,