diff --git a/packages/xpath/src/adapter/WHAT/optimizations.ts b/packages/xpath/src/adapter/WHAT/optimizations.ts
index c4149c8a2..c31992046 100644
--- a/packages/xpath/src/adapter/WHAT/optimizations.ts
+++ b/packages/xpath/src/adapter/WHAT/optimizations.ts
@@ -1,6 +1,9 @@
 import type { WHATChildNode, WHATElement, WHATNode, WHATParentNode } from './WHATNode.ts';
 import { getChildWHATElements, getContainingWHATDocument } from './traversal.ts';
 
+/**
+ * @todo optimization, but belongs in values.ts!
+ */
 export const getQualifiedNamedWHATAttributeValue = (
 	node: WHATElement,
 	namespaceURI: string | null,
@@ -9,6 +12,9 @@ export const getQualifiedNamedWHATAttributeValue = (
 	return node.getAttributeNS(namespaceURI, localName);
 };
 
+/**
+ * @todo optimization, but belongs in values.ts!
+ */
 export const getLocalNamedWHATAttributeValue = (
 	node: WHATElement,
 	localName: string
@@ -16,16 +22,25 @@ export const getLocalNamedWHATAttributeValue = (
 	return node.getAttribute(localName);
 };
 
+/**
+ * @todo optimization, but belongs in traversal.ts!
+ */
 export const hasLocalNamedWHATAttribute = (node: WHATElement, localName: string): boolean => {
 	return node.hasAttribute(localName);
 };
 
+/**
+ * @todo optimization, but belongs in traversal.ts!
+ */
 export const getWHATElementByUniqueId = (node: WHATParentNode, id: string): WHATElement | null => {
 	const element: Element | null = getContainingWHATDocument(node).getElementById(id);
 
 	return element as WHATElement | null;
 };
 
+/**
+ * @todo optimization, but belongs in traversal.ts!
+ */
 export const getWHATChildrenByLocalName = (
 	node: WHATParentNode,
 	localName: string
@@ -35,12 +50,18 @@ export const getWHATChildrenByLocalName = (
 	});
 };
 
+/**
+ * @todo optimization, but belongs in traversal.ts!
+ */
 export const getFirstWHATChildNode = (node: WHATNode): WHATChildNode | null => {
 	const firstChild: ChildNode | null = node.firstChild;
 
 	return firstChild as WHATChildNode | null;
 };
 
+/**
+ * @todo optimization, but belongs in traversal.ts!
+ */
 export const getLastWHATChildNode = (node: WHATNode): WHATChildNode | null => {
 	const lastChild: ChildNode | null = node.lastChild;
 
@@ -53,12 +74,18 @@ type MaybeWHATElement =
 	& WHATNode
 	& Partial<WHATElement>;
 
+/**
+ * @todo optimization, but belongs in traversal.ts!
+ */
 export const getFirstChildWHATElement = (node: WHATNode): WHATElement | null => {
 	const firstElementChild: Element | null = (node as MaybeWHATElement).firstElementChild ?? null;
 
 	return firstElementChild as WHATElement | null;
 };
 
+/**
+ * @todo optimization, but belongs in traversal.ts!
+ */
 export const getLastChildWHATElement = (node: WHATNode): WHATElement | null => {
 	const lastElementChild: Element | null = (node as MaybeWHATElement).lastElementChild ?? null;
 
diff --git a/packages/xpath/src/evaluations/LocationPathEvaluation.ts b/packages/xpath/src/evaluations/LocationPathEvaluation.ts
index 23d2adc0e..255618b58 100644
--- a/packages/xpath/src/evaluations/LocationPathEvaluation.ts
+++ b/packages/xpath/src/evaluations/LocationPathEvaluation.ts
@@ -659,7 +659,7 @@ export class LocationPathEvaluation<T extends XPathNode>
 		this.rootNode = rootNode;
 		this.timeZone = timeZone;
 
-		const [nodes] = tee(distinct(contextNodes));
+		const nodes = distinct(contextNodes);
 
 		this._nodes = nodes;
 
diff --git a/packages/xpath/src/functions/fn/node-set.ts b/packages/xpath/src/functions/fn/node-set.ts
index de12ab76b..f8cd5d495 100644
--- a/packages/xpath/src/functions/fn/node-set.ts
+++ b/packages/xpath/src/functions/fn/node-set.ts
@@ -86,6 +86,7 @@ export const localName = new StringFunction(
 			return domProvider.getProcessingInstructionName(node);
 		}
 
+		// TODO: double check expected behavior with namespace nodes
 		return '';
 	}
 );
diff --git a/packages/xpath/src/functions/javarosa/index.ts b/packages/xpath/src/functions/javarosa/index.ts
index 6dd7cf1c9..712780a8d 100644
--- a/packages/xpath/src/functions/javarosa/index.ts
+++ b/packages/xpath/src/functions/javarosa/index.ts
@@ -1,4 +1,4 @@
-import { JAVAROSA_NAMESPACE_URI } from '@getodk/common/constants/xmlns';
+import { JAVAROSA_NAMESPACE_URI } from '@getodk/common/constants/xmlns.ts';
 import { FunctionLibrary } from '../../evaluator/functions/FunctionLibrary';
 import * as string from './string.ts';
 
diff --git a/packages/xpath/src/functions/javarosa/string.ts b/packages/xpath/src/functions/javarosa/string.ts
index 80d90fd91..7aa7ab6ee 100644
--- a/packages/xpath/src/functions/javarosa/string.ts
+++ b/packages/xpath/src/functions/javarosa/string.ts
@@ -1,6 +1,14 @@
+import { NodeSetFunction } from '../../evaluator/functions/NodeSetFunction.ts';
 import { StringFunction } from '../../evaluator/functions/StringFunction.ts';
 import { XFormsXPathEvaluator } from '../../xforms/XFormsXPathEvaluator.ts';
 
+/**
+ * @todo This could be a {@link NodeSetFunction}. If it were, that might be a
+ * good starting point for thinking about how we'll support:
+ *
+ * - `<output>` in itext translations
+ * - `<value form="...">` (short, guidance, various media types)
+ */
 export const itext = new StringFunction(
 	'itext',
 	[{ arityType: 'required', typeHint: 'string' }],