Internal refactor; no user-facing changes.