diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm
index 305a0023b7..899cc6a0e0 100644
--- a/gnu/packages/music.scm
+++ b/gnu/packages/music.scm
@@ -147,6 +147,7 @@
   #:use-module (gnu packages vim)       ;for 'xxd'
   #:use-module (gnu packages web)
   #:use-module (gnu packages wxwidgets)
+  #:use-module (gnu packages xdisorg)
   #:use-module (gnu packages xml)
   #:use-module (gnu packages xorg)
   #:use-module (gnu packages xiph)
@@ -799,16 +800,16 @@ audio and video).")
       (modify-phases %standard-phases
         (add-after 'unpack 'replace-python
           (lambda* (#:key inputs outputs #:allow-other-keys)
-            (begin
-              (substitute* "CMakeLists.txt"
-                           ((" python ") (string-append " " (assoc-ref inputs "python") "/bin/python3 ")))
-              #t)))
-        (add-after 'unpack 'fix-data-path
+            (substitute* "CMakeLists.txt"
+              ((" python ")
+               (string-append " " (assoc-ref inputs "python")
+                              "/bin/python3 ")))
+            #t))
+        (add-after 'unpack 'fix-data-directory-name
           (lambda* (#:key inputs outputs #:allow-other-keys)
-            (begin
-              (substitute* "src/common/SurgeStorage.cpp"
-                           (("/usr") (assoc-ref outputs "out")))
-              #t)))
+            (substitute* "src/common/SurgeStorage.cpp"
+              (("/usr") (assoc-ref outputs "out")))
+            #t))
         (replace 'install ; no install target
           (lambda* (#:key inputs outputs #:allow-other-keys)
             (let* ((src (assoc-ref inputs "source"))
@@ -842,8 +843,8 @@ audio and video).")
    (synopsis "Synthesizer plugin")
    (description
     "Surge is a subtractive hybrid digital synthesizer.  Each patch contains
-two 'scenes' which are separate instances of the entire synthesis engine
-(except effects) that can be used for layering or split patches.")
+two @dfn{scenes} which are separate instances of the entire synthesis
+engine (except effects) that can be used for layering or split patches.")
    (license license:gpl3+)))
 
 (define-public klick