diff --git a/gtk/gtktextbufferrichtext.c b/gtk/gtktextbufferrichtext.c
index 0132ea9536..7b6fc78651 100644
--- a/gtk/gtktextbufferrichtext.c
+++ b/gtk/gtktextbufferrichtext.c
@@ -335,7 +335,7 @@ gtk_text_buffer_deserialize_set_can_create_tags (GtkTextBuffer *buffer,
 
   formats = g_object_get_qdata (G_OBJECT (buffer), deserialize_quark ());
 
-  for (list = formats; list; list = g_list_next (list))
+  for (list = formats; list; list = list->next)
     {
       GtkRichTextFormat *fmt = list->data;
 
@@ -378,7 +378,7 @@ gtk_text_buffer_deserialize_get_can_create_tags (GtkTextBuffer *buffer,
 
   formats = g_object_get_qdata (G_OBJECT (buffer), deserialize_quark ());
 
-  for (list = formats; list; list = g_list_next (list))
+  for (list = formats; list; list = list->next)
     {
       GtkRichTextFormat *fmt = list->data;
 
@@ -497,7 +497,7 @@ gtk_text_buffer_serialize (GtkTextBuffer     *register_buffer,
   formats = g_object_get_qdata (G_OBJECT (register_buffer),
                                 serialize_quark ());
 
-  for (list = formats; list; list = g_list_next (list))
+  for (list = formats; list; list = list->next)
     {
       GtkRichTextFormat *fmt = list->data;
 
@@ -583,7 +583,7 @@ gtk_text_buffer_deserialize (GtkTextBuffer  *register_buffer,
             {
               GtkTextTag *tag = list->data;
 
-              list = g_slist_next (list);
+              list = list->next;
 
               /*  If a tag begins at the insertion point, ignore it
                *  because it doesn't affect the pasted text
@@ -602,7 +602,7 @@ gtk_text_buffer_deserialize (GtkTextBuffer  *register_buffer,
               right_start = gtk_text_buffer_create_mark (content_buffer,
                                                          NULL, iter, FALSE);
 
-              for (list = split_tags; list; list = g_slist_next (list))
+              for (list = split_tags; list; list = list->next)
                 {
                   GtkTextTag  *tag             = list->data;
                   GtkTextIter *backward_toggle = gtk_text_iter_copy (iter);
@@ -664,12 +664,12 @@ gtk_text_buffer_deserialize (GtkTextBuffer  *register_buffer,
                                                 &right_s, right_start);
 
               for (list = split_tags,
-                     left_list = left_start_list,
-                     right_list = right_end_list;
+                   left_list = left_start_list,
+                   right_list = right_end_list;
                    list && left_list && right_list;
-                   list = g_slist_next (list),
-                     left_list = g_slist_next (left_list),
-                     right_list = g_slist_next (right_list))
+                   list = list->next,
+                   left_list = left_list->next,
+                   right_list = right_list->next)
                 {
                   GtkTextTag  *tag        = list->data;
                   GtkTextMark *left_start = left_list->data;
@@ -745,7 +745,7 @@ unregister_format (GList   *formats,
 {
   GList *list;
 
-  for (list = formats; list; list = g_list_next (list))
+  for (list = formats; list; list = list->next)
     {
       GtkRichTextFormat *format = list->data;
 
@@ -771,7 +771,7 @@ get_formats (GList *formats,
   *n_formats = g_list_length (formats);
   array = g_new0 (GdkAtom, *n_formats);
 
-  for (list = formats, i = 0; list; list = g_list_next (list), i++)
+  for (list = formats, i = 0; list; list = list->next, i++)
     {
       GtkRichTextFormat *format = list->data;