diff --git a/include/beman/inplace_vector/inplace_vector.hpp b/include/beman/inplace_vector/inplace_vector.hpp
index 500b3f8..4eecb38 100644
--- a/include/beman/inplace_vector/inplace_vector.hpp
+++ b/include/beman/inplace_vector/inplace_vector.hpp
@@ -112,10 +112,7 @@ template <class T, size_t N> struct trivial {
   using size_type = smallest_size_t<N>;
 
 private:
-  // If value_type is const, then const std::array of non-const elements:
-  using array_based_storage =
-      std::conditional_t<!std::is_const_v<T>, std::array<T, N>,
-                         const std::array<std::remove_const_t<T>, N>>;
+  using array_based_storage = std::array<std::remove_const_t<T>, N>;
   alignas(alignof(T)) array_based_storage storage_data_{};
   size_type storage_size_ = 0;
 
@@ -123,7 +120,7 @@ template <class T, size_t N> struct trivial {
   constexpr const T *storage_data() const noexcept {
     return storage_data_.data();
   }
-  constexpr T *storage_data() noexcept { return storage_data_.data(); }
+  constexpr auto storage_data() noexcept { return storage_data_.data(); }
   constexpr size_type storage_size() const noexcept { return storage_size_; }
   constexpr void unsafe_set_size(size_t new_size) noexcept {
     IV_EXPECT(size_type(new_size) <= N && "new_size out-of-bounds [0, N]");
@@ -161,9 +158,7 @@ template <class T, size_t N> struct non_trivial {
   using size_type = smallest_size_t<N>;
 
 private:
-  using byte_based_storage = std::conditional_t<
-      !std::is_const_v<T>, raw_byte_based_storage<T, N>,
-      const raw_byte_based_storage<std::remove_const_t<T>, N>>;
+  using byte_based_storage = raw_byte_based_storage<std::remove_const_t<T>, N>;
   byte_based_storage storage_data_{}; // BUGBUG: test SIMD types
   size_type storage_size_ = 0;
 
@@ -171,7 +166,9 @@ template <class T, size_t N> struct non_trivial {
   constexpr const T *storage_data() const noexcept {
     return storage_data_.storage_data(0);
   }
-  constexpr T *storage_data() noexcept { return storage_data_.storage_data(0); }
+  constexpr auto storage_data() noexcept {
+    return storage_data_.storage_data(0);
+  }
   constexpr size_type storage_size() const noexcept { return storage_size_; }
   constexpr void unsafe_set_size(size_t new_size) noexcept {
     IV_EXPECT(size_type(new_size) <= N && "new_size out-of-bounds [0, N)");
@@ -323,7 +320,7 @@ struct inplace_vector_base : private storage::storage_for<T, N> {
     requires(std::constructible_from<T, Args...>)
   {
     IV_EXPECT(size() < capacity() && "inplace_vector out-of-memory");
-    std::construct_at(end(), std::forward<Args>(args)...);
+    std::construct_at(storage_data() + size(), std::forward<Args>(args)...);
     unsafe_set_size(size() + size_type(1));
     return this->back();
   }