diff --git a/lib/puppet/functions/to_python.rb b/lib/puppet/functions/to_python.rb
index c8d1468fe..9e9a38769 100644
--- a/lib/puppet/functions/to_python.rb
+++ b/lib/puppet/functions/to_python.rb
@@ -25,13 +25,18 @@
   # @return [String]
   #   The String representation of the object
   def to_python(object)
-    case object
+    serialized = Puppet::Pops::Serialization::ToDataConverter.convert(object, rich_data: true)
+    serialized_to_python(serialized)
+  end
+
+  def serialized_to_python(serialized)
+    case serialized
     when true then 'True'
     when false then 'False'
-    when :undef then 'None'
-    when Array then "[#{object.map { |x| to_python(x) }.join(', ')}]"
-    when Hash then "{#{object.map { |k, v| "#{to_python(k)}: #{to_python(v)}" }.join(', ')}}"
-    else object.inspect
+    when nil then 'None'
+    when Array then "[#{serialized.map { |x| serialized_to_python(x) }.join(', ')}]"
+    when Hash then "{#{serialized.map { |k, v| "#{serialized_to_python(k)}: #{serialized_to_python(v)}" }.join(', ')}}"
+    else serialized.inspect
     end
   end
 end
diff --git a/lib/puppet/functions/to_ruby.rb b/lib/puppet/functions/to_ruby.rb
index ab37abd10..8e89c9be6 100644
--- a/lib/puppet/functions/to_ruby.rb
+++ b/lib/puppet/functions/to_ruby.rb
@@ -25,11 +25,15 @@
   # @return [String]
   #   The String representation of the object
   def to_ruby(object)
-    case object
-    when :undef then 'nil'
-    when Array then "[#{object.map { |x| to_ruby(x) }.join(', ')}]"
-    when Hash then "{#{object.map { |k, v| "#{to_ruby(k)} => #{to_ruby(v)}" }.join(', ')}}"
-    else object.inspect
+    serialized = Puppet::Pops::Serialization::ToDataConverter.convert(object, rich_data: true)
+    serialized_to_ruby(serialized)
+  end
+
+  def serialized_to_ruby(serialized)
+    case serialized
+    when Array then "[#{serialized.map { |x| serialized_to_ruby(x) }.join(', ')}]"
+    when Hash then "{#{serialized.map { |k, v| "#{serialized_to_ruby(k)} => #{serialized_to_ruby(v)}" }.join(', ')}}"
+    else serialized.inspect
     end
   end
 end
diff --git a/spec/functions/to_python_spec.rb b/spec/functions/to_python_spec.rb
index 17c7ca7d0..cea8a80cf 100644
--- a/spec/functions/to_python_spec.rb
+++ b/spec/functions/to_python_spec.rb
@@ -5,7 +5,7 @@
 describe 'to_python' do
   it { is_expected.not_to eq(nil) }
   it { is_expected.to run.with_params('').and_return('""') }
-  it { is_expected.to run.with_params(:undef).and_return('None') }
+  it { is_expected.to run.with_params(nil).and_return('None') }
   it { is_expected.to run.with_params(true).and_return('True') }
   it { is_expected.to run.with_params(false).and_return('False') }
   it { is_expected.to run.with_params('one').and_return('"one"') }
diff --git a/spec/functions/to_ruby_spec.rb b/spec/functions/to_ruby_spec.rb
index a91319db7..f269a878c 100644
--- a/spec/functions/to_ruby_spec.rb
+++ b/spec/functions/to_ruby_spec.rb
@@ -5,7 +5,7 @@
 describe 'to_ruby' do
   it { is_expected.not_to eq(nil) }
   it { is_expected.to run.with_params('').and_return('""') }
-  it { is_expected.to run.with_params(:undef).and_return('nil') }
+  it { is_expected.to run.with_params(nil).and_return('nil') }
   it { is_expected.to run.with_params(true).and_return('true') }
   it { is_expected.to run.with_params('one').and_return('"one"') }
   it { is_expected.to run.with_params(42).and_return('42') }