diff --git a/src/mem/corealloc.h b/src/mem/corealloc.h
index 0105df0..87d4434 100644
--- a/src/mem/corealloc.h
+++ b/src/mem/corealloc.h
@@ -176,7 +176,7 @@ namespace snmalloc
      *   - Allocating stub in the message queue
      * Note this is not performance critical as very infrequently called.
      */
-    void* small_alloc_one(size_t size)
+    capptr::Alloc<void> small_alloc_one(size_t size)
     {
       SNMALLOC_ASSERT(attached_cache != nullptr);
       auto domesticate =
@@ -285,7 +285,8 @@ namespace snmalloc
         [local_state](freelist::QueuePtr p) SNMALLOC_FAST_PATH_LAMBDA {
           return capptr_domesticate<SharedStateHandle>(local_state, p);
         };
-      void* p = finish_alloc_no_zero(fl.take(key, domesticate), sizeclass);
+      capptr::Alloc<void> p =
+        finish_alloc_no_zero(fl.take(key, domesticate), sizeclass);
 
 #ifdef SNMALLOC_CHECK_CLIENT
       // Check free list is well-formed on platforms with
@@ -321,11 +322,11 @@ namespace snmalloc
       auto start_of_slab = pointer_align_down<void>(
         p, snmalloc::sizeclass_to_slab_size(sizeclass));
       // TODO Add bounds correctly here
-      chunk_record->chunk = capptr::Chunk<void>(start_of_slab);
+      chunk_record->chunk = capptr::Chunk<void>(start_of_slab.unsafe_ptr());
 
 #ifdef SNMALLOC_TRACING
-      std::cout << "Slab " << start_of_slab << " is unused, Object sizeclass "
-                << sizeclass << std::endl;
+      std::cout << "Slab " << start_of_slab.unsafe_ptr()
+                << " is unused, Object sizeclass " << sizeclass << std::endl;
 #endif
       return chunk_record;
     }
@@ -654,7 +655,7 @@ namespace snmalloc
     }
 
     template<ZeroMem zero_mem>
-    SNMALLOC_SLOW_PATH void*
+    SNMALLOC_SLOW_PATH capptr::Alloc<void>
     small_alloc(sizeclass_t sizeclass, freelist::Iter<>& fast_free_list)
     {
       size_t rsize = sizeclass_to_size(sizeclass);
@@ -716,7 +717,7 @@ namespace snmalloc
     }
 
     template<ZeroMem zero_mem>
-    SNMALLOC_SLOW_PATH void* small_alloc_slow(
+    SNMALLOC_SLOW_PATH capptr::Alloc<void> small_alloc_slow(
       sizeclass_t sizeclass, freelist::Iter<>& fast_free_list, size_t rsize)
     {
       // No existing free list get a new slab.
diff --git a/src/mem/localalloc.h b/src/mem/localalloc.h
index 38ee42b..a39eb04 100644
--- a/src/mem/localalloc.h
+++ b/src/mem/localalloc.h
@@ -167,7 +167,7 @@ namespace snmalloc
      * passed to the core allocator.
      */
     template<ZeroMem zero_mem>
-    SNMALLOC_SLOW_PATH void* alloc_not_small(size_t size)
+    SNMALLOC_SLOW_PATH capptr::Alloc<void> alloc_not_small(size_t size)
     {
       if (size == 0)
       {
@@ -203,12 +203,12 @@ namespace snmalloc
             chunk.unsafe_ptr(), size);
         }
 
-        return chunk.unsafe_ptr();
+        return capptr_chunk_is_alloc(capptr_to_user_address_control(chunk));
       });
     }
 
     template<ZeroMem zero_mem>
-    SNMALLOC_FAST_PATH void* small_alloc(size_t size)
+    SNMALLOC_FAST_PATH capptr::Alloc<void> small_alloc(size_t size)
     {
       //      SNMALLOC_ASSUME(size <= sizeclass_to_size(NUM_SIZECLASSES));
       auto domesticate = [this](freelist::QueuePtr p)
@@ -430,11 +430,10 @@ namespace snmalloc
       {
         // Small allocations are more likely. Improve
         // branch prediction by placing this case first.
-        return small_alloc<zero_mem>(size);
+        return capptr_reveal(small_alloc<zero_mem>(size));
       }
 
-      // TODO capptr_reveal?
-      return alloc_not_small<zero_mem>(size);
+      return capptr_reveal(alloc_not_small<zero_mem>(size));
 #endif
     }
 
diff --git a/src/mem/localcache.h b/src/mem/localcache.h
index 1ee55a8..b7c2be7 100644
--- a/src/mem/localcache.h
+++ b/src/mem/localcache.h
@@ -12,25 +12,24 @@ namespace snmalloc
 {
   using Stats = AllocStats<NUM_SIZECLASSES, NUM_LARGE_CLASSES>;
 
-  inline static SNMALLOC_FAST_PATH void*
+  inline static SNMALLOC_FAST_PATH capptr::Alloc<void>
   finish_alloc_no_zero(freelist::HeadPtr p, sizeclass_t sizeclass)
   {
     SNMALLOC_ASSERT(Metaslab::is_start_of_object(sizeclass, address_cast(p)));
     UNUSED(sizeclass);
 
-    auto r = capptr_reveal(p.as_void());
-
-    return r;
+    return p.as_void();
   }
 
   template<ZeroMem zero_mem, typename SharedStateHandle>
-  inline static SNMALLOC_FAST_PATH void*
+  inline static SNMALLOC_FAST_PATH capptr::Alloc<void>
   finish_alloc(freelist::HeadPtr p, sizeclass_t sizeclass)
   {
     auto r = finish_alloc_no_zero(p, sizeclass);
 
     if constexpr (zero_mem == YesZero)
-      SharedStateHandle::Pal::zero(r, sizeclass_to_size(sizeclass));
+      SharedStateHandle::Pal::zero(
+        r.unsafe_ptr(), sizeclass_to_size(sizeclass));
 
     // TODO: Should this be zeroing the free Object state, in the non-zeroing
     // case?
@@ -105,7 +104,7 @@ namespace snmalloc
       typename SharedStateHandle,
       typename Slowpath,
       typename Domesticator>
-    SNMALLOC_FAST_PATH void*
+    SNMALLOC_FAST_PATH capptr::Alloc<void>
     alloc(Domesticator domesticate, size_t size, Slowpath slowpath)
     {
       auto& key = entropy.get_free_list_key();