diff --git a/plugins/tiddlywiki/ai-tools/globals.tid b/plugins/tiddlywiki/ai-tools/globals.tid
index 87f18cfbc..85fa33b4d 100644
--- a/plugins/tiddlywiki/ai-tools/globals.tid
+++ b/plugins/tiddlywiki/ai-tools/globals.tid
@@ -14,49 +14,26 @@ statusTitle - Optional title of a tiddler to which the status of the request wil
 completionServer - Optional URL of server
 -->
 \procedure get-llm-completion(conversationTitle,resultTitlePrefix,resultTags,statusTitle,completionServer)
-	<!--
-	Callback for the HTTP response from the LLM
-	-->
-	\procedure get-llm-completion-callback()
-		<%if [<status>compare:number:gteq[200]compare:number:lteq[299]] %>
-			<!-- Success -->
-			<$action-createtiddler
-				$basetitle=<<resultTitlePrefix>>
-				tags=<<resultTags>>
-				type="text/markdown"
-				role={{{ [<data>jsonget[choices],[0],[message],[role]] }}}
-				text={{{ [<data>jsonget[choices],[0],[message],[content]] }}}
-			/>
-		<%else%>
-			<!-- Error -->
-			<$action-createtiddler
-				$basetitle=<<resultTitlePrefix>>
-				tags=<<resultTags>>
-				type="text/markdown"
-				role="error"
-				text={{{ [[Error:]] [<statusText>] [<data>jsonget[error],[message]]  +[join[]] }}}
-			/>
-		<%endif%>
-	\end get-llm-completion-callback
-
 <$let
 	completionServer={{{ [<completionServer>!is[blank]else<default-llm-completion-server>] }}}
 >
-	<$wikify name="json" text={{{ [<completionServer>get[text]] }}}>
-		<$action-log message="get-llm-completion"/>
-		<$action-log/>
-		<$action-sendmessage
-			$message="tm-http-request"
-			url={{{ [<completionServer>get[url]] }}}
-			body=<<json>>
-			header-content-type="application/json"
-			bearer-auth-token-from-store="openai-secret-key"
-			method="POST"
-			oncompletion=<<get-llm-completion-callback>>
-			bind-status=<<statusTitle>>
-			var-resultTitlePrefix=<<resultTitlePrefix>>
-			var-resultTags=<<resultTags>>
-		/>
-	</$wikify>
+	<$importvariables filter="[<completionServer>]">
+		<$wikify name="json" text=<<json-prompt>>>
+			<$action-log message="get-llm-completion"/>
+			<$action-log/>
+			<$action-sendmessage
+				$message="tm-http-request"
+				url={{{ [<completionServer>get[url]] }}}
+				body=<<json>>
+				header-content-type="application/json"
+				bearer-auth-token-from-store="openai-secret-key"
+				method="POST"
+				oncompletion=<<completion-callback>>
+				bind-status=<<statusTitle>>
+				var-resultTitlePrefix=<<resultTitlePrefix>>
+				var-resultTags=<<resultTags>>
+			/>
+		</$wikify>
+	</$importvariables>
 </$let>
 \end get-llm-completion
diff --git a/plugins/tiddlywiki/ai-tools/servers/local-llamafile.tid b/plugins/tiddlywiki/ai-tools/servers/local-llamafile.tid
index 7ab2b11fb..15ba04e92 100644
--- a/plugins/tiddlywiki/ai-tools/servers/local-llamafile.tid
+++ b/plugins/tiddlywiki/ai-tools/servers/local-llamafile.tid
@@ -3,6 +3,10 @@ tags: $:/tags/AI/CompletionServer
 url: http://127.0.0.1:8080/v1/chat/completions
 caption: Locally running Llamafile server
 
+<!--
+Wikified JSON text to be sent to server
+-->
+\procedure json-prompt()
 \rules only filteredtranscludeinline transcludeinline macrodef macrocallinline html conditional commentblock commentinline
 {
 	"model": "gpt-4o",
@@ -21,4 +25,30 @@ caption: Locally running Llamafile server
 			}
 		</$list>
 	]
-}
\ No newline at end of file
+}
+\end json-prompt
+
+<!--
+Callback for the HTTP response from the LLM
+-->
+\procedure completion-callback()
+	<%if [<status>compare:number:gteq[200]compare:number:lteq[299]] %>
+		<!-- Success -->
+		<$action-createtiddler
+			$basetitle=<<resultTitlePrefix>>
+			tags=<<resultTags>>
+			type="text/markdown"
+			role={{{ [<data>jsonget[choices],[0],[message],[role]] }}}
+			text={{{ [<data>jsonget[choices],[0],[message],[content]] }}}
+		/>
+	<%else%>
+		<!-- Error -->
+		<$action-createtiddler
+			$basetitle=<<resultTitlePrefix>>
+			tags=<<resultTags>>
+			type="text/markdown"
+			role="error"
+			text={{{ [[Error:]] [<statusText>] [<data>jsonget[error],[message]]  +[join[]] }}}
+		/>
+	<%endif%>
+\end completion-callback
diff --git a/plugins/tiddlywiki/ai-tools/servers/openai.tid b/plugins/tiddlywiki/ai-tools/servers/openai.tid
index c1bef5a7d..65ee9429a 100644
--- a/plugins/tiddlywiki/ai-tools/servers/openai.tid
+++ b/plugins/tiddlywiki/ai-tools/servers/openai.tid
@@ -3,6 +3,10 @@ tags: $:/tags/AI/CompletionServer
 url: https://api.openai.com/v1/chat/completions
 caption: OpenAI Service
 
+<!--
+Wikified JSON text to be sent to server
+-->
+\procedure json-prompt()
 \rules only filteredtranscludeinline transcludeinline macrodef macrocallinline html conditional commentblock commentinline
 {
 	"model": "gpt-4o",
@@ -36,4 +40,30 @@ caption: OpenAI Service
 			}
 		</$list>
 	]
-}
\ No newline at end of file
+}
+\end json-prompt
+
+<!--
+Callback for the HTTP response from the LLM
+-->
+\procedure completion-callback()
+	<%if [<status>compare:number:gteq[200]compare:number:lteq[299]] %>
+		<!-- Success -->
+		<$action-createtiddler
+			$basetitle=<<resultTitlePrefix>>
+			tags=<<resultTags>>
+			type="text/markdown"
+			role={{{ [<data>jsonget[choices],[0],[message],[role]] }}}
+			text={{{ [<data>jsonget[choices],[0],[message],[content]] }}}
+		/>
+	<%else%>
+		<!-- Error -->
+		<$action-createtiddler
+			$basetitle=<<resultTitlePrefix>>
+			tags=<<resultTags>>
+			type="text/markdown"
+			role="error"
+			text={{{ [[Error:]] [<statusText>] [<data>jsonget[error],[message]]  +[join[]] }}}
+		/>
+	<%endif%>
+\end completion-callback