remove "*&val" references

They were added by automatic macro conversions

38 files changed, 232 insertions, 232 deletions

diff --git a/swfdec/swfdec_amf.c b/swfdec/swfdec_amf.c
index 11607198..249a693b 100644
--- a/swfdec/swfdec_amf.c
+++ b/swfdec/swfdec_amf.c
@@ -70,7 +70,7 @@ swfdec_amf_parse_properties (SwfdecAsContext *context, SwfdecBits *bits, SwfdecA
 
     if (!swfdec_amf_parse_string (context, bits, &val))
       return FALSE;
-    name = SWFDEC_AS_VALUE_GET_STRING (*&val);
+    name = SWFDEC_AS_VALUE_GET_STRING (val);
     type = swfdec_bits_get_u8 (bits);
     if (type == SWFDEC_AMF_END_OBJECT)
       break;
diff --git a/swfdec/swfdec_as_array.c b/swfdec/swfdec_as_array.c
index a268a5b8..e1a42e9a 100644
--- a/swfdec/swfdec_as_array.c
+++ b/swfdec/swfdec_as_array.c
@@ -721,11 +721,11 @@ swfdec_as_array_concat (SwfdecAsContext *cx, SwfdecAsObject *object,
   swfdec_as_array_append_array (array_new, object);
 
   for (j = 0; j < argc; j++) {
-    if (SWFDEC_AS_VALUE_IS_OBJECT (*&argv[j]) &&
-	SWFDEC_AS_VALUE_GET_OBJECT (*&argv[j])->array)
+    if (SWFDEC_AS_VALUE_IS_OBJECT (argv[j]) &&
+	SWFDEC_AS_VALUE_GET_OBJECT (argv[j])->array)
     {
       swfdec_as_array_append_array (array_new,
-	  SWFDEC_AS_VALUE_GET_OBJECT (*&argv[j]));
+	  SWFDEC_AS_VALUE_GET_OBJECT (argv[j]));
     }
     else
     {
@@ -1172,11 +1172,11 @@ swfdec_as_array_sort (SwfdecAsContext *cx, SwfdecAsObject *object, guint argc,
 
   pos = 0;
 
-  if (argc > pos && !SWFDEC_AS_VALUE_IS_NUMBER (*&argv[pos])) {
+  if (argc > pos && !SWFDEC_AS_VALUE_IS_NUMBER (argv[pos])) {
     SwfdecAsFunction *fun;
-    if (!SWFDEC_AS_VALUE_IS_OBJECT (*&argv[pos]) ||
+    if (!SWFDEC_AS_VALUE_IS_OBJECT (argv[pos]) ||
 	!SWFDEC_IS_AS_FUNCTION (
-	  fun = (SwfdecAsFunction *) SWFDEC_AS_VALUE_GET_OBJECT (*&argv[pos])->relay))
+	  fun = (SwfdecAsFunction *) SWFDEC_AS_VALUE_GET_OBJECT (argv[pos])->relay))
 	return;
     custom_function = fun;
     pos++;
@@ -1210,9 +1210,9 @@ swfdec_as_array_sortOn (SwfdecAsContext *cx, SwfdecAsObject *object,
   if (argc < 1)
     return;
 
-  if (SWFDEC_AS_VALUE_IS_OBJECT (*&argv[0])) {
+  if (SWFDEC_AS_VALUE_IS_OBJECT (argv[0])) {
 
-    array = SWFDEC_AS_VALUE_GET_OBJECT (*&argv[0]);
+    array = SWFDEC_AS_VALUE_GET_OBJECT (argv[0]);
     if (!array->array) {
       SWFDEC_AS_VALUE_SET_OBJECT (ret, object);
       return;
@@ -1232,7 +1232,7 @@ swfdec_as_array_sortOn (SwfdecAsContext *cx, SwfdecAsObject *object,
 
     fields[i] = NULL;
   } else {
-    if (SWFDEC_AS_VALUE_IS_MOVIE (*&argv[0])) {
+    if (SWFDEC_AS_VALUE_IS_MOVIE (argv[0])) {
       SWFDEC_FIXME ("how do we treat movies here?");
     }
     num_fields = 1;
@@ -1244,8 +1244,8 @@ swfdec_as_array_sortOn (SwfdecAsContext *cx, SwfdecAsObject *object,
   options = g_new0 (SortOption, num_fields);
 
   if (argc > 1) {
-    if (SWFDEC_AS_VALUE_IS_OBJECT (*&argv[1])) {
-      array = SWFDEC_AS_VALUE_GET_OBJECT (*&argv[1]);
+    if (SWFDEC_AS_VALUE_IS_OBJECT (argv[1])) {
+      array = SWFDEC_AS_VALUE_GET_OBJECT (argv[1]);
 
       if (array->array &&
 	swfdec_as_array_get_length (array) == num_fields) {
@@ -1284,7 +1284,7 @@ swfdec_as_array_construct (SwfdecAsContext *cx, SwfdecAsObject *object,
   swfdec_as_object_set_relay (object, NULL);
   object->array = TRUE;
 
-  if (argc == 1 && SWFDEC_AS_VALUE_IS_NUMBER (*&argv[0])) {
+  if (argc == 1 && SWFDEC_AS_VALUE_IS_NUMBER (argv[0])) {
     int l = swfdec_as_value_to_integer (cx, &argv[0]);
     swfdec_as_array_set_length (object, l < 0 ? 0 : l);
   } else if (argc > 0) {
diff --git a/swfdec/swfdec_as_context.c b/swfdec/swfdec_as_context.c
index 0bead1ed..011c99df 100644
--- a/swfdec/swfdec_as_context.c
+++ b/swfdec/swfdec_as_context.c
@@ -1082,9 +1082,9 @@ swfdec_as_context_ASSetPropFlags (SwfdecAsContext *cx, SwfdecAsObject *object,
   if (argc < 3)
     return;
 
-  if (!SWFDEC_AS_VALUE_IS_COMPOSITE (*&argv[0]))
+  if (!SWFDEC_AS_VALUE_IS_COMPOSITE (argv[0]))
     return;
-  obj = SWFDEC_AS_VALUE_GET_COMPOSITE (*&argv[0]);
+  obj = SWFDEC_AS_VALUE_GET_COMPOSITE (argv[0]);
   flags[0] = swfdec_as_value_to_integer (cx, &argv[2]);
   flags[1] = (argc > 3) ? swfdec_as_value_to_integer (cx, &argv[3]) : 0;
 
@@ -1094,7 +1094,7 @@ swfdec_as_context_ASSetPropFlags (SwfdecAsContext *cx, SwfdecAsObject *object,
     return;
   }
 
-  if (SWFDEC_AS_VALUE_IS_NULL (*&argv[1])) {
+  if (SWFDEC_AS_VALUE_IS_NULL (argv[1])) {
     swfdec_as_object_foreach (obj, swfdec_as_context_ASSetPropFlags_foreach, flags);
   } else {
     char **split =
diff --git a/swfdec/swfdec_as_date.c b/swfdec/swfdec_as_date.c
index cd621ba4..be5263af 100644
--- a/swfdec/swfdec_as_date.c
+++ b/swfdec/swfdec_as_date.c
@@ -763,7 +763,7 @@ swfdec_as_date_setTime (SwfdecAsContext *cx, SwfdecAsObject *object,
   SWFDEC_AS_CHECK (SWFDEC_TYPE_AS_DATE, &date, "");
 
   if (argc > 0 &&
-      (cx->version > 6 || !SWFDEC_AS_VALUE_IS_UNDEFINED (*&argv[0]))) {
+      (cx->version > 6 || !SWFDEC_AS_VALUE_IS_UNDEFINED (argv[0]))) {
     d = swfdec_as_value_to_number (cx, &argv[0]);
   } else {
     d = NAN;
@@ -950,7 +950,7 @@ swfdec_as_date_UTC (SwfdecAsContext *cx, SwfdecAsObject *object, guint argc,
 
   // special case: ignore undefined and everything after it
   for (i = 0; i < argc; i++) {
-    if (SWFDEC_AS_VALUE_IS_UNDEFINED (*&argv[i])) {
+    if (SWFDEC_AS_VALUE_IS_UNDEFINED (argv[i])) {
       argc = i;
       break;
     }
@@ -1076,7 +1076,7 @@ swfdec_as_date_construct (SwfdecAsContext *cx, SwfdecAsObject *object,
 
   // special case: ignore undefined and everything after it
   for (i = 0; i < argc; i++) {
-    if (SWFDEC_AS_VALUE_IS_UNDEFINED (*&argv[i])) {
+    if (SWFDEC_AS_VALUE_IS_UNDEFINED (argv[i])) {
       argc = i;
       break;
     }
diff --git a/swfdec/swfdec_as_frame.c b/swfdec/swfdec_as_frame.c
index bde7afd4..5af43691 100644
--- a/swfdec/swfdec_as_frame.c
+++ b/swfdec/swfdec_as_frame.c
@@ -341,7 +341,7 @@ void
 swfdec_as_frame_set_this (SwfdecAsFrame *frame, SwfdecAsObject *thisp)
 {
   g_return_if_fail (frame != NULL);
-  g_return_if_fail (SWFDEC_AS_VALUE_IS_UNDEFINED (*&frame->thisp));
+  g_return_if_fail (SWFDEC_AS_VALUE_IS_UNDEFINED (frame->thisp));
   g_return_if_fail (thisp != NULL);
 
   g_assert (!SWFDEC_IS_AS_SUPER (thisp));
diff --git a/swfdec/swfdec_as_function.c b/swfdec/swfdec_as_function.c
index ad1b35fa..45fb7bb5 100644
--- a/swfdec/swfdec_as_function.c
+++ b/swfdec/swfdec_as_function.c
@@ -138,12 +138,12 @@ swfdec_as_function_apply (SwfdecAsContext *cx, SwfdecAsObject *object,
   if (thisp == NULL)
     thisp = swfdec_as_object_new_empty (cx);
 
-  if (argc > 1 && SWFDEC_AS_VALUE_IS_COMPOSITE (*&argv[1])) {
+  if (argc > 1 && SWFDEC_AS_VALUE_IS_COMPOSITE (argv[1])) {
     int i;
     SwfdecAsObject *array;
     SwfdecAsValue val;
 
-    array = SWFDEC_AS_VALUE_GET_COMPOSITE (*&argv[1]);
+    array = SWFDEC_AS_VALUE_GET_COMPOSITE (argv[1]);
 
     swfdec_as_object_get_variable (array, SWFDEC_AS_STR_length, &val);
     length = swfdec_as_value_to_integer (cx, &val);
diff --git a/swfdec/swfdec_as_interpret.c b/swfdec/swfdec_as_interpret.c
index 0d2f55cf..dcf0dbbe 100644
--- a/swfdec/swfdec_as_interpret.c
+++ b/swfdec/swfdec_as_interpret.c
@@ -419,9 +419,9 @@ super_special_movie_lookup_magic (SwfdecAsContext *cx, SwfdecAsObject *o, const
   }
   if (!swfdec_as_object_get_variable (o, name, &val))
     return NULL;
-  if (!SWFDEC_AS_VALUE_IS_COMPOSITE (*&val))
+  if (!SWFDEC_AS_VALUE_IS_COMPOSITE (val))
     return NULL;
-  return SWFDEC_AS_VALUE_GET_COMPOSITE (*&val);
+  return SWFDEC_AS_VALUE_GET_COMPOSITE (val);
 }
 
 static SwfdecAsObject *
@@ -981,10 +981,10 @@ swfdec_action_add2 (SwfdecAsContext *cx, guint action, const guint8 *data, guint
   rtmp = *rval;
   ltmp = *lval;
   swfdec_action_add2_to_primitive (&rtmp);
-  if (!SWFDEC_AS_VALUE_IS_OBJECT (*&rtmp))
+  if (!SWFDEC_AS_VALUE_IS_OBJECT (rtmp))
     rval = &rtmp;
   swfdec_action_add2_to_primitive (&ltmp);
-  if (!SWFDEC_AS_VALUE_IS_OBJECT (*&ltmp))
+  if (!SWFDEC_AS_VALUE_IS_OBJECT (ltmp))
     lval = &ltmp;
 
   if (SWFDEC_AS_VALUE_IS_STRING (*lval) || SWFDEC_AS_VALUE_IS_STRING (*rval)) {
@@ -1427,7 +1427,7 @@ swfdec_action_equals2_5 (SwfdecAsContext *cx, guint action, const guint8 *data,
   ltype = SWFDEC_AS_VALUE_GET_TYPE (ltmp);
   rtype = SWFDEC_AS_VALUE_GET_TYPE (rtmp);
   
-  if (SWFDEC_AS_VALUE_IS_COMPOSITE (*&ltmp) && SWFDEC_AS_VALUE_IS_COMPOSITE (*&rtmp)) {
+  if (SWFDEC_AS_VALUE_IS_COMPOSITE (ltmp) && SWFDEC_AS_VALUE_IS_COMPOSITE (rtmp)) {
     /* get movies compared */
     if (ltype == SWFDEC_AS_TYPE_MOVIE) {
       if (rtype == SWFDEC_AS_TYPE_MOVIE) {
@@ -1436,13 +1436,13 @@ swfdec_action_equals2_5 (SwfdecAsContext *cx, guint action, const guint8 *data,
 	swfdec_as_value_to_primitive (rval);
       }
       cond = SWFDEC_AS_VALUE_IS_MOVIE (*rval) && 
-	SWFDEC_AS_VALUE_GET_MOVIE (*&ltmp) == SWFDEC_AS_VALUE_GET_MOVIE (*rval);
+	SWFDEC_AS_VALUE_GET_MOVIE (ltmp) == SWFDEC_AS_VALUE_GET_MOVIE (*rval);
       goto out;
     }
     if (rtype == SWFDEC_AS_TYPE_MOVIE) {
       swfdec_as_value_to_primitive (lval);
       cond = SWFDEC_AS_VALUE_IS_MOVIE (*lval) && 
-	SWFDEC_AS_VALUE_GET_MOVIE (*&rtmp) == SWFDEC_AS_VALUE_GET_MOVIE (*lval);
+	SWFDEC_AS_VALUE_GET_MOVIE (rtmp) == SWFDEC_AS_VALUE_GET_MOVIE (*lval);
       goto out;
     }
 
@@ -1452,17 +1452,17 @@ swfdec_action_equals2_5 (SwfdecAsContext *cx, guint action, const guint8 *data,
 
   /* compare strings */
   if (ltype == SWFDEC_AS_TYPE_STRING && rtype == SWFDEC_AS_TYPE_STRING) {
-    cond = SWFDEC_AS_VALUE_GET_STRING (*&ltmp) == SWFDEC_AS_VALUE_GET_STRING (*&rtmp);
+    cond = SWFDEC_AS_VALUE_GET_STRING (ltmp) == SWFDEC_AS_VALUE_GET_STRING (rtmp);
     goto out;
   }
 
   /* convert to numbers */
-  if (SWFDEC_AS_VALUE_IS_OBJECT (*&ltmp)) {
+  if (SWFDEC_AS_VALUE_IS_OBJECT (ltmp)) {
     l = swfdec_as_value_to_number (cx, lval);
   } else {
     l = swfdec_as_value_to_number (cx, &ltmp);
   }
-  if (SWFDEC_AS_VALUE_IS_OBJECT (*&rtmp)) {
+  if (SWFDEC_AS_VALUE_IS_OBJECT (rtmp)) {
     r = swfdec_as_value_to_number (cx, rval);
   } else {
     r = swfdec_as_value_to_number (cx, &rtmp);
@@ -2171,7 +2171,7 @@ swfdec_action_type_of (SwfdecAsContext *cx, guint action, const guint8 *data, gu
       break;
     case SWFDEC_AS_TYPE_OBJECT:
       {
-	SwfdecAsObject *obj = SWFDEC_AS_VALUE_GET_OBJECT (*&val);
+	SwfdecAsObject *obj = SWFDEC_AS_VALUE_GET_OBJECT (val);
 	if (SWFDEC_IS_AS_FUNCTION (obj->relay)) {
 	  type = SWFDEC_AS_STR_function;
 	} else {
@@ -2181,7 +2181,7 @@ swfdec_action_type_of (SwfdecAsContext *cx, guint action, const guint8 *data, gu
       break;
     case SWFDEC_AS_TYPE_MOVIE:
       {
-	SwfdecMovie *movie = SWFDEC_AS_VALUE_GET_MOVIE (*&val);
+	SwfdecMovie *movie = SWFDEC_AS_VALUE_GET_MOVIE (val);
 	if (SWFDEC_IS_TEXT_FIELD_MOVIE (movie) &&
 	    movie->state == SWFDEC_MOVIE_STATE_RUNNING) {
 	  type = SWFDEC_AS_STR_object;
@@ -2227,9 +2227,9 @@ swfdec_action_is_instance_of (SwfdecAsObject *object,
 
   // FIXME: propflag tests are wrong, and we shouldn't get __proto__.prototype
   swfdec_as_object_get_variable (constructor, SWFDEC_AS_STR_prototype, &val);
-  if (!SWFDEC_AS_VALUE_IS_OBJECT (*&val))
+  if (!SWFDEC_AS_VALUE_IS_OBJECT (val))
     return FALSE;
-  prototype = SWFDEC_AS_VALUE_GET_OBJECT (*&val);
+  prototype = SWFDEC_AS_VALUE_GET_OBJECT (val);
 
   class = object;
   while ((class = swfdec_as_object_get_prototype (class)) != NULL) {
diff --git a/swfdec/swfdec_as_native_function.c b/swfdec/swfdec_as_native_function.c
index e3f8ec36..7a1684da 100644
--- a/swfdec/swfdec_as_native_function.c
+++ b/swfdec/swfdec_as_native_function.c
@@ -339,8 +339,8 @@ swfdec_as_native_function_checkv (SwfdecAsContext *cx, SwfdecAsObject *object,
 	{
 	  SwfdecMovie *m;
 	  SwfdecMovie **arg = va_arg (varargs, SwfdecMovie **);
-	  if (SWFDEC_AS_VALUE_IS_MOVIE (*&argv[i])) {
-	    m = SWFDEC_AS_VALUE_GET_MOVIE (*&argv[i]);
+	  if (SWFDEC_AS_VALUE_IS_MOVIE (argv[i])) {
+	    m = SWFDEC_AS_VALUE_GET_MOVIE (argv[i]);
 	  } else {
 	    m = NULL;
 	  }
diff --git a/swfdec/swfdec_as_object.c b/swfdec/swfdec_as_object.c
index 2be0fc50..3229abfe 100644
--- a/swfdec/swfdec_as_object.c
+++ b/swfdec/swfdec_as_object.c
@@ -922,7 +922,7 @@ swfdec_as_object_get_variable_and_flags (SwfdecAsObject *object,
     if (resolve == NULL) {
       var = swfdec_as_object_hash_lookup (cur, SWFDEC_AS_STR___resolve);
 
-      if (var != NULL && (context->version <= 6 || SWFDEC_AS_VALUE_IS_COMPOSITE (*&var->value)))
+      if (var != NULL && (context->version <= 6 || SWFDEC_AS_VALUE_IS_COMPOSITE (var->value)))
 	resolve = cur;
     }
     cur = swfdec_as_object_get_prototype_internal (cur);
@@ -945,9 +945,9 @@ swfdec_as_object_get_variable_and_flags (SwfdecAsObject *object,
 
     var = swfdec_as_object_hash_lookup (resolve, SWFDEC_AS_STR___resolve);
     g_assert (var != NULL);
-    if (!SWFDEC_AS_VALUE_IS_OBJECT (*&var->value))
+    if (!SWFDEC_AS_VALUE_IS_OBJECT (var->value))
       return FALSE;
-    fun = (SwfdecAsFunction *) (SWFDEC_AS_VALUE_GET_OBJECT (*&var->value)->relay);
+    fun = (SwfdecAsFunction *) (SWFDEC_AS_VALUE_GET_OBJECT (var->value)->relay);
     if (!SWFDEC_IS_AS_FUNCTION (fun))
       return FALSE;
     SWFDEC_AS_VALUE_SET_STRING (&argv, variable);
@@ -1250,9 +1250,9 @@ swfdec_as_object_call (SwfdecAsObject *object, const char *name, guint argc,
   if (return_value)
     SWFDEC_AS_VALUE_SET_UNDEFINED (return_value);
   swfdec_as_object_get_variable (object, name, &tmp);
-  if (!SWFDEC_AS_VALUE_IS_OBJECT (*&tmp))
+  if (!SWFDEC_AS_VALUE_IS_OBJECT (tmp))
     return FALSE;
-  fun = (SwfdecAsFunction *) SWFDEC_AS_VALUE_GET_OBJECT (*&tmp)->relay;
+  fun = (SwfdecAsFunction *) SWFDEC_AS_VALUE_GET_OBJECT (tmp)->relay;
   if (!SWFDEC_IS_AS_FUNCTION (fun))
     return FALSE;
   swfdec_as_function_call (fun, object, argc, argv, return_value ? return_value : &tmp);
@@ -1445,14 +1445,14 @@ swfdec_as_object_addProperty (SwfdecAsContext *cx, SwfdecAsObject *object,
   if (argc < 3)
     return;
   name = swfdec_as_value_to_string (cx, argv[0]);
-  if (!SWFDEC_AS_VALUE_IS_OBJECT (*&argv[1]) ||
-      !SWFDEC_IS_AS_FUNCTION ((get = (SwfdecAsFunction *) (SWFDEC_AS_VALUE_GET_OBJECT (*&argv[1])->relay))))
+  if (!SWFDEC_AS_VALUE_IS_OBJECT (argv[1]) ||
+      !SWFDEC_IS_AS_FUNCTION ((get = (SwfdecAsFunction *) (SWFDEC_AS_VALUE_GET_OBJECT (argv[1])->relay))))
     return;
-  if (SWFDEC_AS_VALUE_IS_OBJECT (*&argv[2])) {
-    set = (SwfdecAsFunction *) (SWFDEC_AS_VALUE_GET_OBJECT (*&argv[2])->relay);
+  if (SWFDEC_AS_VALUE_IS_OBJECT (argv[2])) {
+    set = (SwfdecAsFunction *) (SWFDEC_AS_VALUE_GET_OBJECT (argv[2])->relay);
     if (!SWFDEC_IS_AS_FUNCTION (set))
       return;
-  } else if (SWFDEC_AS_VALUE_IS_NULL (*&argv[2])) {
+  } else if (SWFDEC_AS_VALUE_IS_NULL (argv[2])) {
     set = NULL;
   } else {
     return;
@@ -1684,7 +1684,7 @@ swfdec_as_object_construct (SwfdecAsContext *cx, SwfdecAsObject *object,
     guint argc, SwfdecAsValue *argv, SwfdecAsValue *ret)
 {
   if (argc > 0) {
-    if (SWFDEC_AS_VALUE_IS_MOVIE (*&argv[0])) {
+    if (SWFDEC_AS_VALUE_IS_MOVIE (argv[0])) {
       *ret = argv[0];
       return;
     } else {
diff --git a/swfdec/swfdec_as_relay.c b/swfdec/swfdec_as_relay.c
index 8a96573f..4c0d2382 100644
--- a/swfdec/swfdec_as_relay.c
+++ b/swfdec/swfdec_as_relay.c
@@ -107,9 +107,9 @@ swfdec_as_relay_call (SwfdecAsRelay *relay, const char *name, guint argc,
   if (return_value)
     SWFDEC_AS_VALUE_SET_UNDEFINED (return_value);
   swfdec_as_object_get_variable (relay->relay, name, &tmp);
-  if (!SWFDEC_AS_VALUE_IS_OBJECT (*&tmp))
+  if (!SWFDEC_AS_VALUE_IS_OBJECT (tmp))
     return FALSE;
-  fun = (SwfdecAsFunction *) (SWFDEC_AS_VALUE_GET_OBJECT (*&tmp)->relay);
+  fun = (SwfdecAsFunction *) (SWFDEC_AS_VALUE_GET_OBJECT (tmp)->relay);
   if (!SWFDEC_IS_AS_FUNCTION (fun))
     return FALSE;
   swfdec_as_function_call (fun, relay->relay, argc, argv, return_value ? return_value : &tmp);
diff --git a/swfdec/swfdec_as_script_function.c b/swfdec/swfdec_as_script_function.c
index 49811c0a..c6ef1fe3 100644
--- a/swfdec/swfdec_as_script_function.c
+++ b/swfdec/swfdec_as_script_function.c
@@ -64,7 +64,7 @@ swfdec_as_script_function_call (SwfdecAsFunction *function, SwfdecAsObject *this
     frame.original_target = script->target;
   }
   /* second check especially for super object */
-  if (thisp != NULL && SWFDEC_AS_VALUE_IS_UNDEFINED (*&frame.thisp)) {
+  if (thisp != NULL && SWFDEC_AS_VALUE_IS_UNDEFINED (frame.thisp)) {
     swfdec_as_frame_set_this (&frame, swfdec_as_object_resolve (thisp));
   }
   frame.argc = n_args;
diff --git a/swfdec/swfdec_as_string.c b/swfdec/swfdec_as_string.c
index 3edea28d..928b2f3d 100644
--- a/swfdec/swfdec_as_string.c
+++ b/swfdec/swfdec_as_string.c
@@ -342,7 +342,7 @@ swfdec_as_string_split_5 (SwfdecAsContext *cx, SwfdecAsObject *object,
   arr = swfdec_as_array_new (cx);
   SWFDEC_AS_VALUE_SET_OBJECT (ret, arr);
   /* hi, i'm the special case */
-  if (argc < 1 || SWFDEC_AS_VALUE_IS_UNDEFINED (*&argv[0])) {
+  if (argc < 1 || SWFDEC_AS_VALUE_IS_UNDEFINED (argv[0])) {
     delim = SWFDEC_AS_STR_COMMA;
   } else {
     delim = swfdec_as_value_to_string (cx, argv[0]);
@@ -352,7 +352,7 @@ swfdec_as_string_split_5 (SwfdecAsContext *cx, SwfdecAsObject *object,
     swfdec_as_array_push (arr, &val);
     return;
   }
-  if (argc > 1 && !SWFDEC_AS_VALUE_IS_UNDEFINED (*&argv[1])) {
+  if (argc > 1 && !SWFDEC_AS_VALUE_IS_UNDEFINED (argv[1])) {
     swfdec_as_value_to_string (cx, argv[0]);
     count = swfdec_as_value_to_integer (cx, &argv[1]);
   } else {
@@ -394,7 +394,7 @@ swfdec_as_string_split_6 (SwfdecAsContext *cx, SwfdecAsObject *object,
   arr = swfdec_as_array_new (cx);
   SWFDEC_AS_VALUE_SET_OBJECT (ret, arr);
   /* hi, i'm the special case */
-  if (argc < 1 || SWFDEC_AS_VALUE_IS_UNDEFINED (*&argv[0])) {
+  if (argc < 1 || SWFDEC_AS_VALUE_IS_UNDEFINED (argv[0])) {
     SWFDEC_AS_VALUE_SET_STRING (&val, str);
     swfdec_as_array_push (arr, &val);
     return;
@@ -407,7 +407,7 @@ swfdec_as_string_split_6 (SwfdecAsContext *cx, SwfdecAsObject *object,
     }
     return;
   }
-  if (argc > 1 && !SWFDEC_AS_VALUE_IS_UNDEFINED (*&argv[1]))
+  if (argc > 1 && !SWFDEC_AS_VALUE_IS_UNDEFINED (argv[1]))
     count = swfdec_as_value_to_integer (cx, &argv[1]);
   else
     count = G_MAXINT;
@@ -520,7 +520,7 @@ swfdec_as_string_substr (SwfdecAsContext *cx, SwfdecAsObject *object,
 
   len = g_utf8_strlen (string, -1);
   
-  if (argc > 1 && !SWFDEC_AS_VALUE_IS_UNDEFINED (*&argv[1])) {
+  if (argc > 1 && !SWFDEC_AS_VALUE_IS_UNDEFINED (argv[1])) {
     to = swfdec_as_value_to_integer (cx, &argv[1]);
     /* FIXME: wtf? */
     if (to < 0) {
@@ -554,7 +554,7 @@ swfdec_as_string_substring (SwfdecAsContext *cx, SwfdecAsObject *object,
   SWFDEC_AS_STRING_CHECK (&string, "i", &from);
 
   len = g_utf8_strlen (string, -1);
-  if (argc > 1 && !SWFDEC_AS_VALUE_IS_UNDEFINED (*&argv[1])) {
+  if (argc > 1 && !SWFDEC_AS_VALUE_IS_UNDEFINED (argv[1])) {
     to = swfdec_as_value_to_integer (cx, &argv[1]);
   } else {
     to = len;
diff --git a/swfdec/swfdec_as_super.c b/swfdec/swfdec_as_super.c
index f7472a97..a012b790 100644
--- a/swfdec/swfdec_as_super.c
+++ b/swfdec/swfdec_as_super.c
@@ -49,8 +49,8 @@ swfdec_as_super_call (SwfdecAsFunction *function, SwfdecAsObject *thisp,
   }
 
   swfdec_as_object_get_variable (super->object, SWFDEC_AS_STR___constructor__, &val);
-  if (!SWFDEC_AS_VALUE_IS_OBJECT (*&val) ||
-      !SWFDEC_IS_AS_FUNCTION (fun = (SwfdecAsFunction *) (SWFDEC_AS_VALUE_GET_OBJECT (*&val)->relay)))
+  if (!SWFDEC_AS_VALUE_IS_OBJECT (val) ||
+      !SWFDEC_IS_AS_FUNCTION (fun = (SwfdecAsFunction *) (SWFDEC_AS_VALUE_GET_OBJECT (val)->relay)))
     return;
 
   if (construct) {
diff --git a/swfdec/swfdec_as_types.c b/swfdec/swfdec_as_types.c
index edb41781..44b8172a 100644
--- a/swfdec/swfdec_as_types.c
+++ b/swfdec/swfdec_as_types.c
@@ -388,28 +388,28 @@ swfdec_as_value_to_string (SwfdecAsContext *context, SwfdecAsValue value)
 
   switch (SWFDEC_AS_VALUE_GET_TYPE (value)) {
     case SWFDEC_AS_TYPE_STRING:
-      return SWFDEC_AS_VALUE_GET_STRING (*&value);
+      return SWFDEC_AS_VALUE_GET_STRING (value);
     case SWFDEC_AS_TYPE_UNDEFINED:
       if (context->version > 6)
 	return SWFDEC_AS_STR_undefined;
       else
 	return SWFDEC_AS_STR_EMPTY;
     case SWFDEC_AS_TYPE_BOOLEAN:
-      return SWFDEC_AS_VALUE_GET_BOOLEAN (*&value) ? SWFDEC_AS_STR_true : SWFDEC_AS_STR_false;
+      return SWFDEC_AS_VALUE_GET_BOOLEAN (value) ? SWFDEC_AS_STR_true : SWFDEC_AS_STR_false;
     case SWFDEC_AS_TYPE_NULL:
       return SWFDEC_AS_STR_null;
     case SWFDEC_AS_TYPE_NUMBER:
-      return swfdec_as_double_to_string (context, SWFDEC_AS_VALUE_GET_NUMBER (*&value));
+      return swfdec_as_double_to_string (context, SWFDEC_AS_VALUE_GET_NUMBER (value));
     case SWFDEC_AS_TYPE_OBJECT:
       {
-	SwfdecAsObject *object = SWFDEC_AS_VALUE_GET_OBJECT (*&value);
+	SwfdecAsObject *object = SWFDEC_AS_VALUE_GET_OBJECT (value);
 	if (SWFDEC_IS_AS_STRING (object->relay)) {
 	  return SWFDEC_AS_STRING (object->relay)->string;
 	} else {
 	  SwfdecAsValue ret;
 	  swfdec_as_object_call (object, SWFDEC_AS_STR_toString, 0, NULL, &ret);
-	  if (SWFDEC_AS_VALUE_IS_STRING (*&ret))
-	    return SWFDEC_AS_VALUE_GET_STRING (*&ret);
+	  if (SWFDEC_AS_VALUE_IS_STRING (ret))
+	    return SWFDEC_AS_VALUE_GET_STRING (ret);
 	  else if (SWFDEC_IS_AS_SUPER (object->relay))
 	    return SWFDEC_AS_STR__type_Object_;
 	  else if (SWFDEC_IS_AS_FUNCTION (object->relay))
@@ -420,7 +420,7 @@ swfdec_as_value_to_string (SwfdecAsContext *context, SwfdecAsValue value)
       }
     case SWFDEC_AS_TYPE_MOVIE:
       {
-	SwfdecMovie *movie = SWFDEC_AS_VALUE_GET_MOVIE (*&value);
+	SwfdecMovie *movie = SWFDEC_AS_VALUE_GET_MOVIE (value);
 	char *str;
 
 	if (movie == NULL)
@@ -462,9 +462,9 @@ swfdec_as_value_to_number (SwfdecAsContext *context, const SwfdecAsValue *value)
     case SWFDEC_AS_TYPE_NULL:
       return (context->version >= 7) ? NAN : 0.0;
     case SWFDEC_AS_TYPE_BOOLEAN:
-      return SWFDEC_AS_VALUE_GET_BOOLEAN (*&tmp) ? 1 : 0;
+      return SWFDEC_AS_VALUE_GET_BOOLEAN (tmp) ? 1 : 0;
     case SWFDEC_AS_TYPE_NUMBER:
-      return SWFDEC_AS_VALUE_GET_NUMBER (*&tmp);
+      return SWFDEC_AS_VALUE_GET_NUMBER (tmp);
     case SWFDEC_AS_TYPE_STRING:
       {
 	const char *s;
@@ -472,7 +472,7 @@ swfdec_as_value_to_number (SwfdecAsContext *context, const SwfdecAsValue *value)
 	double d;
 	
 	// FIXME: We should most likely copy Tamarin's code here (MathUtils.cpp)
-	s = SWFDEC_AS_VALUE_GET_STRING (*&tmp);
+	s = SWFDEC_AS_VALUE_GET_STRING (tmp);
 	if (s == SWFDEC_AS_STR_EMPTY)
 	  return (context->version >= 5) ? NAN : 0.0;
 	if (context->version > 5 && s[0] == '0' &&
@@ -589,12 +589,12 @@ swfdec_as_value_to_object (SwfdecAsContext *context, const SwfdecAsValue *value)
   }
 
   swfdec_as_object_get_variable (context->global, s, &val);
-  if (!SWFDEC_AS_VALUE_IS_OBJECT (*&val) ||
-      !SWFDEC_IS_AS_FUNCTION (fun = (SwfdecAsFunction *) (SWFDEC_AS_VALUE_GET_OBJECT (*&val)->relay)))
+  if (!SWFDEC_AS_VALUE_IS_OBJECT (val) ||
+      !SWFDEC_IS_AS_FUNCTION (fun = (SwfdecAsFunction *) (SWFDEC_AS_VALUE_GET_OBJECT (val)->relay)))
     return NULL;
   swfdec_as_object_create (fun, 1, value, &val);
-  if (SWFDEC_AS_VALUE_IS_OBJECT (*&val)) {
-    return SWFDEC_AS_VALUE_GET_OBJECT (*&val);
+  if (SWFDEC_AS_VALUE_IS_OBJECT (val)) {
+    return SWFDEC_AS_VALUE_GET_OBJECT (val);
   } else {
     SWFDEC_ERROR ("did not construct an object");
     return NULL;
diff --git a/swfdec/swfdec_asbroadcaster.c b/swfdec/swfdec_asbroadcaster.c
index 4de8a42b..f287cbd6 100644
--- a/swfdec/swfdec_asbroadcaster.c
+++ b/swfdec/swfdec_asbroadcaster.c
@@ -51,10 +51,10 @@ broadcastMessage (SwfdecAsContext *cx, SwfdecAsObject *object,
   argc--;
 
   swfdec_as_object_get_variable (object, SWFDEC_AS_STR__listeners, &val);
-  if (!SWFDEC_AS_VALUE_IS_COMPOSITE (*&val))
+  if (!SWFDEC_AS_VALUE_IS_COMPOSITE (val))
     return;
 
-  listeners = SWFDEC_AS_VALUE_GET_COMPOSITE (*&val);
+  listeners = SWFDEC_AS_VALUE_GET_COMPOSITE (val);
   swfdec_as_object_get_variable (listeners, SWFDEC_AS_STR_length, &val);
   length = swfdec_as_value_to_integer (cx, &val);
 
diff --git a/swfdec/swfdec_color_as.c b/swfdec/swfdec_color_as.c
index 65a5ae4e..ce8bb30c 100644
--- a/swfdec/swfdec_color_as.c
+++ b/swfdec/swfdec_color_as.c
@@ -40,10 +40,10 @@ swfdec_movie_color_get_movie (SwfdecAsObject *object)
     return NULL;
 
   swfdec_as_object_get_variable (object, SWFDEC_AS_STR_target, &val);
-  if (!SWFDEC_AS_VALUE_IS_MOVIE (*&val))
+  if (!SWFDEC_AS_VALUE_IS_MOVIE (val))
     return NULL;
 
-  return SWFDEC_AS_VALUE_GET_MOVIE (*&val);
+  return SWFDEC_AS_VALUE_GET_MOVIE (val);
 }
 
 SWFDEC_AS_NATIVE (700, 2, swfdec_movie_color_getRGB)
@@ -159,9 +159,9 @@ swfdec_movie_color_setTransform (SwfdecAsContext *cx, SwfdecAsObject *obj,
   if (movie == NULL)
     return;
 
-  if (!SWFDEC_AS_VALUE_IS_COMPOSITE (*&argv[0]))
+  if (!SWFDEC_AS_VALUE_IS_COMPOSITE (argv[0]))
     return;
-  parse = SWFDEC_AS_VALUE_GET_COMPOSITE (*&argv[0]);
+  parse = SWFDEC_AS_VALUE_GET_COMPOSITE (argv[0]);
   if (parse == NULL)
     return;
   parse_property (parse, SWFDEC_AS_STR_ra, &movie->color_transform.ra, TRUE);
diff --git a/swfdec/swfdec_file_reference.c b/swfdec/swfdec_file_reference.c
index 3708c591..79b39930 100644
--- a/swfdec/swfdec_file_reference.c
+++ b/swfdec/swfdec_file_reference.c
@@ -113,8 +113,8 @@ swfdec_file_reference_construct (SwfdecAsContext *cx, SwfdecAsObject *object,
 
   SWFDEC_STUB ("FileReference");
 
-  if (argc > 0 && SWFDEC_AS_VALUE_IS_COMPOSITE (*&argv[0])) {
-    target = SWFDEC_AS_VALUE_GET_COMPOSITE (*&argv[0]);
+  if (argc > 0 && SWFDEC_AS_VALUE_IS_COMPOSITE (argv[0])) {
+    target = SWFDEC_AS_VALUE_GET_COMPOSITE (argv[0]);
   } else {
     target = object;
   }
diff --git a/swfdec/swfdec_interval.c b/swfdec/swfdec_interval.c
index 38bea49a..233f7f06 100644
--- a/swfdec/swfdec_interval.c
+++ b/swfdec/swfdec_interval.c
@@ -115,7 +115,7 @@ swfdec_interval_trigger (SwfdecTimeout *timeout)
   } else {
     /* we check that the relay's type is correct upon adding the interval */
     swfdec_as_function_call (SWFDEC_AS_FUNCTION (
-	  SWFDEC_AS_VALUE_GET_OBJECT (*&interval->args[0])->relay),
+	  SWFDEC_AS_VALUE_GET_OBJECT (interval->args[0])->relay),
 	NULL, interval->n_args, &interval->args[1], &ret);
   }
   swfdec_sandbox_unuse (interval->sandbox);
diff --git a/swfdec/swfdec_load_object_as.c b/swfdec/swfdec_load_object_as.c
index 12fd6328..a3f8099c 100644
--- a/swfdec/swfdec_load_object_as.c
+++ b/swfdec/swfdec_load_object_as.c
@@ -140,11 +140,11 @@ swfdec_load_object_as_get_headers (SwfdecAsObject *object, guint *header_count,
   if (!swfdec_as_object_get_variable (object, SWFDEC_AS_STR__customHeaders,
 	&val))
     goto end;
-  if (!SWFDEC_AS_VALUE_IS_COMPOSITE (*&val)) {
+  if (!SWFDEC_AS_VALUE_IS_COMPOSITE (val)) {
     SWFDEC_WARNING ("_customHeaders is not an object");
     goto end;
   }
-  list = SWFDEC_AS_VALUE_GET_COMPOSITE (*&val);
+  list = SWFDEC_AS_VALUE_GET_COMPOSITE (val);
 
   swfdec_as_object_get_variable (list, SWFDEC_AS_STR_length, &val);
   length = swfdec_as_value_to_integer (cx, &val);
diff --git a/swfdec/swfdec_movie.c b/swfdec/swfdec_movie.c
index 4f4bb00f..fc7ab756 100644
--- a/swfdec/swfdec_movie.c
+++ b/swfdec/swfdec_movie.c
@@ -1312,7 +1312,7 @@ swfdec_movie_constructor (GType type, guint n_construct_properties,
     movie->as_value = swfdec_as_movie_value_new (movie, name);
 
   /* make the resource ours if it doesn't belong to anyone yet */
-  if (SWFDEC_AS_VALUE_IS_UNDEFINED (*&movie->resource->movie)) {
+  if (SWFDEC_AS_VALUE_IS_UNDEFINED (movie->resource->movie)) {
     g_assert (SWFDEC_IS_SPRITE_MOVIE (movie));
     SWFDEC_AS_VALUE_SET_MOVIE (&movie->resource->movie, movie);
   }
@@ -1670,7 +1670,7 @@ swfdec_movie_get_own_resource (SwfdecMovie *movie)
   if (!SWFDEC_IS_SPRITE_MOVIE (movie))
     return NULL;
 
-  if (SWFDEC_AS_VALUE_GET_MOVIE (*&movie->resource->movie) != movie)
+  if (SWFDEC_AS_VALUE_GET_MOVIE (movie->resource->movie) != movie)
     return NULL;
 
   return movie->resource;
diff --git a/swfdec/swfdec_movie_as_drawing.c b/swfdec/swfdec_movie_as_drawing.c
index 390fea28..ef041a71 100644
--- a/swfdec/swfdec_movie_as_drawing.c
+++ b/swfdec/swfdec_movie_as_drawing.c
@@ -88,7 +88,7 @@ swfdec_sprite_movie_beginFill (SwfdecAsContext *cx, SwfdecAsObject *object,
   SWFDEC_AS_CHECK (SWFDEC_TYPE_MOVIE, &movie, "|ii", &color, &alpha);
   movie->draw_fill = NULL;
   
-  if (argc == 0 || SWFDEC_AS_VALUE_IS_UNDEFINED (*&argv[0])) {
+  if (argc == 0 || SWFDEC_AS_VALUE_IS_UNDEFINED (argv[0])) {
     color = 0;
   } else {
     color = color & 0xFFFFFF;
@@ -219,20 +219,20 @@ swfdec_sprite_movie_beginGradientFill (SwfdecAsContext *cx, SwfdecAsObject *obje
     if (check > i) {
       const char *name = swfdec_as_integer_to_string (cx, i);
       if (swfdec_as_object_get_variable (colors, name, &v)
-	  && SWFDEC_AS_VALUE_IS_NUMBER (*&v))
+	  && SWFDEC_AS_VALUE_IS_NUMBER (v))
 	c = swfdec_as_value_to_integer (cx, &v);
       else
 	c = 0;
       if (!swfdec_as_object_get_variable (alphas, name, &v)) {
 	a = c;
-      } else if (!SWFDEC_AS_VALUE_IS_NUMBER (*&v)) {
+      } else if (!SWFDEC_AS_VALUE_IS_NUMBER (v)) {
 	a = 0;
       } else {
 	a = swfdec_as_value_to_integer (cx, &v);
       }
       if (!swfdec_as_object_get_variable (ratios, name, &v))
 	r = CLAMP (a, 0, 255);
-      else if (!SWFDEC_AS_VALUE_IS_NUMBER (*&v))
+      else if (!SWFDEC_AS_VALUE_IS_NUMBER (v))
 	r = 0;
       else
 	r = swfdec_as_value_to_integer (cx, &v);
@@ -360,7 +360,7 @@ swfdec_sprite_movie_lineStyle (SwfdecAsContext *cx, SwfdecAsObject *object,
   SWFDEC_AS_CHECK (SWFDEC_TYPE_MOVIE, &movie, "i|ii", &width, &color, &alpha);
 
   movie->draw_line = NULL;
-  if (SWFDEC_AS_VALUE_IS_UNDEFINED (*&argv[0]))
+  if (SWFDEC_AS_VALUE_IS_UNDEFINED (argv[0]))
     return;
   if (argc > 3) {
     SWFDEC_FIXME ("implement Flash 8 arguments to lineStyle");
diff --git a/swfdec/swfdec_net_connection.c b/swfdec/swfdec_net_connection.c
index f44f9b66..25da84ba 100644
--- a/swfdec/swfdec_net_connection.c
+++ b/swfdec/swfdec_net_connection.c
@@ -106,9 +106,9 @@ swfdec_net_connection_do_connect (SwfdecAsContext *cx, SwfdecAsObject *object,
 
   SWFDEC_AS_CHECK (SWFDEC_TYPE_NET_CONNECTION, &conn, "v", &val);
 
-  if (SWFDEC_AS_VALUE_IS_STRING (*&val)) {
-    url = SWFDEC_AS_VALUE_GET_STRING (*&val);
-  } else if (SWFDEC_AS_VALUE_IS_NULL (*&val)) {
+  if (SWFDEC_AS_VALUE_IS_STRING (val)) {
+    url = SWFDEC_AS_VALUE_GET_STRING (val);
+  } else if (SWFDEC_AS_VALUE_IS_NULL (val)) {
     url = NULL;
   } else {
     SWFDEC_FIXME ("untested argument to NetConnection.connect: type %u",
diff --git a/swfdec/swfdec_net_stream.c b/swfdec/swfdec_net_stream.c
index 2cc2e739..4a6f6c3a 100644
--- a/swfdec/swfdec_net_stream.c
+++ b/swfdec/swfdec_net_stream.c
@@ -66,8 +66,8 @@ swfdec_net_stream_onstatus (SwfdecNetStream *stream, const char *code, const cha
 
       swfdec_as_object_get_variable (cx->global,
           SWFDEC_AS_STR_System, &system);
-      if (SWFDEC_AS_VALUE_IS_COMPOSITE (*&system) &&
-	  (object = SWFDEC_AS_VALUE_GET_COMPOSITE (*&system)) != NULL) {
+      if (SWFDEC_AS_VALUE_IS_COMPOSITE (system) &&
+	  (object = SWFDEC_AS_VALUE_GET_COMPOSITE (system)) != NULL) {
         swfdec_as_object_call (object, SWFDEC_AS_STR_onStatus, 1, &val, NULL);
       }
     }
@@ -279,7 +279,7 @@ swfdec_net_stream_video_goto (SwfdecNetStream *stream, guint timestamp)
 	SWFDEC_ERROR ("could not parse data tag");
       } else {
 	swfdec_as_relay_call (SWFDEC_AS_RELAY (stream), 
-	    SWFDEC_AS_VALUE_GET_STRING (*&name), 1, &value, NULL);
+	    SWFDEC_AS_VALUE_GET_STRING (name), 1, &value, NULL);
       }
       swfdec_sandbox_unuse (stream->sandbox);
     }
diff --git a/swfdec/swfdec_net_stream_as.c b/swfdec/swfdec_net_stream_as.c
index a4dec3a6..f69369c1 100644
--- a/swfdec/swfdec_net_stream_as.c
+++ b/swfdec/swfdec_net_stream_as.c
@@ -295,8 +295,8 @@ swfdec_net_stream_construct (SwfdecAsContext *cx, SwfdecAsObject *obj, guint arg
 
   swfdec_net_stream_setup (cx, obj, 0, NULL, rval);
   if (argc == 0 ||
-      !SWFDEC_AS_VALUE_IS_OBJECT (*&argv[0]) || 
-      !SWFDEC_IS_NET_CONNECTION ((conn = (SwfdecNetConnection *) SWFDEC_AS_VALUE_GET_OBJECT (*&argv[0])))) {
+      !SWFDEC_AS_VALUE_IS_OBJECT (argv[0]) || 
+      !SWFDEC_IS_NET_CONNECTION ((conn = (SwfdecNetConnection *) SWFDEC_AS_VALUE_GET_OBJECT (argv[0])))) {
     SWFDEC_WARNING ("no connection passed to NetStream ()");
     return;
   }
@@ -326,8 +326,8 @@ swfdec_net_stream_init_context (SwfdecPlayer *player)
   swfdec_as_object_set_variable_and_flags (proto, SWFDEC_AS_STR_constructor,
       &val, SWFDEC_AS_VARIABLE_HIDDEN | SWFDEC_AS_VARIABLE_PERMANENT);
   swfdec_as_object_get_variable (context->global, SWFDEC_AS_STR_Object, &val);
-  if (SWFDEC_AS_VALUE_IS_OBJECT (*&val)) {
-    swfdec_as_object_get_variable (SWFDEC_AS_VALUE_GET_OBJECT (*&val),
+  if (SWFDEC_AS_VALUE_IS_OBJECT (val)) {
+    swfdec_as_object_get_variable (SWFDEC_AS_VALUE_GET_OBJECT (val),
 	SWFDEC_AS_STR_prototype, &val);
     swfdec_as_object_set_variable_and_flags (proto, SWFDEC_AS_STR___proto__, &val,
 	SWFDEC_AS_VARIABLE_HIDDEN | SWFDEC_AS_VARIABLE_PERMANENT);
diff --git a/swfdec/swfdec_player.c b/swfdec/swfdec_player.c
index 915acf9d..35e2d0fc 100644
--- a/swfdec/swfdec_player.c
+++ b/swfdec/swfdec_player.c
@@ -1139,9 +1139,9 @@ swfdec_player_broadcast (SwfdecPlayer *player, const char *object_name,
     SwfdecSandbox *sandbox = walk->data;
     swfdec_sandbox_use (sandbox);
     swfdec_as_object_get_variable (SWFDEC_AS_CONTEXT (player)->global, object_name, &vals[0]);
-    if (!SWFDEC_AS_VALUE_IS_COMPOSITE (*&vals[0]))
+    if (!SWFDEC_AS_VALUE_IS_COMPOSITE (vals[0]))
       return;
-    obj = SWFDEC_AS_VALUE_GET_COMPOSITE (*&vals[0]);
+    obj = SWFDEC_AS_VALUE_GET_COMPOSITE (vals[0]);
     if (obj == NULL)
       return;
     SWFDEC_AS_VALUE_SET_STRING (&vals[0], signal_name);
@@ -1514,7 +1514,7 @@ swfdec_player_get_tab_movies (SwfdecPlayer *player, const GList *current)
 	/* Flash queries again - why not? :/ */
 	swfdec_as_object_get_variable (object, SWFDEC_AS_STR_tabEnabled, &val);
 	ret = g_list_prepend (ret, actor);
-      } else if (SWFDEC_AS_VALUE_IS_UNDEFINED (*&val) && 
+      } else if (SWFDEC_AS_VALUE_IS_UNDEFINED (val) && 
 	  swfdec_actor_get_mouse_events (actor)) {
 	ret = g_list_prepend (ret, actor);
       }
@@ -1525,7 +1525,7 @@ swfdec_player_get_tab_movies (SwfdecPlayer *player, const GList *current)
     else
       swfdec_as_object_get_variable (object, SWFDEC_AS_STR_tabChildren, &val);
 
-    if (SWFDEC_AS_VALUE_IS_UNDEFINED (*&val) ||
+    if (SWFDEC_AS_VALUE_IS_UNDEFINED (val) ||
 	swfdec_as_value_to_boolean (SWFDEC_AS_CONTEXT (player), &val)) {
       GList *list;
       swfdec_sandbox_unuse (SWFDEC_MOVIE (actor)->resource->sandbox);
diff --git a/swfdec/swfdec_player_as.c b/swfdec/swfdec_player_as.c
index 24bf233d..f4f4c26a 100644
--- a/swfdec/swfdec_player_as.c
+++ b/swfdec/swfdec_player_as.c
@@ -51,8 +51,8 @@ swfdec_player_do_set_interval (gboolean repeat, SwfdecAsContext *cx, guint argc,
     return;
   }
 
-  if (!SWFDEC_AS_VALUE_IS_COMPOSITE (*&argv[0]) ||
-      (object = SWFDEC_AS_VALUE_GET_COMPOSITE (*&argv[0])) == NULL) {
+  if (!SWFDEC_AS_VALUE_IS_COMPOSITE (argv[0]) ||
+      (object = SWFDEC_AS_VALUE_GET_COMPOSITE (argv[0])) == NULL) {
     SWFDEC_WARNING ("first argument to setInterval is not an object");
     return;
   }
@@ -331,13 +331,13 @@ swfdec_player_object_registerClass (SwfdecAsContext *cx, SwfdecAsObject *object,
 
   SWFDEC_AS_CHECK (0, NULL, "s", &name);
 
-  if (argc < 2 || !SWFDEC_AS_VALUE_IS_OBJECT (*&argv[1])) {
+  if (argc < 2 || !SWFDEC_AS_VALUE_IS_OBJECT (argv[1])) {
     SWFDEC_AS_VALUE_SET_BOOLEAN (rval, FALSE);
     return;
   }
   
   swfdec_player_set_export_class (SWFDEC_PLAYER (cx), name, 
-      SWFDEC_AS_VALUE_GET_OBJECT (*&argv[1]));
+      SWFDEC_AS_VALUE_GET_OBJECT (argv[1]));
   SWFDEC_AS_VALUE_SET_BOOLEAN (rval, TRUE);
 }
 
diff --git a/swfdec/swfdec_print_job.c b/swfdec/swfdec_print_job.c
index 58de3848..5bf334ba 100644
--- a/swfdec/swfdec_print_job.c
+++ b/swfdec/swfdec_print_job.c
@@ -98,14 +98,14 @@ swfdec_print_job_init_properties (SwfdecAsContext *cx)
   g_return_if_fail (SWFDEC_IS_AS_CONTEXT (cx));
 
   swfdec_as_object_get_variable (cx->global, SWFDEC_AS_STR_PrintJob, &val);
-  if (!SWFDEC_AS_VALUE_IS_OBJECT (*&val))
+  if (!SWFDEC_AS_VALUE_IS_OBJECT (val))
     return;
-  xml = SWFDEC_AS_VALUE_GET_OBJECT (*&val);
+  xml = SWFDEC_AS_VALUE_GET_OBJECT (val);
 
   swfdec_as_object_get_variable (xml, SWFDEC_AS_STR_prototype, &val);
-  if (!SWFDEC_AS_VALUE_IS_OBJECT (*&val))
+  if (!SWFDEC_AS_VALUE_IS_OBJECT (val))
     return;
-  proto = SWFDEC_AS_VALUE_GET_OBJECT (*&val);
+  proto = SWFDEC_AS_VALUE_GET_OBJECT (val);
 
   swfdec_as_object_add_native_variable (proto, SWFDEC_AS_STR_orientation,
       swfdec_print_job_get_orientation, NULL);
diff --git a/swfdec/swfdec_resource.c b/swfdec/swfdec_resource.c
index 387cfabd..ce59da26 100644
--- a/swfdec/swfdec_resource.c
+++ b/swfdec/swfdec_resource.c
@@ -70,7 +70,7 @@ static void
 swfdec_resource_stream_target_image (SwfdecResource *instance)
 {
   SwfdecPlayer *player = SWFDEC_PLAYER (swfdec_gc_object_get_context (instance));
-  SwfdecSpriteMovie *movie = (SwfdecSpriteMovie *) SWFDEC_AS_VALUE_GET_MOVIE (*&instance->movie);
+  SwfdecSpriteMovie *movie = (SwfdecSpriteMovie *) SWFDEC_AS_VALUE_GET_MOVIE (instance->movie);
 
   if (!SWFDEC_IS_SPRITE_MOVIE (movie) || movie->sprite != NULL)
     return;
@@ -124,8 +124,8 @@ swfdec_resource_emit_signal (SwfdecResource *resource, const char *name, gboolea
   cx = swfdec_gc_object_get_context (resource->clip_loader);
 
   SWFDEC_AS_VALUE_SET_STRING (&vals[0], name);
-  if (SWFDEC_AS_VALUE_IS_MOVIE (*&resource->movie)) {
-    movie = SWFDEC_AS_VALUE_GET_MOVIE (*&resource->movie);
+  if (SWFDEC_AS_VALUE_IS_MOVIE (resource->movie)) {
+    movie = SWFDEC_AS_VALUE_GET_MOVIE (resource->movie);
     if (movie == NULL) {
       SWFDEC_DEBUG ("no movie, not emitting signal");
       return;
@@ -212,8 +212,8 @@ swfdec_resource_stream_target_open (SwfdecStreamTarget *target, SwfdecStream *st
   SwfdecMovie *movie;
   const char *query;
 
-  g_assert (SWFDEC_AS_VALUE_IS_MOVIE (*&instance->movie));
-  movie = SWFDEC_AS_VALUE_GET_MOVIE (*&instance->movie);
+  g_assert (SWFDEC_AS_VALUE_IS_MOVIE (instance->movie));
+  movie = SWFDEC_AS_VALUE_GET_MOVIE (instance->movie);
   g_assert (movie);
   object = swfdec_as_relay_get_as_object (SWFDEC_AS_RELAY (movie));
   query = swfdec_url_get_query (swfdec_loader_get_url (loader));
@@ -333,8 +333,8 @@ swfdec_resource_stream_target_close (SwfdecStreamTarget *target, SwfdecStream *s
   if (swfdec_resource_abort_if_not_initialized (resource))
     return;
 
-  if (SWFDEC_AS_VALUE_IS_MOVIE (*&resource->movie)) {
-    SwfdecMovie *movie = SWFDEC_AS_VALUE_GET_MOVIE (*&resource->movie);
+  if (SWFDEC_AS_VALUE_IS_MOVIE (resource->movie)) {
+    SwfdecMovie *movie = SWFDEC_AS_VALUE_GET_MOVIE (resource->movie);
     if (movie)
       swfdec_actor_queue_script (SWFDEC_ACTOR (movie), SWFDEC_EVENT_LOAD);
   }
@@ -532,17 +532,17 @@ swfdec_resource_create_movie (SwfdecResource *resource, SwfdecResourceLoad *load
   SwfdecPlayer *player;
   SwfdecSpriteMovie *movie;
 
-  if (SWFDEC_AS_VALUE_IS_MOVIE (*&resource->movie))
+  if (SWFDEC_AS_VALUE_IS_MOVIE (resource->movie))
     return TRUE;
   player = SWFDEC_PLAYER (swfdec_gc_object_get_context (resource));
-  if (SWFDEC_AS_VALUE_IS_MOVIE (*&load->target)) {
-    movie = (SwfdecSpriteMovie *) SWFDEC_AS_VALUE_GET_MOVIE (*&load->target);
+  if (SWFDEC_AS_VALUE_IS_MOVIE (load->target)) {
+    movie = (SwfdecSpriteMovie *) SWFDEC_AS_VALUE_GET_MOVIE (load->target);
     if (SWFDEC_IS_SPRITE_MOVIE (movie))
       movie = swfdec_resource_replace_movie (movie, resource);
     else
       movie = NULL;
-  } else if (SWFDEC_AS_VALUE_IS_STRING (*&load->target)) {
-    int level = swfdec_player_get_level (player, SWFDEC_AS_VALUE_GET_STRING (*&load->target), 7);
+  } else if (SWFDEC_AS_VALUE_IS_STRING (load->target)) {
+    int level = swfdec_player_get_level (player, SWFDEC_AS_VALUE_GET_STRING (load->target), 7);
     if (level >= 0) {
       movie = swfdec_player_get_movie_at_level (player, level);
       if (movie)
@@ -582,9 +582,9 @@ swfdec_resource_do_load (SwfdecPlayer *player, gboolean allowed, gpointer loadp)
     SWFDEC_WARNING ("SECURITY: no access to %s from %s",
 	load->url, swfdec_url_get_url (load->sandbox->url));
     /* FIXME: is replacing correct? */
-    if (SWFDEC_AS_VALUE_IS_MOVIE (*&load->target)) {
-      if (SWFDEC_AS_VALUE_IS_MOVIE (*&load->target) &&
-	  SWFDEC_IS_SPRITE_MOVIE (SWFDEC_AS_VALUE_GET_MOVIE (*&load->target)))
+    if (SWFDEC_AS_VALUE_IS_MOVIE (load->target)) {
+      if (SWFDEC_AS_VALUE_IS_MOVIE (load->target) &&
+	  SWFDEC_IS_SPRITE_MOVIE (SWFDEC_AS_VALUE_GET_MOVIE (load->target)))
 	resource->movie = load->target;
       swfdec_resource_emit_error (resource, SWFDEC_AS_STR_IllegalRequest);
     }
@@ -619,8 +619,8 @@ swfdec_resource_load_request (gpointer loadp, gpointer playerp)
   if (load->url[0] == '\0') {
     SwfdecSpriteMovie *movie;
       
-    if (SWFDEC_AS_VALUE_IS_MOVIE (*&load->target)) {
-      movie = (SwfdecSpriteMovie *) SWFDEC_AS_VALUE_GET_MOVIE (*&load->target);
+    if (SWFDEC_AS_VALUE_IS_MOVIE (load->target)) {
+      movie = (SwfdecSpriteMovie *) SWFDEC_AS_VALUE_GET_MOVIE (load->target);
     } else {
       movie = NULL;
     }
@@ -637,7 +637,7 @@ swfdec_resource_load_request (gpointer loadp, gpointer playerp)
   if (g_ascii_strncasecmp (load->url, "FSCommand:", 10) == 0) {
     char *command = load->url + 10;
     const char *target = swfdec_as_value_to_string (SWFDEC_AS_CONTEXT (player), load->target);
-    if (SWFDEC_AS_VALUE_IS_MOVIE (*&load->target)) {
+    if (SWFDEC_AS_VALUE_IS_MOVIE (load->target)) {
       SWFDEC_FIXME ("Adobe 9.0.124.0 and later don't emit fscommands here. "
 	  "We just do for compatibility reasons with the testsuite.");
     }
@@ -647,9 +647,9 @@ swfdec_resource_load_request (gpointer loadp, gpointer playerp)
   }
 
   /* LAUNCH command (aka getURL) */
-  if (SWFDEC_AS_VALUE_IS_STRING (*&load->target) && swfdec_player_get_level (player, 
-	SWFDEC_AS_VALUE_GET_STRING (*&load->target), 7) < 0) {
-    swfdec_player_launch (player, load->url, SWFDEC_AS_VALUE_GET_STRING (*&load->target), load->buffer);
+  if (SWFDEC_AS_VALUE_IS_STRING (load->target) && swfdec_player_get_level (player, 
+	SWFDEC_AS_VALUE_GET_STRING (load->target), 7) < 0) {
+    swfdec_player_launch (player, load->url, SWFDEC_AS_VALUE_GET_STRING (load->target), load->buffer);
     swfdec_player_unroot (player, load);
     return;
   }
@@ -758,9 +758,9 @@ swfdec_resource_emit_on_load_init (SwfdecResource *resource)
   if (resource->state != SWFDEC_RESOURCE_COMPLETE)
     return FALSE;
 
-  if (SWFDEC_AS_VALUE_IS_MOVIE (*&resource->movie) && SWFDEC_IS_IMAGE_DECODER (resource->decoder)) {
+  if (SWFDEC_AS_VALUE_IS_MOVIE (resource->movie) && SWFDEC_IS_IMAGE_DECODER (resource->decoder)) {
     SwfdecImage *image = SWFDEC_IMAGE_DECODER (resource->decoder)->image;
-    SwfdecMovie *movie = SWFDEC_AS_VALUE_GET_MOVIE (*&resource->movie);
+    SwfdecMovie *movie = SWFDEC_AS_VALUE_GET_MOVIE (resource->movie);
     if (image && movie) {
       swfdec_movie_invalidate_next (movie);
       swfdec_movie_queue_update (movie, SWFDEC_MOVIE_INVALID_EXTENTS);
diff --git a/swfdec/swfdec_sound_object.c b/swfdec/swfdec_sound_object.c
index 8dce9f08..5a7d31b8 100644
--- a/swfdec/swfdec_sound_object.c
+++ b/swfdec/swfdec_sound_object.c
@@ -451,7 +451,7 @@ swfdec_sound_object_construct (SwfdecAsContext *cx, SwfdecAsObject *object, guin
   sound = g_object_new (SWFDEC_TYPE_SOUND_OBJECT, "context", cx, NULL);
   swfdec_as_object_set_relay (object, SWFDEC_AS_RELAY (sound));
 
-  if (argc == 0 || SWFDEC_AS_VALUE_IS_UNDEFINED (*&argv[0])) {
+  if (argc == 0 || SWFDEC_AS_VALUE_IS_UNDEFINED (argv[0])) {
     sound->target = NULL;
   } else {
     sound->target = swfdec_as_value_to_string (cx, argv[0]);
diff --git a/swfdec/swfdec_sprite_movie_as.c b/swfdec/swfdec_sprite_movie_as.c
index e6d30a81..9f8c32f8 100644
--- a/swfdec/swfdec_sprite_movie_as.c
+++ b/swfdec/swfdec_sprite_movie_as.c
@@ -163,10 +163,10 @@ swfdec_sprite_movie_set_filters (SwfdecAsContext *cx, SwfdecAsObject *object,
   for (i = 0; i < length; i++) {
     if (!swfdec_as_object_get_variable (array, 
 	  swfdec_as_integer_to_string (cx, i), &val) ||
-	!SWFDEC_AS_VALUE_IS_OBJECT (*&val) ||
-	!SWFDEC_IS_FILTER (SWFDEC_AS_VALUE_GET_OBJECT (*&val)->relay))
+	!SWFDEC_AS_VALUE_IS_OBJECT (val) ||
+	!SWFDEC_IS_FILTER (SWFDEC_AS_VALUE_GET_OBJECT (val)->relay))
       continue;
-    filter = SWFDEC_FILTER (SWFDEC_AS_VALUE_GET_OBJECT (*&val)->relay);
+    filter = SWFDEC_FILTER (SWFDEC_AS_VALUE_GET_OBJECT (val)->relay);
     filter = swfdec_filter_clone (filter);
     list = g_slist_prepend (list, filter);
   }
@@ -241,18 +241,18 @@ swfdec_sprite_movie_set_blendMode (SwfdecAsContext *cx, SwfdecAsObject *object,
 
   SWFDEC_AS_CHECK (SWFDEC_TYPE_MOVIE, &movie, "v", &val);
 
-  if (SWFDEC_AS_VALUE_IS_NUMBER (*&val)) {
-    blend_mode = SWFDEC_AS_VALUE_GET_NUMBER (*&val);
-  } else if (SWFDEC_AS_VALUE_IS_STRING (*&val)) {
+  if (SWFDEC_AS_VALUE_IS_NUMBER (val)) {
+    blend_mode = SWFDEC_AS_VALUE_GET_NUMBER (val);
+  } else if (SWFDEC_AS_VALUE_IS_STRING (val)) {
     blend_mode = 0;
-    str = SWFDEC_AS_VALUE_GET_STRING (*&val);
+    str = SWFDEC_AS_VALUE_GET_STRING (val);
     for (i = 0; i < num_blend_mode_names; i++) {
       if (str == blend_mode_names[i]) { // case-sensitive
 	blend_mode = i + 1;
 	break;
       }
     }
-  } else if (SWFDEC_AS_VALUE_IS_OBJECT (*&val)) {
+  } else if (SWFDEC_AS_VALUE_IS_OBJECT (val)) {
     blend_mode = 0;
   } else {
     blend_mode = 1;
@@ -348,7 +348,7 @@ swfdec_sprite_movie_getInstanceAtDepth (SwfdecAsContext *cx,
   SWFDEC_AS_CHECK (SWFDEC_TYPE_MOVIE, &movie, "i", &depth);
 
   // special case
-  if (SWFDEC_AS_VALUE_IS_UNDEFINED (*&argv[0]))
+  if (SWFDEC_AS_VALUE_IS_UNDEFINED (argv[0]))
     return;
 
   movie = swfdec_movie_find (movie, depth);
@@ -676,8 +676,8 @@ swfdec_sprite_movie_swapDepths (SwfdecAsContext *cx, SwfdecAsObject *object,
   if (movie->parent == NULL)
     SWFDEC_FIXME ("swapDepths on root movie, should do something weird");
 
-  if (SWFDEC_AS_VALUE_IS_MOVIE (*&value)) {
-    other = SWFDEC_AS_VALUE_GET_MOVIE (*&value);
+  if (SWFDEC_AS_VALUE_IS_MOVIE (value)) {
+    other = SWFDEC_AS_VALUE_GET_MOVIE (value);
     if (other == NULL || other->parent != movie->parent)
       return;
     depth = other->depth;
@@ -944,7 +944,7 @@ swfdec_sprite_movie_setMask (SwfdecAsContext *cx, SwfdecAsObject *object,
   /* yes, this works with regular movies */
   SWFDEC_AS_CHECK (SWFDEC_TYPE_MOVIE, &movie, "M", &mask);
 
-  if (argc > 0 && mask == NULL && !SWFDEC_AS_VALUE_IS_NULL (*&argv[0])) {
+  if (argc > 0 && mask == NULL && !SWFDEC_AS_VALUE_IS_NULL (argv[0])) {
     SWFDEC_FIXME ("mask is not a movie and not null, what now?");
     mask = NULL;
   }
diff --git a/swfdec/swfdec_style_sheet.c b/swfdec/swfdec_style_sheet.c
index 65e55310..d0d37ceb 100644
--- a/swfdec/swfdec_style_sheet.c
+++ b/swfdec/swfdec_style_sheet.c
@@ -334,12 +334,12 @@ swfdec_style_sheet_get_format (SwfdecStyleSheet *style, const char *name)
   swfdec_as_object_get_variable (swfdec_as_relay_get_as_object (SWFDEC_AS_RELAY (style)),
       SWFDEC_AS_STR__styles, &val);
   swfdec_as_value_get_variable (swfdec_gc_object_get_context (style), &val, name, &val);
-  if (!SWFDEC_AS_VALUE_IS_OBJECT (*&val))
+  if (!SWFDEC_AS_VALUE_IS_OBJECT (val))
     return NULL;
-  if (!SWFDEC_IS_TEXT_FORMAT (SWFDEC_AS_VALUE_GET_OBJECT (*&val)->relay))
+  if (!SWFDEC_IS_TEXT_FORMAT (SWFDEC_AS_VALUE_GET_OBJECT (val)->relay))
     return NULL;
 
-  return SWFDEC_TEXT_FORMAT (SWFDEC_AS_VALUE_GET_OBJECT (*&val)->relay);
+  return SWFDEC_TEXT_FORMAT (SWFDEC_AS_VALUE_GET_OBJECT (val)->relay);
 }
 
 SwfdecTextFormat *
diff --git a/swfdec/swfdec_system_as.c b/swfdec/swfdec_system_as.c
index 139f1610..023011d3 100644
--- a/swfdec/swfdec_system_as.c
+++ b/swfdec/swfdec_system_as.c
@@ -306,11 +306,11 @@ swfdec_system_query (SwfdecAsContext *cx, SwfdecAsObject *object,
     queries[i].get (player, &val);
     swfdec_as_object_set_variable (object, queries[i].name, &val);
     if (queries[i].name == SWFDEC_AS_STR_screenResolutionY) {
-      g_string_append_printf (server, "x%d", (int) SWFDEC_AS_VALUE_GET_NUMBER (*&val));
+      g_string_append_printf (server, "x%d", (int) SWFDEC_AS_VALUE_GET_NUMBER (val));
     } else if (queries[i].name == SWFDEC_AS_STR_pixelAspectRatio) {
       char buffer[10];
       g_ascii_formatd (buffer, sizeof (buffer), "%.1f",
-	  SWFDEC_AS_VALUE_GET_NUMBER (*&val));
+	  SWFDEC_AS_VALUE_GET_NUMBER (val));
       g_string_append (server, "&AR=");
       g_string_append (server, buffer);
     } else if (queries[i].name == SWFDEC_AS_STR_manufacturer) {
@@ -323,12 +323,12 @@ swfdec_system_query (SwfdecAsContext *cx, SwfdecAsObject *object,
 	g_string_append_c (server, '&');
       g_string_append (server, queries[i].server_string);
       g_string_append_c (server, '=');
-      if (SWFDEC_AS_VALUE_IS_BOOLEAN (*&val)) {
-	g_string_append_c (server, SWFDEC_AS_VALUE_GET_BOOLEAN (*&val) ? 't' : 'f');
-      } else if (SWFDEC_AS_VALUE_IS_NUMBER (*&val)) {
-	g_string_append_printf (server, "%d", (int) SWFDEC_AS_VALUE_GET_NUMBER (*&val));
-      } else if (SWFDEC_AS_VALUE_IS_STRING (*&val)) {
-	char *s = swfdec_as_string_escape (cx, SWFDEC_AS_VALUE_GET_STRING (*&val));
+      if (SWFDEC_AS_VALUE_IS_BOOLEAN (val)) {
+	g_string_append_c (server, SWFDEC_AS_VALUE_GET_BOOLEAN (val) ? 't' : 'f');
+      } else if (SWFDEC_AS_VALUE_IS_NUMBER (val)) {
+	g_string_append_printf (server, "%d", (int) SWFDEC_AS_VALUE_GET_NUMBER (val));
+      } else if (SWFDEC_AS_VALUE_IS_STRING (val)) {
+	char *s = swfdec_as_string_escape (cx, SWFDEC_AS_VALUE_GET_STRING (val));
 	g_string_append (server, s);
 	g_free (s);
       } else {
diff --git a/swfdec/swfdec_text_field_movie_as.c b/swfdec/swfdec_text_field_movie_as.c
index 196d8c47..6c518af0 100644
--- a/swfdec/swfdec_text_field_movie_as.c
+++ b/swfdec/swfdec_text_field_movie_as.c
@@ -306,8 +306,8 @@ swfdec_text_field_movie_set_restrict (SwfdecAsContext *cx,
   if (text->restrict_ == NULL && value == SWFDEC_AS_STR_EMPTY)
     return;
 
-  if (SWFDEC_AS_VALUE_IS_UNDEFINED (*&argv[0]) ||
-      SWFDEC_AS_VALUE_IS_NULL (*&argv[0])) {
+  if (SWFDEC_AS_VALUE_IS_UNDEFINED (argv[0]) ||
+      SWFDEC_AS_VALUE_IS_NULL (argv[0])) {
     text->restrict_ = NULL;
   } else {
     text->restrict_ = value;
@@ -411,8 +411,8 @@ swfdec_text_field_movie_do_set_variable (SwfdecAsContext *cx,
 
   SWFDEC_AS_CHECK (SWFDEC_TYPE_TEXT_FIELD_MOVIE, &text, "s", &value);
 
-  if (SWFDEC_AS_VALUE_IS_UNDEFINED (*&argv[0]) ||
-      SWFDEC_AS_VALUE_IS_NULL (*&argv[0]) || value == SWFDEC_AS_STR_EMPTY) {
+  if (SWFDEC_AS_VALUE_IS_UNDEFINED (argv[0]) ||
+      SWFDEC_AS_VALUE_IS_NULL (argv[0]) || value == SWFDEC_AS_STR_EMPTY) {
     value = NULL;
   }
 
@@ -752,8 +752,8 @@ swfdec_text_field_movie_set_autoSize (SwfdecAsContext *cx,
   if (argc < 1)
     return;
 
-  if (SWFDEC_AS_VALUE_IS_BOOLEAN (*&argv[0])) {
-    if (SWFDEC_AS_VALUE_GET_BOOLEAN (*&argv[0])) {
+  if (SWFDEC_AS_VALUE_IS_BOOLEAN (argv[0])) {
+    if (SWFDEC_AS_VALUE_GET_BOOLEAN (argv[0])) {
       text->auto_size = SWFDEC_AUTO_SIZE_LEFT;
     } else {
       text->auto_size = SWFDEC_AUTO_SIZE_NONE;
@@ -903,8 +903,8 @@ swfdec_text_field_movie_set_styleSheet (SwfdecAsContext *cx,
 
   swfdec_as_value_to_number (cx, &argv[0]);
 
-  if (SWFDEC_AS_VALUE_IS_OBJECT (*&argv[0])) {
-    value = SWFDEC_AS_VALUE_GET_OBJECT (*&argv[0]);
+  if (SWFDEC_AS_VALUE_IS_OBJECT (argv[0])) {
+    value = SWFDEC_AS_VALUE_GET_OBJECT (argv[0]);
   } else {
     value = NULL;
   }
@@ -1138,12 +1138,12 @@ swfdec_text_field_movie_setTextFormat (SwfdecAsContext *cx,
   if (start == end)
     return;
 
-  if (!SWFDEC_AS_VALUE_IS_OBJECT (*&argv[i]))
+  if (!SWFDEC_AS_VALUE_IS_OBJECT (argv[i]))
     return;
-  if (!SWFDEC_IS_TEXT_FORMAT (SWFDEC_AS_VALUE_GET_OBJECT (*&argv[i])->relay))
+  if (!SWFDEC_IS_TEXT_FORMAT (SWFDEC_AS_VALUE_GET_OBJECT (argv[i])->relay))
     return;
 
-  format = SWFDEC_TEXT_FORMAT (SWFDEC_AS_VALUE_GET_OBJECT (*&argv[i])->relay);
+  format = SWFDEC_TEXT_FORMAT (SWFDEC_AS_VALUE_GET_OBJECT (argv[i])->relay);
   start = g_utf8_offset_to_pointer (string, start) - string;
   end = g_utf8_offset_to_pointer (string, end) - string;
 
@@ -1391,9 +1391,9 @@ swfdec_text_field_movie_createTextField (SwfdecAsContext *cx,
   swfdec_movie_update (movie);
 
   swfdec_as_object_get_variable (cx->global, SWFDEC_AS_STR_TextField, &val);
-  if (!SWFDEC_AS_VALUE_IS_OBJECT (*&val))
+  if (!SWFDEC_AS_VALUE_IS_OBJECT (val))
     return;
-  fun_object = SWFDEC_AS_VALUE_GET_OBJECT (*&val);
+  fun_object = SWFDEC_AS_VALUE_GET_OBJECT (val);
   if (!SWFDEC_IS_AS_FUNCTION (fun_object->relay))
     return;
   fun = SWFDEC_AS_FUNCTION (fun_object->relay);
@@ -1432,13 +1432,13 @@ swfdec_text_field_movie_init_properties (SwfdecAsContext *cx)
   g_return_if_fail (SWFDEC_IS_AS_CONTEXT (cx));
 
   swfdec_as_object_get_variable (cx->global, SWFDEC_AS_STR_TextField, &val);
-  if (!SWFDEC_AS_VALUE_IS_OBJECT (*&val))
+  if (!SWFDEC_AS_VALUE_IS_OBJECT (val))
     return;
-  object = SWFDEC_AS_VALUE_GET_OBJECT (*&val);
+  object = SWFDEC_AS_VALUE_GET_OBJECT (val);
   swfdec_as_object_get_variable (object, SWFDEC_AS_STR_prototype, &val);
-  if (!SWFDEC_AS_VALUE_IS_OBJECT (*&val))
+  if (!SWFDEC_AS_VALUE_IS_OBJECT (val))
     return;
-  proto = SWFDEC_AS_VALUE_GET_OBJECT (*&val);
+  proto = SWFDEC_AS_VALUE_GET_OBJECT (val);
 
   // text
   swfdec_as_object_add_native_variable (proto, SWFDEC_AS_STR_text,
diff --git a/swfdec/swfdec_text_format.c b/swfdec/swfdec_text_format.c
index f9da9c24..1187d309 100644
--- a/swfdec/swfdec_text_format.c
+++ b/swfdec/swfdec_text_format.c
@@ -140,8 +140,8 @@ swfdec_text_format_set_string (SwfdecAsObject *object,
   swfdec_as_value_to_number (context, &argv[0]);
   s = swfdec_as_value_to_string (context, argv[0]);
 
-  if (SWFDEC_AS_VALUE_IS_UNDEFINED (*&argv[0]) ||
-      SWFDEC_AS_VALUE_IS_NULL (*&argv[0])) {
+  if (SWFDEC_AS_VALUE_IS_UNDEFINED (argv[0]) ||
+      SWFDEC_AS_VALUE_IS_NULL (argv[0])) {
     /* FIXME: reset to defaults here? */
     SWFDEC_TEXT_ATTRIBUTE_UNSET (format->values_set, property);
   } else {
@@ -192,8 +192,8 @@ swfdec_text_format_set_boolean (SwfdecAsObject *object,
   swfdec_as_value_to_number (context, &argv[0]);
   swfdec_as_value_to_string (context, argv[0]);
 
-  if (SWFDEC_AS_VALUE_IS_UNDEFINED (*&argv[0]) ||
-      SWFDEC_AS_VALUE_IS_NULL (*&argv[0])) {
+  if (SWFDEC_AS_VALUE_IS_UNDEFINED (argv[0]) ||
+      SWFDEC_AS_VALUE_IS_NULL (argv[0])) {
     SWFDEC_TEXT_ATTRIBUTE_UNSET (format->values_set, property);
   } else {
     G_STRUCT_MEMBER (gboolean, format, property_offsets[property]) =
@@ -275,8 +275,8 @@ swfdec_text_format_set_integer (SwfdecAsObject *object,
   if (argc < 1)
     return;
 
-  if (SWFDEC_AS_VALUE_IS_UNDEFINED (*&argv[0]) ||
-      SWFDEC_AS_VALUE_IS_NULL (*&argv[0])) {
+  if (SWFDEC_AS_VALUE_IS_UNDEFINED (argv[0]) ||
+      SWFDEC_AS_VALUE_IS_NULL (argv[0])) {
     SWFDEC_TEXT_ATTRIBUTE_UNSET (format->values_set, property);
   } else {
     G_STRUCT_MEMBER (int, format, property_offsets[property]) =
@@ -428,8 +428,8 @@ swfdec_text_format_do_set_color (SwfdecAsContext *cx, SwfdecAsObject *object,
   if (argc < 1)
     return;
 
-  if (SWFDEC_AS_VALUE_IS_UNDEFINED (*&argv[0]) ||
-      SWFDEC_AS_VALUE_IS_NULL (*&argv[0])) {
+  if (SWFDEC_AS_VALUE_IS_UNDEFINED (argv[0]) ||
+      SWFDEC_AS_VALUE_IS_NULL (argv[0])) {
     SWFDEC_TEXT_ATTRIBUTE_UNSET (format->values_set, SWFDEC_TEXT_ATTRIBUTE_COLOR);
   } else {
     format->attr.color = (unsigned) swfdec_as_value_to_integer (cx, &argv[0]);
@@ -624,8 +624,8 @@ swfdec_text_format_do_set_letter_spacing (SwfdecAsContext *cx,
   d = swfdec_as_value_to_number (cx, &argv[0]);
   swfdec_as_value_to_string (cx, argv[0]);
 
-  if (SWFDEC_AS_VALUE_IS_UNDEFINED (*&argv[0]) ||
-      SWFDEC_AS_VALUE_IS_NULL (*&argv[0]))
+  if (SWFDEC_AS_VALUE_IS_UNDEFINED (argv[0]) ||
+      SWFDEC_AS_VALUE_IS_NULL (argv[0]))
   {
     SWFDEC_TEXT_ATTRIBUTE_UNSET (format->values_set,
 	SWFDEC_TEXT_ATTRIBUTE_LETTER_SPACING);
@@ -714,23 +714,23 @@ swfdec_text_format_do_set_tab_stops (SwfdecAsContext *cx,
   swfdec_as_value_to_number (cx, &argv[0]);
   swfdec_as_value_to_string (cx, argv[0]);
 
-  if (SWFDEC_AS_VALUE_IS_UNDEFINED (*&argv[0]) ||
-      SWFDEC_AS_VALUE_IS_NULL (*&argv[0]))
+  if (SWFDEC_AS_VALUE_IS_UNDEFINED (argv[0]) ||
+      SWFDEC_AS_VALUE_IS_NULL (argv[0]))
   {
     g_free (format->attr.tab_stops);
     format->attr.tab_stops = NULL;
     format->attr.n_tab_stops = 0;
     SWFDEC_TEXT_ATTRIBUTE_UNSET (format->values_set, SWFDEC_TEXT_ATTRIBUTE_TAB_STOPS);
   }
-  else if (SWFDEC_AS_VALUE_IS_OBJECT (*&argv[0]) &&
-	SWFDEC_AS_VALUE_GET_OBJECT (*&argv[0])->array)
+  else if (SWFDEC_AS_VALUE_IS_OBJECT (argv[0]) &&
+	SWFDEC_AS_VALUE_GET_OBJECT (argv[0])->array)
   {
     SwfdecAsObject *array;
     SwfdecAsValue val;
     guint i;
     int len;
 
-    array = SWFDEC_AS_VALUE_GET_OBJECT (*&argv[0]);
+    array = SWFDEC_AS_VALUE_GET_OBJECT (argv[0]);
     len = swfdec_as_array_get_length (array);
 
     if (!SWFDEC_TEXT_ATTRIBUTE_IS_SET (format->values_set, SWFDEC_TEXT_ATTRIBUTE_TAB_STOPS)) {
@@ -748,12 +748,12 @@ swfdec_text_format_do_set_tab_stops (SwfdecAsContext *cx,
       format->attr.tab_stops[i] = swfdec_text_format_value_to_integer (cx, &val, TRUE);
     }
   }
-  else if (SWFDEC_AS_VALUE_IS_STRING (*&argv[0]))
+  else if (SWFDEC_AS_VALUE_IS_STRING (argv[0]))
   {
     gsize i;
 
     // special case: empty strings mean null
-    if (SWFDEC_AS_VALUE_GET_STRING (*&argv[0]) == SWFDEC_AS_STR_EMPTY) {
+    if (SWFDEC_AS_VALUE_GET_STRING (argv[0]) == SWFDEC_AS_STR_EMPTY) {
       g_free (format->attr.tab_stops);
       format->attr.tab_stops = NULL;
       format->attr.n_tab_stops = 0;
@@ -761,7 +761,7 @@ swfdec_text_format_do_set_tab_stops (SwfdecAsContext *cx,
     } else {
       int n = cx->version >= 8 ? G_MININT : 0;
       SWFDEC_TEXT_ATTRIBUTE_SET (format->values_set, SWFDEC_TEXT_ATTRIBUTE_TAB_STOPS);
-      format->attr.n_tab_stops = strlen (SWFDEC_AS_VALUE_GET_STRING (*&argv[0]));
+      format->attr.n_tab_stops = strlen (SWFDEC_AS_VALUE_GET_STRING (argv[0]));
       format->attr.tab_stops = g_new (guint, format->attr.n_tab_stops);
       for (i = 0; i < format->attr.n_tab_stops; i++) {
 	format->attr.tab_stops[i] = n;
@@ -950,13 +950,13 @@ swfdec_text_format_init_properties (SwfdecAsContext *cx)
   g_return_if_fail (SWFDEC_IS_AS_CONTEXT (cx));
 
   swfdec_as_object_get_variable (cx->global, SWFDEC_AS_STR_TextFormat, &val);
-  if (!SWFDEC_AS_VALUE_IS_OBJECT (*&val))
+  if (!SWFDEC_AS_VALUE_IS_OBJECT (val))
     return;
-  proto = SWFDEC_AS_VALUE_GET_OBJECT (*&val);
+  proto = SWFDEC_AS_VALUE_GET_OBJECT (val);
   swfdec_as_object_get_variable (proto, SWFDEC_AS_STR_prototype, &val);
-  if (!SWFDEC_AS_VALUE_IS_OBJECT (*&val))
+  if (!SWFDEC_AS_VALUE_IS_OBJECT (val))
     return;
-  proto = SWFDEC_AS_VALUE_GET_OBJECT (*&val);
+  proto = SWFDEC_AS_VALUE_GET_OBJECT (val);
 
   swfdec_as_object_add_native_variable (proto, SWFDEC_AS_STR_align,
       swfdec_text_format_do_get_align, swfdec_text_format_do_set_align);
diff --git a/swfdec/swfdec_transform_as.c b/swfdec/swfdec_transform_as.c
index 380f43d7..6c2cf13b 100644
--- a/swfdec/swfdec_transform_as.c
+++ b/swfdec/swfdec_transform_as.c
@@ -253,7 +253,7 @@ swfdec_transform_as_construct (SwfdecAsContext *cx, SwfdecAsObject *object,
   SWFDEC_AS_CHECK (0, NULL, "M", &movie);
 
   trans = g_object_new (SWFDEC_TYPE_TRANSFORM_AS, "context", cx, NULL);
-  trans->target = SWFDEC_AS_VALUE_GET_MOVIE (*&argv[0]);
+  trans->target = SWFDEC_AS_VALUE_GET_MOVIE (argv[0]);
   swfdec_as_object_set_relay (object, SWFDEC_AS_RELAY (trans));
   SWFDEC_AS_VALUE_SET_OBJECT (ret, object);
 }
diff --git a/swfdec/swfdec_video_movie_as.c b/swfdec/swfdec_video_movie_as.c
index 386726d4..17bad0b4 100644
--- a/swfdec/swfdec_video_movie_as.c
+++ b/swfdec/swfdec_video_movie_as.c
@@ -137,14 +137,14 @@ swfdec_video_movie_init_properties (SwfdecAsContext *cx)
   g_return_if_fail (SWFDEC_IS_AS_CONTEXT (cx));
 
   swfdec_as_object_get_variable (cx->global, SWFDEC_AS_STR_Video, &val);
-  if (!SWFDEC_AS_VALUE_IS_OBJECT (*&val))
+  if (!SWFDEC_AS_VALUE_IS_OBJECT (val))
     return;
-  video = SWFDEC_AS_VALUE_GET_OBJECT (*&val);
+  video = SWFDEC_AS_VALUE_GET_OBJECT (val);
 
   swfdec_as_object_get_variable (video, SWFDEC_AS_STR_prototype, &val);
-  if (!SWFDEC_AS_VALUE_IS_OBJECT (*&val))
+  if (!SWFDEC_AS_VALUE_IS_OBJECT (val))
     return;
-  proto = SWFDEC_AS_VALUE_GET_OBJECT (*&val);
+  proto = SWFDEC_AS_VALUE_GET_OBJECT (val);
 
   swfdec_as_object_add_native_variable (proto, SWFDEC_AS_STR_width, 
       swfdec_video_get_width, NULL);
diff --git a/swfdec/swfdec_xml.c b/swfdec/swfdec_xml.c
index ed204582..402f6cd7 100644
--- a/swfdec/swfdec_xml.c
+++ b/swfdec/swfdec_xml.c
@@ -205,7 +205,7 @@ swfdec_xml_set_ignoreWhite (SwfdecAsContext *cx, SwfdecAsObject *object,
   SWFDEC_AS_CHECK (SWFDEC_TYPE_XML, &xml, "s", &ignore);
 
   // special case
-  if (SWFDEC_AS_VALUE_IS_UNDEFINED (*&argv[0]))
+  if (SWFDEC_AS_VALUE_IS_UNDEFINED (argv[0]))
     return;
 
   xml->ignore_white =
@@ -237,7 +237,7 @@ swfdec_xml_set_xmlDecl (SwfdecAsContext *cx, SwfdecAsObject *object,
   SWFDEC_AS_CHECK (SWFDEC_TYPE_XML, &xml, "s", &s);
 
   // special case
-  if (SWFDEC_AS_VALUE_IS_UNDEFINED (*&argv[0]))
+  if (SWFDEC_AS_VALUE_IS_UNDEFINED (argv[0]))
     return;
 
   xml->xml_decl = s;
@@ -268,7 +268,7 @@ swfdec_xml_set_docTypeDecl (SwfdecAsContext *cx, SwfdecAsObject *object,
   SWFDEC_AS_CHECK (SWFDEC_TYPE_XML, &xml, "s", &s);
 
   // special case
-  if (SWFDEC_AS_VALUE_IS_UNDEFINED (*&argv[0]))
+  if (SWFDEC_AS_VALUE_IS_UNDEFINED (argv[0]))
     return;
 
   xml->doc_type_decl = s;
@@ -295,7 +295,7 @@ swfdec_xml_set_contentType (SwfdecAsContext *cx, SwfdecAsObject *object,
   SWFDEC_AS_CHECK (SWFDEC_TYPE_XML, &xml, "v", &val);
 
   // special case
-  if (SWFDEC_AS_VALUE_IS_UNDEFINED (*&val))
+  if (SWFDEC_AS_VALUE_IS_UNDEFINED (val))
     return;
 
   xml->content_type = val;
@@ -322,7 +322,7 @@ swfdec_xml_set_loaded (SwfdecAsContext *cx, SwfdecAsObject *object,
   SWFDEC_AS_CHECK (SWFDEC_TYPE_XML, &xml, "s", &ignore);
 
   // special case
-  if (SWFDEC_AS_VALUE_IS_UNDEFINED (*&argv[0]))
+  if (SWFDEC_AS_VALUE_IS_UNDEFINED (argv[0]))
     return;
 
   SWFDEC_AS_VALUE_SET_BOOLEAN (&xml->loaded,
@@ -351,7 +351,7 @@ swfdec_xml_set_status (SwfdecAsContext *cx, SwfdecAsObject *object,
   SWFDEC_AS_CHECK (SWFDEC_TYPE_XML, &xml, "s", &ignore);
 
   // special case
-  if (SWFDEC_AS_VALUE_IS_UNDEFINED (*&argv[0]))
+  if (SWFDEC_AS_VALUE_IS_UNDEFINED (argv[0]))
     return;
 
   d = swfdec_as_value_to_number (cx, &argv[0]);
@@ -478,8 +478,8 @@ swfdec_xml_add_id_map (SwfdecXml *xml, SwfdecXmlNode *node, const char *id)
   if (context->version >= 8) {
     if (swfdec_as_object_get_variable (object,
 	  SWFDEC_AS_STR_idMap, &val)) {
-      if (SWFDEC_AS_VALUE_IS_OBJECT (*&val)) {
-	object = SWFDEC_AS_VALUE_GET_OBJECT (*&val);
+      if (SWFDEC_AS_VALUE_IS_OBJECT (val)) {
+	object = SWFDEC_AS_VALUE_GET_OBJECT (val);
       } else {
 	return;
       }
@@ -792,7 +792,7 @@ swfdec_xml_do_parseXML (SwfdecAsContext *cx, SwfdecAsObject *object, guint argc,
 
   SWFDEC_AS_CHECK (SWFDEC_TYPE_XML, &xml, "s", &s);
 
-  if (SWFDEC_AS_VALUE_IS_UNDEFINED (*&argv[0]))
+  if (SWFDEC_AS_VALUE_IS_UNDEFINED (argv[0]))
     return;
 
   swfdec_xml_parseXML (xml, s);
@@ -810,7 +810,7 @@ swfdec_xml_createElement (SwfdecAsContext *cx, SwfdecAsObject *object,
   SWFDEC_AS_CHECK (SWFDEC_TYPE_XML, &xml, "s", &s);
 
   // special case
-  if (SWFDEC_AS_VALUE_IS_UNDEFINED (*&argv[0]))
+  if (SWFDEC_AS_VALUE_IS_UNDEFINED (argv[0]))
     return;
 
   node = swfdec_xml_node_new (cx, SWFDEC_XML_NODE_ELEMENT, s);
@@ -830,7 +830,7 @@ swfdec_xml_createTextNode (SwfdecAsContext *cx, SwfdecAsObject *object,
   SWFDEC_AS_CHECK (SWFDEC_TYPE_XML, &xml, "s", &s);
 
   // special case
-  if (SWFDEC_AS_VALUE_IS_UNDEFINED (*&argv[0]))
+  if (SWFDEC_AS_VALUE_IS_UNDEFINED (argv[0]))
     return;
 
   node = swfdec_xml_node_new (cx, SWFDEC_XML_NODE_TEXT, s);
@@ -851,14 +851,14 @@ swfdec_xml_init_properties (SwfdecAsContext *cx)
   g_return_if_fail (SWFDEC_IS_AS_CONTEXT (cx));
 
   swfdec_as_object_get_variable (cx->global, SWFDEC_AS_STR_XML, &val);
-  if (!SWFDEC_AS_VALUE_IS_OBJECT (*&val))
+  if (!SWFDEC_AS_VALUE_IS_OBJECT (val))
     return;
-  xml = SWFDEC_AS_VALUE_GET_OBJECT (*&val);
+  xml = SWFDEC_AS_VALUE_GET_OBJECT (val);
 
   swfdec_as_object_get_variable (xml, SWFDEC_AS_STR_prototype, &val);
-  if (!SWFDEC_AS_VALUE_IS_OBJECT (*&val))
+  if (!SWFDEC_AS_VALUE_IS_OBJECT (val))
     return;
-  proto = SWFDEC_AS_VALUE_GET_OBJECT (*&val);
+  proto = SWFDEC_AS_VALUE_GET_OBJECT (val);
 
   swfdec_as_object_add_native_variable (proto, SWFDEC_AS_STR_ignoreWhite,
       swfdec_xml_get_ignoreWhite, swfdec_xml_set_ignoreWhite);
@@ -896,7 +896,7 @@ swfdec_xml_construct (SwfdecAsContext *cx, SwfdecAsObject *object,
   if (!SWFDEC_IS_VALID_XML_NODE (xml))
     return;
 
-  if (argc >= 1 && !SWFDEC_AS_VALUE_IS_UNDEFINED (*&argv[0])) {
+  if (argc >= 1 && !SWFDEC_AS_VALUE_IS_UNDEFINED (argv[0])) {
     swfdec_xml_parseXML (xml, swfdec_as_value_to_string (cx, argv[0]));
   }
 }
diff --git a/swfdec/swfdec_xml_node.c b/swfdec/swfdec_xml_node.c
index 47eb72f0..6a9d91d7 100644
--- a/swfdec/swfdec_xml_node.c
+++ b/swfdec/swfdec_xml_node.c
@@ -95,11 +95,11 @@ swfdec_xml_node_get_child (SwfdecXmlNode *node, gint32 index_)
 
   swfdec_as_array_get_value (node->children, index_, &val);
 
-  g_return_val_if_fail (SWFDEC_AS_VALUE_IS_OBJECT (*&val), NULL);
+  g_return_val_if_fail (SWFDEC_AS_VALUE_IS_OBJECT (val), NULL);
   g_return_val_if_fail (SWFDEC_IS_VALID_XML_NODE (
-	SWFDEC_AS_VALUE_GET_OBJECT (*&val)->relay), NULL);
+	SWFDEC_AS_VALUE_GET_OBJECT (val)->relay), NULL);
 
-  return SWFDEC_XML_NODE (SWFDEC_AS_VALUE_GET_OBJECT (*&val)->relay);
+  return SWFDEC_XML_NODE (SWFDEC_AS_VALUE_GET_OBJECT (val)->relay);
 }
 
 static gint32
@@ -178,7 +178,7 @@ swfdec_xml_node_getNamespaceForPrefix (SwfdecXmlNode *node, const char *prefix)
 
   do {
     swfdec_as_object_get_variable (node->attributes, var, &val);
-    if (!SWFDEC_AS_VALUE_IS_UNDEFINED (*&val)) {
+    if (!SWFDEC_AS_VALUE_IS_UNDEFINED (val)) {
       return swfdec_as_value_to_string (swfdec_gc_object_get_context (node), val);
     }
     node = node->parent;
@@ -330,7 +330,7 @@ swfdec_xml_node_set_nodeName (SwfdecAsContext *cx, SwfdecAsObject *object,
     return;
 
   // special case
-  if (SWFDEC_AS_VALUE_IS_UNDEFINED (*&argv[0]))
+  if (SWFDEC_AS_VALUE_IS_UNDEFINED (argv[0]))
     return;
 
   node->name = name;
@@ -1026,14 +1026,14 @@ swfdec_xml_node_init_properties (SwfdecAsContext *cx)
   g_return_if_fail (SWFDEC_IS_AS_CONTEXT (cx));
 
   swfdec_as_object_get_variable (cx->global, SWFDEC_AS_STR_XMLNode, &val);
-  if (!SWFDEC_AS_VALUE_IS_OBJECT (*&val))
+  if (!SWFDEC_AS_VALUE_IS_OBJECT (val))
     return;
-  node = SWFDEC_AS_VALUE_GET_OBJECT (*&val);
+  node = SWFDEC_AS_VALUE_GET_OBJECT (val);
 
   swfdec_as_object_get_variable (node, SWFDEC_AS_STR_prototype, &val);
-  if (!SWFDEC_AS_VALUE_IS_OBJECT (*&val))
+  if (!SWFDEC_AS_VALUE_IS_OBJECT (val))
     return;
-  proto = SWFDEC_AS_VALUE_GET_OBJECT (*&val);
+  proto = SWFDEC_AS_VALUE_GET_OBJECT (val);
 
   swfdec_as_object_add_native_variable (proto, SWFDEC_AS_STR_nodeType,
       swfdec_xml_node_get_nodeType, NULL);
@@ -1109,8 +1109,8 @@ swfdec_xml_node_construct (SwfdecAsContext *cx, SwfdecAsObject *object,
 
   SWFDEC_AS_CHECK (0, NULL, "is", &type, &value);
 
-  if (SWFDEC_AS_VALUE_IS_UNDEFINED (*&argv[0]) ||
-      SWFDEC_AS_VALUE_IS_UNDEFINED (*&argv[1]))
+  if (SWFDEC_AS_VALUE_IS_UNDEFINED (argv[0]) ||
+      SWFDEC_AS_VALUE_IS_UNDEFINED (argv[1]))
     return;
 
   swfdec_xml_node_init_properties (cx);