3 files changed, 5 insertions, 8 deletions

diff --git a/lisp/cedet/srecode/extract.el b/lisp/cedet/srecode/extract.el
index 3e2c4ebd12c..276f2ace2f1 100644
--- a/lisp/cedet/srecode/extract.el
+++ b/lisp/cedet/srecode/extract.el
@@ -88,7 +88,7 @@ the dictionary entries were for that block of text."
     (save-restriction
       (narrow-to-region start end)
       (let ((dict (srecode-create-dictionary t))
-            (state (srecode-extract-state "state"))
+            (state (srecode-extract-state))
             )
         (goto-char start)
         (srecode-extract-method template dict state)
diff --git a/lisp/cedet/srecode/map.el b/lisp/cedet/srecode/map.el
index f885b49614d..1d419c93ba7 100644
--- a/lisp/cedet/srecode/map.el
+++ b/lisp/cedet/srecode/map.el
@@ -270,7 +270,7 @@ if that file is NEW, otherwise assume the mode has not changed."
   (if (not srecode-map-save-file)
       ;; 0) Create a MAP when in no save file mode.
       (when (not srecode-current-map)
-        (setq srecode-current-map (srecode-map "SRecode Map"))
+        (setq srecode-current-map (srecode-map))
         (message "SRecode map created in non-save mode.")
         )
 
@@ -290,8 +290,7 @@ if that file is NEW, otherwise assume the mode has not changed."
             (error "Change your SRecode map file"))))
       ;; Have a dir.  Make the object.
       (setq srecode-current-map
-            (srecode-map "SRecode Map"
-                         :file srecode-map-save-file)))
+            (srecode-map :file srecode-map-save-file)))
 
     ;; 2) Do we not have a current map?  If so load.
     (when (not srecode-current-map)
@@ -301,8 +300,7 @@ if that file is NEW, otherwise assume the mode has not changed."
         (error
          ;; There was an error loading the old map.  Create a new one.
          (setq srecode-current-map
-               (srecode-map "SRecode Map"
-                            :file srecode-map-save-file))))
+               (srecode-map :file srecode-map-save-file))))
       )
 
     )
diff --git a/lisp/cedet/srecode/srt-mode.el b/lisp/cedet/srecode/srt-mode.el
index ef1d9e37c05..6c269e0d914 100644
--- a/lisp/cedet/srecode/srt-mode.el
+++ b/lisp/cedet/srecode/srt-mode.el
@@ -494,7 +494,7 @@ section or ? for an ask variable."
           (let* ((macroend (match-beginning 0))
                  (raw (buffer-substring-no-properties
                        macrostart macroend))
-                 (STATE (srecode-compile-state "TMP"))
+                 (STATE (srecode-compile-state))
                  (inserter (condition-case nil
                                (srecode-compile-parse-inserter
                                 raw STATE)
@@ -605,7 +605,6 @@ section or ? for an ask variable."
 
         (setq context-return
               (semantic-analyze-context-functionarg
-               "context-for-srecode"
                :buffer (current-buffer)
                :scope scope
                :bounds bounds