diff --git a/src/cpp/shared-table.cpp b/src/cpp/shared-table.cpp
index 1baf7dd..8728497 100644
--- a/src/cpp/shared-table.cpp
+++ b/src/cpp/shared-table.cpp
@@ -4,7 +4,6 @@
 
 #include <mutex>
 #include <cassert>
-#include <limits.h>
 
 namespace effil {
 
diff --git a/src/cpp/stored-object.cpp b/src/cpp/stored-object.cpp
index 8d016e3..207f76d 100644
--- a/src/cpp/stored-object.cpp
+++ b/src/cpp/stored-object.cpp
@@ -188,25 +188,24 @@ StoredObject createStoredObject(GCObjectHandle handle) {
     return std::make_unique<TableHolder>(handle);
 }
 
-sol::optional<bool> storedObjectToBool(const StoredObject& sobj) {
-    auto ptr = dynamic_cast<PrimitiveHolder<bool>*>(sobj.get());
+template<typename DataType>
+sol::optional<DataType> getPrimitiveHolderData(const StoredObject& sobj) {
+    auto ptr = dynamic_cast<PrimitiveHolder<DataType>*>(sobj.get());
     if (ptr)
         return ptr->getData();
-    return sol::optional<bool>();
+    return sol::optional<DataType>();
+}
+
+sol::optional<bool> storedObjectToBool(const StoredObject& sobj) {
+    return getPrimitiveHolderData<bool>(sobj);
 }
 
 sol::optional<double> storedObjectToDouble(const StoredObject& sobj) {
-    auto ptr = dynamic_cast<PrimitiveHolder<double>*>(sobj.get());
-    if (ptr)
-        return ptr->getData();
-    return sol::optional<double>();
+    return getPrimitiveHolderData<double>(sobj);
 }
 
 sol::optional<std::string> storedObjectToString(const StoredObject& sobj) {
-    auto ptr = dynamic_cast<PrimitiveHolder<std::string>*>(sobj.get());
-    if (ptr)
-        return ptr->getData();
-    return sol::optional<std::string>();
+    return getPrimitiveHolderData<std::string>(sobj);
 }
 
 } // effil
diff --git a/src/cpp/stored-object.h b/src/cpp/stored-object.h
index b6755be..1c9a132 100644
--- a/src/cpp/stored-object.h
+++ b/src/cpp/stored-object.h
@@ -1,7 +1,5 @@
 #pragma once
 
-#include "utils.h"
-
 #include "garbage-collector.h"
 
 #include <sol.hpp>