solvespace
diff --git a/src/bsp.cpp b/src/bsp.cpp
@@ -12,26 +12,19 @@ SBsp2 *SBsp2::Alloc() { return (SBsp2 *)AllocTemporary(sizeof(SBsp2)); }
 SBsp3 *SBsp3::Alloc() { return (SBsp3 *)AllocTemporary(sizeof(SBsp3)); }
 
 SBsp3 *SBsp3::FromMesh(const SMesh *m) {
-    SBsp3 *bsp3 = NULL;
-    int i;
-
     SMesh mc = {};
-    for(i = 0; i < m->l.n; i++) {
-        mc.AddTriangle(&(m->l.elem[i]));
-    }
+    for(auto const &elt : m->l) { mc.AddTriangle(&elt); }
 
     srand(0); // Let's be deterministic, at least!
     int n = mc.l.n;
     while(n > 1) {
         int k = rand() % n;
         n--;
-        swap(mc.l.elem[k], mc.l.elem[n]);
-    }
-
-    for(i = 0; i < mc.l.n; i++) {
-        bsp3 = InsertOrCreate(bsp3, &(mc.l.elem[i]), NULL);
+        swap(mc.l[k], mc.l[n]);
     }
 
+    SBsp3 *bsp3 = NULL;
+    for(auto &elt : mc.l) { bsp3 = InsertOrCreate(bsp3, &elt, NULL); }
     mc.Clear();
     return bsp3;
 }

diff --git a/src/clipboard.cpp b/src/clipboard.cpp
@@ -287,7 +287,7 @@ void GraphicsWindow::MenuClipboard(Command id) {
         }
 
         case Command::PASTE_TRANSFORM: {
-            if(SS.clipboard.r.n == 0) {
+            if(SS.clipboard.r.IsEmpty()) {
                 Error(_("Clipboard is empty; nothing to paste."));
                 break;
             }

diff --git a/src/constraint.cpp b/src/constraint.cpp
@@ -59,8 +59,8 @@ std::string Constraint::DescriptionString() const {
 void Constraint::DeleteAllConstraintsFor(Constraint::Type type, hEntity entityA, hEntity ptA)
 {
     SK.constraint.ClearTags();
-    for(int i = 0; i < SK.constraint.n; i++) {
-        ConstraintBase *ct = &(SK.constraint.elem[i]);
+    for(auto &constraint : SK.constraint) {
+        ConstraintBase *ct = &constraint;
         if(ct->type != type) continue;
 
         if(ct->entityA != entityA) continue;

diff --git a/src/constrainteq.cpp b/src/constrainteq.cpp
@@ -172,7 +172,7 @@ void ConstraintBase::ModifyToSatisfy() {
 
         // These equations are written in the form f(...) - d = 0, where
         // d is the value of the valA.
-        valA += (l.elem[0].e)->Eval();
+        valA += (l[0].e)->Eval();
 
         l.Clear();
     }

diff --git a/src/describescreen.cpp b/src/describescreen.cpp
@@ -35,7 +35,7 @@ void TextWindow::ScreenSetTtfFont(int link, uint32_t v) {
     if(!r) return;
 
     SS.UndoRemember();
-    r->font = SS.fonts.l.elem[i].FontFileBaseName();
+    r->font = SS.fonts.l[i].FontFileBaseName();
     SS.MarkGroupDirty(r->group);
     SS.ScheduleShowTW();
 }
@@ -177,7 +177,7 @@ void TextWindow::DescribeSelection() {
                     SS.fonts.LoadAll();
                     int i;
                     for(i = 0; i < SS.fonts.l.n; i++) {
-                        TtfFont *tf = &(SS.fonts.l.elem[i]);
+                        TtfFont *tf = &(SS.fonts.l[i]);
                         if(e->font == tf->FontFileBaseName()) {
                             Printf(false, "%Bp    %s",
                                 (i & 1) ? 'd' : 'a',

diff --git a/src/draw.cpp b/src/draw.cpp
@@ -233,7 +233,7 @@ void GraphicsWindow::GroupSelection() {
     gs = {};
     int i;
     for(i = 0; i < selection.n; i++) {
-        Selection *s = &(selection.elem[i]);
+        Selection *s = &(selection[i]);
         if(s->entity.v) {
             (gs.n)++;
 
@@ -329,7 +329,8 @@ Lighting GraphicsWindow::GetLighting() const {
 
 GraphicsWindow::Selection GraphicsWindow::ChooseFromHoverToSelect() {
     Selection sel = {};
-    if(hoverList.n == 0) return sel;
+    if(hoverList.IsEmpty())
+        return sel;
 
     Group *activeGroup = SK.GetGroup(SS.GW.activeGroup);
     int bestOrder = -1;

diff --git a/src/drawentity.cpp b/src/drawentity.cpp
@@ -22,30 +22,30 @@ void Entity::GenerateEdges(SEdgeList *el) {
 
     int i, j;
     for(i = 0; i < sbl->l.n; i++) {
-        SBezier *sb = &(sbl->l.elem[i]);
+        SBezier *sb = &(sbl->l[i]);
 
         List<Vector> lv = {};
         sb->MakePwlInto(&lv);
         for(j = 1; j < lv.n; j++) {
-            el->AddEdge(lv.elem[j-1], lv.elem[j], style.v, i);
+            el->AddEdge(lv[j-1], lv[j], style.v, i);
         }
         lv.Clear();
     }
 }
 
 SBezierList *Entity::GetOrGenerateBezierCurves() {
-    if(beziers.l.n == 0)
+    if(beziers.l.IsEmpty())
         GenerateBezierCurves(&beziers);
     return &beziers;
 }
 
 SEdgeList *Entity::GetOrGenerateEdges() {
-    if(edges.l.n != 0) {
+    if(!edges.l.IsEmpty()) {
         if(EXACT(edgesChordTol == SS.ChordTolMm()))
             return &edges;
         edges.l.Clear();
     }
-    if(edges.l.n == 0)
+    if(edges.l.IsEmpty())
         GenerateEdges(&edges);
     edgesChordTol = SS.ChordTolMm();
     return &edges;
@@ -55,7 +55,7 @@ BBox Entity::GetOrGenerateScreenBBox(bool *hasBBox) {
     SBezierList *sbl = GetOrGenerateBezierCurves();
 
     // We don't bother with bounding boxes for workplanes, etc.
-    *hasBBox = (IsPoint() || IsNormal() || sbl->l.n > 0);
+    *hasBBox = (IsPoint() || IsNormal() || !sbl->l.IsEmpty());
     if(!*hasBBox) return {};
 
     if(screenBBoxValid)
@@ -67,16 +67,14 @@ BBox Entity::GetOrGenerateScreenBBox(bool *hasBBox) {
     } else if(IsNormal()) {
         Vector proj = SK.GetEntity(point[0])->PointGetNum();
         screenBBox = BBox::From(proj, proj);
-    } else if(sbl->l.n > 0) {
-        Vector first = SS.GW.ProjectPoint3(sbl->l.elem[0].ctrl[0]);
+    } else if(!sbl->l.IsEmpty()) {
+        Vector first = SS.GW.ProjectPoint3(sbl->l[0].ctrl[0]);
         screenBBox = BBox::From(first, first);
-        for(int i = 0; i < sbl->l.n; i++) {
-            SBezier *sb = &sbl->l.elem[i];
-            for(int i = 0; i <= sb->deg; i++) {
-                screenBBox.Include(SS.GW.ProjectPoint3(sb->ctrl[i]));
-            }
+        for(auto &sb : sbl->l) {
+            for(int i = 0; i < sb.deg; ++i) { screenBBox.Include(SS.GW.ProjectPoint3(sb.ctrl[i])); }
         }
-    } else ssassert(false, "Expected entity to be a point or have beziers");
+    } else
+        ssassert(false, "Expected entity to be a point or have beziers");
 
     screenBBoxValid = true;
     return screenBBox;
@@ -441,7 +439,7 @@ void Entity::GenerateBezierCurves(SBezierList *sbl) const {
 
     // Record our style for all of the Beziers that we just created.
     for(; i < sbl->l.n; i++) {
-        sbl->l.elem[i].auxA = style.v;
+        sbl->l[i].auxA = style.v;
     }
 }