diff --git a/library/include/DataDefs.h b/library/include/DataDefs.h
index 513ee5ff2..bccc9b3f5 100644
--- a/library/include/DataDefs.h
+++ b/library/include/DataDefs.h
@@ -700,7 +700,7 @@ namespace DFHack {
 #define ENUM_NEXT_ITEM(enum,val) \
     (DFHack::next_enum_item<df::enum>(val))
 #define FOR_ENUM_ITEMS(enum,iter) \
-    for(df::enum iter = ENUM_FIRST_ITEM(enum); iter <= ENUM_LAST_ITEM(enum); iter = df::enum(1+int(iter)))
+    for(df::enum iter = ENUM_FIRST_ITEM(enum); is_valid_enum_item(iter); iter = df::enum(1+int(iter)))
 
 /*
  * Include mandatory generated headers.
diff --git a/library/xml b/library/xml
index a56692ae6..ce779e70c 160000
--- a/library/xml
+++ b/library/xml
@@ -1 +1 @@
-Subproject commit a56692ae635a1e58db8a2cad64bb03fe75122ddd
+Subproject commit ce779e70cc51d843b85e4a31a8bef1024748b4af