diff --git a/lib/puppet/provider/entropy_keywords/parsed.rb b/lib/puppet/provider/entropy_keywords/parsed.rb
index 85b895d..bf309fe 100644
--- a/lib/puppet/provider/entropy_keywords/parsed.rb
+++ b/lib/puppet/provider/entropy_keywords/parsed.rb
@@ -23,9 +23,7 @@ Puppet::Type.type(:entropy_keywords).provide(:parsed,
   record_line :parsed,
     :fields => %w{keyword operator package version repo name},
     :match   => %r{^(\S+)\s+([<>]?=)?([a-zA-Z+\/-]*)(?:-(\d+(?:\.\d+)*[a-z]*(?:_(?:alpha|beta|pre|p|rc)\d*)?(?:-r\d+)?))?(?:\s+repo=([a-zA-Z0-9\._-]+))?\s+## Puppet Name: (.*)\s*$},
-    :block_eval => :instance do
-
-    def to_line(record)
+    :to_line => proc { |record|
       line = record[:keyword] + " "
       line += record[:operator]        if record[:operator]
       line += record[:package]         if record[:package]
@@ -34,10 +32,8 @@ Puppet::Type.type(:entropy_keywords).provide(:parsed,
       line += " ## Puppet Name: " + record[:name]
 
       line
-    end
+    }
 
-  end
-   
 end
 
 # vim: set ts=2 shiftwidth=2 expandtab :
diff --git a/lib/puppet/provider/entropy_mask/parsed.rb b/lib/puppet/provider/entropy_mask/parsed.rb
index 477f1b9..d86f510 100644
--- a/lib/puppet/provider/entropy_mask/parsed.rb
+++ b/lib/puppet/provider/entropy_mask/parsed.rb
@@ -23,12 +23,10 @@ Puppet::Type.type(:entropy_mask).provide(:parsed,
   record_line :parsed,
     :fields => %w{operator package version slot use tag repo name},
     :match   => %r{^([<>]?=)?([a-zA-Z+\/-]*)(?:-(\d+(?:\.\d+)*[a-z]*(?:_(?:alpha|beta|pre|p|rc)\d*)?(?:-r\d+)?))?(?::([a-zA-Z0-9._-]+))?(?:\[([^\]]*)\])?(?:#([a-zA-Z0-9._-]+))?(?:::([a-zA-Z0-9\._-]+))?\s+#+ Puppet Name: (.*)\s*$},
-    :block_eval => :instance do
-
-    def to_line(record)
+    :to_line => proc { |record|
       line = ""
       line += record[:operator]        if record[:operator]
-      line += record[:package]
+      line += record[:package]         if record[:package]
       line += "-" + record[:version]   if record[:version]
       line += ":" + record[:slot]      if record[:slot]
       line += "[" + record[:use] + "]" if record[:use]
@@ -37,10 +35,8 @@ Puppet::Type.type(:entropy_mask).provide(:parsed,
       line += " ## Puppet Name: " + record[:name]
 
       line
-    end
+    }
 
-  end
-   
 end
 
 # vim: set ts=2 shiftwidth=2 expandtab :
diff --git a/lib/puppet/provider/entropy_splitdebug/parsed.rb b/lib/puppet/provider/entropy_splitdebug/parsed.rb
index 9b84a71..0e862c4 100644
--- a/lib/puppet/provider/entropy_splitdebug/parsed.rb
+++ b/lib/puppet/provider/entropy_splitdebug/parsed.rb
@@ -23,12 +23,10 @@ Puppet::Type.type(:entropy_splitdebug).provide(:parsed,
   record_line :parsed,
     :fields => %w{operator package version slot use tag repo name},
     :match   => %r{^([<>]?=)?([a-zA-Z+\/-]*)(?:-(\d+(?:\.\d+)*[a-z]*(?:_(?:alpha|beta|pre|p|rc)\d*)?(?:-r\d+)?))?(?::([a-zA-Z0-9\._-]+))?(?:\[([^\]]*)\])?(?:#([a-zA-Z0-9\._-]+))?(?:::([a-zA-Z0-9\._-]+))?\s+#+ Puppet Name: (.*)\s*$},
-    :block_eval => :instance do
-
-    def to_line(record)
+    :to_line => proc { |record|
       line = ""
       line += record[:operator]        if record[:operator]
-      line += record[:package]
+      line += record[:package]         if record[:package]
       line += "-" + record[:version]   if record[:version]
       line += ":" + record[:slot]      if record[:slot]
       line += "[" + record[:use] + "]" if record[:use]
@@ -37,9 +35,7 @@ Puppet::Type.type(:entropy_splitdebug).provide(:parsed,
       line += " ## Puppet Name: " + record[:name]
 
       line
-    end
-
-  end
+    }
    
 end
 
diff --git a/lib/puppet/provider/entropy_splitdebug_mask/parsed.rb b/lib/puppet/provider/entropy_splitdebug_mask/parsed.rb
index c63d403..b890600 100644
--- a/lib/puppet/provider/entropy_splitdebug_mask/parsed.rb
+++ b/lib/puppet/provider/entropy_splitdebug_mask/parsed.rb
@@ -23,12 +23,10 @@ Puppet::Type.type(:entropy_splitdebug_mask).provide(:parsed,
   record_line :parsed,
     :fields => %w{operator package version slot use tag repo name},
     :match   => %r{^([<>]?=)?([a-zA-Z+\/-]*)(?:-(\d+(?:\.\d+)*[a-z]*(?:_(?:alpha|beta|pre|p|rc)\d*)?(?:-r\d+)?))?(?::([a-zA-Z0-9._-]+))?(?:\[([^\]]*)\])?(?:#([a-zA-Z0-9._-]+))?(?:::([a-zA-Z0-9._-]+))?\s+#+ Puppet Name: (.*)\s*$},
-    :block_eval => :instance do
-
-    def to_line(record)
+    :to_line => proc { |record|
       line = ""
       line += record[:operator]        if record[:operator]
-      line += record[:package]
+      line += record[:package]         if record[:package]
       line += "-" + record[:version]   if record[:version]
       line += ":" + record[:slot]      if record[:slot]
       line += "[" + record[:use] + "]" if record[:use]
@@ -37,9 +35,7 @@ Puppet::Type.type(:entropy_splitdebug_mask).provide(:parsed,
       line += " ## Puppet Name: " + record[:name]
 
       line
-    end
-
-  end
+    }
    
 end
 
diff --git a/lib/puppet/provider/entropy_unmask/parsed.rb b/lib/puppet/provider/entropy_unmask/parsed.rb
index 86f59f1..6d4f4e8 100644
--- a/lib/puppet/provider/entropy_unmask/parsed.rb
+++ b/lib/puppet/provider/entropy_unmask/parsed.rb
@@ -23,12 +23,10 @@ Puppet::Type.type(:entropy_unmask).provide(:parsed,
   record_line :parsed,
     :fields => %w{operator package version slot use tag repo name},
     :match   => %r{^([<>]?=)?([a-zA-Z+\/-]*)(?:-(\d+(?:\.\d+)*[a-z]*(?:_(?:alpha|beta|pre|p|rc)\d*)?(?:-r\d+)?))?(?::([a-zA-Z0-9._-]+))?(?:\[([^\]]*)\])?(?:#([a-zA-Z0-9._-]+))?(?:::([a-zA-Z0-9._-]+))?\s+#+ Puppet Name: (.*)\s*$},
-    :block_eval => :instance do
-
-    def to_line(record)
+    :to_line => proc { |record|
       line = ""
       line += record[:operator]        if record[:operator]
-      line += record[:package]
+      line += record[:package]         if record[:package]
       line += "-" + record[:version]   if record[:version]
       line += ":" + record[:slot]      if record[:slot]
       line += "[" + record[:use] + "]" if record[:use]
@@ -37,9 +35,7 @@ Puppet::Type.type(:entropy_unmask).provide(:parsed,
       line += " ## Puppet Name: " + record[:name]
 
       line
-    end
-
-  end
+    }
    
 end