diff --git a/src/glue.common.a b/src/glue.common.a
index da3c4ee..83f821d 100644
--- a/src/glue.common.a
+++ b/src/glue.common.a
@@ -6,6 +6,13 @@
 ; Public functions
 ; - SetStartupPathToCurrentVersionOfCurrentGame
 ;
+; Public constants
+; - kGameRootDirectory
+;
+
+kGameRootDirectory                   ; length-prefixed pathname of game subdirectories
+         !byte 2
+         !raw  "Z/"
 
 ;------------------------------------------------------------------------------
 ; SetStartupPathToCurrentVersionOfCurrentGame
diff --git a/src/glue.onbeyond.a b/src/glue.onbeyond.a
index 6849f4b..137481e 100644
--- a/src/glue.onbeyond.a
+++ b/src/glue.onbeyond.a
@@ -9,9 +9,6 @@
 ; - LaunchInterpreterWithHints
 ;
 
-kGameRootDirectory                   ; length-prefixed pathname of game subdirectories
-         !byte 2
-         !raw  "Z/"
 kHintsRootDirectory                  ; length-prefixed pathname of hint files
          !byte 6
          !raw  "PRIZM/"
diff --git a/src/parse.prefs.a b/src/parse.prefs.a
index 56c2cee..bed1ba8 100644
--- a/src/parse.prefs.a
+++ b/src/parse.prefs.a
@@ -63,35 +63,35 @@ SaveGlobalPreferences
          +STAY $FE
 
          +LDADDR kFluff1
-         jsr   addString
+         jsr   @addString
 
-         jsr   addBooleanFromStore
+         jsr   @addBooleanFromStore
          !word kForce40
 
-         jsr   addBooleanFromStore
+         jsr   @addBooleanFromStore
          !word kForceUpper
 
-         jsr   addBooleanFromStore
+         jsr   @addBooleanFromStore
          !word kScriptToFile
 
-         jsr   addBooleanFromStore
+         jsr   @addBooleanFromStore
          !word kAutoScript
 
          +LDADDR kFluff2
-         jsr   addString
+         jsr   @addString
 
-         jsr   addStringFromStore
+         jsr   @addStringFromStore
          !word kLastPlayed
 
          +LDADDR kFluff3
-         jsr   addString
+         jsr   @addString
 
          jsr   okvs_iter
          !word gGamesListStore
-         !word addGameToPrefs
+         !word @addGameToPrefs
 
          +LDADDR kEOF
-         jsr   addString
+         jsr   @addString
 
          lda   $FE
          sta   @filelen
@@ -111,24 +111,24 @@ SaveGlobalPreferences
          stz   gGlobalPrefsDirty
 @exit    rts
 
-addGameToPrefs
+@addGameToPrefs
          +STAY +
-         jsr   addStringFromStore
+         jsr   @addStringFromStore
 +        !word $FDFD                 ; SMC
          rts
 
-addBooleanFromStore
+@addBooleanFromStore
          lda   #$24                  ; BIT opcode
          +HIDE_NEXT_2_BYTES
-addStringFromStore
+@addStringFromStore
          lda   #$80                  ; BRA opcode
          sta   @skipOverBooleanLogic
          +PARAMS_ON_STACK 2
          +LDPARAM 1
          +STAY @key
-         jsr   addString
+         jsr   @addString
          +LDADDR kEquals
-         jsr   addString
+         jsr   @addString
          jsr   okvs_get
          !word gGlobalPrefsStore
 @key     !word $FDFD                 ; SMC
@@ -140,11 +140,11 @@ addStringFromStore
          ora   #$30
          sta   (PTR),y
          +LDAY PTR
-+        jsr   addString
++        jsr   @addString
          +LDADDR kLF
-         jmp   addString
+         jmp   @addString
 
-addString
+@addString
          +STAY $00
          lda   ($00)
          inc