--- a/bin/curvecalc	Mon Jun 10 19:56:42 2013 +0000
+++ b/bin/curvecalc	Mon Jun 10 19:57:15 2013 +0000
@@ -173,21 +173,19 @@
             self.makeSubterm(newname, withCurve=wc)
         dialog.hide()
 
-    def currentSong(self, current=None):
-        def fin(current):
+    def currentSong(self):
+
+        with self.graph.currentState(
+                tripleFilter=(self.session, L9['currentSong'], None)
+        ) as current:
             return current.value(self.session, L9['currentSong'])
-        if current is None:
-            with self.graph.currentState() as current:
-                return fin(current)
-        else:
-            return fin(current)
 
-    def songSubtermsContext(self, current=None):
-        return self.currentSong(current=current)
+    def songSubtermsContext(self):
+        return self.currentSong()
 
     def makeSubterm(self, newname, withCurve=False, expr=None, sub=None):
         with self.graph.currentState() as current:
-            song = self.currentSong(current=current)
+            song = self.currentSong()
             for i in range(1000):
                 uri = song + "/subterm/%d" % i
                 if (uri, None, None) not in current: