Index: client/pkgr.eagle
==================================================================
--- client/pkgr.eagle
+++ client/pkgr.eagle
@@ -358,19 +358,19 @@
                 Eagle {
                   #
                   # NOTE: The target language is Eagle, which is evaluating
                   #       this script.  No special handling is needed here.
                   #
-                  return [uplevel 1 $script(inner)]
+                  return [uplevel #0 $script(inner)]
                 }
                 Tcl {
                   #
                   # NOTE: The target language is Tcl; therefore, a bit of
                   #       special handling is needed here.
                   #
-                  {%tclMustBeReady%}; return [tcl eval \
-                      [tcl master] $script(inner)]
+                  {%tclMustBeReady%}; return [tcl eval [tcl master] [list \
+                      uplevel #0 $script(inner)]]
                 }
                 default {
                   error "unsupported language"
                 }
               }

Index: client/pkgr.eagle.harpy
==================================================================
--- client/pkgr.eagle.harpy
+++ client/pkgr.eagle.harpy
@@ -19,32 +19,32 @@
 <Certificate xmlns="https://eagle.to/2011/harpy"
              xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
              xmlns:xsd="http://www.w3.org/2001/XMLSchema">
   <Protocol>None</Protocol>
   <Vendor>Mistachkin Systems</Vendor>
-  <Id>806638d7-a7a4-4814-8666-13957f82bc43</Id>
+  <Id>b46c698d-6a49-4b2b-92c5-520602976c27</Id>
   <HashAlgorithm>SHA512</HashAlgorithm>
   <EntityType>Script</EntityType>
-  <TimeStamp>2016-08-13T20:22:31.1601562Z</TimeStamp>
+  <TimeStamp>2016-08-15T03:06:24.9841328Z</TimeStamp>
   <Duration>-1.00:00:00</Duration>
   <Key>0x2c322765603b5278</Key>
   <Signature>
-    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
+    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
   </Signature>
 </Certificate>