diff --git a/library/LuaApi.cpp b/library/LuaApi.cpp
index b5a1cd754..ed59786a6 100644
--- a/library/LuaApi.cpp
+++ b/library/LuaApi.cpp
@@ -1560,6 +1560,62 @@ static const luaL_Reg dfhack_job_funcs[] = {
 
 static const LuaWrapper::FunctionReg dfhack_units_module[] = {
     WRAPM(Units, isUnitInBox),
+    WRAPM(Units, isActive),
+    WRAPM(Units, isVisible),
+    WRAPM(Units, isCitizen),
+    WRAPM(Units, isFortControlled),
+    WRAPM(Units, isOwnCiv),
+    WRAPM(Units, isOwnGroup),
+    WRAPM(Units, isOwnRace),
+    WRAPM(Units, isAlive),
+    WRAPM(Units, isDead),
+    WRAPM(Units, isKilled),
+    WRAPM(Units, isSane),
+    WRAPM(Units, isCrazed),
+    WRAPM(Units, isGhost),
+    WRAPM(Units, isHidden),
+    WRAPM(Units, isHidingCurse),
+    WRAPM(Units, isMale),
+    WRAPM(Units, isFemale),
+    WRAPM(Units, isBaby),
+    WRAPM(Units, isChild),
+    WRAPM(Units, isAdult),
+    WRAPM(Units, isGay),
+    WRAPM(Units, isNaked),
+    WRAPM(Units, isVisiting),
+    WRAPM(Units, isTrainableHunting),
+    WRAPM(Units, isTrainableWar),
+    WRAPM(Units, isTrained),
+    WRAPM(Units, isHunter),
+    WRAPM(Units, isWar),
+    WRAPM(Units, isTame),
+    WRAPM(Units, isTamable),
+    WRAPM(Units, isDomesticated),
+    WRAPM(Units, isMarkedForSlaughter),
+    WRAPM(Units, isGelded),
+    WRAPM(Units, isEggLayer),
+    WRAPM(Units, isGrazer),
+    WRAPM(Units, isMilkable),
+    WRAPM(Units, isForest),
+    WRAPM(Units, isMischievous),
+    WRAPM(Units, isAvailableForAdoption),
+    WRAPM(Units, hasExtravision),
+    WRAPM(Units, isOpposedToLife),
+    WRAPM(Units, isBloodsucker),
+    WRAPM(Units, isDwarf),
+    WRAPM(Units, isAnimal),
+    WRAPM(Units, isMerchant),
+    WRAPM(Units, isDiplomat),
+    WRAPM(Units, isVisitor),
+    WRAPM(Units, isInvader),
+    WRAPM(Units, isUndead),
+    WRAPM(Units, isNightCreature),
+    WRAPM(Units, isSemiMegabeast),
+    WRAPM(Units, isMegabeast),
+    WRAPM(Units, isTitan),
+    WRAPM(Units, isDemon),
+    WRAPM(Units, isDanger),
+    WRAPM(Units, isGreatDanger),
     WRAPM(Units, teleport),
     WRAPM(Units, getGeneralRef),
     WRAPM(Units, getSpecificRef),
@@ -1568,23 +1624,9 @@ static const LuaWrapper::FunctionReg dfhack_units_module[] = {
     WRAPM(Units, getVisibleName),
     WRAPM(Units, getIdentity),
     WRAPM(Units, getNemesis),
-    WRAPM(Units, isHidingCurse),
     WRAPM(Units, getPhysicalAttrValue),
     WRAPM(Units, getMentalAttrValue),
-    WRAPM(Units, isCrazed),
-    WRAPM(Units, isOpposedToLife),
-    WRAPM(Units, hasExtravision),
-    WRAPM(Units, isBloodsucker),
-    WRAPM(Units, isMischievous),
     WRAPM(Units, getMiscTrait),
-    WRAPM(Units, isDead),
-    WRAPM(Units, isAlive),
-    WRAPM(Units, isSane),
-    WRAPM(Units, isDwarf),
-    WRAPM(Units, isCitizen),
-    WRAPM(Units, isFortControlled),
-    WRAPM(Units, isVisible),
-    WRAPM(Units, isHidden),
     WRAPM(Units, getAge),
     WRAPM(Units, getKillCount),
     WRAPM(Units, getNominalSkill),
@@ -1602,12 +1644,6 @@ static const LuaWrapper::FunctionReg dfhack_units_module[] = {
     WRAPM(Units, getGoalName),
     WRAPM(Units, isGoalAchieved),
     WRAPM(Units, getSquadName),
-    WRAPM(Units, isWar),
-    WRAPM(Units, isHunter),
-    WRAPM(Units, isAvailableForAdoption),
-    WRAPM(Units, isOwnCiv),
-    WRAPM(Units, isOwnGroup),
-    WRAPM(Units, isOwnRace),
     WRAPM(Units, getPhysicalDescription),
     WRAPM(Units, getRaceName),
     WRAPM(Units, getRaceNamePlural),
@@ -1616,42 +1652,6 @@ static const LuaWrapper::FunctionReg dfhack_units_module[] = {
     WRAPM(Units, getRaceBabyNameById),
     WRAPM(Units, getRaceChildName),
     WRAPM(Units, getRaceChildNameById),
-    WRAPM(Units, isInvader),
-    WRAPM(Units, isBaby),
-    WRAPM(Units, isChild),
-    WRAPM(Units, isAdult),
-    WRAPM(Units, isAnimal),
-    WRAPM(Units, isEggLayer),
-    WRAPM(Units, isGrazer),
-    WRAPM(Units, isMilkable),
-    WRAPM(Units, isTrainableWar),
-    WRAPM(Units, isTrainableHunting),
-    WRAPM(Units, isTamable),
-    WRAPM(Units, isMale),
-    WRAPM(Units, isFemale),
-    WRAPM(Units, isVisiting),
-    WRAPM(Units, isMerchant),
-    WRAPM(Units, isDiplomat),
-    WRAPM(Units, isVisitor),
-    WRAPM(Units, isForest),
-    WRAPM(Units, isMarkedForSlaughter),
-    WRAPM(Units, isTame),
-    WRAPM(Units, isTrained),
-    WRAPM(Units, isGay),
-    WRAPM(Units, isNaked),
-    WRAPM(Units, isUndead),
-    WRAPM(Units, isGhost),
-    WRAPM(Units, isActive),
-    WRAPM(Units, isKilled),
-    WRAPM(Units, isGelded),
-    WRAPM(Units, isDomesticated),
-    WRAPM(Units, isDemon),
-    WRAPM(Units, isTitan),
-    WRAPM(Units, isMegabeast),
-    WRAPM(Units, isGreatDanger),
-    WRAPM(Units, isSemiMegabeast),
-    WRAPM(Units, isNightCreature),
-    WRAPM(Units, isDanger),
     WRAPM(Units, getMainSocialActivity),
     WRAPM(Units, getMainSocialEvent),
     WRAPM(Units, getStressCategory),