diff --git a/src/creport.c b/src/creport.c
index 59fa60ecb..f309c2d1c 100644
--- a/src/creport.c
+++ b/src/creport.c
@@ -264,6 +264,7 @@ cr_output_curses(FILE * F, const faction * viewer, const void *obj, objtype_t ty
                 fprintf(F, "\"%s\"\n", buf);
                 msg_release(msg);
             }
+            a = a->next;
         }
         else if (a->type == &at_effect && self) {
             effect_data *data = (effect_data *)a->data.v;
@@ -276,8 +277,11 @@ cr_output_curses(FILE * F, const faction * viewer, const void *obj, objtype_t ty
                 fprintf(F, "\"%d %s\"\n", data->value, translate(key,
                     LOC(default_locale, key)));
             }
+            a = a->next;
+        }
+        else {
+            a = a->nexttype;
         }
-        a = a->next;
     }
 }
 
diff --git a/src/kernel/curse.c b/src/kernel/curse.c
index 0cad2dfa6..2709c7ac0 100644
--- a/src/kernel/curse.c
+++ b/src/kernel/curse.c
@@ -513,12 +513,9 @@ static curse *make_curse(unit * mage, attrib ** ap, const curse_type * ct,
         break;
 
     case CURSETYP_UNIT:
-    {
         c->data.i = men;
         break;
     }
-
-    }
     return c;
 }
 
diff --git a/src/util/attrib.h b/src/util/attrib.h
index 11bc92bd1..38055331f 100644
--- a/src/util/attrib.h
+++ b/src/util/attrib.h
@@ -90,8 +90,8 @@ extern "C" {
 #define AT_READ_OK 0
 #define AT_READ_FAIL -1
 
-#define AT_AGE_REMOVE 0         /* remove the attribute after calling age() */
-#define AT_AGE_KEEP 1           /* keep the attribute for another turn */
+#define AT_AGE_KEEP 0           /* keep the attribute for another turn */
+#define AT_AGE_REMOVE 1         /* remove the attribute after calling age() */
 
 #ifdef __cplusplus
 }