diff --git a/include/vis/leafbits.hh b/include/vis/leafbits.hh
index 508fcc3f..8b69e093 100644
--- a/include/vis/leafbits.hh
+++ b/include/vis/leafbits.hh
@@ -23,92 +23,68 @@
 #include <cstring>
 #include <common/cmdlib.hh>
 
-/* Use some GCC builtins */
-#if !defined(ffsl) && defined(__GNUC__)
-#define ffsl __builtin_ffsl
-#elif defined(_WIN32)
-#include <intrin.h>
-inline int ffsl(long int val)
-{
-    unsigned long indexout;
-    unsigned char res = _BitScanForward(&indexout, val);
-    if (!res)
-        return 0;
-    else
-        return indexout + 1;
-}
-#endif
-
 class leafbits_t
 {
-    size_t _size;
-    uint32_t *bits;
+    size_t _size = 0;
+    std::unique_ptr<uint32_t[]> bits {};
 
     constexpr size_t block_size() const { return (_size + mask) >> shift; }
-    uint32_t *allocate() { return new uint32_t[block_size()]{}; }
-    constexpr size_t byte_size() const { return block_size() * sizeof(*bits); }
+    inline std::unique_ptr<uint32_t[]> allocate() { return std::make_unique<uint32_t[]>(block_size()); }
+    constexpr size_t byte_size() const { return block_size() * sizeof(*bits.get()); }
 
 public:
     static constexpr size_t shift = 5;
     static constexpr size_t mask = (sizeof(uint32_t) << 3) - 1UL;
 
-    constexpr leafbits_t() : _size(0), bits(nullptr) { }
+    leafbits_t() = default;
 
-    leafbits_t(size_t size) : _size(size), bits(allocate()) { }
+    inline leafbits_t(size_t size) : _size(size), bits(allocate()) { }
 
-    leafbits_t(const leafbits_t &copy) : leafbits_t(copy._size) { memcpy(bits, copy.bits, byte_size()); }
+    inline leafbits_t(const leafbits_t &copy) : leafbits_t(copy._size) { memcpy(bits.get(), copy.bits.get(), byte_size()); }
 
-    constexpr leafbits_t(leafbits_t &&move) noexcept : _size(move._size), bits(move.bits)
+    inline leafbits_t(leafbits_t &&move) noexcept : _size(move._size), bits(std::move(move.bits))
     {
         move._size = 0;
-        move.bits = nullptr;
     }
 
-    leafbits_t &operator=(leafbits_t &&move) noexcept
+    inline leafbits_t &operator=(leafbits_t &&move) noexcept
     {
         _size = move._size;
-        bits = move.bits;
+        bits = std::move(move.bits);
 
         move._size = 0;
-        move.bits = nullptr;
 
         return *this;
     }
 
-    leafbits_t &operator=(const leafbits_t &copy)
+    inline leafbits_t &operator=(const leafbits_t &copy)
     {
         resize(copy._size);
-        memcpy(bits, copy.bits, byte_size());
+        memcpy(bits.get(), copy.bits.get(), byte_size());
         return *this;
     }
 
-    ~leafbits_t()
-    {
-        delete[] bits;
-        bits = nullptr;
-    }
-
     constexpr const size_t &size() const { return _size; }
 
     // this clears existing bit data!
-    void resize(size_t new_size) { *this = leafbits_t(new_size); }
+    inline void resize(size_t new_size) { *this = leafbits_t(new_size); }
 
-    void clear() { memset(bits, 0, byte_size()); }
+    inline void clear() { memset(bits.get(), 0, byte_size()); }
 
-    constexpr uint32_t *data() { return bits; }
-    constexpr const uint32_t *data() const { return bits; }
+    inline uint32_t *data() { return bits.get(); }
+    inline const uint32_t *data() const { return bits.get(); }
 
-    constexpr bool operator[](const size_t &index) const { return !!(bits[index >> shift] & nth_bit(index & mask)); }
+    inline bool operator[](const size_t &index) const { return !!(bits[index >> shift] & nth_bit(index & mask)); }
 
     struct reference
     {
-        uint32_t *bits;
+        std::unique_ptr<uint32_t[]> &bits;
         size_t block_index;
         size_t mask;
 
-        constexpr operator bool() const { return !!(bits[block_index] & mask); }
+        inline explicit operator bool() const { return !!(bits[block_index] & mask); }
 
-        reference &operator=(bool value)
+        inline reference &operator=(bool value)
         {
             if (value)
                 bits[block_index] |= mask;
@@ -119,5 +95,5 @@ public:
         }
     };
 
-    constexpr reference operator[](const size_t &index) { return {bits, index >> shift, nth_bit(index & mask)}; }
+    inline reference operator[](const size_t &index) { return {bits, index >> shift, nth_bit(index & mask)}; }
 };
diff --git a/vis/vis.cc b/vis/vis.cc
index 0e9951e6..43cab105 100644
--- a/vis/vis.cc
+++ b/vis/vis.cc
@@ -13,6 +13,22 @@
 #include <common/parallel.hh>
 #include <fmt/chrono.h>
 
+/* Use some GCC builtins */
+#if !defined(ffsl) && defined(__GNUC__)
+#define ffsl __builtin_ffsl
+#elif defined(_WIN32)
+#include <intrin.h>
+inline int ffsl(long int val)
+{
+    unsigned long indexout;
+    unsigned char res = _BitScanForward(&indexout, val);
+    if (!res)
+        return 0;
+    else
+        return indexout + 1;
+}
+#endif
+
 /*
  * If the portal file is "PRT2" format, then the leafs we are dealing with are
  * really clusters of leaves. So, after the vis job is done we need to expand
@@ -300,7 +316,6 @@ static void PortalCompleted(portal_t *completed)
     int i, j, k, bit, numblocks;
     int leafnum;
     const portal_t *p, *p2;
-    const uint32_t *might, *vis;
     uint32_t changed;
 
     portal_mutex.lock();
@@ -317,8 +332,8 @@ static void PortalCompleted(portal_t *completed)
         if (p->status != pstat_done)
             continue;
 
-        might = p->mightsee.data();
-        vis = p->visbits.data();
+        auto might = p->mightsee.data();
+        auto vis = p->visbits.data();
         numblocks = (portalleafs + leafbits_t::mask) >> leafbits_t::shift;
         for (j = 0; j < numblocks; j++) {
             changed = might[j] & ~vis[j];