diff --git a/packages/common/commandIds.ts b/packages/common/src/commandIds.ts
similarity index 100%
rename from packages/common/commandIds.ts
rename to packages/common/src/commandIds.ts
diff --git a/packages/common/errors.ts b/packages/common/src/errors.ts
similarity index 100%
rename from packages/common/errors.ts
rename to packages/common/src/errors.ts
diff --git a/packages/common/extensionDependencies.ts b/packages/common/src/extensionDependencies.ts
similarity index 100%
rename from packages/common/extensionDependencies.ts
rename to packages/common/src/extensionDependencies.ts
diff --git a/packages/common/getFakeCommandServerApi.ts b/packages/common/src/getFakeCommandServerApi.ts
similarity index 100%
rename from packages/common/getFakeCommandServerApi.ts
rename to packages/common/src/getFakeCommandServerApi.ts
diff --git a/packages/common/ide/PassthroughIDEBase.ts b/packages/common/src/ide/PassthroughIDEBase.ts
similarity index 100%
rename from packages/common/ide/PassthroughIDEBase.ts
rename to packages/common/src/ide/PassthroughIDEBase.ts
diff --git a/packages/common/ide/fake/FakeCapabilities.ts b/packages/common/src/ide/fake/FakeCapabilities.ts
similarity index 100%
rename from packages/common/ide/fake/FakeCapabilities.ts
rename to packages/common/src/ide/fake/FakeCapabilities.ts
diff --git a/packages/common/ide/fake/FakeClipboard.ts b/packages/common/src/ide/fake/FakeClipboard.ts
similarity index 100%
rename from packages/common/ide/fake/FakeClipboard.ts
rename to packages/common/src/ide/fake/FakeClipboard.ts
diff --git a/packages/common/ide/fake/FakeConfiguration.ts b/packages/common/src/ide/fake/FakeConfiguration.ts
similarity index 100%
rename from packages/common/ide/fake/FakeConfiguration.ts
rename to packages/common/src/ide/fake/FakeConfiguration.ts
diff --git a/packages/common/ide/fake/FakeHats.ts b/packages/common/src/ide/fake/FakeHats.ts
similarity index 100%
rename from packages/common/ide/fake/FakeHats.ts
rename to packages/common/src/ide/fake/FakeHats.ts
diff --git a/packages/common/ide/fake/FakeIDE.ts b/packages/common/src/ide/fake/FakeIDE.ts
similarity index 100%
rename from packages/common/ide/fake/FakeIDE.ts
rename to packages/common/src/ide/fake/FakeIDE.ts
diff --git a/packages/common/ide/fake/FakeMessages.ts b/packages/common/src/ide/fake/FakeMessages.ts
similarity index 100%
rename from packages/common/ide/fake/FakeMessages.ts
rename to packages/common/src/ide/fake/FakeMessages.ts
diff --git a/packages/common/ide/normalized/NormalizedIDE.ts b/packages/common/src/ide/normalized/NormalizedIDE.ts
similarity index 100%
rename from packages/common/ide/normalized/NormalizedIDE.ts
rename to packages/common/src/ide/normalized/NormalizedIDE.ts
diff --git a/packages/common/ide/spy/SpyIDE.ts b/packages/common/src/ide/spy/SpyIDE.ts
similarity index 100%
rename from packages/common/ide/spy/SpyIDE.ts
rename to packages/common/src/ide/spy/SpyIDE.ts
diff --git a/packages/common/ide/spy/SpyMessages.ts b/packages/common/src/ide/spy/SpyMessages.ts
similarity index 100%
rename from packages/common/ide/spy/SpyMessages.ts
rename to packages/common/src/ide/spy/SpyMessages.ts
diff --git a/packages/common/ide/types/Capabilities.ts b/packages/common/src/ide/types/Capabilities.ts
similarity index 100%
rename from packages/common/ide/types/Capabilities.ts
rename to packages/common/src/ide/types/Capabilities.ts
diff --git a/packages/common/ide/types/CommandId.ts b/packages/common/src/ide/types/CommandId.ts
similarity index 100%
rename from packages/common/ide/types/CommandId.ts
rename to packages/common/src/ide/types/CommandId.ts
diff --git a/packages/common/ide/types/Configuration.ts b/packages/common/src/ide/types/Configuration.ts
similarity index 100%
rename from packages/common/ide/types/Configuration.ts
rename to packages/common/src/ide/types/Configuration.ts
diff --git a/packages/common/ide/types/Events.ts b/packages/common/src/ide/types/Events.ts
similarity index 100%
rename from packages/common/ide/types/Events.ts
rename to packages/common/src/ide/types/Events.ts
diff --git a/packages/common/ide/types/FlashDescriptor.ts b/packages/common/src/ide/types/FlashDescriptor.ts
similarity index 100%
rename from packages/common/ide/types/FlashDescriptor.ts
rename to packages/common/src/ide/types/FlashDescriptor.ts
diff --git a/packages/common/ide/types/HatStability.ts b/packages/common/src/ide/types/HatStability.ts
similarity index 100%
rename from packages/common/ide/types/HatStability.ts
rename to packages/common/src/ide/types/HatStability.ts
diff --git a/packages/common/ide/types/Hats.ts b/packages/common/src/ide/types/Hats.ts
similarity index 100%
rename from packages/common/ide/types/Hats.ts
rename to packages/common/src/ide/types/Hats.ts
diff --git a/packages/common/ide/types/Messages.ts b/packages/common/src/ide/types/Messages.ts
similarity index 100%
rename from packages/common/ide/types/Messages.ts
rename to packages/common/src/ide/types/Messages.ts
diff --git a/packages/common/ide/types/Paths.ts b/packages/common/src/ide/types/Paths.ts
similarity index 100%
rename from packages/common/ide/types/Paths.ts
rename to packages/common/src/ide/types/Paths.ts
diff --git a/packages/common/ide/types/QuickPickOptions.ts b/packages/common/src/ide/types/QuickPickOptions.ts
similarity index 100%
rename from packages/common/ide/types/QuickPickOptions.ts
rename to packages/common/src/ide/types/QuickPickOptions.ts
diff --git a/packages/common/ide/types/README.md b/packages/common/src/ide/types/README.md
similarity index 100%
rename from packages/common/ide/types/README.md
rename to packages/common/src/ide/types/README.md
diff --git a/packages/common/ide/types/events.types.ts b/packages/common/src/ide/types/events.types.ts
similarity index 100%
rename from packages/common/ide/types/events.types.ts
rename to packages/common/src/ide/types/events.types.ts
diff --git a/packages/common/ide/types/hatStyles.types.ts b/packages/common/src/ide/types/hatStyles.types.ts
similarity index 100%
rename from packages/common/ide/types/hatStyles.types.ts
rename to packages/common/src/ide/types/hatStyles.types.ts
diff --git a/packages/common/ide/types/ide.types.ts b/packages/common/src/ide/types/ide.types.ts
similarity index 100%
rename from packages/common/ide/types/ide.types.ts
rename to packages/common/src/ide/types/ide.types.ts
diff --git a/packages/common/ide/util/messages.ts b/packages/common/src/ide/util/messages.ts
similarity index 100%
rename from packages/common/ide/util/messages.ts
rename to packages/common/src/ide/util/messages.ts
diff --git a/packages/common/testUtil/TestCaseSnapshot.ts b/packages/common/src/testUtil/TestCaseSnapshot.ts
similarity index 100%
rename from packages/common/testUtil/TestCaseSnapshot.ts
rename to packages/common/src/testUtil/TestCaseSnapshot.ts
diff --git a/packages/common/testUtil/extractTargetedMarks.ts b/packages/common/src/testUtil/extractTargetedMarks.ts
similarity index 100%
rename from packages/common/testUtil/extractTargetedMarks.ts
rename to packages/common/src/testUtil/extractTargetedMarks.ts
diff --git a/packages/common/testUtil/fromPlainObject.ts b/packages/common/src/testUtil/fromPlainObject.ts
similarity index 100%
rename from packages/common/testUtil/fromPlainObject.ts
rename to packages/common/src/testUtil/fromPlainObject.ts
diff --git a/packages/common/testUtil/isTesting.ts b/packages/common/src/testUtil/isTesting.ts
similarity index 100%
rename from packages/common/testUtil/isTesting.ts
rename to packages/common/src/testUtil/isTesting.ts
diff --git a/packages/common/testUtil/runTestSubset.ts b/packages/common/src/testUtil/runTestSubset.ts
similarity index 100%
rename from packages/common/testUtil/runTestSubset.ts
rename to packages/common/src/testUtil/runTestSubset.ts
diff --git a/packages/common/testUtil/serialize.ts b/packages/common/src/testUtil/serialize.ts
similarity index 100%
rename from packages/common/testUtil/serialize.ts
rename to packages/common/src/testUtil/serialize.ts
diff --git a/packages/common/testUtil/testConstants.ts b/packages/common/src/testUtil/testConstants.ts
similarity index 100%
rename from packages/common/testUtil/testConstants.ts
rename to packages/common/src/testUtil/testConstants.ts
diff --git a/packages/common/testUtil/toPlainObject.ts b/packages/common/src/testUtil/toPlainObject.ts
similarity index 100%
rename from packages/common/testUtil/toPlainObject.ts
rename to packages/common/src/testUtil/toPlainObject.ts
diff --git a/packages/common/types/CommandServerApi.ts b/packages/common/src/types/CommandServerApi.ts
similarity index 100%
rename from packages/common/types/CommandServerApi.ts
rename to packages/common/src/types/CommandServerApi.ts
diff --git a/packages/common/types/GeneralizedRange.ts b/packages/common/src/types/GeneralizedRange.ts
similarity index 100%
rename from packages/common/types/GeneralizedRange.ts
rename to packages/common/src/types/GeneralizedRange.ts
diff --git a/packages/common/types/HatTokenMap.ts b/packages/common/src/types/HatTokenMap.ts
similarity index 100%
rename from packages/common/types/HatTokenMap.ts
rename to packages/common/src/types/HatTokenMap.ts
diff --git a/packages/common/types/InputBoxOptions.ts b/packages/common/src/types/InputBoxOptions.ts
similarity index 100%
rename from packages/common/types/InputBoxOptions.ts
rename to packages/common/src/types/InputBoxOptions.ts
diff --git a/packages/common/types/Position.ts b/packages/common/src/types/Position.ts
similarity index 100%
rename from packages/common/types/Position.ts
rename to packages/common/src/types/Position.ts
diff --git a/packages/common/types/Range.ts b/packages/common/src/types/Range.ts
similarity index 100%
rename from packages/common/types/Range.ts
rename to packages/common/src/types/Range.ts
diff --git a/packages/common/types/RangeExpansionBehavior.ts b/packages/common/src/types/RangeExpansionBehavior.ts
similarity index 100%
rename from packages/common/types/RangeExpansionBehavior.ts
rename to packages/common/src/types/RangeExpansionBehavior.ts
diff --git a/packages/common/types/RangeOffsets.ts b/packages/common/src/types/RangeOffsets.ts
similarity index 100%
rename from packages/common/types/RangeOffsets.ts
rename to packages/common/src/types/RangeOffsets.ts
diff --git a/packages/common/types/RevealLineAt.ts b/packages/common/src/types/RevealLineAt.ts
similarity index 100%
rename from packages/common/types/RevealLineAt.ts
rename to packages/common/src/types/RevealLineAt.ts
diff --git a/packages/common/types/Selection.ts b/packages/common/src/types/Selection.ts
similarity index 100%
rename from packages/common/types/Selection.ts
rename to packages/common/src/types/Selection.ts
diff --git a/packages/common/types/TestCaseFixture.ts b/packages/common/src/types/TestCaseFixture.ts
similarity index 100%
rename from packages/common/types/TestCaseFixture.ts
rename to packages/common/src/types/TestCaseFixture.ts
diff --git a/packages/common/types/TextDocument.ts b/packages/common/src/types/TextDocument.ts
similarity index 100%
rename from packages/common/types/TextDocument.ts
rename to packages/common/src/types/TextDocument.ts
diff --git a/packages/common/types/TextEditor.ts b/packages/common/src/types/TextEditor.ts
similarity index 100%
rename from packages/common/types/TextEditor.ts
rename to packages/common/src/types/TextEditor.ts
diff --git a/packages/common/types/TextEditorDecorationType.ts b/packages/common/src/types/TextEditorDecorationType.ts
similarity index 100%
rename from packages/common/types/TextEditorDecorationType.ts
rename to packages/common/src/types/TextEditorDecorationType.ts
diff --git a/packages/common/types/TextEditorEdit.ts b/packages/common/src/types/TextEditorEdit.ts
similarity index 100%
rename from packages/common/types/TextEditorEdit.ts
rename to packages/common/src/types/TextEditorEdit.ts
diff --git a/packages/common/types/TextEditorOptions.ts b/packages/common/src/types/TextEditorOptions.ts
similarity index 100%
rename from packages/common/types/TextEditorOptions.ts
rename to packages/common/src/types/TextEditorOptions.ts
diff --git a/packages/common/types/TextLine.ts b/packages/common/src/types/TextLine.ts
similarity index 100%
rename from packages/common/types/TextLine.ts
rename to packages/common/src/types/TextLine.ts
diff --git a/packages/common/types/Token.ts b/packages/common/src/types/Token.ts
similarity index 100%
rename from packages/common/types/Token.ts
rename to packages/common/src/types/Token.ts
diff --git a/packages/common/types/command/ActionCommand.ts b/packages/common/src/types/command/ActionCommand.ts
similarity index 100%
rename from packages/common/types/command/ActionCommand.ts
rename to packages/common/src/types/command/ActionCommand.ts
diff --git a/packages/common/types/command/CommandV4.types.ts b/packages/common/src/types/command/CommandV4.types.ts
similarity index 100%
rename from packages/common/types/command/CommandV4.types.ts
rename to packages/common/src/types/command/CommandV4.types.ts
diff --git a/packages/common/types/command/PartialTargetDescriptor.types.ts b/packages/common/src/types/command/PartialTargetDescriptor.types.ts
similarity index 100%
rename from packages/common/types/command/PartialTargetDescriptor.types.ts
rename to packages/common/src/types/command/PartialTargetDescriptor.types.ts
diff --git a/packages/common/types/command/command.types.ts b/packages/common/src/types/command/command.types.ts
similarity index 100%
rename from packages/common/types/command/command.types.ts
rename to packages/common/src/types/command/command.types.ts
diff --git a/packages/common/types/command/legacy/CommandV0V1.types.ts b/packages/common/src/types/command/legacy/CommandV0V1.types.ts
similarity index 100%
rename from packages/common/types/command/legacy/CommandV0V1.types.ts
rename to packages/common/src/types/command/legacy/CommandV0V1.types.ts
diff --git a/packages/common/types/command/legacy/CommandV2.types.ts b/packages/common/src/types/command/legacy/CommandV2.types.ts
similarity index 100%
rename from packages/common/types/command/legacy/CommandV2.types.ts
rename to packages/common/src/types/command/legacy/CommandV2.types.ts
diff --git a/packages/common/types/command/legacy/CommandV3.types.ts b/packages/common/src/types/command/legacy/CommandV3.types.ts
similarity index 100%
rename from packages/common/types/command/legacy/CommandV3.types.ts
rename to packages/common/src/types/command/legacy/CommandV3.types.ts
diff --git a/packages/common/types/command/legacy/PartialTargetDescriptorV3.types.ts b/packages/common/src/types/command/legacy/PartialTargetDescriptorV3.types.ts
similarity index 100%
rename from packages/common/types/command/legacy/PartialTargetDescriptorV3.types.ts
rename to packages/common/src/types/command/legacy/PartialTargetDescriptorV3.types.ts
diff --git a/packages/common/types/command/legacy/targetDescriptorV2.types.ts b/packages/common/src/types/command/legacy/targetDescriptorV2.types.ts
similarity index 100%
rename from packages/common/types/command/legacy/targetDescriptorV2.types.ts
rename to packages/common/src/types/command/legacy/targetDescriptorV2.types.ts
diff --git a/packages/common/types/location.types.ts b/packages/common/src/types/location.types.ts
similarity index 100%
rename from packages/common/types/location.types.ts
rename to packages/common/src/types/location.types.ts
diff --git a/packages/common/types/position.test.ts b/packages/common/src/types/position.test.ts
similarity index 100%
rename from packages/common/types/position.test.ts
rename to packages/common/src/types/position.test.ts
diff --git a/packages/common/types/range.test.ts b/packages/common/src/types/range.test.ts
similarity index 100%
rename from packages/common/types/range.test.ts
rename to packages/common/src/types/range.test.ts
diff --git a/packages/common/types/selection.test.ts b/packages/common/src/types/selection.test.ts
similarity index 100%
rename from packages/common/types/selection.test.ts
rename to packages/common/src/types/selection.test.ts
diff --git a/packages/common/types/snippet.types.ts b/packages/common/src/types/snippet.types.ts
similarity index 100%
rename from packages/common/types/snippet.types.ts
rename to packages/common/src/types/snippet.types.ts
diff --git a/packages/common/util/CompositeKeyMap.ts b/packages/common/src/util/CompositeKeyMap.ts
similarity index 100%
rename from packages/common/util/CompositeKeyMap.ts
rename to packages/common/src/util/CompositeKeyMap.ts
diff --git a/packages/common/util/DefaultMap.ts b/packages/common/src/util/DefaultMap.ts
similarity index 100%
rename from packages/common/util/DefaultMap.ts
rename to packages/common/src/util/DefaultMap.ts
diff --git a/packages/common/util/Notifier.ts b/packages/common/src/util/Notifier.ts
similarity index 100%
rename from packages/common/util/Notifier.ts
rename to packages/common/src/util/Notifier.ts
diff --git a/packages/common/util/index.ts b/packages/common/src/util/index.ts
similarity index 100%
rename from packages/common/util/index.ts
rename to packages/common/src/util/index.ts
diff --git a/packages/common/util/itertools.ts b/packages/common/src/util/itertools.ts
similarity index 100%
rename from packages/common/util/itertools.ts
rename to packages/common/src/util/itertools.ts
diff --git a/packages/common/util/omitByDeep.ts b/packages/common/src/util/omitByDeep.ts
similarity index 100%
rename from packages/common/util/omitByDeep.ts
rename to packages/common/src/util/omitByDeep.ts
diff --git a/packages/common/util/sleep.ts b/packages/common/src/util/sleep.ts
similarity index 100%
rename from packages/common/util/sleep.ts
rename to packages/common/src/util/sleep.ts
diff --git a/packages/common/util/splitKey.ts b/packages/common/src/util/splitKey.ts
similarity index 100%
rename from packages/common/util/splitKey.ts
rename to packages/common/src/util/splitKey.ts
diff --git a/packages/common/util/textFormatters.ts b/packages/common/src/util/textFormatters.ts
similarity index 100%
rename from packages/common/util/textFormatters.ts
rename to packages/common/src/util/textFormatters.ts
diff --git a/packages/common/util/timeUtils.ts b/packages/common/src/util/timeUtils.ts
similarity index 100%
rename from packages/common/util/timeUtils.ts
rename to packages/common/src/util/timeUtils.ts
diff --git a/packages/common/util/typeUtils.ts b/packages/common/src/util/typeUtils.ts
similarity index 100%
rename from packages/common/util/typeUtils.ts
rename to packages/common/src/util/typeUtils.ts
diff --git a/packages/common/util/walkAsync.ts b/packages/common/src/util/walkAsync.ts
similarity index 100%
rename from packages/common/util/walkAsync.ts
rename to packages/common/src/util/walkAsync.ts
diff --git a/packages/common/util/walkSync.ts b/packages/common/src/util/walkSync.ts
similarity index 100%
rename from packages/common/util/walkSync.ts
rename to packages/common/src/util/walkSync.ts
diff --git a/packages/cursorless-engine/actions/Actions.ts b/packages/cursorless-engine/src/actions/Actions.ts
similarity index 100%
rename from packages/cursorless-engine/actions/Actions.ts
rename to packages/cursorless-engine/src/actions/Actions.ts
diff --git a/packages/cursorless-engine/actions/BringMoveSwap.ts b/packages/cursorless-engine/src/actions/BringMoveSwap.ts
similarity index 100%
rename from packages/cursorless-engine/actions/BringMoveSwap.ts
rename to packages/cursorless-engine/src/actions/BringMoveSwap.ts
diff --git a/packages/cursorless-engine/actions/Call.ts b/packages/cursorless-engine/src/actions/Call.ts
similarity index 100%
rename from packages/cursorless-engine/actions/Call.ts
rename to packages/cursorless-engine/src/actions/Call.ts
diff --git a/packages/cursorless-engine/actions/CallbackAction.ts b/packages/cursorless-engine/src/actions/CallbackAction.ts
similarity index 100%
rename from packages/cursorless-engine/actions/CallbackAction.ts
rename to packages/cursorless-engine/src/actions/CallbackAction.ts
diff --git a/packages/cursorless-engine/actions/Clear.ts b/packages/cursorless-engine/src/actions/Clear.ts
similarity index 100%
rename from packages/cursorless-engine/actions/Clear.ts
rename to packages/cursorless-engine/src/actions/Clear.ts
diff --git a/packages/cursorless-engine/actions/CutToClipboard.ts b/packages/cursorless-engine/src/actions/CutToClipboard.ts
similarity index 100%
rename from packages/cursorless-engine/actions/CutToClipboard.ts
rename to packages/cursorless-engine/src/actions/CutToClipboard.ts
diff --git a/packages/cursorless-engine/actions/Deselect.ts b/packages/cursorless-engine/src/actions/Deselect.ts
similarity index 100%
rename from packages/cursorless-engine/actions/Deselect.ts
rename to packages/cursorless-engine/src/actions/Deselect.ts
diff --git a/packages/cursorless-engine/actions/EditNew/EditNew.ts b/packages/cursorless-engine/src/actions/EditNew/EditNew.ts
similarity index 100%
rename from packages/cursorless-engine/actions/EditNew/EditNew.ts
rename to packages/cursorless-engine/src/actions/EditNew/EditNew.ts
diff --git a/packages/cursorless-engine/actions/EditNew/EditNew.types.ts b/packages/cursorless-engine/src/actions/EditNew/EditNew.types.ts
similarity index 100%
rename from packages/cursorless-engine/actions/EditNew/EditNew.types.ts
rename to packages/cursorless-engine/src/actions/EditNew/EditNew.types.ts
diff --git a/packages/cursorless-engine/actions/EditNew/index.ts b/packages/cursorless-engine/src/actions/EditNew/index.ts
similarity index 100%
rename from packages/cursorless-engine/actions/EditNew/index.ts
rename to packages/cursorless-engine/src/actions/EditNew/index.ts
diff --git a/packages/cursorless-engine/actions/EditNew/runEditTargets.ts b/packages/cursorless-engine/src/actions/EditNew/runEditTargets.ts
similarity index 100%
rename from packages/cursorless-engine/actions/EditNew/runEditTargets.ts
rename to packages/cursorless-engine/src/actions/EditNew/runEditTargets.ts
diff --git a/packages/cursorless-engine/actions/EditNew/runInsertLineAfterTargets.ts b/packages/cursorless-engine/src/actions/EditNew/runInsertLineAfterTargets.ts
similarity index 100%
rename from packages/cursorless-engine/actions/EditNew/runInsertLineAfterTargets.ts
rename to packages/cursorless-engine/src/actions/EditNew/runInsertLineAfterTargets.ts
diff --git a/packages/cursorless-engine/actions/EditNew/runNotebookCellTargets.ts b/packages/cursorless-engine/src/actions/EditNew/runNotebookCellTargets.ts
similarity index 100%
rename from packages/cursorless-engine/actions/EditNew/runNotebookCellTargets.ts
rename to packages/cursorless-engine/src/actions/EditNew/runNotebookCellTargets.ts
diff --git a/packages/cursorless-engine/actions/ExecuteCommand.ts b/packages/cursorless-engine/src/actions/ExecuteCommand.ts
similarity index 100%
rename from packages/cursorless-engine/actions/ExecuteCommand.ts
rename to packages/cursorless-engine/src/actions/ExecuteCommand.ts
diff --git a/packages/cursorless-engine/actions/Find.ts b/packages/cursorless-engine/src/actions/Find.ts
similarity index 100%
rename from packages/cursorless-engine/actions/Find.ts
rename to packages/cursorless-engine/src/actions/Find.ts
diff --git a/packages/cursorless-engine/actions/FollowLink.ts b/packages/cursorless-engine/src/actions/FollowLink.ts
similarity index 100%
rename from packages/cursorless-engine/actions/FollowLink.ts
rename to packages/cursorless-engine/src/actions/FollowLink.ts
diff --git a/packages/cursorless-engine/actions/GenerateSnippet/GenerateSnippet.ts b/packages/cursorless-engine/src/actions/GenerateSnippet/GenerateSnippet.ts
similarity index 100%
rename from packages/cursorless-engine/actions/GenerateSnippet/GenerateSnippet.ts
rename to packages/cursorless-engine/src/actions/GenerateSnippet/GenerateSnippet.ts
diff --git a/packages/cursorless-engine/actions/GenerateSnippet/Substituter.ts b/packages/cursorless-engine/src/actions/GenerateSnippet/Substituter.ts
similarity index 100%
rename from packages/cursorless-engine/actions/GenerateSnippet/Substituter.ts
rename to packages/cursorless-engine/src/actions/GenerateSnippet/Substituter.ts
diff --git a/packages/cursorless-engine/actions/GenerateSnippet/constructSnippetBody.ts b/packages/cursorless-engine/src/actions/GenerateSnippet/constructSnippetBody.ts
similarity index 100%
rename from packages/cursorless-engine/actions/GenerateSnippet/constructSnippetBody.ts
rename to packages/cursorless-engine/src/actions/GenerateSnippet/constructSnippetBody.ts
diff --git a/packages/cursorless-engine/actions/GenerateSnippet/editText.ts b/packages/cursorless-engine/src/actions/GenerateSnippet/editText.ts
similarity index 100%
rename from packages/cursorless-engine/actions/GenerateSnippet/editText.ts
rename to packages/cursorless-engine/src/actions/GenerateSnippet/editText.ts
diff --git a/packages/cursorless-engine/actions/GenerateSnippet/index.ts b/packages/cursorless-engine/src/actions/GenerateSnippet/index.ts
similarity index 100%
rename from packages/cursorless-engine/actions/GenerateSnippet/index.ts
rename to packages/cursorless-engine/src/actions/GenerateSnippet/index.ts
diff --git a/packages/cursorless-engine/actions/GenerateSnippet/openNewSnippetFile.ts b/packages/cursorless-engine/src/actions/GenerateSnippet/openNewSnippetFile.ts
similarity index 100%
rename from packages/cursorless-engine/actions/GenerateSnippet/openNewSnippetFile.ts
rename to packages/cursorless-engine/src/actions/GenerateSnippet/openNewSnippetFile.ts
diff --git a/packages/cursorless-engine/actions/GetText.ts b/packages/cursorless-engine/src/actions/GetText.ts
similarity index 100%
rename from packages/cursorless-engine/actions/GetText.ts
rename to packages/cursorless-engine/src/actions/GetText.ts
diff --git a/packages/cursorless-engine/actions/Highlight.ts b/packages/cursorless-engine/src/actions/Highlight.ts
similarity index 100%
rename from packages/cursorless-engine/actions/Highlight.ts
rename to packages/cursorless-engine/src/actions/Highlight.ts
diff --git a/packages/cursorless-engine/actions/InsertCopy.ts b/packages/cursorless-engine/src/actions/InsertCopy.ts
similarity index 100%
rename from packages/cursorless-engine/actions/InsertCopy.ts
rename to packages/cursorless-engine/src/actions/InsertCopy.ts
diff --git a/packages/cursorless-engine/actions/InsertEmptyLines.ts b/packages/cursorless-engine/src/actions/InsertEmptyLines.ts
similarity index 100%
rename from packages/cursorless-engine/actions/InsertEmptyLines.ts
rename to packages/cursorless-engine/src/actions/InsertEmptyLines.ts
diff --git a/packages/cursorless-engine/actions/InsertSnippet.ts b/packages/cursorless-engine/src/actions/InsertSnippet.ts
similarity index 100%
rename from packages/cursorless-engine/actions/InsertSnippet.ts
rename to packages/cursorless-engine/src/actions/InsertSnippet.ts
diff --git a/packages/cursorless-engine/actions/PasteFromClipboard.ts b/packages/cursorless-engine/src/actions/PasteFromClipboard.ts
similarity index 100%
rename from packages/cursorless-engine/actions/PasteFromClipboard.ts
rename to packages/cursorless-engine/src/actions/PasteFromClipboard.ts
diff --git a/packages/cursorless-engine/actions/Remove.ts b/packages/cursorless-engine/src/actions/Remove.ts
similarity index 100%
rename from packages/cursorless-engine/actions/Remove.ts
rename to packages/cursorless-engine/src/actions/Remove.ts
diff --git a/packages/cursorless-engine/actions/Replace.ts b/packages/cursorless-engine/src/actions/Replace.ts
similarity index 100%
rename from packages/cursorless-engine/actions/Replace.ts
rename to packages/cursorless-engine/src/actions/Replace.ts
diff --git a/packages/cursorless-engine/actions/Rewrap.ts b/packages/cursorless-engine/src/actions/Rewrap.ts
similarity index 100%
rename from packages/cursorless-engine/actions/Rewrap.ts
rename to packages/cursorless-engine/src/actions/Rewrap.ts
diff --git a/packages/cursorless-engine/actions/Scroll.ts b/packages/cursorless-engine/src/actions/Scroll.ts
similarity index 100%
rename from packages/cursorless-engine/actions/Scroll.ts
rename to packages/cursorless-engine/src/actions/Scroll.ts
diff --git a/packages/cursorless-engine/actions/SetSelection.ts b/packages/cursorless-engine/src/actions/SetSelection.ts
similarity index 100%
rename from packages/cursorless-engine/actions/SetSelection.ts
rename to packages/cursorless-engine/src/actions/SetSelection.ts
diff --git a/packages/cursorless-engine/actions/SimpleIdeCommandActions.ts b/packages/cursorless-engine/src/actions/SimpleIdeCommandActions.ts
similarity index 100%
rename from packages/cursorless-engine/actions/SimpleIdeCommandActions.ts
rename to packages/cursorless-engine/src/actions/SimpleIdeCommandActions.ts
diff --git a/packages/cursorless-engine/actions/Sort.ts b/packages/cursorless-engine/src/actions/Sort.ts
similarity index 100%
rename from packages/cursorless-engine/actions/Sort.ts
rename to packages/cursorless-engine/src/actions/Sort.ts
diff --git a/packages/cursorless-engine/actions/ToggleBreakpoint.ts b/packages/cursorless-engine/src/actions/ToggleBreakpoint.ts
similarity index 100%
rename from packages/cursorless-engine/actions/ToggleBreakpoint.ts
rename to packages/cursorless-engine/src/actions/ToggleBreakpoint.ts
diff --git a/packages/cursorless-engine/actions/Wrap.ts b/packages/cursorless-engine/src/actions/Wrap.ts
similarity index 100%
rename from packages/cursorless-engine/actions/Wrap.ts
rename to packages/cursorless-engine/src/actions/Wrap.ts
diff --git a/packages/cursorless-engine/actions/WrapWithSnippet.ts b/packages/cursorless-engine/src/actions/WrapWithSnippet.ts
similarity index 100%
rename from packages/cursorless-engine/actions/WrapWithSnippet.ts
rename to packages/cursorless-engine/src/actions/WrapWithSnippet.ts
diff --git a/packages/cursorless-engine/actions/actions.types.ts b/packages/cursorless-engine/src/actions/actions.types.ts
similarity index 100%
rename from packages/cursorless-engine/actions/actions.types.ts
rename to packages/cursorless-engine/src/actions/actions.types.ts
diff --git a/packages/cursorless-engine/actions/index.ts b/packages/cursorless-engine/src/actions/index.ts
similarity index 100%
rename from packages/cursorless-engine/actions/index.ts
rename to packages/cursorless-engine/src/actions/index.ts
diff --git a/packages/cursorless-engine/core/HatAllocator.ts b/packages/cursorless-engine/src/core/HatAllocator.ts
similarity index 100%
rename from packages/cursorless-engine/core/HatAllocator.ts
rename to packages/cursorless-engine/src/core/HatAllocator.ts
diff --git a/packages/cursorless-engine/core/HatTokenMapImpl.ts b/packages/cursorless-engine/src/core/HatTokenMapImpl.ts
similarity index 100%
rename from packages/cursorless-engine/core/HatTokenMapImpl.ts
rename to packages/cursorless-engine/src/core/HatTokenMapImpl.ts
diff --git a/packages/cursorless-engine/core/IndividualHatMap.ts b/packages/cursorless-engine/src/core/IndividualHatMap.ts
similarity index 100%
rename from packages/cursorless-engine/core/IndividualHatMap.ts
rename to packages/cursorless-engine/src/core/IndividualHatMap.ts
diff --git a/packages/cursorless-engine/core/Snippets.ts b/packages/cursorless-engine/src/core/Snippets.ts
similarity index 100%
rename from packages/cursorless-engine/core/Snippets.ts
rename to packages/cursorless-engine/src/core/Snippets.ts
diff --git a/packages/cursorless-engine/core/ThatMark.ts b/packages/cursorless-engine/src/core/ThatMark.ts
similarity index 100%
rename from packages/cursorless-engine/core/ThatMark.ts
rename to packages/cursorless-engine/src/core/ThatMark.ts
diff --git a/packages/cursorless-engine/core/commandRunner/CommandRunner.ts b/packages/cursorless-engine/src/core/commandRunner/CommandRunner.ts
similarity index 100%
rename from packages/cursorless-engine/core/commandRunner/CommandRunner.ts
rename to packages/cursorless-engine/src/core/commandRunner/CommandRunner.ts
diff --git a/packages/cursorless-engine/core/commandRunner/selectionToThatTarget.ts b/packages/cursorless-engine/src/core/commandRunner/selectionToThatTarget.ts
similarity index 100%
rename from packages/cursorless-engine/core/commandRunner/selectionToThatTarget.ts
rename to packages/cursorless-engine/src/core/commandRunner/selectionToThatTarget.ts
diff --git a/packages/cursorless-engine/core/commandVersionUpgrades/canonicalizeActionName.ts b/packages/cursorless-engine/src/core/commandVersionUpgrades/canonicalizeActionName.ts
similarity index 100%
rename from packages/cursorless-engine/core/commandVersionUpgrades/canonicalizeActionName.ts
rename to packages/cursorless-engine/src/core/commandVersionUpgrades/canonicalizeActionName.ts
diff --git a/packages/cursorless-engine/core/commandVersionUpgrades/canonicalizeAndValidateCommand.ts b/packages/cursorless-engine/src/core/commandVersionUpgrades/canonicalizeAndValidateCommand.ts
similarity index 100%
rename from packages/cursorless-engine/core/commandVersionUpgrades/canonicalizeAndValidateCommand.ts
rename to packages/cursorless-engine/src/core/commandVersionUpgrades/canonicalizeAndValidateCommand.ts
diff --git a/packages/cursorless-engine/core/commandVersionUpgrades/canonicalizeTargets.ts b/packages/cursorless-engine/src/core/commandVersionUpgrades/canonicalizeTargets.ts
similarity index 100%
rename from packages/cursorless-engine/core/commandVersionUpgrades/canonicalizeTargets.ts
rename to packages/cursorless-engine/src/core/commandVersionUpgrades/canonicalizeTargets.ts
diff --git a/packages/cursorless-engine/core/commandVersionUpgrades/upgradeV0ToV1/index.ts b/packages/cursorless-engine/src/core/commandVersionUpgrades/upgradeV0ToV1/index.ts
similarity index 100%
rename from packages/cursorless-engine/core/commandVersionUpgrades/upgradeV0ToV1/index.ts
rename to packages/cursorless-engine/src/core/commandVersionUpgrades/upgradeV0ToV1/index.ts
diff --git a/packages/cursorless-engine/core/commandVersionUpgrades/upgradeV0ToV1/upgradeV0ToV1.ts b/packages/cursorless-engine/src/core/commandVersionUpgrades/upgradeV0ToV1/upgradeV0ToV1.ts
similarity index 100%
rename from packages/cursorless-engine/core/commandVersionUpgrades/upgradeV0ToV1/upgradeV0ToV1.ts
rename to packages/cursorless-engine/src/core/commandVersionUpgrades/upgradeV0ToV1/upgradeV0ToV1.ts
diff --git a/packages/cursorless-engine/core/commandVersionUpgrades/upgradeV1ToV2/index.ts b/packages/cursorless-engine/src/core/commandVersionUpgrades/upgradeV1ToV2/index.ts
similarity index 100%
rename from packages/cursorless-engine/core/commandVersionUpgrades/upgradeV1ToV2/index.ts
rename to packages/cursorless-engine/src/core/commandVersionUpgrades/upgradeV1ToV2/index.ts
diff --git a/packages/cursorless-engine/core/commandVersionUpgrades/upgradeV1ToV2/upgradeStrictHere.ts b/packages/cursorless-engine/src/core/commandVersionUpgrades/upgradeV1ToV2/upgradeStrictHere.ts
similarity index 100%
rename from packages/cursorless-engine/core/commandVersionUpgrades/upgradeV1ToV2/upgradeStrictHere.ts
rename to packages/cursorless-engine/src/core/commandVersionUpgrades/upgradeV1ToV2/upgradeStrictHere.ts
diff --git a/packages/cursorless-engine/core/commandVersionUpgrades/upgradeV1ToV2/upgradeV1ToV2.ts b/packages/cursorless-engine/src/core/commandVersionUpgrades/upgradeV1ToV2/upgradeV1ToV2.ts
similarity index 100%
rename from packages/cursorless-engine/core/commandVersionUpgrades/upgradeV1ToV2/upgradeV1ToV2.ts
rename to packages/cursorless-engine/src/core/commandVersionUpgrades/upgradeV1ToV2/upgradeV1ToV2.ts
diff --git a/packages/cursorless-engine/core/commandVersionUpgrades/upgradeV2ToV3/index.ts b/packages/cursorless-engine/src/core/commandVersionUpgrades/upgradeV2ToV3/index.ts
similarity index 100%
rename from packages/cursorless-engine/core/commandVersionUpgrades/upgradeV2ToV3/index.ts
rename to packages/cursorless-engine/src/core/commandVersionUpgrades/upgradeV2ToV3/index.ts
diff --git a/packages/cursorless-engine/core/commandVersionUpgrades/upgradeV2ToV3/upgradeV2ToV3.ts b/packages/cursorless-engine/src/core/commandVersionUpgrades/upgradeV2ToV3/upgradeV2ToV3.ts
similarity index 100%
rename from packages/cursorless-engine/core/commandVersionUpgrades/upgradeV2ToV3/upgradeV2ToV3.ts
rename to packages/cursorless-engine/src/core/commandVersionUpgrades/upgradeV2ToV3/upgradeV2ToV3.ts
diff --git a/packages/cursorless-engine/core/commandVersionUpgrades/upgradeV3ToV4/index.ts b/packages/cursorless-engine/src/core/commandVersionUpgrades/upgradeV3ToV4/index.ts
similarity index 100%
rename from packages/cursorless-engine/core/commandVersionUpgrades/upgradeV3ToV4/index.ts
rename to packages/cursorless-engine/src/core/commandVersionUpgrades/upgradeV3ToV4/index.ts
diff --git a/packages/cursorless-engine/core/commandVersionUpgrades/upgradeV3ToV4/upgradeV3ToV4.ts b/packages/cursorless-engine/src/core/commandVersionUpgrades/upgradeV3ToV4/upgradeV3ToV4.ts
similarity index 100%
rename from packages/cursorless-engine/core/commandVersionUpgrades/upgradeV3ToV4/upgradeV3ToV4.ts
rename to packages/cursorless-engine/src/core/commandVersionUpgrades/upgradeV3ToV4/upgradeV3ToV4.ts
diff --git a/packages/cursorless-engine/core/inferFullTargets.ts b/packages/cursorless-engine/src/core/inferFullTargets.ts
similarity index 100%
rename from packages/cursorless-engine/core/inferFullTargets.ts
rename to packages/cursorless-engine/src/core/inferFullTargets.ts
diff --git a/packages/cursorless-engine/core/updateSelections/RangeUpdater.ts b/packages/cursorless-engine/src/core/updateSelections/RangeUpdater.ts
similarity index 100%
rename from packages/cursorless-engine/core/updateSelections/RangeUpdater.ts
rename to packages/cursorless-engine/src/core/updateSelections/RangeUpdater.ts
diff --git a/packages/cursorless-engine/core/updateSelections/getOffsetsForDeleteOrReplace.ts b/packages/cursorless-engine/src/core/updateSelections/getOffsetsForDeleteOrReplace.ts
similarity index 100%
rename from packages/cursorless-engine/core/updateSelections/getOffsetsForDeleteOrReplace.ts
rename to packages/cursorless-engine/src/core/updateSelections/getOffsetsForDeleteOrReplace.ts
diff --git a/packages/cursorless-engine/core/updateSelections/getOffsetsForEmptyRangeInsert.ts b/packages/cursorless-engine/src/core/updateSelections/getOffsetsForEmptyRangeInsert.ts
similarity index 100%
rename from packages/cursorless-engine/core/updateSelections/getOffsetsForEmptyRangeInsert.ts
rename to packages/cursorless-engine/src/core/updateSelections/getOffsetsForEmptyRangeInsert.ts
diff --git a/packages/cursorless-engine/core/updateSelections/getOffsetsForNonEmptyRangeInsert.ts b/packages/cursorless-engine/src/core/updateSelections/getOffsetsForNonEmptyRangeInsert.ts
similarity index 100%
rename from packages/cursorless-engine/core/updateSelections/getOffsetsForNonEmptyRangeInsert.ts
rename to packages/cursorless-engine/src/core/updateSelections/getOffsetsForNonEmptyRangeInsert.ts
diff --git a/packages/cursorless-engine/core/updateSelections/getUpdatedText.ts b/packages/cursorless-engine/src/core/updateSelections/getUpdatedText.ts
similarity index 100%
rename from packages/cursorless-engine/core/updateSelections/getUpdatedText.ts
rename to packages/cursorless-engine/src/core/updateSelections/getUpdatedText.ts
diff --git a/packages/cursorless-engine/core/updateSelections/updateRangeInfos.ts b/packages/cursorless-engine/src/core/updateSelections/updateRangeInfos.ts
similarity index 100%
rename from packages/cursorless-engine/core/updateSelections/updateRangeInfos.ts
rename to packages/cursorless-engine/src/core/updateSelections/updateRangeInfos.ts
diff --git a/packages/cursorless-engine/index.ts b/packages/cursorless-engine/src/index.ts
similarity index 100%
rename from packages/cursorless-engine/index.ts
rename to packages/cursorless-engine/src/index.ts
diff --git a/packages/cursorless-engine/languages/branchMatcher.ts b/packages/cursorless-engine/src/languages/branchMatcher.ts
similarity index 100%
rename from packages/cursorless-engine/languages/branchMatcher.ts
rename to packages/cursorless-engine/src/languages/branchMatcher.ts
diff --git a/packages/cursorless-engine/languages/constants.ts b/packages/cursorless-engine/src/languages/constants.ts
similarity index 100%
rename from packages/cursorless-engine/languages/constants.ts
rename to packages/cursorless-engine/src/languages/constants.ts
diff --git a/packages/cursorless-engine/languages/cpp.ts b/packages/cursorless-engine/src/languages/cpp.ts
similarity index 100%
rename from packages/cursorless-engine/languages/cpp.ts
rename to packages/cursorless-engine/src/languages/cpp.ts
diff --git a/packages/cursorless-engine/languages/go.ts b/packages/cursorless-engine/src/languages/go.ts
similarity index 100%
rename from packages/cursorless-engine/languages/go.ts
rename to packages/cursorless-engine/src/languages/go.ts
diff --git a/packages/cursorless-engine/languages/index.ts b/packages/cursorless-engine/src/languages/index.ts
similarity index 100%
rename from packages/cursorless-engine/languages/index.ts
rename to packages/cursorless-engine/src/languages/index.ts
diff --git a/packages/cursorless-engine/languages/java.ts b/packages/cursorless-engine/src/languages/java.ts
similarity index 100%
rename from packages/cursorless-engine/languages/java.ts
rename to packages/cursorless-engine/src/languages/java.ts
diff --git a/packages/cursorless-engine/languages/scala.ts b/packages/cursorless-engine/src/languages/scala.ts
similarity index 100%
rename from packages/cursorless-engine/languages/scala.ts
rename to packages/cursorless-engine/src/languages/scala.ts
diff --git a/packages/cursorless-engine/processTargets/PipelineStages.types.ts b/packages/cursorless-engine/src/processTargets/PipelineStages.types.ts
similarity index 100%
rename from packages/cursorless-engine/processTargets/PipelineStages.types.ts
rename to packages/cursorless-engine/src/processTargets/PipelineStages.types.ts
diff --git a/packages/cursorless-engine/processTargets/getMarkStage.ts b/packages/cursorless-engine/src/processTargets/getMarkStage.ts
similarity index 100%
rename from packages/cursorless-engine/processTargets/getMarkStage.ts
rename to packages/cursorless-engine/src/processTargets/getMarkStage.ts
diff --git a/packages/cursorless-engine/processTargets/getModifierStage.ts b/packages/cursorless-engine/src/processTargets/getModifierStage.ts
similarity index 100%
rename from packages/cursorless-engine/processTargets/getModifierStage.ts
rename to packages/cursorless-engine/src/processTargets/getModifierStage.ts
diff --git a/packages/cursorless-engine/processTargets/index.ts b/packages/cursorless-engine/src/processTargets/index.ts
similarity index 100%
rename from packages/cursorless-engine/processTargets/index.ts
rename to packages/cursorless-engine/src/processTargets/index.ts
diff --git a/packages/cursorless-engine/processTargets/marks/CursorStage.ts b/packages/cursorless-engine/src/processTargets/marks/CursorStage.ts
similarity index 100%
rename from packages/cursorless-engine/processTargets/marks/CursorStage.ts
rename to packages/cursorless-engine/src/processTargets/marks/CursorStage.ts
diff --git a/packages/cursorless-engine/processTargets/marks/DecoratedSymbolStage.ts b/packages/cursorless-engine/src/processTargets/marks/DecoratedSymbolStage.ts
similarity index 100%
rename from packages/cursorless-engine/processTargets/marks/DecoratedSymbolStage.ts
rename to packages/cursorless-engine/src/processTargets/marks/DecoratedSymbolStage.ts
diff --git a/packages/cursorless-engine/processTargets/marks/ImplicitStage.ts b/packages/cursorless-engine/src/processTargets/marks/ImplicitStage.ts
similarity index 100%
rename from packages/cursorless-engine/processTargets/marks/ImplicitStage.ts
rename to packages/cursorless-engine/src/processTargets/marks/ImplicitStage.ts
diff --git a/packages/cursorless-engine/processTargets/marks/LineNumberStage.ts b/packages/cursorless-engine/src/processTargets/marks/LineNumberStage.ts
similarity index 100%
rename from packages/cursorless-engine/processTargets/marks/LineNumberStage.ts
rename to packages/cursorless-engine/src/processTargets/marks/LineNumberStage.ts
diff --git a/packages/cursorless-engine/processTargets/marks/NothingStage.ts b/packages/cursorless-engine/src/processTargets/marks/NothingStage.ts
similarity index 100%
rename from packages/cursorless-engine/processTargets/marks/NothingStage.ts
rename to packages/cursorless-engine/src/processTargets/marks/NothingStage.ts
diff --git a/packages/cursorless-engine/processTargets/marks/RangeMarkStage.ts b/packages/cursorless-engine/src/processTargets/marks/RangeMarkStage.ts
similarity index 100%
rename from packages/cursorless-engine/processTargets/marks/RangeMarkStage.ts
rename to packages/cursorless-engine/src/processTargets/marks/RangeMarkStage.ts
diff --git a/packages/cursorless-engine/processTargets/marks/ThatStage.ts b/packages/cursorless-engine/src/processTargets/marks/ThatStage.ts
similarity index 100%
rename from packages/cursorless-engine/processTargets/marks/ThatStage.ts
rename to packages/cursorless-engine/src/processTargets/marks/ThatStage.ts
diff --git a/packages/cursorless-engine/processTargets/modifiers/CascadingStage.ts b/packages/cursorless-engine/src/processTargets/modifiers/CascadingStage.ts
similarity index 100%
rename from packages/cursorless-engine/processTargets/modifiers/CascadingStage.ts
rename to packages/cursorless-engine/src/processTargets/modifiers/CascadingStage.ts
diff --git a/packages/cursorless-engine/processTargets/modifiers/ConditionalModifierStages.ts b/packages/cursorless-engine/src/processTargets/modifiers/ConditionalModifierStages.ts
similarity index 100%
rename from packages/cursorless-engine/processTargets/modifiers/ConditionalModifierStages.ts
rename to packages/cursorless-engine/src/processTargets/modifiers/ConditionalModifierStages.ts
diff --git a/packages/cursorless-engine/processTargets/modifiers/ContainingScopeStage.ts b/packages/cursorless-engine/src/processTargets/modifiers/ContainingScopeStage.ts
similarity index 100%
rename from packages/cursorless-engine/processTargets/modifiers/ContainingScopeStage.ts
rename to packages/cursorless-engine/src/processTargets/modifiers/ContainingScopeStage.ts
diff --git a/packages/cursorless-engine/processTargets/modifiers/EveryScopeStage.ts b/packages/cursorless-engine/src/processTargets/modifiers/EveryScopeStage.ts
similarity index 100%
rename from packages/cursorless-engine/processTargets/modifiers/EveryScopeStage.ts
rename to packages/cursorless-engine/src/processTargets/modifiers/EveryScopeStage.ts
diff --git a/packages/cursorless-engine/processTargets/modifiers/FilterStages.ts b/packages/cursorless-engine/src/processTargets/modifiers/FilterStages.ts
similarity index 100%
rename from packages/cursorless-engine/processTargets/modifiers/FilterStages.ts
rename to packages/cursorless-engine/src/processTargets/modifiers/FilterStages.ts
diff --git a/packages/cursorless-engine/processTargets/modifiers/HeadTailStage.ts b/packages/cursorless-engine/src/processTargets/modifiers/HeadTailStage.ts
similarity index 100%
rename from packages/cursorless-engine/processTargets/modifiers/HeadTailStage.ts
rename to packages/cursorless-engine/src/processTargets/modifiers/HeadTailStage.ts
diff --git a/packages/cursorless-engine/processTargets/modifiers/InteriorStage.ts b/packages/cursorless-engine/src/processTargets/modifiers/InteriorStage.ts
similarity index 100%
rename from packages/cursorless-engine/processTargets/modifiers/InteriorStage.ts
rename to packages/cursorless-engine/src/processTargets/modifiers/InteriorStage.ts
diff --git a/packages/cursorless-engine/processTargets/modifiers/ItemStage/ItemStage.ts b/packages/cursorless-engine/src/processTargets/modifiers/ItemStage/ItemStage.ts
similarity index 100%
rename from packages/cursorless-engine/processTargets/modifiers/ItemStage/ItemStage.ts
rename to packages/cursorless-engine/src/processTargets/modifiers/ItemStage/ItemStage.ts
diff --git a/packages/cursorless-engine/processTargets/modifiers/ItemStage/getIterationScope.ts b/packages/cursorless-engine/src/processTargets/modifiers/ItemStage/getIterationScope.ts
similarity index 100%
rename from packages/cursorless-engine/processTargets/modifiers/ItemStage/getIterationScope.ts
rename to packages/cursorless-engine/src/processTargets/modifiers/ItemStage/getIterationScope.ts
diff --git a/packages/cursorless-engine/processTargets/modifiers/ItemStage/index.ts b/packages/cursorless-engine/src/processTargets/modifiers/ItemStage/index.ts
similarity index 100%
rename from packages/cursorless-engine/processTargets/modifiers/ItemStage/index.ts
rename to packages/cursorless-engine/src/processTargets/modifiers/ItemStage/index.ts
diff --git a/packages/cursorless-engine/processTargets/modifiers/ItemStage/tokenizeRange.ts b/packages/cursorless-engine/src/processTargets/modifiers/ItemStage/tokenizeRange.ts
similarity index 100%
rename from packages/cursorless-engine/processTargets/modifiers/ItemStage/tokenizeRange.ts
rename to packages/cursorless-engine/src/processTargets/modifiers/ItemStage/tokenizeRange.ts
diff --git a/packages/cursorless-engine/processTargets/modifiers/LeadingTrailingStages.ts b/packages/cursorless-engine/src/processTargets/modifiers/LeadingTrailingStages.ts
similarity index 100%
rename from packages/cursorless-engine/processTargets/modifiers/LeadingTrailingStages.ts
rename to packages/cursorless-engine/src/processTargets/modifiers/LeadingTrailingStages.ts
diff --git a/packages/cursorless-engine/processTargets/modifiers/OrdinalScopeStage.ts b/packages/cursorless-engine/src/processTargets/modifiers/OrdinalScopeStage.ts
similarity index 100%
rename from packages/cursorless-engine/processTargets/modifiers/OrdinalScopeStage.ts
rename to packages/cursorless-engine/src/processTargets/modifiers/OrdinalScopeStage.ts
diff --git a/packages/cursorless-engine/processTargets/modifiers/PositionStage.ts b/packages/cursorless-engine/src/processTargets/modifiers/PositionStage.ts
similarity index 100%
rename from packages/cursorless-engine/processTargets/modifiers/PositionStage.ts
rename to packages/cursorless-engine/src/processTargets/modifiers/PositionStage.ts
diff --git a/packages/cursorless-engine/processTargets/modifiers/RangeModifierStage.ts b/packages/cursorless-engine/src/processTargets/modifiers/RangeModifierStage.ts
similarity index 100%
rename from packages/cursorless-engine/processTargets/modifiers/RangeModifierStage.ts
rename to packages/cursorless-engine/src/processTargets/modifiers/RangeModifierStage.ts
diff --git a/packages/cursorless-engine/processTargets/modifiers/RawSelectionStage.ts b/packages/cursorless-engine/src/processTargets/modifiers/RawSelectionStage.ts
similarity index 100%
rename from packages/cursorless-engine/processTargets/modifiers/RawSelectionStage.ts
rename to packages/cursorless-engine/src/processTargets/modifiers/RawSelectionStage.ts
diff --git a/packages/cursorless-engine/processTargets/modifiers/RelativeExclusiveScopeStage.ts b/packages/cursorless-engine/src/processTargets/modifiers/RelativeExclusiveScopeStage.ts
similarity index 100%
rename from packages/cursorless-engine/processTargets/modifiers/RelativeExclusiveScopeStage.ts
rename to packages/cursorless-engine/src/processTargets/modifiers/RelativeExclusiveScopeStage.ts
diff --git a/packages/cursorless-engine/processTargets/modifiers/RelativeInclusiveScopeStage.ts b/packages/cursorless-engine/src/processTargets/modifiers/RelativeInclusiveScopeStage.ts
similarity index 100%
rename from packages/cursorless-engine/processTargets/modifiers/RelativeInclusiveScopeStage.ts
rename to packages/cursorless-engine/src/processTargets/modifiers/RelativeInclusiveScopeStage.ts
diff --git a/packages/cursorless-engine/processTargets/modifiers/RelativeScopeStage.ts b/packages/cursorless-engine/src/processTargets/modifiers/RelativeScopeStage.ts
similarity index 100%
rename from packages/cursorless-engine/processTargets/modifiers/RelativeScopeStage.ts
rename to packages/cursorless-engine/src/processTargets/modifiers/RelativeScopeStage.ts
diff --git a/packages/cursorless-engine/processTargets/modifiers/SurroundingPairStage.ts b/packages/cursorless-engine/src/processTargets/modifiers/SurroundingPairStage.ts
similarity index 100%
rename from packages/cursorless-engine/processTargets/modifiers/SurroundingPairStage.ts
rename to packages/cursorless-engine/src/processTargets/modifiers/SurroundingPairStage.ts
diff --git a/packages/cursorless-engine/processTargets/modifiers/TooFewScopesError.ts b/packages/cursorless-engine/src/processTargets/modifiers/TooFewScopesError.ts
similarity index 100%
rename from packages/cursorless-engine/processTargets/modifiers/TooFewScopesError.ts
rename to packages/cursorless-engine/src/processTargets/modifiers/TooFewScopesError.ts
diff --git a/packages/cursorless-engine/processTargets/modifiers/commonContainingScopeIfUntypedStages.ts b/packages/cursorless-engine/src/processTargets/modifiers/commonContainingScopeIfUntypedStages.ts
similarity index 100%
rename from packages/cursorless-engine/processTargets/modifiers/commonContainingScopeIfUntypedStages.ts
rename to packages/cursorless-engine/src/processTargets/modifiers/commonContainingScopeIfUntypedStages.ts
diff --git a/packages/cursorless-engine/processTargets/modifiers/constructScopeRangeTarget.ts b/packages/cursorless-engine/src/processTargets/modifiers/constructScopeRangeTarget.ts
similarity index 100%
rename from packages/cursorless-engine/processTargets/modifiers/constructScopeRangeTarget.ts
rename to packages/cursorless-engine/src/processTargets/modifiers/constructScopeRangeTarget.ts
diff --git a/packages/cursorless-engine/processTargets/modifiers/getContainingScope.ts b/packages/cursorless-engine/src/processTargets/modifiers/getContainingScope.ts
similarity index 100%
rename from packages/cursorless-engine/processTargets/modifiers/getContainingScope.ts
rename to packages/cursorless-engine/src/processTargets/modifiers/getContainingScope.ts
diff --git a/packages/cursorless-engine/processTargets/modifiers/getLegacyScopeStage.ts b/packages/cursorless-engine/src/processTargets/modifiers/getLegacyScopeStage.ts
similarity index 100%
rename from packages/cursorless-engine/processTargets/modifiers/getLegacyScopeStage.ts
rename to packages/cursorless-engine/src/processTargets/modifiers/getLegacyScopeStage.ts
diff --git a/packages/cursorless-engine/processTargets/modifiers/relativeScopeLegacy.ts b/packages/cursorless-engine/src/processTargets/modifiers/relativeScopeLegacy.ts
similarity index 100%
rename from packages/cursorless-engine/processTargets/modifiers/relativeScopeLegacy.ts
rename to packages/cursorless-engine/src/processTargets/modifiers/relativeScopeLegacy.ts
diff --git a/packages/cursorless-engine/processTargets/modifiers/scopeHandlers/BaseScopeHandler.ts b/packages/cursorless-engine/src/processTargets/modifiers/scopeHandlers/BaseScopeHandler.ts
similarity index 100%
rename from packages/cursorless-engine/processTargets/modifiers/scopeHandlers/BaseScopeHandler.ts
rename to packages/cursorless-engine/src/processTargets/modifiers/scopeHandlers/BaseScopeHandler.ts
diff --git a/packages/cursorless-engine/processTargets/modifiers/scopeHandlers/CharacterScopeHandler.ts b/packages/cursorless-engine/src/processTargets/modifiers/scopeHandlers/CharacterScopeHandler.ts
similarity index 100%
rename from packages/cursorless-engine/processTargets/modifiers/scopeHandlers/CharacterScopeHandler.ts
rename to packages/cursorless-engine/src/processTargets/modifiers/scopeHandlers/CharacterScopeHandler.ts
diff --git a/packages/cursorless-engine/processTargets/modifiers/scopeHandlers/DocumentScopeHandler.ts b/packages/cursorless-engine/src/processTargets/modifiers/scopeHandlers/DocumentScopeHandler.ts
similarity index 100%
rename from packages/cursorless-engine/processTargets/modifiers/scopeHandlers/DocumentScopeHandler.ts
rename to packages/cursorless-engine/src/processTargets/modifiers/scopeHandlers/DocumentScopeHandler.ts
diff --git a/packages/cursorless-engine/processTargets/modifiers/scopeHandlers/IdentifierScopeHandler.ts b/packages/cursorless-engine/src/processTargets/modifiers/scopeHandlers/IdentifierScopeHandler.ts
similarity index 100%
rename from packages/cursorless-engine/processTargets/modifiers/scopeHandlers/IdentifierScopeHandler.ts
rename to packages/cursorless-engine/src/processTargets/modifiers/scopeHandlers/IdentifierScopeHandler.ts
diff --git a/packages/cursorless-engine/processTargets/modifiers/scopeHandlers/IteratorInfo.ts b/packages/cursorless-engine/src/processTargets/modifiers/scopeHandlers/IteratorInfo.ts
similarity index 100%
rename from packages/cursorless-engine/processTargets/modifiers/scopeHandlers/IteratorInfo.ts
rename to packages/cursorless-engine/src/processTargets/modifiers/scopeHandlers/IteratorInfo.ts
diff --git a/packages/cursorless-engine/processTargets/modifiers/scopeHandlers/LineScopeHandler.ts b/packages/cursorless-engine/src/processTargets/modifiers/scopeHandlers/LineScopeHandler.ts
similarity index 100%
rename from packages/cursorless-engine/processTargets/modifiers/scopeHandlers/LineScopeHandler.ts
rename to packages/cursorless-engine/src/processTargets/modifiers/scopeHandlers/LineScopeHandler.ts
diff --git a/packages/cursorless-engine/processTargets/modifiers/scopeHandlers/NestedScopeHandler.ts b/packages/cursorless-engine/src/processTargets/modifiers/scopeHandlers/NestedScopeHandler.ts
similarity index 100%
rename from packages/cursorless-engine/processTargets/modifiers/scopeHandlers/NestedScopeHandler.ts
rename to packages/cursorless-engine/src/processTargets/modifiers/scopeHandlers/NestedScopeHandler.ts
diff --git a/packages/cursorless-engine/processTargets/modifiers/scopeHandlers/NotHierarchicalScopeError.ts b/packages/cursorless-engine/src/processTargets/modifiers/scopeHandlers/NotHierarchicalScopeError.ts
similarity index 100%
rename from packages/cursorless-engine/processTargets/modifiers/scopeHandlers/NotHierarchicalScopeError.ts
rename to packages/cursorless-engine/src/processTargets/modifiers/scopeHandlers/NotHierarchicalScopeError.ts
diff --git a/packages/cursorless-engine/processTargets/modifiers/scopeHandlers/OneOfScopeHandler.ts b/packages/cursorless-engine/src/processTargets/modifiers/scopeHandlers/OneOfScopeHandler.ts
similarity index 100%
rename from packages/cursorless-engine/processTargets/modifiers/scopeHandlers/OneOfScopeHandler.ts
rename to packages/cursorless-engine/src/processTargets/modifiers/scopeHandlers/OneOfScopeHandler.ts
diff --git a/packages/cursorless-engine/processTargets/modifiers/scopeHandlers/ParagraphScopeHandler.ts b/packages/cursorless-engine/src/processTargets/modifiers/scopeHandlers/ParagraphScopeHandler.ts
similarity index 100%
rename from packages/cursorless-engine/processTargets/modifiers/scopeHandlers/ParagraphScopeHandler.ts
rename to packages/cursorless-engine/src/processTargets/modifiers/scopeHandlers/ParagraphScopeHandler.ts
diff --git a/packages/cursorless-engine/processTargets/modifiers/scopeHandlers/SurroundingPairScopeHandler.ts b/packages/cursorless-engine/src/processTargets/modifiers/scopeHandlers/SurroundingPairScopeHandler.ts
similarity index 100%
rename from packages/cursorless-engine/processTargets/modifiers/scopeHandlers/SurroundingPairScopeHandler.ts
rename to packages/cursorless-engine/src/processTargets/modifiers/scopeHandlers/SurroundingPairScopeHandler.ts
diff --git a/packages/cursorless-engine/processTargets/modifiers/scopeHandlers/TokenScopeHandler.ts b/packages/cursorless-engine/src/processTargets/modifiers/scopeHandlers/TokenScopeHandler.ts
similarity index 100%
rename from packages/cursorless-engine/processTargets/modifiers/scopeHandlers/TokenScopeHandler.ts
rename to packages/cursorless-engine/src/processTargets/modifiers/scopeHandlers/TokenScopeHandler.ts
diff --git a/packages/cursorless-engine/processTargets/modifiers/scopeHandlers/WordScopeHandler.ts b/packages/cursorless-engine/src/processTargets/modifiers/scopeHandlers/WordScopeHandler.ts
similarity index 100%
rename from packages/cursorless-engine/processTargets/modifiers/scopeHandlers/WordScopeHandler.ts
rename to packages/cursorless-engine/src/processTargets/modifiers/scopeHandlers/WordScopeHandler.ts
diff --git a/packages/cursorless-engine/processTargets/modifiers/scopeHandlers/compareTargetScopes.ts b/packages/cursorless-engine/src/processTargets/modifiers/scopeHandlers/compareTargetScopes.ts
similarity index 100%
rename from packages/cursorless-engine/processTargets/modifiers/scopeHandlers/compareTargetScopes.ts
rename to packages/cursorless-engine/src/processTargets/modifiers/scopeHandlers/compareTargetScopes.ts
diff --git a/packages/cursorless-engine/processTargets/modifiers/scopeHandlers/getScopeHandler.ts b/packages/cursorless-engine/src/processTargets/modifiers/scopeHandlers/getScopeHandler.ts
similarity index 100%
rename from packages/cursorless-engine/processTargets/modifiers/scopeHandlers/getScopeHandler.ts
rename to packages/cursorless-engine/src/processTargets/modifiers/scopeHandlers/getScopeHandler.ts
diff --git a/packages/cursorless-engine/processTargets/modifiers/scopeHandlers/getScopeRelativeToPosition.ts b/packages/cursorless-engine/src/processTargets/modifiers/scopeHandlers/getScopeRelativeToPosition.ts
similarity index 100%
rename from packages/cursorless-engine/processTargets/modifiers/scopeHandlers/getScopeRelativeToPosition.ts
rename to packages/cursorless-engine/src/processTargets/modifiers/scopeHandlers/getScopeRelativeToPosition.ts
diff --git a/packages/cursorless-engine/processTargets/modifiers/scopeHandlers/getScopesOverlappingRange.ts b/packages/cursorless-engine/src/processTargets/modifiers/scopeHandlers/getScopesOverlappingRange.ts
similarity index 100%
rename from packages/cursorless-engine/processTargets/modifiers/scopeHandlers/getScopesOverlappingRange.ts
rename to packages/cursorless-engine/src/processTargets/modifiers/scopeHandlers/getScopesOverlappingRange.ts
diff --git a/packages/cursorless-engine/processTargets/modifiers/scopeHandlers/index.ts b/packages/cursorless-engine/src/processTargets/modifiers/scopeHandlers/index.ts
similarity index 100%
rename from packages/cursorless-engine/processTargets/modifiers/scopeHandlers/index.ts
rename to packages/cursorless-engine/src/processTargets/modifiers/scopeHandlers/index.ts
diff --git a/packages/cursorless-engine/processTargets/modifiers/scopeHandlers/scope.types.ts b/packages/cursorless-engine/src/processTargets/modifiers/scopeHandlers/scope.types.ts
similarity index 100%
rename from packages/cursorless-engine/processTargets/modifiers/scopeHandlers/scope.types.ts
rename to packages/cursorless-engine/src/processTargets/modifiers/scopeHandlers/scope.types.ts
diff --git a/packages/cursorless-engine/processTargets/modifiers/scopeHandlers/scopeHandler.types.ts b/packages/cursorless-engine/src/processTargets/modifiers/scopeHandlers/scopeHandler.types.ts
similarity index 100%
rename from packages/cursorless-engine/processTargets/modifiers/scopeHandlers/scopeHandler.types.ts
rename to packages/cursorless-engine/src/processTargets/modifiers/scopeHandlers/scopeHandler.types.ts
diff --git a/packages/cursorless-engine/processTargets/modifiers/scopeHandlers/scopeTypeUtil.ts b/packages/cursorless-engine/src/processTargets/modifiers/scopeHandlers/scopeTypeUtil.ts
similarity index 100%
rename from packages/cursorless-engine/processTargets/modifiers/scopeHandlers/scopeTypeUtil.ts
rename to packages/cursorless-engine/src/processTargets/modifiers/scopeHandlers/scopeTypeUtil.ts
diff --git a/packages/cursorless-engine/processTargets/modifiers/scopeHandlers/shouldYieldScope.ts b/packages/cursorless-engine/src/processTargets/modifiers/scopeHandlers/shouldYieldScope.ts
similarity index 100%
rename from packages/cursorless-engine/processTargets/modifiers/scopeHandlers/shouldYieldScope.ts
rename to packages/cursorless-engine/src/processTargets/modifiers/scopeHandlers/shouldYieldScope.ts
diff --git a/packages/cursorless-engine/processTargets/modifiers/scopeTypeStages/BoundedNonWhitespaceStage.ts b/packages/cursorless-engine/src/processTargets/modifiers/scopeTypeStages/BoundedNonWhitespaceStage.ts
similarity index 100%
rename from packages/cursorless-engine/processTargets/modifiers/scopeTypeStages/BoundedNonWhitespaceStage.ts
rename to packages/cursorless-engine/src/processTargets/modifiers/scopeTypeStages/BoundedNonWhitespaceStage.ts
diff --git a/packages/cursorless-engine/processTargets/modifiers/scopeTypeStages/ContainingSyntaxScopeStage.ts b/packages/cursorless-engine/src/processTargets/modifiers/scopeTypeStages/ContainingSyntaxScopeStage.ts
similarity index 100%
rename from packages/cursorless-engine/processTargets/modifiers/scopeTypeStages/ContainingSyntaxScopeStage.ts
rename to packages/cursorless-engine/src/processTargets/modifiers/scopeTypeStages/ContainingSyntaxScopeStage.ts
diff --git a/packages/cursorless-engine/processTargets/modifiers/scopeTypeStages/NotebookCellStage.ts b/packages/cursorless-engine/src/processTargets/modifiers/scopeTypeStages/NotebookCellStage.ts
similarity index 100%
rename from packages/cursorless-engine/processTargets/modifiers/scopeTypeStages/NotebookCellStage.ts
rename to packages/cursorless-engine/src/processTargets/modifiers/scopeTypeStages/NotebookCellStage.ts
diff --git a/packages/cursorless-engine/processTargets/modifiers/scopeTypeStages/RegexStage.ts b/packages/cursorless-engine/src/processTargets/modifiers/scopeTypeStages/RegexStage.ts
similarity index 100%
rename from packages/cursorless-engine/processTargets/modifiers/scopeTypeStages/RegexStage.ts
rename to packages/cursorless-engine/src/processTargets/modifiers/scopeTypeStages/RegexStage.ts
diff --git a/packages/cursorless-engine/processTargets/modifiers/surroundingPair/delimiterMaps.ts b/packages/cursorless-engine/src/processTargets/modifiers/surroundingPair/delimiterMaps.ts
similarity index 100%
rename from packages/cursorless-engine/processTargets/modifiers/surroundingPair/delimiterMaps.ts
rename to packages/cursorless-engine/src/processTargets/modifiers/surroundingPair/delimiterMaps.ts
diff --git a/packages/cursorless-engine/processTargets/modifiers/surroundingPair/extractSelectionFromSurroundingPairOffsets.ts b/packages/cursorless-engine/src/processTargets/modifiers/surroundingPair/extractSelectionFromSurroundingPairOffsets.ts
similarity index 100%
rename from packages/cursorless-engine/processTargets/modifiers/surroundingPair/extractSelectionFromSurroundingPairOffsets.ts
rename to packages/cursorless-engine/src/processTargets/modifiers/surroundingPair/extractSelectionFromSurroundingPairOffsets.ts
diff --git a/packages/cursorless-engine/processTargets/modifiers/surroundingPair/findDelimiterPairAdjacentToSelection.ts b/packages/cursorless-engine/src/processTargets/modifiers/surroundingPair/findDelimiterPairAdjacentToSelection.ts
similarity index 100%
rename from packages/cursorless-engine/processTargets/modifiers/surroundingPair/findDelimiterPairAdjacentToSelection.ts
rename to packages/cursorless-engine/src/processTargets/modifiers/surroundingPair/findDelimiterPairAdjacentToSelection.ts
diff --git a/packages/cursorless-engine/processTargets/modifiers/surroundingPair/findDelimiterPairContainingSelection.ts b/packages/cursorless-engine/src/processTargets/modifiers/surroundingPair/findDelimiterPairContainingSelection.ts
similarity index 100%
rename from packages/cursorless-engine/processTargets/modifiers/surroundingPair/findDelimiterPairContainingSelection.ts
rename to packages/cursorless-engine/src/processTargets/modifiers/surroundingPair/findDelimiterPairContainingSelection.ts
diff --git a/packages/cursorless-engine/processTargets/modifiers/surroundingPair/findOppositeDelimiter.ts b/packages/cursorless-engine/src/processTargets/modifiers/surroundingPair/findOppositeDelimiter.ts
similarity index 100%
rename from packages/cursorless-engine/processTargets/modifiers/surroundingPair/findOppositeDelimiter.ts
rename to packages/cursorless-engine/src/processTargets/modifiers/surroundingPair/findOppositeDelimiter.ts
diff --git a/packages/cursorless-engine/processTargets/modifiers/surroundingPair/findSurroundingPairCore.ts b/packages/cursorless-engine/src/processTargets/modifiers/surroundingPair/findSurroundingPairCore.ts
similarity index 100%
rename from packages/cursorless-engine/processTargets/modifiers/surroundingPair/findSurroundingPairCore.ts
rename to packages/cursorless-engine/src/processTargets/modifiers/surroundingPair/findSurroundingPairCore.ts
diff --git a/packages/cursorless-engine/processTargets/modifiers/surroundingPair/findSurroundingPairTextBased.ts b/packages/cursorless-engine/src/processTargets/modifiers/surroundingPair/findSurroundingPairTextBased.ts
similarity index 100%
rename from packages/cursorless-engine/processTargets/modifiers/surroundingPair/findSurroundingPairTextBased.ts
rename to packages/cursorless-engine/src/processTargets/modifiers/surroundingPair/findSurroundingPairTextBased.ts
diff --git a/packages/cursorless-engine/processTargets/modifiers/surroundingPair/generateUnmatchedDelimiters.ts b/packages/cursorless-engine/src/processTargets/modifiers/surroundingPair/generateUnmatchedDelimiters.ts
similarity index 100%
rename from packages/cursorless-engine/processTargets/modifiers/surroundingPair/generateUnmatchedDelimiters.ts
rename to packages/cursorless-engine/src/processTargets/modifiers/surroundingPair/generateUnmatchedDelimiters.ts
diff --git a/packages/cursorless-engine/processTargets/modifiers/surroundingPair/getIndividualDelimiters.ts b/packages/cursorless-engine/src/processTargets/modifiers/surroundingPair/getIndividualDelimiters.ts
similarity index 100%
rename from packages/cursorless-engine/processTargets/modifiers/surroundingPair/getIndividualDelimiters.ts
rename to packages/cursorless-engine/src/processTargets/modifiers/surroundingPair/getIndividualDelimiters.ts
diff --git a/packages/cursorless-engine/processTargets/modifiers/surroundingPair/getSurroundingPairOffsets.ts b/packages/cursorless-engine/src/processTargets/modifiers/surroundingPair/getSurroundingPairOffsets.ts
similarity index 100%
rename from packages/cursorless-engine/processTargets/modifiers/surroundingPair/getSurroundingPairOffsets.ts
rename to packages/cursorless-engine/src/processTargets/modifiers/surroundingPair/getSurroundingPairOffsets.ts
diff --git a/packages/cursorless-engine/processTargets/modifiers/surroundingPair/types.ts b/packages/cursorless-engine/src/processTargets/modifiers/surroundingPair/types.ts
similarity index 100%
rename from packages/cursorless-engine/processTargets/modifiers/surroundingPair/types.ts
rename to packages/cursorless-engine/src/processTargets/modifiers/surroundingPair/types.ts
diff --git a/packages/cursorless-engine/processTargets/modifiers/surroundingPair/weaklyContains.ts b/packages/cursorless-engine/src/processTargets/modifiers/surroundingPair/weaklyContains.ts
similarity index 100%
rename from packages/cursorless-engine/processTargets/modifiers/surroundingPair/weaklyContains.ts
rename to packages/cursorless-engine/src/processTargets/modifiers/surroundingPair/weaklyContains.ts
diff --git a/packages/cursorless-engine/processTargets/modifiers/targetSequenceUtils.ts b/packages/cursorless-engine/src/processTargets/modifiers/targetSequenceUtils.ts
similarity index 100%
rename from packages/cursorless-engine/processTargets/modifiers/targetSequenceUtils.ts
rename to packages/cursorless-engine/src/processTargets/modifiers/targetSequenceUtils.ts
diff --git a/packages/cursorless-engine/processTargets/modifiers/toPositionTarget.ts b/packages/cursorless-engine/src/processTargets/modifiers/toPositionTarget.ts
similarity index 100%
rename from packages/cursorless-engine/processTargets/modifiers/toPositionTarget.ts
rename to packages/cursorless-engine/src/processTargets/modifiers/toPositionTarget.ts
diff --git a/packages/cursorless-engine/processTargets/processTargets.ts b/packages/cursorless-engine/src/processTargets/processTargets.ts
similarity index 100%
rename from packages/cursorless-engine/processTargets/processTargets.ts
rename to packages/cursorless-engine/src/processTargets/processTargets.ts
diff --git a/packages/cursorless-engine/processTargets/targetUtil/createContinuousRange.ts b/packages/cursorless-engine/src/processTargets/targetUtil/createContinuousRange.ts
similarity index 100%
rename from packages/cursorless-engine/processTargets/targetUtil/createContinuousRange.ts
rename to packages/cursorless-engine/src/processTargets/targetUtil/createContinuousRange.ts
diff --git a/packages/cursorless-engine/processTargets/targetUtil/insertionRemovalBehaviors/DelimitedSequenceInsertionRemovalBehavior.ts b/packages/cursorless-engine/src/processTargets/targetUtil/insertionRemovalBehaviors/DelimitedSequenceInsertionRemovalBehavior.ts
similarity index 100%
rename from packages/cursorless-engine/processTargets/targetUtil/insertionRemovalBehaviors/DelimitedSequenceInsertionRemovalBehavior.ts
rename to packages/cursorless-engine/src/processTargets/targetUtil/insertionRemovalBehaviors/DelimitedSequenceInsertionRemovalBehavior.ts
diff --git a/packages/cursorless-engine/processTargets/targetUtil/insertionRemovalBehaviors/TokenInsertionRemovalBehavior.ts b/packages/cursorless-engine/src/processTargets/targetUtil/insertionRemovalBehaviors/TokenInsertionRemovalBehavior.ts
similarity index 100%
rename from packages/cursorless-engine/processTargets/targetUtil/insertionRemovalBehaviors/TokenInsertionRemovalBehavior.ts
rename to packages/cursorless-engine/src/processTargets/targetUtil/insertionRemovalBehaviors/TokenInsertionRemovalBehavior.ts
diff --git a/packages/cursorless-engine/processTargets/targetUtil/insertionRemovalBehaviors/insertionRemovalBehavior.types.ts b/packages/cursorless-engine/src/processTargets/targetUtil/insertionRemovalBehaviors/insertionRemovalBehavior.types.ts
similarity index 100%
rename from packages/cursorless-engine/processTargets/targetUtil/insertionRemovalBehaviors/insertionRemovalBehavior.types.ts
rename to packages/cursorless-engine/src/processTargets/targetUtil/insertionRemovalBehaviors/insertionRemovalBehavior.types.ts
diff --git a/packages/cursorless-engine/processTargets/targets/BaseTarget.ts b/packages/cursorless-engine/src/processTargets/targets/BaseTarget.ts
similarity index 100%
rename from packages/cursorless-engine/processTargets/targets/BaseTarget.ts
rename to packages/cursorless-engine/src/processTargets/targets/BaseTarget.ts
diff --git a/packages/cursorless-engine/processTargets/targets/DocumentTarget.ts b/packages/cursorless-engine/src/processTargets/targets/DocumentTarget.ts
similarity index 100%
rename from packages/cursorless-engine/processTargets/targets/DocumentTarget.ts
rename to packages/cursorless-engine/src/processTargets/targets/DocumentTarget.ts
diff --git a/packages/cursorless-engine/processTargets/targets/ImplicitTarget.ts b/packages/cursorless-engine/src/processTargets/targets/ImplicitTarget.ts
similarity index 100%
rename from packages/cursorless-engine/processTargets/targets/ImplicitTarget.ts
rename to packages/cursorless-engine/src/processTargets/targets/ImplicitTarget.ts
diff --git a/packages/cursorless-engine/processTargets/targets/InteriorTarget.ts b/packages/cursorless-engine/src/processTargets/targets/InteriorTarget.ts
similarity index 100%
rename from packages/cursorless-engine/processTargets/targets/InteriorTarget.ts
rename to packages/cursorless-engine/src/processTargets/targets/InteriorTarget.ts
diff --git a/packages/cursorless-engine/processTargets/targets/LineTarget.ts b/packages/cursorless-engine/src/processTargets/targets/LineTarget.ts
similarity index 100%
rename from packages/cursorless-engine/processTargets/targets/LineTarget.ts
rename to packages/cursorless-engine/src/processTargets/targets/LineTarget.ts
diff --git a/packages/cursorless-engine/processTargets/targets/NotebookCellTarget.ts b/packages/cursorless-engine/src/processTargets/targets/NotebookCellTarget.ts
similarity index 100%
rename from packages/cursorless-engine/processTargets/targets/NotebookCellTarget.ts
rename to packages/cursorless-engine/src/processTargets/targets/NotebookCellTarget.ts
diff --git a/packages/cursorless-engine/processTargets/targets/ParagraphTarget.ts b/packages/cursorless-engine/src/processTargets/targets/ParagraphTarget.ts
similarity index 100%
rename from packages/cursorless-engine/processTargets/targets/ParagraphTarget.ts
rename to packages/cursorless-engine/src/processTargets/targets/ParagraphTarget.ts
diff --git a/packages/cursorless-engine/processTargets/targets/PlainTarget.ts b/packages/cursorless-engine/src/processTargets/targets/PlainTarget.ts
similarity index 100%
rename from packages/cursorless-engine/processTargets/targets/PlainTarget.ts
rename to packages/cursorless-engine/src/processTargets/targets/PlainTarget.ts
diff --git a/packages/cursorless-engine/processTargets/targets/PositionTarget.ts b/packages/cursorless-engine/src/processTargets/targets/PositionTarget.ts
similarity index 100%
rename from packages/cursorless-engine/processTargets/targets/PositionTarget.ts
rename to packages/cursorless-engine/src/processTargets/targets/PositionTarget.ts
diff --git a/packages/cursorless-engine/processTargets/targets/RawSelectionTarget.ts b/packages/cursorless-engine/src/processTargets/targets/RawSelectionTarget.ts
similarity index 100%
rename from packages/cursorless-engine/processTargets/targets/RawSelectionTarget.ts
rename to packages/cursorless-engine/src/processTargets/targets/RawSelectionTarget.ts
diff --git a/packages/cursorless-engine/processTargets/targets/ScopeTypeTarget.ts b/packages/cursorless-engine/src/processTargets/targets/ScopeTypeTarget.ts
similarity index 100%
rename from packages/cursorless-engine/processTargets/targets/ScopeTypeTarget.ts
rename to packages/cursorless-engine/src/processTargets/targets/ScopeTypeTarget.ts
diff --git a/packages/cursorless-engine/processTargets/targets/SubTokenWordTarget.ts b/packages/cursorless-engine/src/processTargets/targets/SubTokenWordTarget.ts
similarity index 100%
rename from packages/cursorless-engine/processTargets/targets/SubTokenWordTarget.ts
rename to packages/cursorless-engine/src/processTargets/targets/SubTokenWordTarget.ts
diff --git a/packages/cursorless-engine/processTargets/targets/SurroundingPairTarget.ts b/packages/cursorless-engine/src/processTargets/targets/SurroundingPairTarget.ts
similarity index 100%
rename from packages/cursorless-engine/processTargets/targets/SurroundingPairTarget.ts
rename to packages/cursorless-engine/src/processTargets/targets/SurroundingPairTarget.ts
diff --git a/packages/cursorless-engine/processTargets/targets/TokenTarget.ts b/packages/cursorless-engine/src/processTargets/targets/TokenTarget.ts
similarity index 100%
rename from packages/cursorless-engine/processTargets/targets/TokenTarget.ts
rename to packages/cursorless-engine/src/processTargets/targets/TokenTarget.ts
diff --git a/packages/cursorless-engine/processTargets/targets/UntypedTarget.ts b/packages/cursorless-engine/src/processTargets/targets/UntypedTarget.ts
similarity index 100%
rename from packages/cursorless-engine/processTargets/targets/UntypedTarget.ts
rename to packages/cursorless-engine/src/processTargets/targets/UntypedTarget.ts
diff --git a/packages/cursorless-engine/processTargets/targets/index.ts b/packages/cursorless-engine/src/processTargets/targets/index.ts
similarity index 100%
rename from packages/cursorless-engine/processTargets/targets/index.ts
rename to packages/cursorless-engine/src/processTargets/targets/index.ts
diff --git a/packages/cursorless-engine/scopeHandlers/WordScopeHandler/WordTokenizer.ts b/packages/cursorless-engine/src/scopeHandlers/WordScopeHandler/WordTokenizer.ts
similarity index 100%
rename from packages/cursorless-engine/scopeHandlers/WordScopeHandler/WordTokenizer.ts
rename to packages/cursorless-engine/src/scopeHandlers/WordScopeHandler/WordTokenizer.ts
diff --git a/packages/cursorless-engine/scripts/transformRecordedTests/moveFile.ts b/packages/cursorless-engine/src/scripts/transformRecordedTests/moveFile.ts
similarity index 100%
rename from packages/cursorless-engine/scripts/transformRecordedTests/moveFile.ts
rename to packages/cursorless-engine/src/scripts/transformRecordedTests/moveFile.ts
diff --git a/packages/cursorless-engine/scripts/transformRecordedTests/transformFile.ts b/packages/cursorless-engine/src/scripts/transformRecordedTests/transformFile.ts
similarity index 100%
rename from packages/cursorless-engine/scripts/transformRecordedTests/transformFile.ts
rename to packages/cursorless-engine/src/scripts/transformRecordedTests/transformFile.ts
diff --git a/packages/cursorless-engine/scripts/transformRecordedTests/transformations/identity.ts b/packages/cursorless-engine/src/scripts/transformRecordedTests/transformations/identity.ts
similarity index 100%
rename from packages/cursorless-engine/scripts/transformRecordedTests/transformations/identity.ts
rename to packages/cursorless-engine/src/scripts/transformRecordedTests/transformations/identity.ts
diff --git a/packages/cursorless-engine/scripts/transformRecordedTests/transformations/reorderFields.ts b/packages/cursorless-engine/src/scripts/transformRecordedTests/transformations/reorderFields.ts
similarity index 100%
rename from packages/cursorless-engine/scripts/transformRecordedTests/transformations/reorderFields.ts
rename to packages/cursorless-engine/src/scripts/transformRecordedTests/transformations/reorderFields.ts
diff --git a/packages/cursorless-engine/scripts/transformRecordedTests/transformations/upgrade.ts b/packages/cursorless-engine/src/scripts/transformRecordedTests/transformations/upgrade.ts
similarity index 100%
rename from packages/cursorless-engine/scripts/transformRecordedTests/transformations/upgrade.ts
rename to packages/cursorless-engine/src/scripts/transformRecordedTests/transformations/upgrade.ts
diff --git a/packages/cursorless-engine/scripts/transformRecordedTests/transformations/upgradeFromVersion0.ts b/packages/cursorless-engine/src/scripts/transformRecordedTests/transformations/upgradeFromVersion0.ts
similarity index 100%
rename from packages/cursorless-engine/scripts/transformRecordedTests/transformations/upgradeFromVersion0.ts
rename to packages/cursorless-engine/src/scripts/transformRecordedTests/transformations/upgradeFromVersion0.ts
diff --git a/packages/cursorless-engine/scripts/transformRecordedTests/types.ts b/packages/cursorless-engine/src/scripts/transformRecordedTests/types.ts
similarity index 100%
rename from packages/cursorless-engine/scripts/transformRecordedTests/types.ts
rename to packages/cursorless-engine/src/scripts/transformRecordedTests/types.ts
diff --git a/packages/cursorless-engine/scripts/transformRecordedTests/upgradeDecorations.ts b/packages/cursorless-engine/src/scripts/transformRecordedTests/upgradeDecorations.ts
similarity index 100%
rename from packages/cursorless-engine/scripts/transformRecordedTests/upgradeDecorations.ts
rename to packages/cursorless-engine/src/scripts/transformRecordedTests/upgradeDecorations.ts
diff --git a/packages/cursorless-engine/singletons/ide.singleton.ts b/packages/cursorless-engine/src/singletons/ide.singleton.ts
similarity index 100%
rename from packages/cursorless-engine/singletons/ide.singleton.ts
rename to packages/cursorless-engine/src/singletons/ide.singleton.ts
diff --git a/packages/cursorless-engine/singletons/tokenGraphemeSplitter.singleton.ts b/packages/cursorless-engine/src/singletons/tokenGraphemeSplitter.singleton.ts
similarity index 100%
rename from packages/cursorless-engine/singletons/tokenGraphemeSplitter.singleton.ts
rename to packages/cursorless-engine/src/singletons/tokenGraphemeSplitter.singleton.ts
diff --git a/packages/cursorless-engine/snippets/snippet.ts b/packages/cursorless-engine/src/snippets/snippet.ts
similarity index 100%
rename from packages/cursorless-engine/snippets/snippet.ts
rename to packages/cursorless-engine/src/snippets/snippet.ts
diff --git a/packages/cursorless-engine/snippets/snippetParser.test.ts b/packages/cursorless-engine/src/snippets/snippetParser.test.ts
similarity index 100%
rename from packages/cursorless-engine/snippets/snippetParser.test.ts
rename to packages/cursorless-engine/src/snippets/snippetParser.test.ts
diff --git a/packages/cursorless-engine/snippets/vendor/vscodeSnippet/charCode.ts b/packages/cursorless-engine/src/snippets/vendor/vscodeSnippet/charCode.ts
similarity index 100%
rename from packages/cursorless-engine/snippets/vendor/vscodeSnippet/charCode.ts
rename to packages/cursorless-engine/src/snippets/vendor/vscodeSnippet/charCode.ts
diff --git a/packages/cursorless-engine/snippets/vendor/vscodeSnippet/snippetParser.ts b/packages/cursorless-engine/src/snippets/vendor/vscodeSnippet/snippetParser.ts
similarity index 100%
rename from packages/cursorless-engine/snippets/vendor/vscodeSnippet/snippetParser.ts
rename to packages/cursorless-engine/src/snippets/vendor/vscodeSnippet/snippetParser.ts
diff --git a/packages/cursorless-engine/snippets/vendor/vscodeSnippet/snippetVariables.ts b/packages/cursorless-engine/src/snippets/vendor/vscodeSnippet/snippetVariables.ts
similarity index 100%
rename from packages/cursorless-engine/snippets/vendor/vscodeSnippet/snippetVariables.ts
rename to packages/cursorless-engine/src/snippets/vendor/vscodeSnippet/snippetVariables.ts
diff --git a/packages/cursorless-engine/test/fixtures/subtoken.fixture.ts b/packages/cursorless-engine/src/test/fixtures/subtoken.fixture.ts
similarity index 100%
rename from packages/cursorless-engine/test/fixtures/subtoken.fixture.ts
rename to packages/cursorless-engine/src/test/fixtures/subtoken.fixture.ts
diff --git a/packages/cursorless-engine/test/subtoken.test.ts b/packages/cursorless-engine/src/test/subtoken.test.ts
similarity index 100%
rename from packages/cursorless-engine/test/subtoken.test.ts
rename to packages/cursorless-engine/src/test/subtoken.test.ts
diff --git a/packages/cursorless-engine/test/unitTestSetup.ts b/packages/cursorless-engine/src/test/unitTestSetup.ts
similarity index 100%
rename from packages/cursorless-engine/test/unitTestSetup.ts
rename to packages/cursorless-engine/src/test/unitTestSetup.ts
diff --git a/packages/cursorless-engine/testCaseRecorder/TestCase.ts b/packages/cursorless-engine/src/testCaseRecorder/TestCase.ts
similarity index 100%
rename from packages/cursorless-engine/testCaseRecorder/TestCase.ts
rename to packages/cursorless-engine/src/testCaseRecorder/TestCase.ts
diff --git a/packages/cursorless-engine/testUtil/cleanUpTestCaseCommand.ts b/packages/cursorless-engine/src/testUtil/cleanUpTestCaseCommand.ts
similarity index 100%
rename from packages/cursorless-engine/testUtil/cleanUpTestCaseCommand.ts
rename to packages/cursorless-engine/src/testUtil/cleanUpTestCaseCommand.ts
diff --git a/packages/cursorless-engine/testUtil/extractTargetKeys.ts b/packages/cursorless-engine/src/testUtil/extractTargetKeys.ts
similarity index 100%
rename from packages/cursorless-engine/testUtil/extractTargetKeys.ts
rename to packages/cursorless-engine/src/testUtil/extractTargetKeys.ts
diff --git a/packages/cursorless-engine/testUtil/plainObjectToTarget.ts b/packages/cursorless-engine/src/testUtil/plainObjectToTarget.ts
similarity index 100%
rename from packages/cursorless-engine/testUtil/plainObjectToTarget.ts
rename to packages/cursorless-engine/src/testUtil/plainObjectToTarget.ts
diff --git a/packages/cursorless-engine/testUtil/takeSnapshot.ts b/packages/cursorless-engine/src/testUtil/takeSnapshot.ts
similarity index 100%
rename from packages/cursorless-engine/testUtil/takeSnapshot.ts
rename to packages/cursorless-engine/src/testUtil/takeSnapshot.ts
diff --git a/packages/cursorless-engine/testUtil/targetToPlainObject.ts b/packages/cursorless-engine/src/testUtil/targetToPlainObject.ts
similarity index 100%
rename from packages/cursorless-engine/testUtil/targetToPlainObject.ts
rename to packages/cursorless-engine/src/testUtil/targetToPlainObject.ts
diff --git a/packages/cursorless-engine/tokenGraphemeSplitter/index.ts b/packages/cursorless-engine/src/tokenGraphemeSplitter/index.ts
similarity index 100%
rename from packages/cursorless-engine/tokenGraphemeSplitter/index.ts
rename to packages/cursorless-engine/src/tokenGraphemeSplitter/index.ts
diff --git a/packages/cursorless-engine/tokenGraphemeSplitter/tokenGraphemeSplitter.test.ts b/packages/cursorless-engine/src/tokenGraphemeSplitter/tokenGraphemeSplitter.test.ts
similarity index 100%
rename from packages/cursorless-engine/tokenGraphemeSplitter/tokenGraphemeSplitter.test.ts
rename to packages/cursorless-engine/src/tokenGraphemeSplitter/tokenGraphemeSplitter.test.ts
diff --git a/packages/cursorless-engine/tokenGraphemeSplitter/tokenGraphemeSplitter.ts b/packages/cursorless-engine/src/tokenGraphemeSplitter/tokenGraphemeSplitter.ts
similarity index 100%
rename from packages/cursorless-engine/tokenGraphemeSplitter/tokenGraphemeSplitter.ts
rename to packages/cursorless-engine/src/tokenGraphemeSplitter/tokenGraphemeSplitter.ts
diff --git a/packages/cursorless-engine/tokenizer/index.ts b/packages/cursorless-engine/src/tokenizer/index.ts
similarity index 100%
rename from packages/cursorless-engine/tokenizer/index.ts
rename to packages/cursorless-engine/src/tokenizer/index.ts
diff --git a/packages/cursorless-engine/tokenizer/tokenizer.test.ts b/packages/cursorless-engine/src/tokenizer/tokenizer.test.ts
similarity index 100%
rename from packages/cursorless-engine/tokenizer/tokenizer.test.ts
rename to packages/cursorless-engine/src/tokenizer/tokenizer.test.ts
diff --git a/packages/cursorless-engine/tokenizer/tokenizer.ts b/packages/cursorless-engine/src/tokenizer/tokenizer.ts
similarity index 100%
rename from packages/cursorless-engine/tokenizer/tokenizer.ts
rename to packages/cursorless-engine/src/tokenizer/tokenizer.ts
diff --git a/packages/cursorless-engine/tokenizer/tokenizer.types.ts b/packages/cursorless-engine/src/tokenizer/tokenizer.types.ts
similarity index 100%
rename from packages/cursorless-engine/tokenizer/tokenizer.types.ts
rename to packages/cursorless-engine/src/tokenizer/tokenizer.types.ts
diff --git a/packages/cursorless-engine/typings/TargetDescriptor.ts b/packages/cursorless-engine/src/typings/TargetDescriptor.ts
similarity index 100%
rename from packages/cursorless-engine/typings/TargetDescriptor.ts
rename to packages/cursorless-engine/src/typings/TargetDescriptor.ts
diff --git a/packages/cursorless-engine/typings/target.types.ts b/packages/cursorless-engine/src/typings/target.types.ts
similarity index 100%
rename from packages/cursorless-engine/typings/target.types.ts
rename to packages/cursorless-engine/src/typings/target.types.ts
diff --git a/packages/cursorless-engine/typings/updateSelections.ts b/packages/cursorless-engine/src/typings/updateSelections.ts
similarity index 100%
rename from packages/cursorless-engine/typings/updateSelections.ts
rename to packages/cursorless-engine/src/typings/updateSelections.ts
diff --git a/packages/cursorless-engine/util/allocateHats/HatMetrics.ts b/packages/cursorless-engine/src/util/allocateHats/HatMetrics.ts
similarity index 100%
rename from packages/cursorless-engine/util/allocateHats/HatMetrics.ts
rename to packages/cursorless-engine/src/util/allocateHats/HatMetrics.ts
diff --git a/packages/cursorless-engine/util/allocateHats/allocateHats.ts b/packages/cursorless-engine/src/util/allocateHats/allocateHats.ts
similarity index 100%
rename from packages/cursorless-engine/util/allocateHats/allocateHats.ts
rename to packages/cursorless-engine/src/util/allocateHats/allocateHats.ts
diff --git a/packages/cursorless-engine/util/allocateHats/chooseTokenHat.ts b/packages/cursorless-engine/src/util/allocateHats/chooseTokenHat.ts
similarity index 100%
rename from packages/cursorless-engine/util/allocateHats/chooseTokenHat.ts
rename to packages/cursorless-engine/src/util/allocateHats/chooseTokenHat.ts
diff --git a/packages/cursorless-engine/util/allocateHats/getDisplayLineMap.ts b/packages/cursorless-engine/src/util/allocateHats/getDisplayLineMap.ts
similarity index 100%
rename from packages/cursorless-engine/util/allocateHats/getDisplayLineMap.ts
rename to packages/cursorless-engine/src/util/allocateHats/getDisplayLineMap.ts
diff --git a/packages/cursorless-engine/util/allocateHats/getHatRankingContext.ts b/packages/cursorless-engine/src/util/allocateHats/getHatRankingContext.ts
similarity index 100%
rename from packages/cursorless-engine/util/allocateHats/getHatRankingContext.ts
rename to packages/cursorless-engine/src/util/allocateHats/getHatRankingContext.ts
diff --git a/packages/cursorless-engine/util/allocateHats/getRankedTokens.ts b/packages/cursorless-engine/src/util/allocateHats/getRankedTokens.ts
similarity index 100%
rename from packages/cursorless-engine/util/allocateHats/getRankedTokens.ts
rename to packages/cursorless-engine/src/util/allocateHats/getRankedTokens.ts
diff --git a/packages/cursorless-engine/util/allocateHats/getTokenComparator.ts b/packages/cursorless-engine/src/util/allocateHats/getTokenComparator.ts
similarity index 100%
rename from packages/cursorless-engine/util/allocateHats/getTokenComparator.ts
rename to packages/cursorless-engine/src/util/allocateHats/getTokenComparator.ts
diff --git a/packages/cursorless-engine/util/allocateHats/getTokensInRange.ts b/packages/cursorless-engine/src/util/allocateHats/getTokensInRange.ts
similarity index 100%
rename from packages/cursorless-engine/util/allocateHats/getTokensInRange.ts
rename to packages/cursorless-engine/src/util/allocateHats/getTokensInRange.ts
diff --git a/packages/cursorless-engine/util/allocateHats/index.ts b/packages/cursorless-engine/src/util/allocateHats/index.ts
similarity index 100%
rename from packages/cursorless-engine/util/allocateHats/index.ts
rename to packages/cursorless-engine/src/util/allocateHats/index.ts
diff --git a/packages/cursorless-engine/util/allocateHats/maxByFirstDiffering.ts b/packages/cursorless-engine/src/util/allocateHats/maxByFirstDiffering.ts
similarity index 100%
rename from packages/cursorless-engine/util/allocateHats/maxByFirstDiffering.ts
rename to packages/cursorless-engine/src/util/allocateHats/maxByFirstDiffering.ts
diff --git a/packages/cursorless-engine/util/array.ts b/packages/cursorless-engine/src/util/array.ts
similarity index 100%
rename from packages/cursorless-engine/util/array.ts
rename to packages/cursorless-engine/src/util/array.ts
diff --git a/packages/cursorless-engine/util/bigint.ts b/packages/cursorless-engine/src/util/bigint.ts
similarity index 100%
rename from packages/cursorless-engine/util/bigint.ts
rename to packages/cursorless-engine/src/util/bigint.ts
diff --git a/packages/cursorless-engine/util/getMatchesInRange.ts b/packages/cursorless-engine/src/util/getMatchesInRange.ts
similarity index 100%
rename from packages/cursorless-engine/util/getMatchesInRange.ts
rename to packages/cursorless-engine/src/util/getMatchesInRange.ts
diff --git a/packages/cursorless-engine/util/getPrimitiveTargets.ts b/packages/cursorless-engine/src/util/getPrimitiveTargets.ts
similarity index 100%
rename from packages/cursorless-engine/util/getPrimitiveTargets.ts
rename to packages/cursorless-engine/src/util/getPrimitiveTargets.ts
diff --git a/packages/cursorless-engine/util/graphFactories.ts b/packages/cursorless-engine/src/util/graphFactories.ts
similarity index 100%
rename from packages/cursorless-engine/util/graphFactories.ts
rename to packages/cursorless-engine/src/util/graphFactories.ts
diff --git a/packages/cursorless-engine/util/makeGraph.ts b/packages/cursorless-engine/src/util/makeGraph.ts
similarity index 100%
rename from packages/cursorless-engine/util/makeGraph.ts
rename to packages/cursorless-engine/src/util/makeGraph.ts
diff --git a/packages/cursorless-engine/util/map.ts b/packages/cursorless-engine/src/util/map.ts
similarity index 100%
rename from packages/cursorless-engine/util/map.ts
rename to packages/cursorless-engine/src/util/map.ts
diff --git a/packages/cursorless-engine/util/object.ts b/packages/cursorless-engine/src/util/object.ts
similarity index 100%
rename from packages/cursorless-engine/util/object.ts
rename to packages/cursorless-engine/src/util/object.ts
diff --git a/packages/cursorless-engine/util/performDocumentEdits.ts b/packages/cursorless-engine/src/util/performDocumentEdits.ts
similarity index 100%
rename from packages/cursorless-engine/util/performDocumentEdits.ts
rename to packages/cursorless-engine/src/util/performDocumentEdits.ts
diff --git a/packages/cursorless-engine/util/rangeUtils.ts b/packages/cursorless-engine/src/util/rangeUtils.ts
similarity index 100%
rename from packages/cursorless-engine/util/rangeUtils.ts
rename to packages/cursorless-engine/src/util/rangeUtils.ts
diff --git a/packages/cursorless-engine/util/regex.ts b/packages/cursorless-engine/src/util/regex.ts
similarity index 100%
rename from packages/cursorless-engine/util/regex.ts
rename to packages/cursorless-engine/src/util/regex.ts
diff --git a/packages/cursorless-engine/util/selectionUtils.ts b/packages/cursorless-engine/src/util/selectionUtils.ts
similarity index 100%
rename from packages/cursorless-engine/util/selectionUtils.ts
rename to packages/cursorless-engine/src/util/selectionUtils.ts
diff --git a/packages/cursorless-engine/util/setSelectionsAndFocusEditor.ts b/packages/cursorless-engine/src/util/setSelectionsAndFocusEditor.ts
similarity index 100%
rename from packages/cursorless-engine/util/setSelectionsAndFocusEditor.ts
rename to packages/cursorless-engine/src/util/setSelectionsAndFocusEditor.ts
diff --git a/packages/cursorless-engine/util/targetUtils.ts b/packages/cursorless-engine/src/util/targetUtils.ts
similarity index 100%
rename from packages/cursorless-engine/util/targetUtils.ts
rename to packages/cursorless-engine/src/util/targetUtils.ts
diff --git a/packages/cursorless-engine/util/tryConstructTarget.ts b/packages/cursorless-engine/src/util/tryConstructTarget.ts
similarity index 100%
rename from packages/cursorless-engine/util/tryConstructTarget.ts
rename to packages/cursorless-engine/src/util/tryConstructTarget.ts
diff --git a/packages/cursorless-engine/util/type.ts b/packages/cursorless-engine/src/util/type.ts
similarity index 100%
rename from packages/cursorless-engine/util/type.ts
rename to packages/cursorless-engine/src/util/type.ts
diff --git a/packages/cursorless-engine/util/typeUtils.ts b/packages/cursorless-engine/src/util/typeUtils.ts
similarity index 100%
rename from packages/cursorless-engine/util/typeUtils.ts
rename to packages/cursorless-engine/src/util/typeUtils.ts
diff --git a/packages/cursorless-engine/util/unifyRanges.ts b/packages/cursorless-engine/src/util/unifyRanges.ts
similarity index 100%
rename from packages/cursorless-engine/util/unifyRanges.ts
rename to packages/cursorless-engine/src/util/unifyRanges.ts
diff --git a/packages/cursorless-engine/util/uniqDeep.ts b/packages/cursorless-engine/src/util/uniqDeep.ts
similarity index 100%
rename from packages/cursorless-engine/util/uniqDeep.ts
rename to packages/cursorless-engine/src/util/uniqDeep.ts
diff --git a/packages/cursorless-vscode-core/StatusBarItem.ts b/packages/cursorless-vscode-core/src/StatusBarItem.ts
similarity index 100%
rename from packages/cursorless-vscode-core/StatusBarItem.ts
rename to packages/cursorless-vscode-core/src/StatusBarItem.ts
diff --git a/packages/cursorless-vscode-core/commands.ts b/packages/cursorless-vscode-core/src/commands.ts
similarity index 100%
rename from packages/cursorless-vscode-core/commands.ts
rename to packages/cursorless-vscode-core/src/commands.ts
diff --git a/packages/cursorless-vscode-core/ide/vscode/VscodeCapabilities.ts b/packages/cursorless-vscode-core/src/ide/vscode/VscodeCapabilities.ts
similarity index 100%
rename from packages/cursorless-vscode-core/ide/vscode/VscodeCapabilities.ts
rename to packages/cursorless-vscode-core/src/ide/vscode/VscodeCapabilities.ts
diff --git a/packages/cursorless-vscode-core/ide/vscode/VscodeConfiguration.ts b/packages/cursorless-vscode-core/src/ide/vscode/VscodeConfiguration.ts
similarity index 100%
rename from packages/cursorless-vscode-core/ide/vscode/VscodeConfiguration.ts
rename to packages/cursorless-vscode-core/src/ide/vscode/VscodeConfiguration.ts
diff --git a/packages/cursorless-vscode-core/ide/vscode/VscodeEdit.ts b/packages/cursorless-vscode-core/src/ide/vscode/VscodeEdit.ts
similarity index 100%
rename from packages/cursorless-vscode-core/ide/vscode/VscodeEdit.ts
rename to packages/cursorless-vscode-core/src/ide/vscode/VscodeEdit.ts
diff --git a/packages/cursorless-vscode-core/ide/vscode/VscodeEnabledHatStyleManager.ts b/packages/cursorless-vscode-core/src/ide/vscode/VscodeEnabledHatStyleManager.ts
similarity index 100%
rename from packages/cursorless-vscode-core/ide/vscode/VscodeEnabledHatStyleManager.ts
rename to packages/cursorless-vscode-core/src/ide/vscode/VscodeEnabledHatStyleManager.ts
diff --git a/packages/cursorless-vscode-core/ide/vscode/VscodeEvents.ts b/packages/cursorless-vscode-core/src/ide/vscode/VscodeEvents.ts
similarity index 100%
rename from packages/cursorless-vscode-core/ide/vscode/VscodeEvents.ts
rename to packages/cursorless-vscode-core/src/ide/vscode/VscodeEvents.ts
diff --git a/packages/cursorless-vscode-core/ide/vscode/VscodeFlashHandler.ts b/packages/cursorless-vscode-core/src/ide/vscode/VscodeFlashHandler.ts
similarity index 100%
rename from packages/cursorless-vscode-core/ide/vscode/VscodeFlashHandler.ts
rename to packages/cursorless-vscode-core/src/ide/vscode/VscodeFlashHandler.ts
diff --git a/packages/cursorless-vscode-core/ide/vscode/VscodeFocusEditor.ts b/packages/cursorless-vscode-core/src/ide/vscode/VscodeFocusEditor.ts
similarity index 100%
rename from packages/cursorless-vscode-core/ide/vscode/VscodeFocusEditor.ts
rename to packages/cursorless-vscode-core/src/ide/vscode/VscodeFocusEditor.ts
diff --git a/packages/cursorless-vscode-core/ide/vscode/VscodeFold.ts b/packages/cursorless-vscode-core/src/ide/vscode/VscodeFold.ts
similarity index 100%
rename from packages/cursorless-vscode-core/ide/vscode/VscodeFold.ts
rename to packages/cursorless-vscode-core/src/ide/vscode/VscodeFold.ts
diff --git a/packages/cursorless-vscode-core/ide/vscode/VscodeHighlightDecorationTypes.ts b/packages/cursorless-vscode-core/src/ide/vscode/VscodeHighlightDecorationTypes.ts
similarity index 100%
rename from packages/cursorless-vscode-core/ide/vscode/VscodeHighlightDecorationTypes.ts
rename to packages/cursorless-vscode-core/src/ide/vscode/VscodeHighlightDecorationTypes.ts
diff --git a/packages/cursorless-vscode-core/ide/vscode/VscodeHighlights.ts b/packages/cursorless-vscode-core/src/ide/vscode/VscodeHighlights.ts
similarity index 100%
rename from packages/cursorless-vscode-core/ide/vscode/VscodeHighlights.ts
rename to packages/cursorless-vscode-core/src/ide/vscode/VscodeHighlights.ts
diff --git a/packages/cursorless-vscode-core/ide/vscode/VscodeIDE.ts b/packages/cursorless-vscode-core/src/ide/vscode/VscodeIDE.ts
similarity index 100%
rename from packages/cursorless-vscode-core/ide/vscode/VscodeIDE.ts
rename to packages/cursorless-vscode-core/src/ide/vscode/VscodeIDE.ts
diff --git a/packages/cursorless-vscode-core/ide/vscode/VscodeInsertSnippets.ts b/packages/cursorless-vscode-core/src/ide/vscode/VscodeInsertSnippets.ts
similarity index 100%
rename from packages/cursorless-vscode-core/ide/vscode/VscodeInsertSnippets.ts
rename to packages/cursorless-vscode-core/src/ide/vscode/VscodeInsertSnippets.ts
diff --git a/packages/cursorless-vscode-core/ide/vscode/VscodeMessages.ts b/packages/cursorless-vscode-core/src/ide/vscode/VscodeMessages.ts
similarity index 100%
rename from packages/cursorless-vscode-core/ide/vscode/VscodeMessages.ts
rename to packages/cursorless-vscode-core/src/ide/vscode/VscodeMessages.ts
diff --git a/packages/cursorless-vscode-core/ide/vscode/VscodeNotebooks.ts b/packages/cursorless-vscode-core/src/ide/vscode/VscodeNotebooks.ts
similarity index 100%
rename from packages/cursorless-vscode-core/ide/vscode/VscodeNotebooks.ts
rename to packages/cursorless-vscode-core/src/ide/vscode/VscodeNotebooks.ts
diff --git a/packages/cursorless-vscode-core/ide/vscode/VscodeRevealLine.ts b/packages/cursorless-vscode-core/src/ide/vscode/VscodeRevealLine.ts
similarity index 100%
rename from packages/cursorless-vscode-core/ide/vscode/VscodeRevealLine.ts
rename to packages/cursorless-vscode-core/src/ide/vscode/VscodeRevealLine.ts
diff --git a/packages/cursorless-vscode-core/ide/vscode/VscodeRunMode.ts b/packages/cursorless-vscode-core/src/ide/vscode/VscodeRunMode.ts
similarity index 100%
rename from packages/cursorless-vscode-core/ide/vscode/VscodeRunMode.ts
rename to packages/cursorless-vscode-core/src/ide/vscode/VscodeRunMode.ts
diff --git a/packages/cursorless-vscode-core/ide/vscode/VscodeTextDocumentImpl.ts b/packages/cursorless-vscode-core/src/ide/vscode/VscodeTextDocumentImpl.ts
similarity index 100%
rename from packages/cursorless-vscode-core/ide/vscode/VscodeTextDocumentImpl.ts
rename to packages/cursorless-vscode-core/src/ide/vscode/VscodeTextDocumentImpl.ts
diff --git a/packages/cursorless-vscode-core/ide/vscode/VscodeTextEditorImpl.ts b/packages/cursorless-vscode-core/src/ide/vscode/VscodeTextEditorImpl.ts
similarity index 100%
rename from packages/cursorless-vscode-core/ide/vscode/VscodeTextEditorImpl.ts
rename to packages/cursorless-vscode-core/src/ide/vscode/VscodeTextEditorImpl.ts
diff --git a/packages/cursorless-vscode-core/ide/vscode/VscodeTextLineImpl.ts b/packages/cursorless-vscode-core/src/ide/vscode/VscodeTextLineImpl.ts
similarity index 100%
rename from packages/cursorless-vscode-core/ide/vscode/VscodeTextLineImpl.ts
rename to packages/cursorless-vscode-core/src/ide/vscode/VscodeTextLineImpl.ts
diff --git a/packages/cursorless-vscode-core/ide/vscode/VscodeToggleBreakpoint.ts b/packages/cursorless-vscode-core/src/ide/vscode/VscodeToggleBreakpoint.ts
similarity index 100%
rename from packages/cursorless-vscode-core/ide/vscode/VscodeToggleBreakpoint.ts
rename to packages/cursorless-vscode-core/src/ide/vscode/VscodeToggleBreakpoint.ts
diff --git a/packages/cursorless-vscode-core/ide/vscode/hatStyles.types.ts b/packages/cursorless-vscode-core/src/ide/vscode/hatStyles.types.ts
similarity index 100%
rename from packages/cursorless-vscode-core/ide/vscode/hatStyles.types.ts
rename to packages/cursorless-vscode-core/src/ide/vscode/hatStyles.types.ts
diff --git a/packages/cursorless-vscode-core/ide/vscode/hats/FontMeasurements.ts b/packages/cursorless-vscode-core/src/ide/vscode/hats/FontMeasurements.ts
similarity index 100%
rename from packages/cursorless-vscode-core/ide/vscode/hats/FontMeasurements.ts
rename to packages/cursorless-vscode-core/src/ide/vscode/hats/FontMeasurements.ts
diff --git a/packages/cursorless-vscode-core/ide/vscode/hats/VscodeHats.ts b/packages/cursorless-vscode-core/src/ide/vscode/hats/VscodeHats.ts
similarity index 100%
rename from packages/cursorless-vscode-core/ide/vscode/hats/VscodeHats.ts
rename to packages/cursorless-vscode-core/src/ide/vscode/hats/VscodeHats.ts
diff --git a/packages/cursorless-vscode-core/ide/vscode/hats/getHatThemeColors.ts b/packages/cursorless-vscode-core/src/ide/vscode/hats/getHatThemeColors.ts
similarity index 100%
rename from packages/cursorless-vscode-core/ide/vscode/hats/getHatThemeColors.ts
rename to packages/cursorless-vscode-core/src/ide/vscode/hats/getHatThemeColors.ts
diff --git a/packages/cursorless-vscode-core/ide/vscode/hats/getStyleName.ts b/packages/cursorless-vscode-core/src/ide/vscode/hats/getStyleName.ts
similarity index 100%
rename from packages/cursorless-vscode-core/ide/vscode/hats/getStyleName.ts
rename to packages/cursorless-vscode-core/src/ide/vscode/hats/getStyleName.ts
diff --git a/packages/cursorless-vscode-core/ide/vscode/hats/shapeAdjustments.ts b/packages/cursorless-vscode-core/src/ide/vscode/hats/shapeAdjustments.ts
similarity index 100%
rename from packages/cursorless-vscode-core/ide/vscode/hats/shapeAdjustments.ts
rename to packages/cursorless-vscode-core/src/ide/vscode/hats/shapeAdjustments.ts
diff --git a/packages/cursorless-vscode-core/ide/vscode/notebook/notebook.ts b/packages/cursorless-vscode-core/src/ide/vscode/notebook/notebook.ts
similarity index 100%
rename from packages/cursorless-vscode-core/ide/vscode/notebook/notebook.ts
rename to packages/cursorless-vscode-core/src/ide/vscode/notebook/notebook.ts
diff --git a/packages/cursorless-vscode-core/ide/vscode/notebook/notebookLegacy.ts b/packages/cursorless-vscode-core/src/ide/vscode/notebook/notebookLegacy.ts
similarity index 100%
rename from packages/cursorless-vscode-core/ide/vscode/notebook/notebookLegacy.ts
rename to packages/cursorless-vscode-core/src/ide/vscode/notebook/notebookLegacy.ts
diff --git a/packages/cursorless-vscode-core/ide/vscode/textLine.test.ts b/packages/cursorless-vscode-core/src/ide/vscode/textLine.test.ts
similarity index 100%
rename from packages/cursorless-vscode-core/ide/vscode/textLine.test.ts
rename to packages/cursorless-vscode-core/src/ide/vscode/textLine.test.ts
diff --git a/packages/cursorless-vscode-core/ide/vscode/toVscodeEditor.ts b/packages/cursorless-vscode-core/src/ide/vscode/toVscodeEditor.ts
similarity index 100%
rename from packages/cursorless-vscode-core/ide/vscode/toVscodeEditor.ts
rename to packages/cursorless-vscode-core/src/ide/vscode/toVscodeEditor.ts
diff --git a/packages/cursorless-vscode-core/ide/vscode/vscodeShowQuickPick.ts b/packages/cursorless-vscode-core/src/ide/vscode/vscodeShowQuickPick.ts
similarity index 100%
rename from packages/cursorless-vscode-core/ide/vscode/vscodeShowQuickPick.ts
rename to packages/cursorless-vscode-core/src/ide/vscode/vscodeShowQuickPick.ts
diff --git a/packages/cursorless-vscode-core/index.ts b/packages/cursorless-vscode-core/src/index.ts
similarity index 100%
rename from packages/cursorless-vscode-core/index.ts
rename to packages/cursorless-vscode-core/src/index.ts
diff --git a/packages/cursorless-vscode-core/keyboard/KeyboardCommands.ts b/packages/cursorless-vscode-core/src/keyboard/KeyboardCommands.ts
similarity index 100%
rename from packages/cursorless-vscode-core/keyboard/KeyboardCommands.ts
rename to packages/cursorless-vscode-core/src/keyboard/KeyboardCommands.ts
diff --git a/packages/cursorless-vscode-core/keyboard/KeyboardCommandsModal.ts b/packages/cursorless-vscode-core/src/keyboard/KeyboardCommandsModal.ts
similarity index 100%
rename from packages/cursorless-vscode-core/keyboard/KeyboardCommandsModal.ts
rename to packages/cursorless-vscode-core/src/keyboard/KeyboardCommandsModal.ts
diff --git a/packages/cursorless-vscode-core/keyboard/KeyboardCommandsTargeted.ts b/packages/cursorless-vscode-core/src/keyboard/KeyboardCommandsTargeted.ts
similarity index 100%
rename from packages/cursorless-vscode-core/keyboard/KeyboardCommandsTargeted.ts
rename to packages/cursorless-vscode-core/src/keyboard/KeyboardCommandsTargeted.ts
diff --git a/packages/cursorless-vscode-core/keyboard/KeyboardHandler.ts b/packages/cursorless-vscode-core/src/keyboard/KeyboardHandler.ts
similarity index 100%
rename from packages/cursorless-vscode-core/keyboard/KeyboardHandler.ts
rename to packages/cursorless-vscode-core/src/keyboard/KeyboardHandler.ts
diff --git a/packages/cursorless-vscode-core/keyboard/defaultKeymaps.ts b/packages/cursorless-vscode-core/src/keyboard/defaultKeymaps.ts
similarity index 100%
rename from packages/cursorless-vscode-core/keyboard/defaultKeymaps.ts
rename to packages/cursorless-vscode-core/src/keyboard/defaultKeymaps.ts
diff --git a/packages/cursorless-vscode-core/scripts/hatAdjustments/add.ts b/packages/cursorless-vscode-core/src/scripts/hatAdjustments/add.ts
similarity index 100%
rename from packages/cursorless-vscode-core/scripts/hatAdjustments/add.ts
rename to packages/cursorless-vscode-core/src/scripts/hatAdjustments/add.ts
diff --git a/packages/cursorless-vscode-core/scripts/hatAdjustments/average.ts b/packages/cursorless-vscode-core/src/scripts/hatAdjustments/average.ts
similarity index 100%
rename from packages/cursorless-vscode-core/scripts/hatAdjustments/average.ts
rename to packages/cursorless-vscode-core/src/scripts/hatAdjustments/average.ts
diff --git a/packages/cursorless-vscode-core/scripts/hatAdjustments/lib.ts b/packages/cursorless-vscode-core/src/scripts/hatAdjustments/lib.ts
similarity index 100%
rename from packages/cursorless-vscode-core/scripts/hatAdjustments/lib.ts
rename to packages/cursorless-vscode-core/src/scripts/hatAdjustments/lib.ts
diff --git a/packages/cursorless-vscode-e2e/asyncSafety.ts b/packages/cursorless-vscode-e2e/src/asyncSafety.ts
similarity index 100%
rename from packages/cursorless-vscode-e2e/asyncSafety.ts
rename to packages/cursorless-vscode-e2e/src/asyncSafety.ts
diff --git a/packages/cursorless-vscode-e2e/endToEndTestSetup.ts b/packages/cursorless-vscode-e2e/src/endToEndTestSetup.ts
similarity index 100%
rename from packages/cursorless-vscode-e2e/endToEndTestSetup.ts
rename to packages/cursorless-vscode-e2e/src/endToEndTestSetup.ts
diff --git a/packages/cursorless-vscode-e2e/mockPrePhraseGetVersion.ts b/packages/cursorless-vscode-e2e/src/mockPrePhraseGetVersion.ts
similarity index 100%
rename from packages/cursorless-vscode-e2e/mockPrePhraseGetVersion.ts
rename to packages/cursorless-vscode-e2e/src/mockPrePhraseGetVersion.ts
diff --git a/packages/cursorless-vscode-e2e/notebook.ts b/packages/cursorless-vscode-e2e/src/notebook.ts
similarity index 100%
rename from packages/cursorless-vscode-e2e/notebook.ts
rename to packages/cursorless-vscode-e2e/src/notebook.ts
diff --git a/packages/cursorless-vscode-e2e/shouldUpdateFixtures.ts b/packages/cursorless-vscode-e2e/src/shouldUpdateFixtures.ts
similarity index 100%
rename from packages/cursorless-vscode-e2e/shouldUpdateFixtures.ts
rename to packages/cursorless-vscode-e2e/src/shouldUpdateFixtures.ts
diff --git a/packages/cursorless-vscode-e2e/suite/backwardCompatibility.test.ts b/packages/cursorless-vscode-e2e/src/suite/backwardCompatibility.test.ts
similarity index 100%
rename from packages/cursorless-vscode-e2e/suite/backwardCompatibility.test.ts
rename to packages/cursorless-vscode-e2e/src/suite/backwardCompatibility.test.ts
diff --git a/packages/cursorless-vscode-e2e/suite/breakpoints.test.ts b/packages/cursorless-vscode-e2e/src/suite/breakpoints.test.ts
similarity index 100%
rename from packages/cursorless-vscode-e2e/suite/breakpoints.test.ts
rename to packages/cursorless-vscode-e2e/src/suite/breakpoints.test.ts
diff --git a/packages/cursorless-vscode-e2e/suite/containingTokenTwice.test.ts b/packages/cursorless-vscode-e2e/src/suite/containingTokenTwice.test.ts
similarity index 100%
rename from packages/cursorless-vscode-e2e/suite/containingTokenTwice.test.ts
rename to packages/cursorless-vscode-e2e/src/suite/containingTokenTwice.test.ts
diff --git a/packages/cursorless-vscode-e2e/suite/crossCellsSetSelection.test.ts b/packages/cursorless-vscode-e2e/src/suite/crossCellsSetSelection.test.ts
similarity index 100%
rename from packages/cursorless-vscode-e2e/suite/crossCellsSetSelection.test.ts
rename to packages/cursorless-vscode-e2e/src/suite/crossCellsSetSelection.test.ts
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/cursorless-snippets/duplicatedVariableTest.cursorless-snippets b/packages/cursorless-vscode-e2e/src/suite/fixtures/cursorless-snippets/duplicatedVariableTest.cursorless-snippets
similarity index 100%
rename from packages/cursorless-vscode-e2e/suite/fixtures/cursorless-snippets/duplicatedVariableTest.cursorless-snippets
rename to packages/cursorless-vscode-e2e/src/suite/fixtures/cursorless-snippets/duplicatedVariableTest.cursorless-snippets
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/cursorless-snippets/spaghetti.cursorless-snippets b/packages/cursorless-vscode-e2e/src/suite/fixtures/cursorless-snippets/spaghetti.cursorless-snippets
similarity index 100%
rename from packages/cursorless-vscode-e2e/suite/fixtures/cursorless-snippets/spaghetti.cursorless-snippets
rename to packages/cursorless-vscode-e2e/src/suite/fixtures/cursorless-snippets/spaghetti.cursorless-snippets
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/cursorless-snippets/tryCatchStatement.cursorless-snippets b/packages/cursorless-vscode-e2e/src/suite/fixtures/cursorless-snippets/tryCatchStatement.cursorless-snippets
similarity index 100%
rename from packages/cursorless-vscode-e2e/suite/fixtures/cursorless-snippets/tryCatchStatement.cursorless-snippets
rename to packages/cursorless-vscode-e2e/src/suite/fixtures/cursorless-snippets/tryCatchStatement.cursorless-snippets
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/helloWorld.txt b/packages/cursorless-vscode-e2e/src/suite/fixtures/helloWorld.txt
similarity index 100%
rename from packages/cursorless-vscode-e2e/suite/fixtures/helloWorld.txt
rename to packages/cursorless-vscode-e2e/src/suite/fixtures/helloWorld.txt
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/actions/_bringLineHarpAndWhale.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/actions/_bringLineHarpAndWhale.yml
new file mode 100644
index 0000000000..3abff39627
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/actions/_bringLineHarpAndWhale.yml
@@ -0,0 +1,97 @@
+languageId: plaintext
+command:
+  version: 1
+  spokenForm: bring line harp and whale
+  action: replaceWithTarget
+  targets:
+    - type: list
+      elements:
+        - type: primitive
+          selectionType: line
+          mark: { type: decoratedSymbol, symbolColor: default, character: h }
+        - type: primitive
+          mark: { type: decoratedSymbol, symbolColor: default, character: w }
+    - { type: primitive, isImplicit: true }
+initialState:
+  documentContents: |+
+    hello
+    there
+    whatever
+
+  selections:
+    - anchor: { line: 4, character: 0 }
+      active: { line: 4, character: 0 }
+  marks:
+    default.h:
+      start: { line: 0, character: 0 }
+      end: { line: 0, character: 5 }
+    default.w:
+      start: { line: 2, character: 0 }
+      end: { line: 2, character: 8 }
+finalState:
+  documentContents: |-
+    hello
+    there
+    whatever
+
+    hello
+    whatever
+  selections:
+    - anchor: { line: 5, character: 8 }
+      active: { line: 5, character: 8 }
+  thatMark:
+    - type: UntypedTarget
+      contentRange:
+        start: { line: 4, character: 0 }
+        end: { line: 5, character: 8 }
+      isReversed: false
+      hasExplicitRange: true
+  sourceMark:
+    - type: UntypedTarget
+      contentRange:
+        start: { line: 0, character: 0 }
+        end: { line: 0, character: 5 }
+      isReversed: false
+      hasExplicitRange: true
+    - type: UntypedTarget
+      contentRange:
+        start: { line: 2, character: 0 }
+        end: { line: 2, character: 8 }
+      isReversed: false
+      hasExplicitRange: true
+fullTargets:
+  [
+    {
+      type: list,
+      elements:
+        [
+          {
+            type: primitive,
+            mark: { type: decoratedSymbol, symbolColor: default, character: h },
+            selectionType: line,
+            position: contents,
+            insideOutsideType: null,
+            modifier: { type: identity },
+            isImplicit: false,
+          },
+          {
+            type: primitive,
+            mark: { type: decoratedSymbol, symbolColor: default, character: w },
+            selectionType: line,
+            position: contents,
+            insideOutsideType: null,
+            modifier: { type: identity },
+            isImplicit: false,
+          },
+        ],
+    },
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: null,
+      modifier: { type: identity },
+      isImplicit: true,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/actions/alternateHighlightHarp.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/actions/alternateHighlightHarp.yml
new file mode 100644
index 0000000000..3dcbc4b99e
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/actions/alternateHighlightHarp.yml
@@ -0,0 +1,47 @@
+languageId: plaintext
+command:
+  version: 4
+  spokenForm: alternate highlight harp
+  action:
+    name: highlight
+    args: [highlight1]
+  targets:
+    - type: primitive
+      mark: { type: decoratedSymbol, symbolColor: default, character: h }
+  usePrePhraseSnapshot: true
+initialState:
+  documentContents: hello world
+  selections:
+    - anchor: { line: 0, character: 11 }
+      active: { line: 0, character: 11 }
+  marks:
+    default.h:
+      start: { line: 0, character: 0 }
+      end: { line: 0, character: 5 }
+finalState:
+  documentContents: hello world
+  selections:
+    - anchor: { line: 0, character: 11 }
+      active: { line: 0, character: 11 }
+  thatMark:
+    - type: UntypedTarget
+      contentRange:
+        start: { line: 0, character: 0 }
+        end: { line: 0, character: 5 }
+      isReversed: false
+      hasExplicitRange: false
+ide:
+  highlights:
+    - highlightId: highlight1
+      ranges:
+        - type: character
+          start: { line: 0, character: 0 }
+          end: { line: 0, character: 5 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: decoratedSymbol, symbolColor: default, character: h },
+      modifiers: [],
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/actions/bringAirAndBatAndCap.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/actions/bringAirAndBatAndCap.yml
new file mode 100644
index 0000000000..e3a7e411b8
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/actions/bringAirAndBatAndCap.yml
@@ -0,0 +1,111 @@
+languageId: typescript
+command:
+  version: 1
+  spokenForm: bring air and bat and cap
+  action: replaceWithTarget
+  targets:
+    - type: list
+      elements:
+        - type: primitive
+          mark: { type: decoratedSymbol, symbolColor: default, character: a }
+        - type: primitive
+          mark: { type: decoratedSymbol, symbolColor: default, character: b }
+        - type: primitive
+          mark: { type: decoratedSymbol, symbolColor: default, character: c }
+    - { type: primitive, isImplicit: true }
+initialState:
+  documentContents: |+
+    a
+    b
+    c
+
+  selections:
+    - anchor: { line: 4, character: 0 }
+      active: { line: 4, character: 0 }
+  marks:
+    default.a:
+      start: { line: 0, character: 0 }
+      end: { line: 0, character: 1 }
+    default.b:
+      start: { line: 1, character: 0 }
+      end: { line: 1, character: 1 }
+    default.c:
+      start: { line: 2, character: 0 }
+      end: { line: 2, character: 1 }
+finalState:
+  documentContents: |-
+    a
+    b
+    c
+
+    a b c
+  selections:
+    - anchor: { line: 4, character: 5 }
+      active: { line: 4, character: 5 }
+  thatMark:
+    - type: UntypedTarget
+      contentRange:
+        start: { line: 4, character: 0 }
+        end: { line: 4, character: 5 }
+      isReversed: false
+      hasExplicitRange: true
+  sourceMark:
+    - type: UntypedTarget
+      contentRange:
+        start: { line: 0, character: 0 }
+        end: { line: 0, character: 1 }
+      isReversed: false
+      hasExplicitRange: true
+    - type: UntypedTarget
+      contentRange:
+        start: { line: 1, character: 0 }
+        end: { line: 1, character: 1 }
+      isReversed: false
+      hasExplicitRange: true
+    - type: UntypedTarget
+      contentRange:
+        start: { line: 2, character: 0 }
+        end: { line: 2, character: 1 }
+      isReversed: false
+      hasExplicitRange: true
+fullTargets:
+  [
+    {
+      type: list,
+      elements:
+        [
+          {
+            type: primitive,
+            mark: { type: decoratedSymbol, symbolColor: default, character: a },
+            selectionType: token,
+            position: contents,
+            insideOutsideType: null,
+            modifier: { type: identity },
+          },
+          {
+            type: primitive,
+            mark: { type: decoratedSymbol, symbolColor: default, character: b },
+            selectionType: token,
+            position: contents,
+            insideOutsideType: null,
+            modifier: { type: identity },
+          },
+          {
+            type: primitive,
+            mark: { type: decoratedSymbol, symbolColor: default, character: c },
+            selectionType: token,
+            position: contents,
+            insideOutsideType: null,
+            modifier: { type: identity },
+          },
+        ],
+    },
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier: { type: identity },
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/actions/bringAirAndBatAndCapToAfterDrum.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/actions/bringAirAndBatAndCapToAfterDrum.yml
new file mode 100644
index 0000000000..d970ab9e54
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/actions/bringAirAndBatAndCapToAfterDrum.yml
@@ -0,0 +1,117 @@
+languageId: typescript
+command:
+  version: 1
+  spokenForm: bring air and bat and cap to after drum
+  action: replaceWithTarget
+  targets:
+    - type: list
+      elements:
+        - type: primitive
+          mark: { type: decoratedSymbol, symbolColor: default, character: a }
+        - type: primitive
+          mark: { type: decoratedSymbol, symbolColor: default, character: b }
+        - type: primitive
+          mark: { type: decoratedSymbol, symbolColor: default, character: c }
+    - type: primitive
+      position: after
+      mark: { type: decoratedSymbol, symbolColor: default, character: d }
+initialState:
+  documentContents: |
+    a
+    b
+    c
+
+    d
+  selections:
+    - anchor: { line: 5, character: 0 }
+      active: { line: 5, character: 0 }
+  marks:
+    default.a:
+      start: { line: 0, character: 0 }
+      end: { line: 0, character: 1 }
+    default.b:
+      start: { line: 1, character: 0 }
+      end: { line: 1, character: 1 }
+    default.c:
+      start: { line: 2, character: 0 }
+      end: { line: 2, character: 1 }
+    default.d:
+      start: { line: 4, character: 0 }
+      end: { line: 4, character: 1 }
+finalState:
+  documentContents: |
+    a
+    b
+    c
+
+    d a b c
+  selections:
+    - anchor: { line: 5, character: 0 }
+      active: { line: 5, character: 0 }
+  thatMark:
+    - type: UntypedTarget
+      contentRange:
+        start: { line: 4, character: 2 }
+        end: { line: 4, character: 7 }
+      isReversed: false
+      hasExplicitRange: true
+  sourceMark:
+    - type: UntypedTarget
+      contentRange:
+        start: { line: 0, character: 0 }
+        end: { line: 0, character: 1 }
+      isReversed: false
+      hasExplicitRange: true
+    - type: UntypedTarget
+      contentRange:
+        start: { line: 1, character: 0 }
+        end: { line: 1, character: 1 }
+      isReversed: false
+      hasExplicitRange: true
+    - type: UntypedTarget
+      contentRange:
+        start: { line: 2, character: 0 }
+        end: { line: 2, character: 1 }
+      isReversed: false
+      hasExplicitRange: true
+fullTargets:
+  [
+    {
+      type: list,
+      elements:
+        [
+          {
+            type: primitive,
+            mark: { type: decoratedSymbol, symbolColor: default, character: a },
+            selectionType: token,
+            position: contents,
+            insideOutsideType: null,
+            modifier: { type: identity },
+          },
+          {
+            type: primitive,
+            mark: { type: decoratedSymbol, symbolColor: default, character: b },
+            selectionType: token,
+            position: contents,
+            insideOutsideType: null,
+            modifier: { type: identity },
+          },
+          {
+            type: primitive,
+            mark: { type: decoratedSymbol, symbolColor: default, character: c },
+            selectionType: token,
+            position: contents,
+            insideOutsideType: null,
+            modifier: { type: identity },
+          },
+        ],
+    },
+    {
+      type: primitive,
+      mark: { type: decoratedSymbol, symbolColor: default, character: d },
+      selectionType: token,
+      position: after,
+      insideOutsideType: null,
+      modifier: { type: identity },
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/actions/bringAirAndBatAndCapToAfterItemEach.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/actions/bringAirAndBatAndCapToAfterItemEach.yml
new file mode 100644
index 0000000000..7b88ba3987
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/actions/bringAirAndBatAndCapToAfterItemEach.yml
@@ -0,0 +1,128 @@
+languageId: typescript
+command:
+  version: 1
+  spokenForm: bring air and bat and cap to after item each
+  action: replaceWithTarget
+  targets:
+    - type: list
+      elements:
+        - type: primitive
+          mark: { type: decoratedSymbol, symbolColor: default, character: a }
+        - type: primitive
+          mark: { type: decoratedSymbol, symbolColor: default, character: b }
+        - type: primitive
+          mark: { type: decoratedSymbol, symbolColor: default, character: c }
+    - type: primitive
+      position: after
+      modifier:
+        {
+          type: containingScope,
+          scopeType: collectionItem,
+          includeSiblings: false,
+        }
+      mark: { type: decoratedSymbol, symbolColor: default, character: e }
+initialState:
+  documentContents: |
+    a
+    b
+    c
+
+    const values = [e]
+  selections:
+    - anchor: { line: 5, character: 0 }
+      active: { line: 5, character: 0 }
+  marks:
+    default.a:
+      start: { line: 0, character: 0 }
+      end: { line: 0, character: 1 }
+    default.b:
+      start: { line: 1, character: 0 }
+      end: { line: 1, character: 1 }
+    default.c:
+      start: { line: 2, character: 0 }
+      end: { line: 2, character: 1 }
+    default.e:
+      start: { line: 4, character: 16 }
+      end: { line: 4, character: 17 }
+finalState:
+  documentContents: |
+    a
+    b
+    c
+
+    const values = [e, a, b, c]
+  selections:
+    - anchor: { line: 5, character: 0 }
+      active: { line: 5, character: 0 }
+  thatMark:
+    - type: UntypedTarget
+      contentRange:
+        start: { line: 4, character: 19 }
+        end: { line: 4, character: 26 }
+      isReversed: false
+      hasExplicitRange: true
+  sourceMark:
+    - type: UntypedTarget
+      contentRange:
+        start: { line: 0, character: 0 }
+        end: { line: 0, character: 1 }
+      isReversed: false
+      hasExplicitRange: true
+    - type: UntypedTarget
+      contentRange:
+        start: { line: 1, character: 0 }
+        end: { line: 1, character: 1 }
+      isReversed: false
+      hasExplicitRange: true
+    - type: UntypedTarget
+      contentRange:
+        start: { line: 2, character: 0 }
+        end: { line: 2, character: 1 }
+      isReversed: false
+      hasExplicitRange: true
+fullTargets:
+  [
+    {
+      type: list,
+      elements:
+        [
+          {
+            type: primitive,
+            mark: { type: decoratedSymbol, symbolColor: default, character: a },
+            selectionType: token,
+            position: contents,
+            insideOutsideType: null,
+            modifier: { type: identity },
+          },
+          {
+            type: primitive,
+            mark: { type: decoratedSymbol, symbolColor: default, character: b },
+            selectionType: token,
+            position: contents,
+            insideOutsideType: null,
+            modifier: { type: identity },
+          },
+          {
+            type: primitive,
+            mark: { type: decoratedSymbol, symbolColor: default, character: c },
+            selectionType: token,
+            position: contents,
+            insideOutsideType: null,
+            modifier: { type: identity },
+          },
+        ],
+    },
+    {
+      type: primitive,
+      mark: { type: decoratedSymbol, symbolColor: default, character: e },
+      selectionType: token,
+      position: after,
+      insideOutsideType: null,
+      modifier:
+        {
+          type: containingScope,
+          scopeType: collectionItem,
+          includeSiblings: false,
+        },
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/actions/bringAirAndBatAndCapToBeforeDrum.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/actions/bringAirAndBatAndCapToBeforeDrum.yml
new file mode 100644
index 0000000000..2772af69d6
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/actions/bringAirAndBatAndCapToBeforeDrum.yml
@@ -0,0 +1,117 @@
+languageId: typescript
+command:
+  version: 1
+  spokenForm: bring air and bat and cap to before drum
+  action: replaceWithTarget
+  targets:
+    - type: list
+      elements:
+        - type: primitive
+          mark: { type: decoratedSymbol, symbolColor: default, character: a }
+        - type: primitive
+          mark: { type: decoratedSymbol, symbolColor: default, character: b }
+        - type: primitive
+          mark: { type: decoratedSymbol, symbolColor: default, character: c }
+    - type: primitive
+      position: before
+      mark: { type: decoratedSymbol, symbolColor: default, character: d }
+initialState:
+  documentContents: |
+    a
+    b
+    c
+
+    d
+  selections:
+    - anchor: { line: 5, character: 0 }
+      active: { line: 5, character: 0 }
+  marks:
+    default.a:
+      start: { line: 0, character: 0 }
+      end: { line: 0, character: 1 }
+    default.b:
+      start: { line: 1, character: 0 }
+      end: { line: 1, character: 1 }
+    default.c:
+      start: { line: 2, character: 0 }
+      end: { line: 2, character: 1 }
+    default.d:
+      start: { line: 4, character: 0 }
+      end: { line: 4, character: 1 }
+finalState:
+  documentContents: |
+    a
+    b
+    c
+
+    a b c d
+  selections:
+    - anchor: { line: 5, character: 0 }
+      active: { line: 5, character: 0 }
+  thatMark:
+    - type: UntypedTarget
+      contentRange:
+        start: { line: 4, character: 0 }
+        end: { line: 4, character: 5 }
+      isReversed: false
+      hasExplicitRange: true
+  sourceMark:
+    - type: UntypedTarget
+      contentRange:
+        start: { line: 0, character: 0 }
+        end: { line: 0, character: 1 }
+      isReversed: false
+      hasExplicitRange: true
+    - type: UntypedTarget
+      contentRange:
+        start: { line: 1, character: 0 }
+        end: { line: 1, character: 1 }
+      isReversed: false
+      hasExplicitRange: true
+    - type: UntypedTarget
+      contentRange:
+        start: { line: 2, character: 0 }
+        end: { line: 2, character: 1 }
+      isReversed: false
+      hasExplicitRange: true
+fullTargets:
+  [
+    {
+      type: list,
+      elements:
+        [
+          {
+            type: primitive,
+            mark: { type: decoratedSymbol, symbolColor: default, character: a },
+            selectionType: token,
+            position: contents,
+            insideOutsideType: null,
+            modifier: { type: identity },
+          },
+          {
+            type: primitive,
+            mark: { type: decoratedSymbol, symbolColor: default, character: b },
+            selectionType: token,
+            position: contents,
+            insideOutsideType: null,
+            modifier: { type: identity },
+          },
+          {
+            type: primitive,
+            mark: { type: decoratedSymbol, symbolColor: default, character: c },
+            selectionType: token,
+            position: contents,
+            insideOutsideType: null,
+            modifier: { type: identity },
+          },
+        ],
+    },
+    {
+      type: primitive,
+      mark: { type: decoratedSymbol, symbolColor: default, character: d },
+      selectionType: token,
+      position: before,
+      insideOutsideType: null,
+      modifier: { type: identity },
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/actions/bringAirAndBatAndCapToBeforeItemEach.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/actions/bringAirAndBatAndCapToBeforeItemEach.yml
new file mode 100644
index 0000000000..e679e69850
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/actions/bringAirAndBatAndCapToBeforeItemEach.yml
@@ -0,0 +1,128 @@
+languageId: typescript
+command:
+  version: 1
+  spokenForm: bring air and bat and cap to before item each
+  action: replaceWithTarget
+  targets:
+    - type: list
+      elements:
+        - type: primitive
+          mark: { type: decoratedSymbol, symbolColor: default, character: a }
+        - type: primitive
+          mark: { type: decoratedSymbol, symbolColor: default, character: b }
+        - type: primitive
+          mark: { type: decoratedSymbol, symbolColor: default, character: c }
+    - type: primitive
+      position: before
+      modifier:
+        {
+          type: containingScope,
+          scopeType: collectionItem,
+          includeSiblings: false,
+        }
+      mark: { type: decoratedSymbol, symbolColor: default, character: e }
+initialState:
+  documentContents: |
+    a
+    b
+    c
+
+    const values = [e]
+  selections:
+    - anchor: { line: 5, character: 0 }
+      active: { line: 5, character: 0 }
+  marks:
+    default.a:
+      start: { line: 0, character: 0 }
+      end: { line: 0, character: 1 }
+    default.b:
+      start: { line: 1, character: 0 }
+      end: { line: 1, character: 1 }
+    default.c:
+      start: { line: 2, character: 0 }
+      end: { line: 2, character: 1 }
+    default.e:
+      start: { line: 4, character: 16 }
+      end: { line: 4, character: 17 }
+finalState:
+  documentContents: |
+    a
+    b
+    c
+
+    const values = [a, b, c, e]
+  selections:
+    - anchor: { line: 5, character: 0 }
+      active: { line: 5, character: 0 }
+  thatMark:
+    - type: UntypedTarget
+      contentRange:
+        start: { line: 4, character: 16 }
+        end: { line: 4, character: 23 }
+      isReversed: false
+      hasExplicitRange: true
+  sourceMark:
+    - type: UntypedTarget
+      contentRange:
+        start: { line: 0, character: 0 }
+        end: { line: 0, character: 1 }
+      isReversed: false
+      hasExplicitRange: true
+    - type: UntypedTarget
+      contentRange:
+        start: { line: 1, character: 0 }
+        end: { line: 1, character: 1 }
+      isReversed: false
+      hasExplicitRange: true
+    - type: UntypedTarget
+      contentRange:
+        start: { line: 2, character: 0 }
+        end: { line: 2, character: 1 }
+      isReversed: false
+      hasExplicitRange: true
+fullTargets:
+  [
+    {
+      type: list,
+      elements:
+        [
+          {
+            type: primitive,
+            mark: { type: decoratedSymbol, symbolColor: default, character: a },
+            selectionType: token,
+            position: contents,
+            insideOutsideType: null,
+            modifier: { type: identity },
+          },
+          {
+            type: primitive,
+            mark: { type: decoratedSymbol, symbolColor: default, character: b },
+            selectionType: token,
+            position: contents,
+            insideOutsideType: null,
+            modifier: { type: identity },
+          },
+          {
+            type: primitive,
+            mark: { type: decoratedSymbol, symbolColor: default, character: c },
+            selectionType: token,
+            position: contents,
+            insideOutsideType: null,
+            modifier: { type: identity },
+          },
+        ],
+    },
+    {
+      type: primitive,
+      mark: { type: decoratedSymbol, symbolColor: default, character: e },
+      selectionType: token,
+      position: before,
+      insideOutsideType: null,
+      modifier:
+        {
+          type: containingScope,
+          scopeType: collectionItem,
+          includeSiblings: false,
+        },
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/actions/bringArgMadeAfterLook.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/actions/bringArgMadeAfterLook.yml
new file mode 100644
index 0000000000..54465e9449
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/actions/bringArgMadeAfterLook.yml
@@ -0,0 +1,77 @@
+languageId: typescript
+command:
+  spokenForm: bring arg made after look
+  version: 2
+  targets:
+    - type: primitive
+      mark: { type: decoratedSymbol, symbolColor: default, character: m }
+      modifiers:
+        - type: containingScope
+          scopeType: { type: argumentOrParameter }
+    - type: primitive
+      mark: { type: decoratedSymbol, symbolColor: default, character: l }
+      modifiers:
+        - { type: position, position: after }
+  usePrePhraseSnapshot: true
+  action: { name: replaceWithTarget }
+initialState:
+  documentContents: |-
+    function myFunk(
+        name: string,
+        value: number,
+        whatever: boolean
+    ) {}
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+  marks:
+    default.m:
+      start: { line: 1, character: 4 }
+      end: { line: 1, character: 8 }
+    default.l:
+      start: { line: 2, character: 4 }
+      end: { line: 2, character: 9 }
+finalState:
+  documentContents: |-
+    function myFunk(
+        name: string,
+        value: number,
+        name: string,
+        whatever: boolean
+    ) {}
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+  thatMark:
+    - type: UntypedTarget
+      contentRange:
+        start: { line: 3, character: 4 }
+        end: { line: 3, character: 16 }
+      isReversed: false
+      hasExplicitRange: true
+  sourceMark:
+    - type: UntypedTarget
+      contentRange:
+        start: { line: 1, character: 4 }
+        end: { line: 1, character: 16 }
+      isReversed: false
+      hasExplicitRange: true
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: decoratedSymbol, symbolColor: default, character: m },
+      modifiers:
+        [
+          &ref_0 {
+            type: containingScope,
+            scopeType: { type: argumentOrParameter },
+          },
+        ],
+    },
+    {
+      type: primitive,
+      mark: { type: decoratedSymbol, symbolColor: default, character: l },
+      modifiers: [{ type: position, position: after }, *ref_0],
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/actions/bringArgMadeAfterVest.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/actions/bringArgMadeAfterVest.yml
new file mode 100644
index 0000000000..71e575cad8
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/actions/bringArgMadeAfterVest.yml
@@ -0,0 +1,75 @@
+languageId: typescript
+command:
+  spokenForm: bring arg made after vest
+  version: 2
+  targets:
+    - type: primitive
+      mark: { type: decoratedSymbol, symbolColor: default, character: m }
+      modifiers:
+        - type: containingScope
+          scopeType: { type: argumentOrParameter }
+    - type: primitive
+      mark: { type: decoratedSymbol, symbolColor: default, character: v }
+      modifiers:
+        - { type: position, position: after }
+  usePrePhraseSnapshot: true
+  action: { name: replaceWithTarget }
+initialState:
+  documentContents: |-
+    function myFunk(
+        name: string,
+        value: number
+    ) {}
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+  marks:
+    default.m:
+      start: { line: 1, character: 4 }
+      end: { line: 1, character: 8 }
+    default.v:
+      start: { line: 2, character: 4 }
+      end: { line: 2, character: 9 }
+finalState:
+  documentContents: |-
+    function myFunk(
+        name: string,
+        value: number,
+        name: string
+    ) {}
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+  thatMark:
+    - type: UntypedTarget
+      contentRange:
+        start: { line: 3, character: 4 }
+        end: { line: 3, character: 16 }
+      isReversed: false
+      hasExplicitRange: true
+  sourceMark:
+    - type: UntypedTarget
+      contentRange:
+        start: { line: 1, character: 4 }
+        end: { line: 1, character: 16 }
+      isReversed: false
+      hasExplicitRange: true
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: decoratedSymbol, symbolColor: default, character: m },
+      modifiers:
+        [
+          &ref_0 {
+            type: containingScope,
+            scopeType: { type: argumentOrParameter },
+          },
+        ],
+    },
+    {
+      type: primitive,
+      mark: { type: decoratedSymbol, symbolColor: default, character: v },
+      modifiers: [{ type: position, position: after }, *ref_0],
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/actions/bringArgWhaleBeforeLook.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/actions/bringArgWhaleBeforeLook.yml
new file mode 100644
index 0000000000..0cf7d93e68
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/actions/bringArgWhaleBeforeLook.yml
@@ -0,0 +1,77 @@
+languageId: typescript
+command:
+  spokenForm: bring arg whale before look
+  version: 2
+  targets:
+    - type: primitive
+      mark: { type: decoratedSymbol, symbolColor: default, character: w }
+      modifiers:
+        - type: containingScope
+          scopeType: { type: argumentOrParameter }
+    - type: primitive
+      mark: { type: decoratedSymbol, symbolColor: default, character: l }
+      modifiers:
+        - { type: position, position: before }
+  usePrePhraseSnapshot: true
+  action: { name: replaceWithTarget }
+initialState:
+  documentContents: |-
+    function myFunk(
+        name: string,
+        value: number,
+        whatever: boolean
+    ) {}
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+  marks:
+    default.w:
+      start: { line: 3, character: 4 }
+      end: { line: 3, character: 12 }
+    default.l:
+      start: { line: 2, character: 4 }
+      end: { line: 2, character: 9 }
+finalState:
+  documentContents: |-
+    function myFunk(
+        name: string,
+        whatever: boolean,
+        value: number,
+        whatever: boolean
+    ) {}
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+  thatMark:
+    - type: UntypedTarget
+      contentRange:
+        start: { line: 2, character: 4 }
+        end: { line: 2, character: 21 }
+      isReversed: false
+      hasExplicitRange: true
+  sourceMark:
+    - type: UntypedTarget
+      contentRange:
+        start: { line: 4, character: 4 }
+        end: { line: 4, character: 21 }
+      isReversed: false
+      hasExplicitRange: true
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: decoratedSymbol, symbolColor: default, character: w },
+      modifiers:
+        [
+          &ref_0 {
+            type: containingScope,
+            scopeType: { type: argumentOrParameter },
+          },
+        ],
+    },
+    {
+      type: primitive,
+      mark: { type: decoratedSymbol, symbolColor: default, character: l },
+      modifiers: [{ type: position, position: before }, *ref_0],
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/actions/bringArgueFineAndZip.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/actions/bringArgueFineAndZip.yml
new file mode 100644
index 0000000000..3f1a70488b
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/actions/bringArgueFineAndZip.yml
@@ -0,0 +1,116 @@
+languageId: typescript
+command:
+  version: 1
+  spokenForm: bring argue fine and zip
+  action: replaceWithTarget
+  targets:
+    - type: list
+      elements:
+        - type: primitive
+          modifier:
+            {
+              type: containingScope,
+              scopeType: argumentOrParameter,
+              includeSiblings: false,
+            }
+          mark: { type: decoratedSymbol, symbolColor: default, character: f }
+        - type: primitive
+          mark: { type: decoratedSymbol, symbolColor: default, character: z }
+    - { type: primitive, isImplicit: true }
+initialState:
+  documentContents: |-
+    function helloWorld(foo: string, bar: number, baz: string) {
+
+    }
+
+    function bongo() {
+
+    }
+  selections:
+    - anchor: { line: 4, character: 15 }
+      active: { line: 4, character: 15 }
+  marks:
+    default.f:
+      start: { line: 0, character: 20 }
+      end: { line: 0, character: 23 }
+    default.z:
+      start: { line: 0, character: 46 }
+      end: { line: 0, character: 49 }
+finalState:
+  documentContents: |-
+    function helloWorld(foo: string, bar: number, baz: string) {
+
+    }
+
+    function bongo(foo: string, baz: string) {
+
+    }
+  selections:
+    - anchor: { line: 4, character: 39 }
+      active: { line: 4, character: 39 }
+  thatMark:
+    - type: UntypedTarget
+      contentRange:
+        start: { line: 4, character: 15 }
+        end: { line: 4, character: 39 }
+      isReversed: false
+      hasExplicitRange: true
+  sourceMark:
+    - type: UntypedTarget
+      contentRange:
+        start: { line: 0, character: 20 }
+        end: { line: 0, character: 31 }
+      isReversed: false
+      hasExplicitRange: true
+    - type: UntypedTarget
+      contentRange:
+        start: { line: 0, character: 46 }
+        end: { line: 0, character: 57 }
+      isReversed: false
+      hasExplicitRange: true
+fullTargets:
+  [
+    {
+      type: list,
+      elements:
+        [
+          {
+            type: primitive,
+            mark: { type: decoratedSymbol, symbolColor: default, character: f },
+            selectionType: token,
+            position: contents,
+            insideOutsideType: null,
+            modifier:
+              {
+                type: containingScope,
+                scopeType: argumentOrParameter,
+                includeSiblings: false,
+              },
+            isImplicit: false,
+          },
+          {
+            type: primitive,
+            mark: { type: decoratedSymbol, symbolColor: default, character: z },
+            selectionType: token,
+            position: contents,
+            insideOutsideType: null,
+            modifier:
+              {
+                type: containingScope,
+                scopeType: argumentOrParameter,
+                includeSiblings: false,
+              },
+            isImplicit: false,
+          },
+        ],
+    },
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: null,
+      modifier: { type: identity },
+      isImplicit: true,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/actions/bringArgueOxAndZipToAfterJustLeper.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/actions/bringArgueOxAndZipToAfterJustLeper.yml
new file mode 100644
index 0000000000..374882ac0d
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/actions/bringArgueOxAndZipToAfterJustLeper.yml
@@ -0,0 +1,122 @@
+languageId: typescript
+command:
+  version: 1
+  spokenForm: bring argue ox and zip to after just leper
+  action: replaceWithTarget
+  targets:
+    - type: list
+      elements:
+        - type: primitive
+          modifier:
+            {
+              type: containingScope,
+              scopeType: argumentOrParameter,
+              includeSiblings: false,
+            }
+          mark: { type: decoratedSymbol, symbolColor: default, character: o }
+        - type: primitive
+          mark: { type: decoratedSymbol, symbolColor: default, character: z }
+    - type: primitive
+      position: after
+      modifier: { type: toRawSelection }
+      mark: { type: decoratedSymbol, symbolColor: default, character: ( }
+initialState:
+  documentContents: |-
+    function helloWorld(foo: string, bar: number, baz: string) {
+
+    }
+
+    function bongo() {
+
+    }
+  selections:
+    - anchor: { line: 3, character: 0 }
+      active: { line: 3, character: 0 }
+  marks:
+    default.o:
+      start: { line: 0, character: 20 }
+      end: { line: 0, character: 23 }
+    default.z:
+      start: { line: 0, character: 46 }
+      end: { line: 0, character: 49 }
+    default.(:
+      start: { line: 4, character: 14 }
+      end: { line: 4, character: 15 }
+finalState:
+  documentContents: |-
+    function helloWorld(foo: string, bar: number, baz: string) {
+
+    }
+
+    function bongo(foo: string, baz: string) {
+
+    }
+  selections:
+    - anchor: { line: 3, character: 0 }
+      active: { line: 3, character: 0 }
+  thatMark:
+    - type: UntypedTarget
+      contentRange:
+        start: { line: 4, character: 15 }
+        end: { line: 4, character: 39 }
+      isReversed: false
+      hasExplicitRange: true
+  sourceMark:
+    - type: UntypedTarget
+      contentRange:
+        start: { line: 0, character: 20 }
+        end: { line: 0, character: 31 }
+      isReversed: false
+      hasExplicitRange: true
+    - type: UntypedTarget
+      contentRange:
+        start: { line: 0, character: 46 }
+        end: { line: 0, character: 57 }
+      isReversed: false
+      hasExplicitRange: true
+fullTargets:
+  [
+    {
+      type: list,
+      elements:
+        [
+          {
+            type: primitive,
+            mark: { type: decoratedSymbol, symbolColor: default, character: o },
+            selectionType: token,
+            position: contents,
+            insideOutsideType: null,
+            modifier:
+              {
+                type: containingScope,
+                scopeType: argumentOrParameter,
+                includeSiblings: false,
+              },
+            isImplicit: false,
+          },
+          {
+            type: primitive,
+            mark: { type: decoratedSymbol, symbolColor: default, character: z },
+            selectionType: token,
+            position: contents,
+            insideOutsideType: null,
+            modifier:
+              {
+                type: containingScope,
+                scopeType: argumentOrParameter,
+                includeSiblings: false,
+              },
+            isImplicit: false,
+          },
+        ],
+    },
+    {
+      type: primitive,
+      mark: { type: decoratedSymbol, symbolColor: default, character: ( },
+      selectionType: token,
+      position: after,
+      insideOutsideType: null,
+      modifier: { type: toRawSelection },
+      isImplicit: false,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/actions/bringFineAfterLineVest.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/actions/bringFineAfterLineVest.yml
new file mode 100644
index 0000000000..a57e6c469b
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/actions/bringFineAfterLineVest.yml
@@ -0,0 +1,68 @@
+languageId: plaintext
+command:
+  spokenForm: bring fine after line vest
+  version: 2
+  targets:
+    - type: primitive
+      mark: { type: decoratedSymbol, symbolColor: default, character: f }
+    - type: primitive
+      mark: { type: decoratedSymbol, symbolColor: default, character: v }
+      modifiers:
+        - { type: position, position: after }
+        - type: containingScope
+          scopeType: { type: line }
+  usePrePhraseSnapshot: true
+  action: { name: replaceWithTarget }
+initialState:
+  documentContents: |
+    foo
+        const value = "Hello world";
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+  marks:
+    default.f:
+      start: { line: 0, character: 0 }
+      end: { line: 0, character: 3 }
+    default.v:
+      start: { line: 1, character: 10 }
+      end: { line: 1, character: 15 }
+finalState:
+  documentContents: |
+    foo
+        const value = "Hello world";
+        foo
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+  thatMark:
+    - type: UntypedTarget
+      contentRange:
+        start: { line: 2, character: 4 }
+        end: { line: 2, character: 7 }
+      isReversed: false
+      hasExplicitRange: true
+  sourceMark:
+    - type: UntypedTarget
+      contentRange:
+        start: { line: 0, character: 0 }
+        end: { line: 0, character: 3 }
+      isReversed: false
+      hasExplicitRange: true
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: decoratedSymbol, symbolColor: default, character: f },
+      modifiers: [],
+    },
+    {
+      type: primitive,
+      mark: { type: decoratedSymbol, symbolColor: default, character: v },
+      modifiers:
+        [
+          { type: position, position: after },
+          { type: containingScope, scopeType: { type: line } },
+        ],
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/actions/bringFineBeforeLineVest.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/actions/bringFineBeforeLineVest.yml
new file mode 100644
index 0000000000..a9ebb5b897
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/actions/bringFineBeforeLineVest.yml
@@ -0,0 +1,70 @@
+languageId: plaintext
+command:
+  spokenForm: bring fine before line vest
+  version: 2
+  targets:
+    - type: primitive
+      mark: { type: decoratedSymbol, symbolColor: default, character: f }
+    - type: primitive
+      mark: { type: decoratedSymbol, symbolColor: default, character: v }
+      modifiers:
+        - { type: position, position: before }
+        - type: containingScope
+          scopeType: { type: line }
+  usePrePhraseSnapshot: true
+  action: { name: replaceWithTarget }
+initialState:
+  documentContents: |2
+
+        const value = "Hello world";
+    foo
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+  marks:
+    default.f:
+      start: { line: 2, character: 0 }
+      end: { line: 2, character: 3 }
+    default.v:
+      start: { line: 1, character: 10 }
+      end: { line: 1, character: 15 }
+finalState:
+  documentContents: |2
+
+        foo
+        const value = "Hello world";
+    foo
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+  thatMark:
+    - type: UntypedTarget
+      contentRange:
+        start: { line: 1, character: 4 }
+        end: { line: 1, character: 7 }
+      isReversed: false
+      hasExplicitRange: true
+  sourceMark:
+    - type: UntypedTarget
+      contentRange:
+        start: { line: 3, character: 0 }
+        end: { line: 3, character: 3 }
+      isReversed: false
+      hasExplicitRange: true
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: decoratedSymbol, symbolColor: default, character: f },
+      modifiers: [],
+    },
+    {
+      type: primitive,
+      mark: { type: decoratedSymbol, symbolColor: default, character: v },
+      modifiers:
+        [
+          { type: position, position: before },
+          { type: containingScope, scopeType: { type: line } },
+        ],
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/actions/bringItemAirAfterCap.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/actions/bringItemAirAfterCap.yml
new file mode 100644
index 0000000000..95a8da5639
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/actions/bringItemAirAfterCap.yml
@@ -0,0 +1,72 @@
+languageId: typescript
+command:
+  spokenForm: bring item air after cap
+  version: 2
+  targets:
+    - type: primitive
+      mark: { type: decoratedSymbol, symbolColor: default, character: a }
+      modifiers:
+        - type: containingScope
+          scopeType: { type: collectionItem }
+    - type: primitive
+      mark: { type: decoratedSymbol, symbolColor: default, character: c }
+      modifiers:
+        - { type: position, position: after }
+  usePrePhraseSnapshot: true
+  action: { name: replaceWithTarget }
+initialState:
+  documentContents: |-
+    [
+        a,
+        b,
+        c
+    ]
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+  marks:
+    default.a:
+      start: { line: 1, character: 4 }
+      end: { line: 1, character: 5 }
+    default.c:
+      start: { line: 3, character: 4 }
+      end: { line: 3, character: 5 }
+finalState:
+  documentContents: |-
+    [
+        a,
+        b,
+        c,
+        a
+    ]
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+  thatMark:
+    - type: UntypedTarget
+      contentRange:
+        start: { line: 4, character: 4 }
+        end: { line: 4, character: 5 }
+      isReversed: false
+      hasExplicitRange: true
+  sourceMark:
+    - type: UntypedTarget
+      contentRange:
+        start: { line: 1, character: 4 }
+        end: { line: 1, character: 5 }
+      isReversed: false
+      hasExplicitRange: true
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: decoratedSymbol, symbolColor: default, character: a },
+      modifiers:
+        [&ref_0 { type: containingScope, scopeType: { type: collectionItem } }],
+    },
+    {
+      type: primitive,
+      mark: { type: decoratedSymbol, symbolColor: default, character: c },
+      modifiers: [{ type: position, position: after }, *ref_0],
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/actions/bringLineAirAndBatAndCapToAfterDrum.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/actions/bringLineAirAndBatAndCapToAfterDrum.yml
new file mode 100644
index 0000000000..a488c9c0f7
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/actions/bringLineAirAndBatAndCapToAfterDrum.yml
@@ -0,0 +1,121 @@
+languageId: typescript
+command:
+  version: 1
+  spokenForm: bring line air and bat and cap to after drum
+  action: replaceWithTarget
+  targets:
+    - type: list
+      elements:
+        - type: primitive
+          selectionType: line
+          mark: { type: decoratedSymbol, symbolColor: default, character: a }
+        - type: primitive
+          mark: { type: decoratedSymbol, symbolColor: default, character: b }
+        - type: primitive
+          mark: { type: decoratedSymbol, symbolColor: default, character: c }
+    - type: primitive
+      position: after
+      mark: { type: decoratedSymbol, symbolColor: default, character: d }
+initialState:
+  documentContents: |
+    a
+    b
+    c
+
+    d
+  selections:
+    - anchor: { line: 5, character: 0 }
+      active: { line: 5, character: 0 }
+  marks:
+    default.a:
+      start: { line: 0, character: 0 }
+      end: { line: 0, character: 1 }
+    default.b:
+      start: { line: 1, character: 0 }
+      end: { line: 1, character: 1 }
+    default.c:
+      start: { line: 2, character: 0 }
+      end: { line: 2, character: 1 }
+    default.d:
+      start: { line: 4, character: 0 }
+      end: { line: 4, character: 1 }
+finalState:
+  documentContents: |
+    a
+    b
+    c
+
+    d
+    a
+    b
+    c
+  selections:
+    - anchor: { line: 8, character: 0 }
+      active: { line: 8, character: 0 }
+  thatMark:
+    - type: UntypedTarget
+      contentRange:
+        start: { line: 5, character: 0 }
+        end: { line: 7, character: 1 }
+      isReversed: false
+      hasExplicitRange: true
+  sourceMark:
+    - type: UntypedTarget
+      contentRange:
+        start: { line: 0, character: 0 }
+        end: { line: 0, character: 1 }
+      isReversed: false
+      hasExplicitRange: true
+    - type: UntypedTarget
+      contentRange:
+        start: { line: 1, character: 0 }
+        end: { line: 1, character: 1 }
+      isReversed: false
+      hasExplicitRange: true
+    - type: UntypedTarget
+      contentRange:
+        start: { line: 2, character: 0 }
+        end: { line: 2, character: 1 }
+      isReversed: false
+      hasExplicitRange: true
+fullTargets:
+  [
+    {
+      type: list,
+      elements:
+        [
+          {
+            type: primitive,
+            mark: { type: decoratedSymbol, symbolColor: default, character: a },
+            selectionType: line,
+            position: contents,
+            insideOutsideType: null,
+            modifier: { type: identity },
+          },
+          {
+            type: primitive,
+            mark: { type: decoratedSymbol, symbolColor: default, character: b },
+            selectionType: line,
+            position: contents,
+            insideOutsideType: null,
+            modifier: { type: identity },
+          },
+          {
+            type: primitive,
+            mark: { type: decoratedSymbol, symbolColor: default, character: c },
+            selectionType: line,
+            position: contents,
+            insideOutsideType: null,
+            modifier: { type: identity },
+          },
+        ],
+    },
+    {
+      type: primitive,
+      mark: { type: decoratedSymbol, symbolColor: default, character: d },
+      selectionType: line,
+      position: after,
+      insideOutsideType: null,
+      modifier: { type: identity },
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/actions/bringLineAirAndBatAndCapToBeforeDrum.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/actions/bringLineAirAndBatAndCapToBeforeDrum.yml
new file mode 100644
index 0000000000..94f8ab908f
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/actions/bringLineAirAndBatAndCapToBeforeDrum.yml
@@ -0,0 +1,121 @@
+languageId: typescript
+command:
+  version: 1
+  spokenForm: bring line air and bat and cap to before drum
+  action: replaceWithTarget
+  targets:
+    - type: list
+      elements:
+        - type: primitive
+          selectionType: line
+          mark: { type: decoratedSymbol, symbolColor: default, character: a }
+        - type: primitive
+          mark: { type: decoratedSymbol, symbolColor: default, character: b }
+        - type: primitive
+          mark: { type: decoratedSymbol, symbolColor: default, character: c }
+    - type: primitive
+      position: before
+      mark: { type: decoratedSymbol, symbolColor: default, character: d }
+initialState:
+  documentContents: |
+    a
+    b
+    c
+
+    d
+  selections:
+    - anchor: { line: 5, character: 0 }
+      active: { line: 5, character: 0 }
+  marks:
+    default.a:
+      start: { line: 0, character: 0 }
+      end: { line: 0, character: 1 }
+    default.b:
+      start: { line: 1, character: 0 }
+      end: { line: 1, character: 1 }
+    default.c:
+      start: { line: 2, character: 0 }
+      end: { line: 2, character: 1 }
+    default.d:
+      start: { line: 4, character: 0 }
+      end: { line: 4, character: 1 }
+finalState:
+  documentContents: |
+    a
+    b
+    c
+
+    a
+    b
+    c
+    d
+  selections:
+    - anchor: { line: 8, character: 0 }
+      active: { line: 8, character: 0 }
+  thatMark:
+    - type: UntypedTarget
+      contentRange:
+        start: { line: 4, character: 0 }
+        end: { line: 6, character: 1 }
+      isReversed: false
+      hasExplicitRange: true
+  sourceMark:
+    - type: UntypedTarget
+      contentRange:
+        start: { line: 0, character: 0 }
+        end: { line: 0, character: 1 }
+      isReversed: false
+      hasExplicitRange: true
+    - type: UntypedTarget
+      contentRange:
+        start: { line: 1, character: 0 }
+        end: { line: 1, character: 1 }
+      isReversed: false
+      hasExplicitRange: true
+    - type: UntypedTarget
+      contentRange:
+        start: { line: 2, character: 0 }
+        end: { line: 2, character: 1 }
+      isReversed: false
+      hasExplicitRange: true
+fullTargets:
+  [
+    {
+      type: list,
+      elements:
+        [
+          {
+            type: primitive,
+            mark: { type: decoratedSymbol, symbolColor: default, character: a },
+            selectionType: line,
+            position: contents,
+            insideOutsideType: null,
+            modifier: { type: identity },
+          },
+          {
+            type: primitive,
+            mark: { type: decoratedSymbol, symbolColor: default, character: b },
+            selectionType: line,
+            position: contents,
+            insideOutsideType: null,
+            modifier: { type: identity },
+          },
+          {
+            type: primitive,
+            mark: { type: decoratedSymbol, symbolColor: default, character: c },
+            selectionType: line,
+            position: contents,
+            insideOutsideType: null,
+            modifier: { type: identity },
+          },
+        ],
+    },
+    {
+      type: primitive,
+      mark: { type: decoratedSymbol, symbolColor: default, character: d },
+      selectionType: line,
+      position: before,
+      insideOutsideType: null,
+      modifier: { type: identity },
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/actions/bringVest.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/actions/bringVest.yml
new file mode 100644
index 0000000000..2378220d95
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/actions/bringVest.yml
@@ -0,0 +1,60 @@
+languageId: typescript
+command:
+  version: 1
+  spokenForm: bring vest
+  action: replaceWithTarget
+  targets:
+    - type: primitive
+      mark: { type: decoratedSymbol, symbolColor: default, character: v }
+    - { type: primitive, isImplicit: true }
+initialState:
+  documentContents: |
+
+    const value = "Hello world";
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+  marks:
+    default.v:
+      start: { line: 1, character: 6 }
+      end: { line: 1, character: 11 }
+finalState:
+  documentContents: |
+    value
+    const value = "Hello world";
+  selections:
+    - anchor: { line: 0, character: 5 }
+      active: { line: 0, character: 5 }
+  thatMark:
+    - type: UntypedTarget
+      contentRange:
+        start: { line: 0, character: 0 }
+        end: { line: 0, character: 5 }
+      isReversed: false
+      hasExplicitRange: true
+  sourceMark:
+    - type: UntypedTarget
+      contentRange:
+        start: { line: 1, character: 6 }
+        end: { line: 1, character: 11 }
+      isReversed: false
+      hasExplicitRange: true
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: decoratedSymbol, symbolColor: default, character: v },
+      selectionType: token,
+      position: contents,
+      modifier: { type: identity },
+      insideOutsideType: null,
+    },
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      modifier: { type: identity },
+      insideOutsideType: inside,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/actions/bringVestToCap.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/actions/bringVestToCap.yml
new file mode 100644
index 0000000000..f42f5bd91c
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/actions/bringVestToCap.yml
@@ -0,0 +1,64 @@
+languageId: typescript
+command:
+  version: 1
+  spokenForm: bring vest to cap
+  action: replaceWithTarget
+  targets:
+    - type: primitive
+      mark: { type: decoratedSymbol, symbolColor: default, character: v }
+    - type: primitive
+      mark: { type: decoratedSymbol, symbolColor: default, character: c }
+initialState:
+  documentContents: |
+
+    const value = "Hello world";
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+  marks:
+    default.v:
+      start: { line: 1, character: 6 }
+      end: { line: 1, character: 11 }
+    default.c:
+      start: { line: 1, character: 0 }
+      end: { line: 1, character: 5 }
+finalState:
+  documentContents: |
+
+    value value = "Hello world";
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+  thatMark:
+    - type: UntypedTarget
+      contentRange:
+        start: { line: 1, character: 0 }
+        end: { line: 1, character: 5 }
+      isReversed: false
+      hasExplicitRange: true
+  sourceMark:
+    - type: UntypedTarget
+      contentRange:
+        start: { line: 1, character: 6 }
+        end: { line: 1, character: 11 }
+      isReversed: false
+      hasExplicitRange: true
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: decoratedSymbol, symbolColor: default, character: v },
+      selectionType: token,
+      position: contents,
+      modifier: { type: identity },
+      insideOutsideType: null,
+    },
+    {
+      type: primitive,
+      mark: { type: decoratedSymbol, symbolColor: default, character: c },
+      selectionType: token,
+      position: contents,
+      modifier: { type: identity },
+      insideOutsideType: null,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/actions/callFine.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/actions/callFine.yml
new file mode 100644
index 0000000000..440847461c
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/actions/callFine.yml
@@ -0,0 +1,65 @@
+languageId: typescript
+command:
+  version: 1
+  spokenForm: call fine
+  action: callAsFunction
+  targets:
+    - type: primitive
+      mark: { type: decoratedSymbol, symbolColor: default, character: f }
+    - { type: primitive, isImplicit: true }
+initialState:
+  documentContents: |-
+    foo;
+    bar;
+    baz;
+  selections:
+    - anchor: { line: 1, character: 0 }
+      active: { line: 1, character: 3 }
+    - anchor: { line: 2, character: 0 }
+      active: { line: 2, character: 3 }
+  marks:
+    default.f:
+      start: { line: 0, character: 0 }
+      end: { line: 0, character: 3 }
+finalState:
+  documentContents: |-
+    foo;
+    foo(bar);
+    foo(baz);
+  selections:
+    - anchor: { line: 1, character: 4 }
+      active: { line: 1, character: 7 }
+    - anchor: { line: 2, character: 4 }
+      active: { line: 2, character: 7 }
+  thatMark:
+    - type: UntypedTarget
+      contentRange:
+        start: { line: 1, character: 0 }
+        end: { line: 1, character: 8 }
+      isReversed: false
+      hasExplicitRange: true
+    - type: UntypedTarget
+      contentRange:
+        start: { line: 2, character: 0 }
+        end: { line: 2, character: 8 }
+      isReversed: false
+      hasExplicitRange: true
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: decoratedSymbol, symbolColor: default, character: f },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier: { type: identity },
+    },
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier: { type: identity },
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/actions/callVest.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/actions/callVest.yml
new file mode 100644
index 0000000000..e45fc5dd1f
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/actions/callVest.yml
@@ -0,0 +1,53 @@
+languageId: typescript
+command:
+  version: 1
+  spokenForm: call vest
+  action: callAsFunction
+  targets:
+    - type: primitive
+      mark: { type: decoratedSymbol, symbolColor: default, character: v }
+    - { type: primitive, isImplicit: true }
+initialState:
+  documentContents: |
+
+    const value = "Hello world";
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+  marks:
+    default.v:
+      start: { line: 1, character: 6 }
+      end: { line: 1, character: 11 }
+finalState:
+  documentContents: |
+    value()
+    const value = "Hello world";
+  selections:
+    - anchor: { line: 0, character: 6 }
+      active: { line: 0, character: 6 }
+  thatMark:
+    - type: UntypedTarget
+      contentRange:
+        start: { line: 0, character: 0 }
+        end: { line: 0, character: 7 }
+      isReversed: false
+      hasExplicitRange: true
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: decoratedSymbol, symbolColor: default, character: v },
+      selectionType: token,
+      position: contents,
+      modifier: { type: identity },
+      insideOutsideType: inside,
+    },
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      modifier: { type: identity },
+      insideOutsideType: inside,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/actions/callVestOnCap.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/actions/callVestOnCap.yml
new file mode 100644
index 0000000000..82595f8b3f
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/actions/callVestOnCap.yml
@@ -0,0 +1,57 @@
+languageId: typescript
+command:
+  version: 1
+  spokenForm: call vest on cap
+  action: callAsFunction
+  targets:
+    - type: primitive
+      mark: { type: decoratedSymbol, symbolColor: default, character: v }
+    - type: primitive
+      mark: { type: decoratedSymbol, symbolColor: default, character: c }
+initialState:
+  documentContents: |
+
+    const value = "Hello world";
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+  marks:
+    default.v:
+      start: { line: 1, character: 6 }
+      end: { line: 1, character: 11 }
+    default.c:
+      start: { line: 1, character: 0 }
+      end: { line: 1, character: 5 }
+finalState:
+  documentContents: |
+
+    value(const) value = "Hello world";
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+  thatMark:
+    - type: UntypedTarget
+      contentRange:
+        start: { line: 1, character: 0 }
+        end: { line: 1, character: 12 }
+      isReversed: false
+      hasExplicitRange: true
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: decoratedSymbol, symbolColor: default, character: v },
+      selectionType: token,
+      position: contents,
+      modifier: { type: identity },
+      insideOutsideType: inside,
+    },
+    {
+      type: primitive,
+      mark: { type: decoratedSymbol, symbolColor: default, character: c },
+      selectionType: token,
+      position: contents,
+      modifier: { type: identity },
+      insideOutsideType: inside,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/actions/carveVest.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/actions/carveVest.yml
new file mode 100644
index 0000000000..cbff75cd82
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/actions/carveVest.yml
@@ -0,0 +1,44 @@
+languageId: typescript
+command:
+  version: 1
+  spokenForm: carve vest
+  action: cutToClipboard
+  targets:
+    - type: primitive
+      mark: { type: decoratedSymbol, symbolColor: default, character: v }
+initialState:
+  documentContents: |
+
+    const value = "Hello world";
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+  marks:
+    default.v:
+      start: { line: 1, character: 6 }
+      end: { line: 1, character: 11 }
+finalState:
+  documentContents: |
+
+    const = "Hello world";
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+  thatMark:
+    - type: RawSelectionTarget
+      contentRange:
+        start: { line: 1, character: 6 }
+        end: { line: 1, character: 6 }
+      isReversed: false
+      hasExplicitRange: true
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: decoratedSymbol, symbolColor: default, character: v },
+      selectionType: token,
+      position: contents,
+      modifier: { type: identity },
+      insideOutsideType: null,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/actions/chuckArgMadeAndAir.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/actions/chuckArgMadeAndAir.yml
new file mode 100644
index 0000000000..fec755afe2
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/actions/chuckArgMadeAndAir.yml
@@ -0,0 +1,79 @@
+languageId: typescript
+command:
+  version: 1
+  spokenForm: chuck arg made and air
+  action: remove
+  targets:
+    - type: list
+      elements:
+        - type: primitive
+          modifier:
+            {
+              type: containingScope,
+              scopeType: argumentOrParameter,
+              includeSiblings: false,
+            }
+          mark: { type: decoratedSymbol, symbolColor: default, character: m }
+        - type: primitive
+          mark: { type: decoratedSymbol, symbolColor: default, character: a }
+initialState:
+  documentContents: "function myFunk(value: string, name: string, age: number) { };"
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+  marks:
+    default.m:
+      start: { line: 0, character: 31 }
+      end: { line: 0, character: 35 }
+    default.a:
+      start: { line: 0, character: 45 }
+      end: { line: 0, character: 48 }
+finalState:
+  documentContents: "function myFunk(value: string) { };"
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+  thatMark:
+    - type: RawSelectionTarget
+      contentRange:
+        start: { line: 0, character: 29 }
+        end: { line: 0, character: 29 }
+      isReversed: false
+      hasExplicitRange: true
+fullTargets:
+  [
+    {
+      type: list,
+      elements:
+        [
+          {
+            type: primitive,
+            mark: { type: decoratedSymbol, symbolColor: default, character: m },
+            selectionType: token,
+            position: contents,
+            insideOutsideType: outside,
+            modifier:
+              {
+                type: containingScope,
+                scopeType: argumentOrParameter,
+                includeSiblings: false,
+              },
+            isImplicit: false,
+          },
+          {
+            type: primitive,
+            mark: { type: decoratedSymbol, symbolColor: default, character: a },
+            selectionType: token,
+            position: contents,
+            insideOutsideType: outside,
+            modifier:
+              {
+                type: containingScope,
+                scopeType: argumentOrParameter,
+                includeSiblings: false,
+              },
+            isImplicit: false,
+          },
+        ],
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/actions/chuckArgMadeAndAirAndJustSoon.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/actions/chuckArgMadeAndAirAndJustSoon.yml
new file mode 100644
index 0000000000..7d0072fc0e
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/actions/chuckArgMadeAndAirAndJustSoon.yml
@@ -0,0 +1,94 @@
+languageId: typescript
+command:
+  version: 1
+  spokenForm: chuck arg made and air and just soon
+  action: remove
+  targets:
+    - type: list
+      elements:
+        - type: primitive
+          modifier:
+            {
+              type: containingScope,
+              scopeType: argumentOrParameter,
+              includeSiblings: false,
+            }
+          mark: { type: decoratedSymbol, symbolColor: default, character: m }
+        - type: primitive
+          mark: { type: decoratedSymbol, symbolColor: default, character: a }
+        - type: primitive
+          modifier: { type: toRawSelection }
+          mark: { type: decoratedSymbol, symbolColor: default, character: s }
+initialState:
+  documentContents: "function myFunk(value: string, name: string, age: number) { };"
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+  marks:
+    default.m:
+      start: { line: 0, character: 31 }
+      end: { line: 0, character: 35 }
+    default.a:
+      start: { line: 0, character: 45 }
+      end: { line: 0, character: 48 }
+    default.s:
+      start: { line: 0, character: 23 }
+      end: { line: 0, character: 29 }
+finalState:
+  documentContents: function myFunk(value:) { };
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+  thatMark:
+    - type: RawSelectionTarget
+      contentRange:
+        start: { line: 0, character: 22 }
+        end: { line: 0, character: 22 }
+      isReversed: false
+      hasExplicitRange: true
+fullTargets:
+  [
+    {
+      type: list,
+      elements:
+        [
+          {
+            type: primitive,
+            mark: { type: decoratedSymbol, symbolColor: default, character: m },
+            selectionType: token,
+            position: contents,
+            insideOutsideType: outside,
+            modifier:
+              {
+                type: containingScope,
+                scopeType: argumentOrParameter,
+                includeSiblings: false,
+              },
+            isImplicit: false,
+          },
+          {
+            type: primitive,
+            mark: { type: decoratedSymbol, symbolColor: default, character: a },
+            selectionType: token,
+            position: contents,
+            insideOutsideType: outside,
+            modifier:
+              {
+                type: containingScope,
+                scopeType: argumentOrParameter,
+                includeSiblings: false,
+              },
+            isImplicit: false,
+          },
+          {
+            type: primitive,
+            mark: { type: decoratedSymbol, symbolColor: default, character: s },
+            selectionType: token,
+            position: contents,
+            insideOutsideType: outside,
+            modifier: { type: toRawSelection },
+            isImplicit: false,
+          },
+        ],
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/actions/chuckEveryArgMade.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/actions/chuckEveryArgMade.yml
new file mode 100644
index 0000000000..7d3e50dcaf
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/actions/chuckEveryArgMade.yml
@@ -0,0 +1,52 @@
+languageId: typescript
+command:
+  version: 1
+  spokenForm: chuck every arg made
+  action: remove
+  targets:
+    - type: primitive
+      modifier:
+        {
+          type: containingScope,
+          scopeType: argumentOrParameter,
+          includeSiblings: true,
+        }
+      mark: { type: decoratedSymbol, symbolColor: default, character: m }
+initialState:
+  documentContents: "function myFunk(value: string, name: string, age: number) { };"
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+  marks:
+    default.m:
+      start: { line: 0, character: 31 }
+      end: { line: 0, character: 35 }
+finalState:
+  documentContents: function myFunk() { };
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+  thatMark:
+    - type: RawSelectionTarget
+      contentRange:
+        start: { line: 0, character: 16 }
+        end: { line: 0, character: 16 }
+      isReversed: false
+      hasExplicitRange: true
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: decoratedSymbol, symbolColor: default, character: m },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: outside,
+      modifier:
+        {
+          type: containingScope,
+          scopeType: argumentOrParameter,
+          includeSiblings: true,
+        },
+      isImplicit: false,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/actions/chuckVest.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/actions/chuckVest.yml
new file mode 100644
index 0000000000..42ab75057d
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/actions/chuckVest.yml
@@ -0,0 +1,44 @@
+languageId: typescript
+command:
+  version: 1
+  spokenForm: chuck vest
+  action: remove
+  targets:
+    - type: primitive
+      mark: { type: decoratedSymbol, symbolColor: default, character: v }
+initialState:
+  documentContents: |
+
+    const value = "Hello world";
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+  marks:
+    default.v:
+      start: { line: 1, character: 6 }
+      end: { line: 1, character: 11 }
+finalState:
+  documentContents: |
+
+    const = "Hello world";
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+  thatMark:
+    - type: RawSelectionTarget
+      contentRange:
+        start: { line: 1, character: 6 }
+        end: { line: 1, character: 6 }
+      isReversed: false
+      hasExplicitRange: true
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: decoratedSymbol, symbolColor: default, character: v },
+      selectionType: token,
+      position: contents,
+      modifier: { type: identity },
+      insideOutsideType: outside,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/actions/clearVest.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/actions/clearVest.yml
new file mode 100644
index 0000000000..e6534f0b0c
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/actions/clearVest.yml
@@ -0,0 +1,44 @@
+languageId: typescript
+command:
+  version: 1
+  spokenForm: clear vest
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      mark: { type: decoratedSymbol, symbolColor: default, character: v }
+initialState:
+  documentContents: |
+
+    const value = "Hello world";
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+  marks:
+    default.v:
+      start: { line: 1, character: 6 }
+      end: { line: 1, character: 11 }
+finalState:
+  documentContents: |
+
+    const  = "Hello world";
+  selections:
+    - anchor: { line: 1, character: 6 }
+      active: { line: 1, character: 6 }
+  thatMark:
+    - type: RawSelectionTarget
+      contentRange:
+        start: { line: 1, character: 6 }
+        end: { line: 1, character: 6 }
+      isReversed: false
+      hasExplicitRange: true
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: decoratedSymbol, symbolColor: default, character: v },
+      selectionType: token,
+      position: contents,
+      modifier: { type: identity },
+      insideOutsideType: inside,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/actions/cloneArgue.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/actions/cloneArgue.yml
new file mode 100644
index 0000000000..214170232f
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/actions/cloneArgue.yml
@@ -0,0 +1,62 @@
+languageId: typescript
+command:
+  spokenForm: clone argue
+  version: 2
+  targets:
+    - type: primitive
+      modifiers:
+        - type: containingScope
+          scopeType: { type: argumentOrParameter }
+  usePrePhraseSnapshot: true
+  action: { name: insertCopyAfter }
+initialState:
+  documentContents: |-
+    function foo(bar: number) {
+
+    }
+  selections:
+    - anchor: { line: 0, character: 15 }
+      active: { line: 0, character: 15 }
+    - anchor: { line: 0, character: 20 }
+      active: { line: 0, character: 20 }
+  marks: {}
+finalState:
+  documentContents: |-
+    function foo(bar: number, bar: number) {
+
+    }
+  selections:
+    - anchor: { line: 0, character: 28 }
+      active: { line: 0, character: 28 }
+    - anchor: { line: 0, character: 33 }
+      active: { line: 0, character: 33 }
+  thatMark:
+    - type: UntypedTarget
+      contentRange:
+        start: { line: 0, character: 26 }
+        end: { line: 0, character: 37 }
+      isReversed: false
+      hasExplicitRange: true
+  sourceMark:
+    - type: UntypedTarget
+      contentRange:
+        start: { line: 0, character: 13 }
+        end: { line: 0, character: 24 }
+      isReversed: false
+      hasExplicitRange: true
+ide:
+  flashes:
+    - range:
+        type: character
+        start: { line: 0, character: 26 }
+        end: { line: 0, character: 37 }
+      style: justAdded
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      modifiers:
+        [{ type: containingScope, scopeType: { type: argumentOrParameter } }],
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/actions/cloneArgue2.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/actions/cloneArgue2.yml
new file mode 100644
index 0000000000..4174420885
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/actions/cloneArgue2.yml
@@ -0,0 +1,51 @@
+languageId: typescript
+command:
+  spokenForm: clone argue
+  version: 2
+  targets:
+    - type: primitive
+      modifiers:
+        - type: containingScope
+          scopeType: { type: argumentOrParameter }
+  usePrePhraseSnapshot: true
+  action: { name: insertCopyAfter }
+initialState:
+  documentContents: |-
+    function foo(bar: number) {
+
+    }
+  selections:
+    - anchor: { line: 0, character: 24 }
+      active: { line: 0, character: 24 }
+  marks: {}
+finalState:
+  documentContents: |-
+    function foo(bar: number, bar: number) {
+
+    }
+  selections:
+    - anchor: { line: 0, character: 37 }
+      active: { line: 0, character: 37 }
+  thatMark:
+    - type: UntypedTarget
+      contentRange:
+        start: { line: 0, character: 26 }
+        end: { line: 0, character: 37 }
+      isReversed: false
+      hasExplicitRange: true
+  sourceMark:
+    - type: UntypedTarget
+      contentRange:
+        start: { line: 0, character: 13 }
+        end: { line: 0, character: 24 }
+      isReversed: false
+      hasExplicitRange: true
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      modifiers:
+        [{ type: containingScope, scopeType: { type: argumentOrParameter } }],
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/actions/cloneEveryArg.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/actions/cloneEveryArg.yml
new file mode 100644
index 0000000000..eb72956eb1
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/actions/cloneEveryArg.yml
@@ -0,0 +1,57 @@
+languageId: typescript
+command:
+  spokenForm: clone every arg
+  version: 2
+  targets:
+    - type: primitive
+      modifiers:
+        - type: everyScope
+          scopeType: { type: argumentOrParameter }
+  usePrePhraseSnapshot: true
+  action: { name: insertCopyAfter }
+initialState:
+  documentContents: "function myFunk(a: number, b: number) {}"
+  selections:
+    - anchor: { line: 0, character: 20 }
+      active: { line: 0, character: 20 }
+  marks: {}
+finalState:
+  documentContents: "function myFunk(a: number, a: number, b: number, b: number) {}"
+  selections:
+    - anchor: { line: 0, character: 31 }
+      active: { line: 0, character: 31 }
+  thatMark:
+    - type: UntypedTarget
+      contentRange:
+        start: { line: 0, character: 27 }
+        end: { line: 0, character: 36 }
+      isReversed: false
+      hasExplicitRange: true
+    - type: UntypedTarget
+      contentRange:
+        start: { line: 0, character: 49 }
+        end: { line: 0, character: 58 }
+      isReversed: false
+      hasExplicitRange: true
+  sourceMark:
+    - type: UntypedTarget
+      contentRange:
+        start: { line: 0, character: 16 }
+        end: { line: 0, character: 25 }
+      isReversed: false
+      hasExplicitRange: true
+    - type: UntypedTarget
+      contentRange:
+        start: { line: 0, character: 38 }
+        end: { line: 0, character: 47 }
+      isReversed: false
+      hasExplicitRange: true
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      modifiers:
+        [{ type: everyScope, scopeType: { type: argumentOrParameter } }],
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/actions/cloneHarp.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/actions/cloneHarp.yml
new file mode 100644
index 0000000000..ed403eea34
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/actions/cloneHarp.yml
@@ -0,0 +1,49 @@
+languageId: plaintext
+command:
+  version: 1
+  spokenForm: clone harp
+  action: insertCopyAfter
+  targets:
+    - type: primitive
+      mark: { type: decoratedSymbol, symbolColor: default, character: h }
+initialState:
+  documentContents: hello
+  selections:
+    - anchor: { line: 0, character: 5 }
+      active: { line: 0, character: 5 }
+  marks:
+    default.h:
+      start: { line: 0, character: 0 }
+      end: { line: 0, character: 5 }
+finalState:
+  documentContents: |-
+    hello
+    hello
+  selections:
+    - anchor: { line: 1, character: 5 }
+      active: { line: 1, character: 5 }
+  thatMark:
+    - type: UntypedTarget
+      contentRange:
+        start: { line: 1, character: 0 }
+        end: { line: 1, character: 5 }
+      isReversed: false
+      hasExplicitRange: true
+  sourceMark:
+    - type: UntypedTarget
+      contentRange:
+        start: { line: 0, character: 0 }
+        end: { line: 0, character: 5 }
+      isReversed: false
+      hasExplicitRange: true
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: decoratedSymbol, symbolColor: default, character: h },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier: { type: identity },
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/actions/cloneHarp2.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/actions/cloneHarp2.yml
new file mode 100644
index 0000000000..97989a04bf
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/actions/cloneHarp2.yml
@@ -0,0 +1,49 @@
+languageId: plaintext
+command:
+  version: 1
+  spokenForm: clone harp
+  action: insertCopyAfter
+  targets:
+    - type: primitive
+      mark: { type: decoratedSymbol, symbolColor: default, character: h }
+initialState:
+  documentContents: hello
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+  marks:
+    default.h:
+      start: { line: 0, character: 0 }
+      end: { line: 0, character: 5 }
+finalState:
+  documentContents: |-
+    hello
+    hello
+  selections:
+    - anchor: { line: 1, character: 0 }
+      active: { line: 1, character: 0 }
+  thatMark:
+    - type: UntypedTarget
+      contentRange:
+        start: { line: 1, character: 0 }
+        end: { line: 1, character: 5 }
+      isReversed: false
+      hasExplicitRange: true
+  sourceMark:
+    - type: UntypedTarget
+      contentRange:
+        start: { line: 0, character: 0 }
+        end: { line: 0, character: 5 }
+      isReversed: false
+      hasExplicitRange: true
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: decoratedSymbol, symbolColor: default, character: h },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier: { type: identity },
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/actions/cloneToken.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/actions/cloneToken.yml
new file mode 100644
index 0000000000..9a0cbdd1ec
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/actions/cloneToken.yml
@@ -0,0 +1,51 @@
+languageId: plaintext
+command:
+  spokenForm: clone token
+  version: 2
+  targets:
+    - type: primitive
+      modifiers:
+        - type: containingScope
+          scopeType: { type: token }
+  usePrePhraseSnapshot: true
+  action: { name: insertCopyAfter }
+initialState:
+  documentContents: hello world
+  selections:
+    - anchor: { line: 0, character: 8 }
+      active: { line: 0, character: 8 }
+  marks: {}
+finalState:
+  documentContents: hello world world
+  selections:
+    - anchor: { line: 0, character: 14 }
+      active: { line: 0, character: 14 }
+  thatMark:
+    - type: UntypedTarget
+      contentRange:
+        start: { line: 0, character: 12 }
+        end: { line: 0, character: 17 }
+      isReversed: false
+      hasExplicitRange: true
+  sourceMark:
+    - type: UntypedTarget
+      contentRange:
+        start: { line: 0, character: 6 }
+        end: { line: 0, character: 11 }
+      isReversed: false
+      hasExplicitRange: true
+ide:
+  flashes:
+    - range:
+        type: character
+        start: { line: 0, character: 12 }
+        end: { line: 0, character: 17 }
+      style: justAdded
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      modifiers: [{ type: containingScope, scopeType: { type: token } }],
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/actions/cloneToken2.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/actions/cloneToken2.yml
new file mode 100644
index 0000000000..eee86038fd
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/actions/cloneToken2.yml
@@ -0,0 +1,51 @@
+languageId: plaintext
+command:
+  spokenForm: clone token
+  version: 2
+  targets:
+    - type: primitive
+      modifiers:
+        - type: containingScope
+          scopeType: { type: token }
+  usePrePhraseSnapshot: true
+  action: { name: insertCopyAfter }
+initialState:
+  documentContents: hello
+  selections:
+    - anchor: { line: 0, character: 3 }
+      active: { line: 0, character: 3 }
+  marks: {}
+finalState:
+  documentContents: hello hello
+  selections:
+    - anchor: { line: 0, character: 9 }
+      active: { line: 0, character: 9 }
+  thatMark:
+    - type: UntypedTarget
+      contentRange:
+        start: { line: 0, character: 6 }
+        end: { line: 0, character: 11 }
+      isReversed: false
+      hasExplicitRange: true
+  sourceMark:
+    - type: UntypedTarget
+      contentRange:
+        start: { line: 0, character: 0 }
+        end: { line: 0, character: 5 }
+      isReversed: false
+      hasExplicitRange: true
+ide:
+  flashes:
+    - range:
+        type: character
+        start: { line: 0, character: 6 }
+        end: { line: 0, character: 11 }
+      style: justAdded
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      modifiers: [{ type: containingScope, scopeType: { type: token } }],
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/actions/cloneToken3.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/actions/cloneToken3.yml
new file mode 100644
index 0000000000..5ade4a7581
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/actions/cloneToken3.yml
@@ -0,0 +1,44 @@
+languageId: plaintext
+command:
+  spokenForm: clone token
+  version: 2
+  targets:
+    - type: primitive
+      modifiers:
+        - type: containingScope
+          scopeType: { type: token }
+  usePrePhraseSnapshot: true
+  action: { name: insertCopyAfter }
+initialState:
+  documentContents: hello
+  selections:
+    - anchor: { line: 0, character: 5 }
+      active: { line: 0, character: 5 }
+  marks: {}
+finalState:
+  documentContents: hello hello
+  selections:
+    - anchor: { line: 0, character: 11 }
+      active: { line: 0, character: 11 }
+  thatMark:
+    - type: UntypedTarget
+      contentRange:
+        start: { line: 0, character: 6 }
+        end: { line: 0, character: 11 }
+      isReversed: false
+      hasExplicitRange: true
+  sourceMark:
+    - type: UntypedTarget
+      contentRange:
+        start: { line: 0, character: 0 }
+        end: { line: 0, character: 5 }
+      isReversed: false
+      hasExplicitRange: true
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      modifiers: [{ type: containingScope, scopeType: { type: token } }],
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/actions/cloneToken4.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/actions/cloneToken4.yml
new file mode 100644
index 0000000000..ba4201677f
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/actions/cloneToken4.yml
@@ -0,0 +1,44 @@
+languageId: plaintext
+command:
+  spokenForm: clone token
+  version: 2
+  targets:
+    - type: primitive
+      modifiers:
+        - type: containingScope
+          scopeType: { type: token }
+  usePrePhraseSnapshot: true
+  action: { name: insertCopyAfter }
+initialState:
+  documentContents: hello
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+  marks: {}
+finalState:
+  documentContents: hello hello
+  selections:
+    - anchor: { line: 0, character: 6 }
+      active: { line: 0, character: 6 }
+  thatMark:
+    - type: UntypedTarget
+      contentRange:
+        start: { line: 0, character: 6 }
+        end: { line: 0, character: 11 }
+      isReversed: false
+      hasExplicitRange: true
+  sourceMark:
+    - type: UntypedTarget
+      contentRange:
+        start: { line: 0, character: 0 }
+        end: { line: 0, character: 5 }
+      isReversed: false
+      hasExplicitRange: true
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      modifiers: [{ type: containingScope, scopeType: { type: token } }],
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/actions/cloneToken5.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/actions/cloneToken5.yml
new file mode 100644
index 0000000000..88512c18b7
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/actions/cloneToken5.yml
@@ -0,0 +1,44 @@
+languageId: plaintext
+command:
+  spokenForm: clone token
+  version: 2
+  targets:
+    - type: primitive
+      modifiers:
+        - type: containingScope
+          scopeType: { type: token }
+  usePrePhraseSnapshot: true
+  action: { name: insertCopyAfter }
+initialState:
+  documentContents: hello
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 5 }
+  marks: {}
+finalState:
+  documentContents: hello hello
+  selections:
+    - anchor: { line: 0, character: 6 }
+      active: { line: 0, character: 11 }
+  thatMark:
+    - type: UntypedTarget
+      contentRange:
+        start: { line: 0, character: 6 }
+        end: { line: 0, character: 11 }
+      isReversed: false
+      hasExplicitRange: true
+  sourceMark:
+    - type: UntypedTarget
+      contentRange:
+        start: { line: 0, character: 0 }
+        end: { line: 0, character: 5 }
+      isReversed: false
+      hasExplicitRange: true
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      modifiers: [{ type: containingScope, scopeType: { type: token } }],
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/actions/cloneUpArgue.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/actions/cloneUpArgue.yml
new file mode 100644
index 0000000000..ede15464f6
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/actions/cloneUpArgue.yml
@@ -0,0 +1,62 @@
+languageId: typescript
+command:
+  spokenForm: clone up argue
+  version: 2
+  targets:
+    - type: primitive
+      modifiers:
+        - type: containingScope
+          scopeType: { type: argumentOrParameter }
+  usePrePhraseSnapshot: true
+  action: { name: insertCopyBefore }
+initialState:
+  documentContents: |-
+    function foo(bar: number) {
+
+    }
+  selections:
+    - anchor: { line: 0, character: 15 }
+      active: { line: 0, character: 15 }
+    - anchor: { line: 0, character: 20 }
+      active: { line: 0, character: 20 }
+  marks: {}
+finalState:
+  documentContents: |-
+    function foo(bar: number, bar: number) {
+
+    }
+  selections:
+    - anchor: { line: 0, character: 15 }
+      active: { line: 0, character: 15 }
+    - anchor: { line: 0, character: 20 }
+      active: { line: 0, character: 20 }
+  thatMark:
+    - type: UntypedTarget
+      contentRange:
+        start: { line: 0, character: 13 }
+        end: { line: 0, character: 24 }
+      isReversed: false
+      hasExplicitRange: true
+  sourceMark:
+    - type: UntypedTarget
+      contentRange:
+        start: { line: 0, character: 26 }
+        end: { line: 0, character: 37 }
+      isReversed: false
+      hasExplicitRange: true
+ide:
+  flashes:
+    - range:
+        type: character
+        start: { line: 0, character: 13 }
+        end: { line: 0, character: 24 }
+      style: justAdded
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      modifiers:
+        [{ type: containingScope, scopeType: { type: argumentOrParameter } }],
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/actions/cloneUpArgue2.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/actions/cloneUpArgue2.yml
new file mode 100644
index 0000000000..a2510c5bec
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/actions/cloneUpArgue2.yml
@@ -0,0 +1,51 @@
+languageId: typescript
+command:
+  spokenForm: clone up argue
+  version: 2
+  targets:
+    - type: primitive
+      modifiers:
+        - type: containingScope
+          scopeType: { type: argumentOrParameter }
+  usePrePhraseSnapshot: true
+  action: { name: insertCopyBefore }
+initialState:
+  documentContents: |-
+    function foo(bar: number) {
+
+    }
+  selections:
+    - anchor: { line: 0, character: 13 }
+      active: { line: 0, character: 13 }
+  marks: {}
+finalState:
+  documentContents: |-
+    function foo(bar: number, bar: number) {
+
+    }
+  selections:
+    - anchor: { line: 0, character: 13 }
+      active: { line: 0, character: 13 }
+  thatMark:
+    - type: UntypedTarget
+      contentRange:
+        start: { line: 0, character: 13 }
+        end: { line: 0, character: 24 }
+      isReversed: false
+      hasExplicitRange: true
+  sourceMark:
+    - type: UntypedTarget
+      contentRange:
+        start: { line: 0, character: 26 }
+        end: { line: 0, character: 37 }
+      isReversed: false
+      hasExplicitRange: true
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      modifiers:
+        [{ type: containingScope, scopeType: { type: argumentOrParameter } }],
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/actions/cloneUpEveryArg.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/actions/cloneUpEveryArg.yml
new file mode 100644
index 0000000000..67bad3bde8
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/actions/cloneUpEveryArg.yml
@@ -0,0 +1,57 @@
+languageId: typescript
+command:
+  spokenForm: clone up every arg
+  version: 2
+  targets:
+    - type: primitive
+      modifiers:
+        - type: everyScope
+          scopeType: { type: argumentOrParameter }
+  usePrePhraseSnapshot: true
+  action: { name: insertCopyBefore }
+initialState:
+  documentContents: "function myFunk(a: number, b: number) {}"
+  selections:
+    - anchor: { line: 0, character: 20 }
+      active: { line: 0, character: 20 }
+  marks: {}
+finalState:
+  documentContents: "function myFunk(a: number, a: number, b: number, b: number) {}"
+  selections:
+    - anchor: { line: 0, character: 20 }
+      active: { line: 0, character: 20 }
+  thatMark:
+    - type: UntypedTarget
+      contentRange:
+        start: { line: 0, character: 16 }
+        end: { line: 0, character: 25 }
+      isReversed: false
+      hasExplicitRange: true
+    - type: UntypedTarget
+      contentRange:
+        start: { line: 0, character: 38 }
+        end: { line: 0, character: 47 }
+      isReversed: false
+      hasExplicitRange: true
+  sourceMark:
+    - type: UntypedTarget
+      contentRange:
+        start: { line: 0, character: 27 }
+        end: { line: 0, character: 36 }
+      isReversed: false
+      hasExplicitRange: true
+    - type: UntypedTarget
+      contentRange:
+        start: { line: 0, character: 49 }
+        end: { line: 0, character: 58 }
+      isReversed: false
+      hasExplicitRange: true
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      modifiers:
+        [{ type: everyScope, scopeType: { type: argumentOrParameter } }],
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/actions/cloneUpHarp.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/actions/cloneUpHarp.yml
new file mode 100644
index 0000000000..b865b3d9d7
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/actions/cloneUpHarp.yml
@@ -0,0 +1,49 @@
+languageId: plaintext
+command:
+  version: 1
+  spokenForm: clone up harp
+  action: insertCopyBefore
+  targets:
+    - type: primitive
+      mark: { type: decoratedSymbol, symbolColor: default, character: h }
+initialState:
+  documentContents: hello
+  selections:
+    - anchor: { line: 0, character: 5 }
+      active: { line: 0, character: 5 }
+  marks:
+    default.h:
+      start: { line: 0, character: 0 }
+      end: { line: 0, character: 5 }
+finalState:
+  documentContents: |-
+    hello
+    hello
+  selections:
+    - anchor: { line: 0, character: 5 }
+      active: { line: 0, character: 5 }
+  thatMark:
+    - type: UntypedTarget
+      contentRange:
+        start: { line: 0, character: 0 }
+        end: { line: 0, character: 5 }
+      isReversed: false
+      hasExplicitRange: true
+  sourceMark:
+    - type: UntypedTarget
+      contentRange:
+        start: { line: 1, character: 0 }
+        end: { line: 1, character: 5 }
+      isReversed: false
+      hasExplicitRange: true
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: decoratedSymbol, symbolColor: default, character: h },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier: { type: identity },
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/actions/cloneUpHarp2.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/actions/cloneUpHarp2.yml
new file mode 100644
index 0000000000..b2a5b71a41
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/actions/cloneUpHarp2.yml
@@ -0,0 +1,49 @@
+languageId: plaintext
+command:
+  version: 1
+  spokenForm: clone up harp
+  action: insertCopyBefore
+  targets:
+    - type: primitive
+      mark: { type: decoratedSymbol, symbolColor: default, character: h }
+initialState:
+  documentContents: hello
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+  marks:
+    default.h:
+      start: { line: 0, character: 0 }
+      end: { line: 0, character: 5 }
+finalState:
+  documentContents: |-
+    hello
+    hello
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+  thatMark:
+    - type: UntypedTarget
+      contentRange:
+        start: { line: 0, character: 0 }
+        end: { line: 0, character: 5 }
+      isReversed: false
+      hasExplicitRange: true
+  sourceMark:
+    - type: UntypedTarget
+      contentRange:
+        start: { line: 1, character: 0 }
+        end: { line: 1, character: 5 }
+      isReversed: false
+      hasExplicitRange: true
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: decoratedSymbol, symbolColor: default, character: h },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier: { type: identity },
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/actions/cloneUpToken.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/actions/cloneUpToken.yml
new file mode 100644
index 0000000000..af8d556746
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/actions/cloneUpToken.yml
@@ -0,0 +1,51 @@
+languageId: plaintext
+command:
+  spokenForm: clone up token
+  version: 2
+  targets:
+    - type: primitive
+      modifiers:
+        - type: containingScope
+          scopeType: { type: token }
+  usePrePhraseSnapshot: true
+  action: { name: insertCopyBefore }
+initialState:
+  documentContents: hello world
+  selections:
+    - anchor: { line: 0, character: 8 }
+      active: { line: 0, character: 8 }
+  marks: {}
+finalState:
+  documentContents: hello world world
+  selections:
+    - anchor: { line: 0, character: 8 }
+      active: { line: 0, character: 8 }
+  thatMark:
+    - type: UntypedTarget
+      contentRange:
+        start: { line: 0, character: 6 }
+        end: { line: 0, character: 11 }
+      isReversed: false
+      hasExplicitRange: true
+  sourceMark:
+    - type: UntypedTarget
+      contentRange:
+        start: { line: 0, character: 12 }
+        end: { line: 0, character: 17 }
+      isReversed: false
+      hasExplicitRange: true
+ide:
+  flashes:
+    - range:
+        type: character
+        start: { line: 0, character: 6 }
+        end: { line: 0, character: 11 }
+      style: justAdded
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      modifiers: [{ type: containingScope, scopeType: { type: token } }],
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/actions/cloneUpToken2.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/actions/cloneUpToken2.yml
new file mode 100644
index 0000000000..108f9ee442
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/actions/cloneUpToken2.yml
@@ -0,0 +1,51 @@
+languageId: plaintext
+command:
+  spokenForm: clone up token
+  version: 2
+  targets:
+    - type: primitive
+      modifiers:
+        - type: containingScope
+          scopeType: { type: token }
+  usePrePhraseSnapshot: true
+  action: { name: insertCopyBefore }
+initialState:
+  documentContents: hello
+  selections:
+    - anchor: { line: 0, character: 3 }
+      active: { line: 0, character: 3 }
+  marks: {}
+finalState:
+  documentContents: hello hello
+  selections:
+    - anchor: { line: 0, character: 3 }
+      active: { line: 0, character: 3 }
+  thatMark:
+    - type: UntypedTarget
+      contentRange:
+        start: { line: 0, character: 0 }
+        end: { line: 0, character: 5 }
+      isReversed: false
+      hasExplicitRange: true
+  sourceMark:
+    - type: UntypedTarget
+      contentRange:
+        start: { line: 0, character: 6 }
+        end: { line: 0, character: 11 }
+      isReversed: false
+      hasExplicitRange: true
+ide:
+  flashes:
+    - range:
+        type: character
+        start: { line: 0, character: 0 }
+        end: { line: 0, character: 5 }
+      style: justAdded
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      modifiers: [{ type: containingScope, scopeType: { type: token } }],
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/actions/cloneUpToken3.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/actions/cloneUpToken3.yml
new file mode 100644
index 0000000000..f43e3b05af
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/actions/cloneUpToken3.yml
@@ -0,0 +1,44 @@
+languageId: plaintext
+command:
+  spokenForm: clone up token
+  version: 2
+  targets:
+    - type: primitive
+      modifiers:
+        - type: containingScope
+          scopeType: { type: token }
+  usePrePhraseSnapshot: true
+  action: { name: insertCopyBefore }
+initialState:
+  documentContents: hello
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+  marks: {}
+finalState:
+  documentContents: hello hello
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+  thatMark:
+    - type: UntypedTarget
+      contentRange:
+        start: { line: 0, character: 0 }
+        end: { line: 0, character: 5 }
+      isReversed: false
+      hasExplicitRange: true
+  sourceMark:
+    - type: UntypedTarget
+      contentRange:
+        start: { line: 0, character: 6 }
+        end: { line: 0, character: 11 }
+      isReversed: false
+      hasExplicitRange: true
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      modifiers: [{ type: containingScope, scopeType: { type: token } }],
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/actions/cloneUpToken4.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/actions/cloneUpToken4.yml
new file mode 100644
index 0000000000..8f393c52fd
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/actions/cloneUpToken4.yml
@@ -0,0 +1,44 @@
+languageId: plaintext
+command:
+  spokenForm: clone up token
+  version: 2
+  targets:
+    - type: primitive
+      modifiers:
+        - type: containingScope
+          scopeType: { type: token }
+  usePrePhraseSnapshot: false
+  action: { name: insertCopyBefore }
+initialState:
+  documentContents: hello
+  selections:
+    - anchor: { line: 0, character: 5 }
+      active: { line: 0, character: 5 }
+  marks: {}
+finalState:
+  documentContents: hello hello
+  selections:
+    - anchor: { line: 0, character: 5 }
+      active: { line: 0, character: 5 }
+  thatMark:
+    - type: UntypedTarget
+      contentRange:
+        start: { line: 0, character: 0 }
+        end: { line: 0, character: 5 }
+      isReversed: false
+      hasExplicitRange: true
+  sourceMark:
+    - type: UntypedTarget
+      contentRange:
+        start: { line: 0, character: 6 }
+        end: { line: 0, character: 11 }
+      isReversed: false
+      hasExplicitRange: true
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      modifiers: [{ type: containingScope, scopeType: { type: token } }],
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/actions/cloneUpToken5.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/actions/cloneUpToken5.yml
new file mode 100644
index 0000000000..9447a91513
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/actions/cloneUpToken5.yml
@@ -0,0 +1,44 @@
+languageId: plaintext
+command:
+  spokenForm: clone up token
+  version: 2
+  targets:
+    - type: primitive
+      modifiers:
+        - type: containingScope
+          scopeType: { type: token }
+  usePrePhraseSnapshot: true
+  action: { name: insertCopyBefore }
+initialState:
+  documentContents: hello
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 5 }
+  marks: {}
+finalState:
+  documentContents: hello hello
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 5 }
+  thatMark:
+    - type: UntypedTarget
+      contentRange:
+        start: { line: 0, character: 0 }
+        end: { line: 0, character: 5 }
+      isReversed: false
+      hasExplicitRange: true
+  sourceMark:
+    - type: UntypedTarget
+      contentRange:
+        start: { line: 0, character: 6 }
+        end: { line: 0, character: 11 }
+      isReversed: false
+      hasExplicitRange: true
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      modifiers: [{ type: containingScope, scopeType: { type: token } }],
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/actions/cloneUpVest.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/actions/cloneUpVest.yml
new file mode 100644
index 0000000000..a1a2081f1c
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/actions/cloneUpVest.yml
@@ -0,0 +1,49 @@
+languageId: plaintext
+command:
+  version: 1
+  spokenForm: clone up vest
+  action: insertCopyBefore
+  targets:
+    - type: primitive
+      mark: { type: decoratedSymbol, symbolColor: default, character: v }
+initialState:
+  documentContents: '    const value = "Hello world";'
+  selections:
+    - anchor: { line: 0, character: 15 }
+      active: { line: 0, character: 15 }
+  marks:
+    default.v:
+      start: { line: 0, character: 10 }
+      end: { line: 0, character: 15 }
+finalState:
+  documentContents: |2-
+        const value = "Hello world";
+        const value = "Hello world";
+  selections:
+    - anchor: { line: 0, character: 15 }
+      active: { line: 0, character: 15 }
+  thatMark:
+    - type: UntypedTarget
+      contentRange:
+        start: { line: 0, character: 4 }
+        end: { line: 0, character: 32 }
+      isReversed: false
+      hasExplicitRange: true
+  sourceMark:
+    - type: UntypedTarget
+      contentRange:
+        start: { line: 1, character: 4 }
+        end: { line: 1, character: 32 }
+      isReversed: false
+      hasExplicitRange: true
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: decoratedSymbol, symbolColor: default, character: v },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier: { type: identity },
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/actions/cloneVest.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/actions/cloneVest.yml
new file mode 100644
index 0000000000..d7dbe89e0c
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/actions/cloneVest.yml
@@ -0,0 +1,49 @@
+languageId: plaintext
+command:
+  version: 1
+  spokenForm: clone vest
+  action: insertCopyAfter
+  targets:
+    - type: primitive
+      mark: { type: decoratedSymbol, symbolColor: default, character: v }
+initialState:
+  documentContents: '    const value = "Hello world";'
+  selections:
+    - anchor: { line: 0, character: 15 }
+      active: { line: 0, character: 15 }
+  marks:
+    default.v:
+      start: { line: 0, character: 10 }
+      end: { line: 0, character: 15 }
+finalState:
+  documentContents: |2-
+        const value = "Hello world";
+        const value = "Hello world";
+  selections:
+    - anchor: { line: 1, character: 15 }
+      active: { line: 1, character: 15 }
+  thatMark:
+    - type: UntypedTarget
+      contentRange:
+        start: { line: 1, character: 4 }
+        end: { line: 1, character: 32 }
+      isReversed: false
+      hasExplicitRange: true
+  sourceMark:
+    - type: UntypedTarget
+      contentRange:
+        start: { line: 0, character: 4 }
+        end: { line: 0, character: 32 }
+      isReversed: false
+      hasExplicitRange: true
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: decoratedSymbol, symbolColor: default, character: v },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier: { type: identity },
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/actions/commentVest.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/actions/commentVest.yml
new file mode 100644
index 0000000000..e74266d204
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/actions/commentVest.yml
@@ -0,0 +1,44 @@
+languageId: typescript
+command:
+  version: 1
+  spokenForm: comment vest
+  action: toggleLineComment
+  targets:
+    - type: primitive
+      mark: { type: decoratedSymbol, symbolColor: default, character: v }
+initialState:
+  documentContents: |
+
+    const value = "Hello world";
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+  marks:
+    default.v:
+      start: { line: 1, character: 6 }
+      end: { line: 1, character: 11 }
+finalState:
+  documentContents: |
+
+    // const value = "Hello world";
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+  thatMark:
+    - type: UntypedTarget
+      contentRange:
+        start: { line: 1, character: 9 }
+        end: { line: 1, character: 14 }
+      isReversed: false
+      hasExplicitRange: true
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: decoratedSymbol, symbolColor: default, character: v },
+      selectionType: token,
+      position: contents,
+      modifier: { type: identity },
+      insideOutsideType: inside,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/actions/config.json b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/actions/config.json
similarity index 100%
rename from packages/cursorless-vscode-e2e/suite/fixtures/recorded/actions/config.json
rename to packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/actions/config.json
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/actions/copyVest.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/actions/copyVest.yml
new file mode 100644
index 0000000000..61e0e53a97
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/actions/copyVest.yml
@@ -0,0 +1,46 @@
+languageId: typescript
+command:
+  version: 1
+  spokenForm: copy vest
+  action: copyToClipboard
+  targets:
+    - type: primitive
+      mark: { type: decoratedSymbol, symbolColor: default, character: v }
+initialState:
+  documentContents: |
+
+    const value = "Hello world";
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+  clipboard: value
+  marks:
+    default.v:
+      start: { line: 1, character: 6 }
+      end: { line: 1, character: 11 }
+finalState:
+  documentContents: |
+
+    const value = "Hello world";
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+  clipboard: value
+  thatMark:
+    - type: UntypedTarget
+      contentRange:
+        start: { line: 1, character: 6 }
+        end: { line: 1, character: 11 }
+      isReversed: false
+      hasExplicitRange: false
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: decoratedSymbol, symbolColor: default, character: v },
+      selectionType: token,
+      position: contents,
+      modifier: { type: identity },
+      insideOutsideType: inside,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/actions/curlyRepackRound.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/actions/curlyRepackRound.yml
new file mode 100644
index 0000000000..59dd0b2683
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/actions/curlyRepackRound.yml
@@ -0,0 +1,65 @@
+languageId: plaintext
+command:
+  version: 1
+  spokenForm: curly repack round
+  action: rewrapWithPairedDelimiter
+  targets:
+    - type: primitive
+      modifier: { type: surroundingPair, delimiter: parentheses }
+  extraArgs: ["{", "}"]
+initialState:
+  documentContents: |-
+    ([hello])
+    (there)
+  selections:
+    - anchor: { line: 0, character: 5 }
+      active: { line: 0, character: 5 }
+    - anchor: { line: 1, character: 5 }
+      active: { line: 1, character: 5 }
+  marks: {}
+finalState:
+  documentContents: |-
+    {[hello]}
+    {there}
+  selections:
+    - anchor: { line: 0, character: 5 }
+      active: { line: 0, character: 5 }
+    - anchor: { line: 1, character: 5 }
+      active: { line: 1, character: 5 }
+  thatMark:
+    - type: UntypedTarget
+      contentRange:
+        start: { line: 0, character: 0 }
+        end: { line: 0, character: 9 }
+      isReversed: false
+      hasExplicitRange: true
+    - type: UntypedTarget
+      contentRange:
+        start: { line: 1, character: 0 }
+        end: { line: 1, character: 7 }
+      isReversed: false
+      hasExplicitRange: true
+  sourceMark:
+    - type: UntypedTarget
+      contentRange:
+        start: { line: 0, character: 0 }
+        end: { line: 0, character: 9 }
+      isReversed: false
+      hasExplicitRange: true
+    - type: UntypedTarget
+      contentRange:
+        start: { line: 1, character: 0 }
+        end: { line: 1, character: 7 }
+      isReversed: false
+      hasExplicitRange: true
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier: { type: surroundingPair, delimiter: parentheses },
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/actions/customHarp.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/actions/customHarp.yml
new file mode 100644
index 0000000000..e9ce3496d1
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/actions/customHarp.yml
@@ -0,0 +1,45 @@
+languageId: markdown
+command:
+  version: 1
+  spokenForm: custom harp
+  action: executeCommand
+  targets:
+    - type: primitive
+      mark: { type: decoratedSymbol, symbolColor: default, character: h }
+  extraArgs:
+    - editor.action.addCommentLine
+    - {}
+initialState:
+  documentContents: |
+    hello world
+  selections:
+    - anchor: { line: 1, character: 0 }
+      active: { line: 1, character: 0 }
+  marks:
+    default.h:
+      start: { line: 0, character: 0 }
+      end: { line: 0, character: 5 }
+finalState:
+  documentContents: |
+    <!-- hello world -->
+  selections:
+    - anchor: { line: 1, character: 0 }
+      active: { line: 1, character: 0 }
+  thatMark:
+    - type: UntypedTarget
+      contentRange:
+        start: { line: 0, character: 5 }
+        end: { line: 0, character: 10 }
+      isReversed: false
+      hasExplicitRange: true
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: decoratedSymbol, symbolColor: default, character: h },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier: { type: identity },
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/actions/cutEveryArgMade.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/actions/cutEveryArgMade.yml
new file mode 100644
index 0000000000..d233d4cf57
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/actions/cutEveryArgMade.yml
@@ -0,0 +1,52 @@
+languageId: typescript
+command:
+  version: 1
+  spokenForm: cut every arg made
+  action: cutToClipboard
+  targets:
+    - type: primitive
+      modifier:
+        {
+          type: containingScope,
+          scopeType: argumentOrParameter,
+          includeSiblings: true,
+        }
+      mark: { type: decoratedSymbol, symbolColor: default, character: m }
+initialState:
+  documentContents: "function myFunk(value: string, name: string, age: number) { };"
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+  marks:
+    default.m:
+      start: { line: 0, character: 31 }
+      end: { line: 0, character: 35 }
+finalState:
+  documentContents: function myFunk() { };
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+  thatMark:
+    - type: RawSelectionTarget
+      contentRange:
+        start: { line: 0, character: 16 }
+        end: { line: 0, character: 16 }
+      isReversed: false
+      hasExplicitRange: true
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: decoratedSymbol, symbolColor: default, character: m },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: null,
+      modifier:
+        {
+          type: containingScope,
+          scopeType: argumentOrParameter,
+          includeSiblings: true,
+        },
+      isImplicit: false,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/actions/dedentVest.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/actions/dedentVest.yml
new file mode 100644
index 0000000000..54c7924b17
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/actions/dedentVest.yml
@@ -0,0 +1,44 @@
+languageId: typescript
+command:
+  version: 1
+  spokenForm: dedent vest
+  action: outdentLine
+  targets:
+    - type: primitive
+      mark: { type: decoratedSymbol, symbolColor: default, character: v }
+initialState:
+  documentContents: |2
+
+        const value = "Hello world";
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+  marks:
+    default.v:
+      start: { line: 1, character: 10 }
+      end: { line: 1, character: 15 }
+finalState:
+  documentContents: |
+
+    const value = "Hello world";
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+  thatMark:
+    - type: UntypedTarget
+      contentRange:
+        start: { line: 1, character: 6 }
+        end: { line: 1, character: 11 }
+      isReversed: false
+      hasExplicitRange: true
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: decoratedSymbol, symbolColor: default, character: v },
+      selectionType: token,
+      position: contents,
+      modifier: { type: identity },
+      insideOutsideType: inside,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/actions/defineVest.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/actions/defineVest.yml
new file mode 100644
index 0000000000..ecbef16b96
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/actions/defineVest.yml
@@ -0,0 +1,49 @@
+languageId: typescript
+command:
+  version: 1
+  spokenForm: define vest
+  action: executeCommand
+  targets:
+    - type: primitive
+      mark: { type: decoratedSymbol, symbolColor: default, character: v }
+  extraArgs:
+    - editor.action.revealDefinition
+    - { restoreSelection: false }
+initialState:
+  documentContents: |
+    const value = "value";
+
+    console.log(value);
+  selections:
+    - anchor: { line: 3, character: 0 }
+      active: { line: 3, character: 0 }
+  marks:
+    default.v:
+      start: { line: 2, character: 12 }
+      end: { line: 2, character: 17 }
+finalState:
+  documentContents: |
+    const value = "value";
+
+    console.log(value);
+  selections:
+    - anchor: { line: 0, character: 6 }
+      active: { line: 0, character: 6 }
+  thatMark:
+    - type: UntypedTarget
+      contentRange:
+        start: { line: 2, character: 12 }
+        end: { line: 2, character: 17 }
+      isReversed: false
+      hasExplicitRange: false
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: decoratedSymbol, symbolColor: default, character: v },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier: { type: identity },
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/actions/drinkArg.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/actions/drinkArg.yml
new file mode 100644
index 0000000000..9ac54af88f
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/actions/drinkArg.yml
@@ -0,0 +1,39 @@
+languageId: typescript
+command:
+  spokenForm: drink arg
+  version: 2
+  action: { name: editNewLineBefore }
+  targets:
+    - type: primitive
+      modifiers:
+        - type: containingScope
+          scopeType: { type: argumentOrParameter }
+  usePrePhraseSnapshot: true
+initialState:
+  documentContents: |
+    function helloWorld(foo: string, bar: number, baz: string) {}
+  selections:
+    - anchor: { line: 0, character: 40 }
+      active: { line: 0, character: 40 }
+  marks: {}
+finalState:
+  documentContents: |
+    function helloWorld(foo: string, , bar: number, baz: string) {}
+  selections:
+    - anchor: { line: 0, character: 33 }
+      active: { line: 0, character: 33 }
+  thatMark:
+    - type: UntypedTarget
+      contentRange:
+        start: { line: 0, character: 35 }
+        end: { line: 0, character: 46 }
+      isReversed: false
+      hasExplicitRange: true
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      modifiers: [{ type: containingScope, scopeType: argumentOrParameter }],
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/actions/drinkArg2.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/actions/drinkArg2.yml
new file mode 100644
index 0000000000..06975ccb18
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/actions/drinkArg2.yml
@@ -0,0 +1,47 @@
+languageId: typescript
+command:
+  spokenForm: drink arg
+  version: 2
+  targets:
+    - type: primitive
+      modifiers:
+        - type: containingScope
+          scopeType: { type: argumentOrParameter }
+  usePrePhraseSnapshot: true
+  action: { name: editNewLineBefore }
+initialState:
+  documentContents: |-
+    function myFunk(
+        name: string,
+        value: number,
+    ) {}
+  selections:
+    - anchor: { line: 2, character: 9 }
+      active: { line: 2, character: 9 }
+  marks: {}
+finalState:
+  documentContents: |-
+    function myFunk(
+        name: string,
+        ,
+        value: number,
+    ) {}
+  selections:
+    - anchor: { line: 2, character: 4 }
+      active: { line: 2, character: 4 }
+  thatMark:
+    - type: UntypedTarget
+      contentRange:
+        start: { line: 3, character: 4 }
+        end: { line: 3, character: 17 }
+      isReversed: false
+      hasExplicitRange: true
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      modifiers:
+        [{ type: containingScope, scopeType: { type: argumentOrParameter } }],
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/actions/drinkArg3.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/actions/drinkArg3.yml
new file mode 100644
index 0000000000..24e60a8beb
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/actions/drinkArg3.yml
@@ -0,0 +1,47 @@
+languageId: typescript
+command:
+  spokenForm: drink arg
+  version: 2
+  targets:
+    - type: primitive
+      modifiers:
+        - type: containingScope
+          scopeType: { type: argumentOrParameter }
+  usePrePhraseSnapshot: true
+  action: { name: editNewLineBefore }
+initialState:
+  documentContents: |-
+    function myFunk(
+        name: string,
+        value: number
+    ) {}
+  selections:
+    - anchor: { line: 2, character: 9 }
+      active: { line: 2, character: 9 }
+  marks: {}
+finalState:
+  documentContents: |-
+    function myFunk(
+        name: string,
+        ,
+        value: number
+    ) {}
+  selections:
+    - anchor: { line: 2, character: 4 }
+      active: { line: 2, character: 4 }
+  thatMark:
+    - type: UntypedTarget
+      contentRange:
+        start: { line: 3, character: 4 }
+        end: { line: 3, character: 17 }
+      isReversed: false
+      hasExplicitRange: true
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      modifiers:
+        [{ type: containingScope, scopeType: { type: argumentOrParameter } }],
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/actions/drinkArg4.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/actions/drinkArg4.yml
new file mode 100644
index 0000000000..10e418d358
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/actions/drinkArg4.yml
@@ -0,0 +1,47 @@
+languageId: typescript
+command:
+  spokenForm: drink arg
+  version: 2
+  targets:
+    - type: primitive
+      modifiers:
+        - type: containingScope
+          scopeType: { type: argumentOrParameter }
+  usePrePhraseSnapshot: true
+  action: { name: editNewLineBefore }
+initialState:
+  documentContents: |-
+    function myFunk(
+        name: string,
+        value: number
+    ) {}
+  selections:
+    - anchor: { line: 1, character: 8 }
+      active: { line: 1, character: 8 }
+  marks: {}
+finalState:
+  documentContents: |-
+    function myFunk(
+        ,
+        name: string,
+        value: number
+    ) {}
+  selections:
+    - anchor: { line: 1, character: 4 }
+      active: { line: 1, character: 4 }
+  thatMark:
+    - type: UntypedTarget
+      contentRange:
+        start: { line: 2, character: 4 }
+        end: { line: 2, character: 16 }
+      isReversed: false
+      hasExplicitRange: true
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      modifiers:
+        [{ type: containingScope, scopeType: { type: argumentOrParameter } }],
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/actions/drinkArg5.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/actions/drinkArg5.yml
new file mode 100644
index 0000000000..5d154b7d81
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/actions/drinkArg5.yml
@@ -0,0 +1,49 @@
+languageId: typescript
+command:
+  spokenForm: drink arg
+  version: 2
+  targets:
+    - type: primitive
+      modifiers:
+        - type: containingScope
+          scopeType: { type: argumentOrParameter }
+  usePrePhraseSnapshot: true
+  action: { name: editNewLineBefore }
+initialState:
+  documentContents: |-
+    function myFunk(
+        name: string,
+        value: number,
+        stuff: boolean
+    ) {}
+  selections:
+    - anchor: { line: 2, character: 9 }
+      active: { line: 2, character: 9 }
+  marks: {}
+finalState:
+  documentContents: |-
+    function myFunk(
+        name: string,
+        ,
+        value: number,
+        stuff: boolean
+    ) {}
+  selections:
+    - anchor: { line: 2, character: 4 }
+      active: { line: 2, character: 4 }
+  thatMark:
+    - type: UntypedTarget
+      contentRange:
+        start: { line: 3, character: 4 }
+        end: { line: 3, character: 17 }
+      isReversed: false
+      hasExplicitRange: true
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      modifiers:
+        [{ type: containingScope, scopeType: { type: argumentOrParameter } }],
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/actions/drinkBlock.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/actions/drinkBlock.yml
new file mode 100644
index 0000000000..56662c5d52
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/actions/drinkBlock.yml
@@ -0,0 +1,41 @@
+languageId: typescript
+command:
+  spokenForm: drink block
+  version: 2
+  action: { name: editNewLineBefore }
+  targets:
+    - type: primitive
+      modifiers:
+        - type: containingScope
+          scopeType: { type: paragraph }
+  usePrePhraseSnapshot: true
+initialState:
+  documentContents: |
+    function helloWorld(foo: string, bar: number, baz: string) {}
+  selections:
+    - anchor: { line: 0, character: 40 }
+      active: { line: 0, character: 40 }
+  marks: {}
+finalState:
+  documentContents: |
+
+
+    function helloWorld(foo: string, bar: number, baz: string) {}
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+  thatMark:
+    - type: UntypedTarget
+      contentRange:
+        start: { line: 2, character: 0 }
+        end: { line: 2, character: 61 }
+      isReversed: false
+      hasExplicitRange: true
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      modifiers: [{ type: containingScope, scopeType: paragraph }],
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/actions/drinkDrumAndSpunAndTrap.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/actions/drinkDrumAndSpunAndTrap.yml
new file mode 100644
index 0000000000..b6f17ecf96
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/actions/drinkDrumAndSpunAndTrap.yml
@@ -0,0 +1,82 @@
+languageId: plaintext
+command:
+  spokenForm: drink drum and spun and trap
+  version: 2
+  targets:
+    - type: list
+      elements:
+        - type: primitive
+          mark: { type: decoratedSymbol, symbolColor: default, character: d }
+        - type: primitive
+          mark: { type: decoratedSymbol, symbolColor: default, character: s }
+        - type: primitive
+          mark: { type: decoratedSymbol, symbolColor: default, character: t }
+  usePrePhraseSnapshot: true
+  action: { name: editNewLineBefore }
+initialState:
+  documentContents: |
+    hello world there now
+
+    testing
+  selections:
+    - anchor: { line: 2, character: 7 }
+      active: { line: 2, character: 7 }
+  marks:
+    default.d:
+      start: { line: 0, character: 6 }
+      end: { line: 0, character: 11 }
+    default.s:
+      start: { line: 2, character: 0 }
+      end: { line: 2, character: 7 }
+    default.t:
+      start: { line: 0, character: 12 }
+      end: { line: 0, character: 17 }
+finalState:
+  documentContents: |
+
+    hello world there now
+
+
+    testing
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+    - anchor: { line: 3, character: 0 }
+      active: { line: 3, character: 0 }
+  thatMark:
+    - type: UntypedTarget
+      contentRange:
+        start: { line: 1, character: 6 }
+        end: { line: 1, character: 11 }
+      isReversed: false
+      hasExplicitRange: true
+    - type: UntypedTarget
+      contentRange:
+        start: { line: 4, character: 0 }
+        end: { line: 4, character: 7 }
+      isReversed: false
+      hasExplicitRange: true
+fullTargets:
+  [
+    {
+      type: list,
+      elements:
+        [
+          {
+            type: primitive,
+            mark: { type: decoratedSymbol, symbolColor: default, character: d },
+            modifiers: [],
+          },
+          {
+            type: primitive,
+            mark: { type: decoratedSymbol, symbolColor: default, character: s },
+            modifiers: [],
+          },
+          {
+            type: primitive,
+            mark: { type: decoratedSymbol, symbolColor: default, character: t },
+            modifiers: [],
+          },
+        ],
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/actions/drinkHarpAndLookAndTrap.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/actions/drinkHarpAndLookAndTrap.yml
new file mode 100644
index 0000000000..acac474bc0
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/actions/drinkHarpAndLookAndTrap.yml
@@ -0,0 +1,69 @@
+languageId: plaintext
+command:
+  spokenForm: drink harp and look and trap
+  version: 2
+  targets:
+    - type: list
+      elements:
+        - type: primitive
+          mark: { type: decoratedSymbol, symbolColor: default, character: h }
+        - type: primitive
+          mark: { type: decoratedSymbol, symbolColor: default, character: l }
+        - type: primitive
+          mark: { type: decoratedSymbol, symbolColor: default, character: t }
+  usePrePhraseSnapshot: true
+  action: { name: editNewLineBefore }
+initialState:
+  documentContents: |
+    hello world there now
+  selections:
+    - anchor: { line: 1, character: 0 }
+      active: { line: 1, character: 0 }
+  marks:
+    default.h:
+      start: { line: 0, character: 0 }
+      end: { line: 0, character: 5 }
+    default.l:
+      start: { line: 0, character: 6 }
+      end: { line: 0, character: 11 }
+    default.t:
+      start: { line: 0, character: 12 }
+      end: { line: 0, character: 17 }
+finalState:
+  documentContents: |
+
+    hello world there now
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+  thatMark:
+    - type: UntypedTarget
+      contentRange:
+        start: { line: 1, character: 0 }
+        end: { line: 1, character: 5 }
+      isReversed: false
+      hasExplicitRange: true
+fullTargets:
+  [
+    {
+      type: list,
+      elements:
+        [
+          {
+            type: primitive,
+            mark: { type: decoratedSymbol, symbolColor: default, character: h },
+            modifiers: [],
+          },
+          {
+            type: primitive,
+            mark: { type: decoratedSymbol, symbolColor: default, character: l },
+            modifiers: [],
+          },
+          {
+            type: primitive,
+            mark: { type: decoratedSymbol, symbolColor: default, character: t },
+            modifiers: [],
+          },
+        ],
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/actions/drinkItem.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/actions/drinkItem.yml
new file mode 100644
index 0000000000..2ba4ae22c9
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/actions/drinkItem.yml
@@ -0,0 +1,49 @@
+languageId: typescript
+command:
+  spokenForm: drink item
+  version: 2
+  targets:
+    - type: primitive
+      modifiers:
+        - type: containingScope
+          scopeType: { type: collectionItem }
+  usePrePhraseSnapshot: true
+  action: { name: editNewLineBefore }
+initialState:
+  documentContents: |-
+    [
+        a,
+        b,
+        c
+    ]
+  selections:
+    - anchor: { line: 3, character: 5 }
+      active: { line: 3, character: 5 }
+  marks: {}
+finalState:
+  documentContents: |-
+    [
+        a,
+        b,
+        ,
+        c
+    ]
+  selections:
+    - anchor: { line: 3, character: 4 }
+      active: { line: 3, character: 4 }
+  thatMark:
+    - type: UntypedTarget
+      contentRange:
+        start: { line: 4, character: 4 }
+        end: { line: 4, character: 5 }
+      isReversed: false
+      hasExplicitRange: true
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      modifiers:
+        [{ type: containingScope, scopeType: { type: collectionItem } }],
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/actions/drinkItem2.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/actions/drinkItem2.yml
new file mode 100644
index 0000000000..941c8c15e6
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/actions/drinkItem2.yml
@@ -0,0 +1,49 @@
+languageId: typescript
+command:
+  spokenForm: drink item
+  version: 2
+  targets:
+    - type: primitive
+      modifiers:
+        - type: containingScope
+          scopeType: { type: collectionItem }
+  usePrePhraseSnapshot: true
+  action: { name: editNewLineBefore }
+initialState:
+  documentContents: |-
+    [
+        a,
+        b,
+        c,
+    ]
+  selections:
+    - anchor: { line: 3, character: 5 }
+      active: { line: 3, character: 5 }
+  marks: {}
+finalState:
+  documentContents: |-
+    [
+        a,
+        b,
+        ,
+        c,
+    ]
+  selections:
+    - anchor: { line: 3, character: 4 }
+      active: { line: 3, character: 4 }
+  thatMark:
+    - type: UntypedTarget
+      contentRange:
+        start: { line: 4, character: 4 }
+        end: { line: 4, character: 5 }
+      isReversed: false
+      hasExplicitRange: true
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      modifiers:
+        [{ type: containingScope, scopeType: { type: collectionItem } }],
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/actions/drinkItem3.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/actions/drinkItem3.yml
new file mode 100644
index 0000000000..17cf02e3d6
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/actions/drinkItem3.yml
@@ -0,0 +1,49 @@
+languageId: typescript
+command:
+  spokenForm: drink item
+  version: 2
+  targets:
+    - type: primitive
+      modifiers:
+        - type: containingScope
+          scopeType: { type: collectionItem }
+  usePrePhraseSnapshot: true
+  action: { name: editNewLineBefore }
+initialState:
+  documentContents: |-
+    [
+        a,
+        b,
+        c,
+    ]
+  selections:
+    - anchor: { line: 1, character: 5 }
+      active: { line: 1, character: 5 }
+  marks: {}
+finalState:
+  documentContents: |-
+    [
+        ,
+        a,
+        b,
+        c,
+    ]
+  selections:
+    - anchor: { line: 1, character: 4 }
+      active: { line: 1, character: 4 }
+  thatMark:
+    - type: UntypedTarget
+      contentRange:
+        start: { line: 2, character: 4 }
+        end: { line: 2, character: 5 }
+      isReversed: false
+      hasExplicitRange: true
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      modifiers:
+        [{ type: containingScope, scopeType: { type: collectionItem } }],
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/actions/drinkLine.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/actions/drinkLine.yml
new file mode 100644
index 0000000000..ad95b7c729
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/actions/drinkLine.yml
@@ -0,0 +1,44 @@
+languageId: python
+command:
+  spokenForm: drink line
+  version: 2
+  targets:
+    - type: primitive
+      modifiers:
+        - type: containingScope
+          scopeType: { type: line }
+  usePrePhraseSnapshot: true
+  action: { name: editNewLineBefore }
+initialState:
+  documentContents: |
+    class MyClass:
+        def my_funk():
+            pass
+  selections:
+    - anchor: { line: 1, character: 11 }
+      active: { line: 1, character: 11 }
+  marks: {}
+finalState:
+  documentContents: |
+    class MyClass:
+
+        def my_funk():
+            pass
+  selections:
+    - anchor: { line: 1, character: 4 }
+      active: { line: 1, character: 4 }
+  thatMark:
+    - type: UntypedTarget
+      contentRange:
+        start: { line: 2, character: 4 }
+        end: { line: 2, character: 18 }
+      isReversed: false
+      hasExplicitRange: true
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      modifiers: [{ type: containingScope, scopeType: { type: line } }],
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/actions/drinkThis.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/actions/drinkThis.yml
new file mode 100644
index 0000000000..a86b5a8329
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/actions/drinkThis.yml
@@ -0,0 +1,34 @@
+languageId: plaintext
+command:
+  spokenForm: drink this
+  version: 2
+  targets:
+    - type: primitive
+      mark: { type: cursor }
+  usePrePhraseSnapshot: true
+  action: { name: editNewLineBefore }
+initialState:
+  documentContents: hello world
+  selections:
+    - anchor: { line: 0, character: 2 }
+      active: { line: 0, character: 2 }
+    - anchor: { line: 0, character: 4 }
+      active: { line: 0, character: 4 }
+    - anchor: { line: 0, character: 8 }
+      active: { line: 0, character: 8 }
+  marks: {}
+finalState:
+  documentContents: |-
+
+    hello world
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+  thatMark:
+    - type: UntypedTarget
+      contentRange:
+        start: { line: 1, character: 2 }
+        end: { line: 1, character: 2 }
+      isReversed: false
+      hasExplicitRange: false
+fullTargets: [{ type: primitive, mark: { type: cursor }, modifiers: [] }]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/actions/drinkVest.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/actions/drinkVest.yml
new file mode 100644
index 0000000000..b340f70de3
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/actions/drinkVest.yml
@@ -0,0 +1,45 @@
+languageId: typescript
+command:
+  version: 1
+  spokenForm: drink vest
+  action: editNewLineBefore
+  targets:
+    - type: primitive
+      mark: { type: decoratedSymbol, symbolColor: default, character: v }
+initialState:
+  documentContents: |
+
+    const value = "Hello world";
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+  marks:
+    default.v:
+      start: { line: 1, character: 6 }
+      end: { line: 1, character: 11 }
+finalState:
+  documentContents: |
+
+
+    const value = "Hello world";
+  selections:
+    - anchor: { line: 1, character: 0 }
+      active: { line: 1, character: 0 }
+  thatMark:
+    - type: UntypedTarget
+      contentRange:
+        start: { line: 2, character: 6 }
+        end: { line: 2, character: 11 }
+      isReversed: false
+      hasExplicitRange: true
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: decoratedSymbol, symbolColor: default, character: v },
+      selectionType: token,
+      position: contents,
+      modifier: { type: identity },
+      insideOutsideType: outside,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/actions/drinkVest2.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/actions/drinkVest2.yml
new file mode 100644
index 0000000000..3d4fdddaa4
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/actions/drinkVest2.yml
@@ -0,0 +1,43 @@
+languageId: plaintext
+command:
+  spokenForm: drink vest
+  version: 2
+  targets:
+    - type: primitive
+      mark: { type: decoratedSymbol, symbolColor: default, character: v }
+  usePrePhraseSnapshot: true
+  action: { name: editNewLineBefore }
+initialState:
+  documentContents: |2
+
+        const value = "Hello world";
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+  marks:
+    default.v:
+      start: { line: 1, character: 10 }
+      end: { line: 1, character: 15 }
+finalState:
+  documentContents: |2
+
+
+        const value = "Hello world";
+  selections:
+    - anchor: { line: 1, character: 4 }
+      active: { line: 1, character: 4 }
+  thatMark:
+    - type: UntypedTarget
+      contentRange:
+        start: { line: 2, character: 10 }
+        end: { line: 2, character: 15 }
+      isReversed: false
+      hasExplicitRange: true
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: decoratedSymbol, symbolColor: default, character: v },
+      modifiers: [],
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/actions/findVest.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/actions/findVest.yml
new file mode 100644
index 0000000000..3aaa8e2bc0
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/actions/findVest.yml
@@ -0,0 +1,47 @@
+languageId: typescript
+command:
+  version: 1
+  spokenForm: find vest
+  action: getText
+  targets:
+    - type: primitive
+      mark: { type: decoratedSymbol, symbolColor: default, character: v }
+  extraArgs:
+    - { showDecorations: null, ensureSingleTarget: true }
+initialState:
+  documentContents: |
+
+    const value = "Hello world";
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+  marks:
+    default.v:
+      start: { line: 1, character: 6 }
+      end: { line: 1, character: 11 }
+finalState:
+  documentContents: |
+
+    const value = "Hello world";
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+  thatMark:
+    - type: UntypedTarget
+      contentRange:
+        start: { line: 1, character: 6 }
+        end: { line: 1, character: 11 }
+      isReversed: false
+      hasExplicitRange: false
+returnValue: [value]
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: decoratedSymbol, symbolColor: default, character: v },
+      selectionType: token,
+      position: contents,
+      modifier: { type: identity },
+      insideOutsideType: inside,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/actions/giveAfterDot.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/actions/giveAfterDot.yml
new file mode 100644
index 0000000000..7e8f0af102
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/actions/giveAfterDot.yml
@@ -0,0 +1,47 @@
+languageId: typescript
+command:
+  version: 1
+  spokenForm: give after dot
+  action: deselect
+  targets:
+    - type: primitive
+      position: after
+      mark: { type: decoratedSymbol, symbolColor: default, character: . }
+initialState:
+  documentContents: a b.c
+  selections:
+    - anchor: { line: 0, character: 1 }
+      active: { line: 0, character: 1 }
+    - anchor: { line: 0, character: 3 }
+      active: { line: 0, character: 3 }
+    - anchor: { line: 0, character: 4 }
+      active: { line: 0, character: 4 }
+  marks:
+    default..:
+      start: { line: 0, character: 3 }
+      end: { line: 0, character: 4 }
+finalState:
+  documentContents: a b.c
+  selections:
+    - anchor: { line: 0, character: 1 }
+      active: { line: 0, character: 1 }
+    - anchor: { line: 0, character: 3 }
+      active: { line: 0, character: 3 }
+  thatMark:
+    - type: PositionTarget
+      contentRange:
+        start: { line: 0, character: 4 }
+        end: { line: 0, character: 4 }
+      isReversed: false
+      hasExplicitRange: true
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: decoratedSymbol, symbolColor: default, character: . },
+      selectionType: token,
+      position: after,
+      insideOutsideType: inside,
+      modifier: { type: identity },
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/actions/giveAirAndBang.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/actions/giveAirAndBang.yml
new file mode 100644
index 0000000000..714f2d6582
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/actions/giveAirAndBang.yml
@@ -0,0 +1,74 @@
+languageId: typescript
+command:
+  version: 1
+  spokenForm: give air and bang
+  action: deselect
+  targets:
+    - type: list
+      elements:
+        - type: primitive
+          mark: { type: decoratedSymbol, symbolColor: default, character: a }
+        - type: primitive
+          mark: { type: decoratedSymbol, symbolColor: default, character: "!" }
+initialState:
+  documentContents: |
+    "a!
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 1 }
+    - anchor: { line: 0, character: 1 }
+      active: { line: 0, character: 2 }
+    - anchor: { line: 0, character: 2 }
+      active: { line: 0, character: 3 }
+  marks:
+    default.a:
+      start: { line: 0, character: 1 }
+      end: { line: 0, character: 2 }
+    default.!:
+      start: { line: 0, character: 2 }
+      end: { line: 0, character: 3 }
+finalState:
+  documentContents: |
+    "a!
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 1 }
+  thatMark:
+    - type: UntypedTarget
+      contentRange:
+        start: { line: 0, character: 1 }
+        end: { line: 0, character: 2 }
+      isReversed: false
+      hasExplicitRange: false
+    - type: UntypedTarget
+      contentRange:
+        start: { line: 0, character: 2 }
+        end: { line: 0, character: 3 }
+      isReversed: false
+      hasExplicitRange: false
+fullTargets:
+  [
+    {
+      type: list,
+      elements:
+        [
+          {
+            type: primitive,
+            mark: { type: decoratedSymbol, symbolColor: default, character: a },
+            selectionType: token,
+            position: contents,
+            insideOutsideType: inside,
+            modifier: { type: identity },
+          },
+          {
+            type: primitive,
+            mark:
+              { type: decoratedSymbol, symbolColor: default, character: "!" },
+            selectionType: token,
+            position: contents,
+            insideOutsideType: inside,
+            modifier: { type: identity },
+          },
+        ],
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/actions/giveBat.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/actions/giveBat.yml
new file mode 100644
index 0000000000..0930e0019f
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/actions/giveBat.yml
@@ -0,0 +1,42 @@
+languageId: typescript
+command:
+  version: 1
+  spokenForm: give bat
+  action: deselect
+  targets:
+    - type: primitive
+      mark: { type: decoratedSymbol, symbolColor: default, character: b }
+initialState:
+  documentContents: a b c d
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 1 }
+    - anchor: { line: 0, character: 2 }
+      active: { line: 0, character: 7 }
+  marks:
+    default.b:
+      start: { line: 0, character: 2 }
+      end: { line: 0, character: 3 }
+finalState:
+  documentContents: a b c d
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 1 }
+  thatMark:
+    - type: UntypedTarget
+      contentRange:
+        start: { line: 0, character: 2 }
+        end: { line: 0, character: 3 }
+      isReversed: false
+      hasExplicitRange: false
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: decoratedSymbol, symbolColor: default, character: b },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier: { type: identity },
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/actions/giveBat2.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/actions/giveBat2.yml
new file mode 100644
index 0000000000..ca01643f7e
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/actions/giveBat2.yml
@@ -0,0 +1,42 @@
+languageId: markdown
+command:
+  version: 1
+  spokenForm: give bat
+  action: deselect
+  targets:
+    - type: primitive
+      mark: { type: decoratedSymbol, symbolColor: default, character: b }
+initialState:
+  documentContents: a b.
+  selections:
+    - anchor: { line: 0, character: 1 }
+      active: { line: 0, character: 1 }
+    - anchor: { line: 0, character: 3 }
+      active: { line: 0, character: 3 }
+  marks:
+    default.b:
+      start: { line: 0, character: 2 }
+      end: { line: 0, character: 3 }
+finalState:
+  documentContents: a b.
+  selections:
+    - anchor: { line: 0, character: 1 }
+      active: { line: 0, character: 1 }
+  thatMark:
+    - type: UntypedTarget
+      contentRange:
+        start: { line: 0, character: 2 }
+        end: { line: 0, character: 3 }
+      isReversed: false
+      hasExplicitRange: false
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: decoratedSymbol, symbolColor: default, character: b },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier: { type: identity },
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/actions/giveBeforeDot.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/actions/giveBeforeDot.yml
new file mode 100644
index 0000000000..14f28eeee7
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/actions/giveBeforeDot.yml
@@ -0,0 +1,47 @@
+languageId: typescript
+command:
+  version: 1
+  spokenForm: give before dot
+  action: deselect
+  targets:
+    - type: primitive
+      position: before
+      mark: { type: decoratedSymbol, symbolColor: default, character: . }
+initialState:
+  documentContents: a b.c
+  selections:
+    - anchor: { line: 0, character: 1 }
+      active: { line: 0, character: 1 }
+    - anchor: { line: 0, character: 3 }
+      active: { line: 0, character: 3 }
+    - anchor: { line: 0, character: 4 }
+      active: { line: 0, character: 4 }
+  marks:
+    default..:
+      start: { line: 0, character: 3 }
+      end: { line: 0, character: 4 }
+finalState:
+  documentContents: a b.c
+  selections:
+    - anchor: { line: 0, character: 1 }
+      active: { line: 0, character: 1 }
+    - anchor: { line: 0, character: 4 }
+      active: { line: 0, character: 4 }
+  thatMark:
+    - type: PositionTarget
+      contentRange:
+        start: { line: 0, character: 3 }
+        end: { line: 0, character: 3 }
+      isReversed: false
+      hasExplicitRange: true
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: decoratedSymbol, symbolColor: default, character: . },
+      selectionType: token,
+      position: before,
+      insideOutsideType: inside,
+      modifier: { type: identity },
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/actions/giveBlueQuote.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/actions/giveBlueQuote.yml
new file mode 100644
index 0000000000..573637ea49
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/actions/giveBlueQuote.yml
@@ -0,0 +1,48 @@
+languageId: typescript
+command:
+  version: 1
+  spokenForm: give blue quote
+  action: deselect
+  targets:
+    - type: primitive
+      mark: { type: decoratedSymbol, symbolColor: blue, character: '"' }
+initialState:
+  documentContents: |
+    "hello"
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 1 }
+    - anchor: { line: 0, character: 1 }
+      active: { line: 0, character: 6 }
+    - anchor: { line: 0, character: 6 }
+      active: { line: 0, character: 7 }
+  marks:
+    blue.":
+      start: { line: 0, character: 6 }
+      end: { line: 0, character: 7 }
+finalState:
+  documentContents: |
+    "hello"
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 1 }
+    - anchor: { line: 0, character: 1 }
+      active: { line: 0, character: 6 }
+  thatMark:
+    - type: UntypedTarget
+      contentRange:
+        start: { line: 0, character: 6 }
+        end: { line: 0, character: 7 }
+      isReversed: false
+      hasExplicitRange: false
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: decoratedSymbol, symbolColor: blue, character: '"' },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier: { type: identity },
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/actions/giveBlueQuoteAndQuote.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/actions/giveBlueQuoteAndQuote.yml
new file mode 100644
index 0000000000..abd9445cc2
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/actions/giveBlueQuoteAndQuote.yml
@@ -0,0 +1,74 @@
+languageId: typescript
+command:
+  version: 1
+  spokenForm: give blue quote and quote
+  action: deselect
+  targets:
+    - type: list
+      elements:
+        - type: primitive
+          mark: { type: decoratedSymbol, symbolColor: blue, character: '"' }
+        - type: primitive
+          mark: { type: decoratedSymbol, symbolColor: default, character: '"' }
+initialState:
+  documentContents: |
+    "hello"
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 1 }
+    - anchor: { line: 0, character: 1 }
+      active: { line: 0, character: 6 }
+    - anchor: { line: 0, character: 6 }
+      active: { line: 0, character: 7 }
+  marks:
+    blue.":
+      start: { line: 0, character: 6 }
+      end: { line: 0, character: 7 }
+    default.":
+      start: { line: 0, character: 0 }
+      end: { line: 0, character: 1 }
+finalState:
+  documentContents: |
+    "hello"
+  selections:
+    - anchor: { line: 0, character: 1 }
+      active: { line: 0, character: 6 }
+  thatMark:
+    - type: UntypedTarget
+      contentRange:
+        start: { line: 0, character: 6 }
+        end: { line: 0, character: 7 }
+      isReversed: false
+      hasExplicitRange: false
+    - type: UntypedTarget
+      contentRange:
+        start: { line: 0, character: 0 }
+        end: { line: 0, character: 1 }
+      isReversed: false
+      hasExplicitRange: false
+fullTargets:
+  [
+    {
+      type: list,
+      elements:
+        [
+          {
+            type: primitive,
+            mark: { type: decoratedSymbol, symbolColor: blue, character: '"' },
+            selectionType: token,
+            position: contents,
+            insideOutsideType: inside,
+            modifier: { type: identity },
+          },
+          {
+            type: primitive,
+            mark:
+              { type: decoratedSymbol, symbolColor: default, character: '"' },
+            selectionType: token,
+            position: contents,
+            insideOutsideType: inside,
+            modifier: { type: identity },
+          },
+        ],
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/actions/giveCap.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/actions/giveCap.yml
new file mode 100644
index 0000000000..b62f320c1e
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/actions/giveCap.yml
@@ -0,0 +1,42 @@
+languageId: typescript
+command:
+  version: 1
+  spokenForm: give cap
+  action: deselect
+  targets:
+    - type: primitive
+      mark: { type: decoratedSymbol, symbolColor: default, character: c }
+initialState:
+  documentContents: a b c d
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 1 }
+    - anchor: { line: 0, character: 2 }
+      active: { line: 0, character: 7 }
+  marks:
+    default.c:
+      start: { line: 0, character: 4 }
+      end: { line: 0, character: 5 }
+finalState:
+  documentContents: a b c d
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 1 }
+  thatMark:
+    - type: UntypedTarget
+      contentRange:
+        start: { line: 0, character: 4 }
+        end: { line: 0, character: 5 }
+      isReversed: false
+      hasExplicitRange: false
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: decoratedSymbol, symbolColor: default, character: c },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier: { type: identity },
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/actions/giveDot.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/actions/giveDot.yml
new file mode 100644
index 0000000000..79390afc7d
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/actions/giveDot.yml
@@ -0,0 +1,42 @@
+languageId: markdown
+command:
+  version: 1
+  spokenForm: give dot
+  action: deselect
+  targets:
+    - type: primitive
+      mark: { type: decoratedSymbol, symbolColor: default, character: . }
+initialState:
+  documentContents: a b.
+  selections:
+    - anchor: { line: 0, character: 1 }
+      active: { line: 0, character: 1 }
+    - anchor: { line: 0, character: 3 }
+      active: { line: 0, character: 3 }
+  marks:
+    default..:
+      start: { line: 0, character: 3 }
+      end: { line: 0, character: 4 }
+finalState:
+  documentContents: a b.
+  selections:
+    - anchor: { line: 0, character: 1 }
+      active: { line: 0, character: 1 }
+  thatMark:
+    - type: UntypedTarget
+      contentRange:
+        start: { line: 0, character: 3 }
+        end: { line: 0, character: 4 }
+      isReversed: false
+      hasExplicitRange: false
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: decoratedSymbol, symbolColor: default, character: . },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier: { type: identity },
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/actions/giveDot2.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/actions/giveDot2.yml
new file mode 100644
index 0000000000..089c3624f1
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/actions/giveDot2.yml
@@ -0,0 +1,44 @@
+languageId: typescript
+command:
+  version: 1
+  spokenForm: give dot
+  action: deselect
+  targets:
+    - type: primitive
+      mark: { type: decoratedSymbol, symbolColor: default, character: . }
+initialState:
+  documentContents: a b.c
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 1 }
+    - anchor: { line: 0, character: 3 }
+      active: { line: 0, character: 3 }
+    - anchor: { line: 0, character: 4 }
+      active: { line: 0, character: 4 }
+  marks:
+    default..:
+      start: { line: 0, character: 3 }
+      end: { line: 0, character: 4 }
+finalState:
+  documentContents: a b.c
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 1 }
+  thatMark:
+    - type: UntypedTarget
+      contentRange:
+        start: { line: 0, character: 3 }
+        end: { line: 0, character: 4 }
+      isReversed: false
+      hasExplicitRange: false
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: decoratedSymbol, symbolColor: default, character: . },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier: { type: identity },
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/actions/giveDrum.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/actions/giveDrum.yml
new file mode 100644
index 0000000000..9ab25f6a9b
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/actions/giveDrum.yml
@@ -0,0 +1,42 @@
+languageId: typescript
+command:
+  version: 1
+  spokenForm: give drum
+  action: deselect
+  targets:
+    - type: primitive
+      mark: { type: decoratedSymbol, symbolColor: default, character: d }
+initialState:
+  documentContents: a b c d
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 1 }
+    - anchor: { line: 0, character: 2 }
+      active: { line: 0, character: 7 }
+  marks:
+    default.d:
+      start: { line: 0, character: 6 }
+      end: { line: 0, character: 7 }
+finalState:
+  documentContents: a b c d
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 1 }
+  thatMark:
+    - type: UntypedTarget
+      contentRange:
+        start: { line: 0, character: 6 }
+        end: { line: 0, character: 7 }
+      isReversed: false
+      hasExplicitRange: false
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: decoratedSymbol, symbolColor: default, character: d },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier: { type: identity },
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/actions/giveEqualsPastColon.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/actions/giveEqualsPastColon.yml
new file mode 100644
index 0000000000..52dfcf5b53
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/actions/giveEqualsPastColon.yml
@@ -0,0 +1,77 @@
+languageId: typescript
+command:
+  version: 1
+  spokenForm: give equals past colon
+  action: deselect
+  targets:
+    - type: range
+      start:
+        type: primitive
+        mark: { type: decoratedSymbol, symbolColor: default, character: "=" }
+      end:
+        type: primitive
+        mark: { type: decoratedSymbol, symbolColor: default, character: ":" }
+      excludeStart: false
+      excludeEnd: false
+initialState:
+  documentContents: |
+    const values: string = "hello"
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 5 }
+    - anchor: { line: 0, character: 6 }
+      active: { line: 0, character: 12 }
+    - anchor: { line: 0, character: 14 }
+      active: { line: 0, character: 20 }
+    - anchor: { line: 0, character: 24 }
+      active: { line: 0, character: 29 }
+  marks:
+    default.=:
+      start: { line: 0, character: 21 }
+      end: { line: 0, character: 22 }
+    "default.:":
+      start: { line: 0, character: 12 }
+      end: { line: 0, character: 13 }
+finalState:
+  documentContents: |
+    const values: string = "hello"
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 5 }
+    - anchor: { line: 0, character: 6 }
+      active: { line: 0, character: 12 }
+    - anchor: { line: 0, character: 24 }
+      active: { line: 0, character: 29 }
+  thatMark:
+    - type: UntypedTarget
+      contentRange:
+        start: { line: 0, character: 12 }
+        end: { line: 0, character: 22 }
+      isReversed: true
+      hasExplicitRange: true
+fullTargets:
+  [
+    {
+      type: range,
+      excludeAnchor: false,
+      excludeActive: false,
+      anchor:
+        {
+          type: primitive,
+          mark: { type: decoratedSymbol, symbolColor: default, character: "=" },
+          selectionType: token,
+          position: contents,
+          insideOutsideType: inside,
+          modifier: { type: identity },
+        },
+      active:
+        {
+          type: primitive,
+          mark: { type: decoratedSymbol, symbolColor: default, character: ":" },
+          selectionType: token,
+          position: contents,
+          insideOutsideType: inside,
+          modifier: { type: identity },
+        },
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/actions/giveHarp.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/actions/giveHarp.yml
new file mode 100644
index 0000000000..eb5fcf0186
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/actions/giveHarp.yml
@@ -0,0 +1,48 @@
+languageId: typescript
+command:
+  version: 1
+  spokenForm: give harp
+  action: deselect
+  targets:
+    - type: primitive
+      mark: { type: decoratedSymbol, symbolColor: default, character: h }
+initialState:
+  documentContents: |
+    "hello"
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 1 }
+    - anchor: { line: 0, character: 1 }
+      active: { line: 0, character: 6 }
+    - anchor: { line: 0, character: 6 }
+      active: { line: 0, character: 7 }
+  marks:
+    default.h:
+      start: { line: 0, character: 1 }
+      end: { line: 0, character: 6 }
+finalState:
+  documentContents: |
+    "hello"
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 1 }
+    - anchor: { line: 0, character: 6 }
+      active: { line: 0, character: 7 }
+  thatMark:
+    - type: UntypedTarget
+      contentRange:
+        start: { line: 0, character: 1 }
+        end: { line: 0, character: 6 }
+      isReversed: false
+      hasExplicitRange: false
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: decoratedSymbol, symbolColor: default, character: h },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier: { type: identity },
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/actions/giveHarpAndWhale.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/actions/giveHarpAndWhale.yml
new file mode 100644
index 0000000000..a30d22db63
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/actions/giveHarpAndWhale.yml
@@ -0,0 +1,52 @@
+languageId: typescript
+command:
+  version: 1
+  spokenForm: give harp and whale
+  action: deselect
+  targets:
+    - type: list
+      elements:
+        - type: primitive
+          mark: { type: decoratedSymbol, symbolColor: default, character: h }
+        - type: primitive
+          mark: { type: decoratedSymbol, symbolColor: default, character: w }
+initialState:
+  documentContents: hello world
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 5 }
+    - anchor: { line: 0, character: 6 }
+      active: { line: 0, character: 11 }
+  marks:
+    default.h:
+      start: { line: 0, character: 0 }
+      end: { line: 0, character: 5 }
+    default.w:
+      start: { line: 0, character: 6 }
+      end: { line: 0, character: 11 }
+fullTargets:
+  [
+    {
+      type: list,
+      elements:
+        [
+          {
+            type: primitive,
+            mark: { type: decoratedSymbol, symbolColor: default, character: h },
+            selectionType: token,
+            position: contents,
+            insideOutsideType: inside,
+            modifier: { type: identity },
+          },
+          {
+            type: primitive,
+            mark: { type: decoratedSymbol, symbolColor: default, character: w },
+            selectionType: token,
+            position: contents,
+            insideOutsideType: inside,
+            modifier: { type: identity },
+          },
+        ],
+    },
+  ]
+thrownError: { name: SelectionRequiredError }
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/actions/giveQuote.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/actions/giveQuote.yml
new file mode 100644
index 0000000000..8fe05aba01
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/actions/giveQuote.yml
@@ -0,0 +1,48 @@
+languageId: typescript
+command:
+  version: 1
+  spokenForm: give quote
+  action: deselect
+  targets:
+    - type: primitive
+      mark: { type: decoratedSymbol, symbolColor: default, character: '"' }
+initialState:
+  documentContents: |
+    "hello"
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 1 }
+    - anchor: { line: 0, character: 1 }
+      active: { line: 0, character: 6 }
+    - anchor: { line: 0, character: 6 }
+      active: { line: 0, character: 7 }
+  marks:
+    default.":
+      start: { line: 0, character: 0 }
+      end: { line: 0, character: 1 }
+finalState:
+  documentContents: |
+    "hello"
+  selections:
+    - anchor: { line: 0, character: 1 }
+      active: { line: 0, character: 6 }
+    - anchor: { line: 0, character: 6 }
+      active: { line: 0, character: 7 }
+  thatMark:
+    - type: UntypedTarget
+      contentRange:
+        start: { line: 0, character: 0 }
+        end: { line: 0, character: 1 }
+      isReversed: false
+      hasExplicitRange: false
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: decoratedSymbol, symbolColor: default, character: '"' },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier: { type: identity },
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/actions/giveQuoteAndAir.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/actions/giveQuoteAndAir.yml
new file mode 100644
index 0000000000..2e675661e0
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/actions/giveQuoteAndAir.yml
@@ -0,0 +1,74 @@
+languageId: typescript
+command:
+  version: 1
+  spokenForm: give quote and air
+  action: deselect
+  targets:
+    - type: list
+      elements:
+        - type: primitive
+          mark: { type: decoratedSymbol, symbolColor: default, character: '"' }
+        - type: primitive
+          mark: { type: decoratedSymbol, symbolColor: default, character: a }
+initialState:
+  documentContents: |
+    "a!
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 1 }
+    - anchor: { line: 0, character: 1 }
+      active: { line: 0, character: 2 }
+    - anchor: { line: 0, character: 2 }
+      active: { line: 0, character: 3 }
+  marks:
+    default.":
+      start: { line: 0, character: 0 }
+      end: { line: 0, character: 1 }
+    default.a:
+      start: { line: 0, character: 1 }
+      end: { line: 0, character: 2 }
+finalState:
+  documentContents: |
+    "a!
+  selections:
+    - anchor: { line: 0, character: 2 }
+      active: { line: 0, character: 3 }
+  thatMark:
+    - type: UntypedTarget
+      contentRange:
+        start: { line: 0, character: 0 }
+        end: { line: 0, character: 1 }
+      isReversed: false
+      hasExplicitRange: false
+    - type: UntypedTarget
+      contentRange:
+        start: { line: 0, character: 1 }
+        end: { line: 0, character: 2 }
+      isReversed: false
+      hasExplicitRange: false
+fullTargets:
+  [
+    {
+      type: list,
+      elements:
+        [
+          {
+            type: primitive,
+            mark:
+              { type: decoratedSymbol, symbolColor: default, character: '"' },
+            selectionType: token,
+            position: contents,
+            insideOutsideType: inside,
+            modifier: { type: identity },
+          },
+          {
+            type: primitive,
+            mark: { type: decoratedSymbol, symbolColor: default, character: a },
+            selectionType: token,
+            position: contents,
+            insideOutsideType: inside,
+            modifier: { type: identity },
+          },
+        ],
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/actions/giveQuoteAndBang.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/actions/giveQuoteAndBang.yml
new file mode 100644
index 0000000000..56ed72f6b1
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/actions/giveQuoteAndBang.yml
@@ -0,0 +1,75 @@
+languageId: typescript
+command:
+  version: 1
+  spokenForm: give quote and bang
+  action: deselect
+  targets:
+    - type: list
+      elements:
+        - type: primitive
+          mark: { type: decoratedSymbol, symbolColor: default, character: '"' }
+        - type: primitive
+          mark: { type: decoratedSymbol, symbolColor: default, character: "!" }
+initialState:
+  documentContents: |
+    "a!
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 1 }
+    - anchor: { line: 0, character: 1 }
+      active: { line: 0, character: 2 }
+    - anchor: { line: 0, character: 2 }
+      active: { line: 0, character: 3 }
+  marks:
+    default.":
+      start: { line: 0, character: 0 }
+      end: { line: 0, character: 1 }
+    default.!:
+      start: { line: 0, character: 2 }
+      end: { line: 0, character: 3 }
+finalState:
+  documentContents: |
+    "a!
+  selections:
+    - anchor: { line: 0, character: 1 }
+      active: { line: 0, character: 2 }
+  thatMark:
+    - type: UntypedTarget
+      contentRange:
+        start: { line: 0, character: 0 }
+        end: { line: 0, character: 1 }
+      isReversed: false
+      hasExplicitRange: false
+    - type: UntypedTarget
+      contentRange:
+        start: { line: 0, character: 2 }
+        end: { line: 0, character: 3 }
+      isReversed: false
+      hasExplicitRange: false
+fullTargets:
+  [
+    {
+      type: list,
+      elements:
+        [
+          {
+            type: primitive,
+            mark:
+              { type: decoratedSymbol, symbolColor: default, character: '"' },
+            selectionType: token,
+            position: contents,
+            insideOutsideType: inside,
+            modifier: { type: identity },
+          },
+          {
+            type: primitive,
+            mark:
+              { type: decoratedSymbol, symbolColor: default, character: "!" },
+            selectionType: token,
+            position: contents,
+            insideOutsideType: inside,
+            modifier: { type: identity },
+          },
+        ],
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/actions/giveVestAndHarp.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/actions/giveVestAndHarp.yml
new file mode 100644
index 0000000000..a5b8c34a00
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/actions/giveVestAndHarp.yml
@@ -0,0 +1,77 @@
+languageId: typescript
+command:
+  version: 1
+  spokenForm: give vest and harp
+  action: deselect
+  targets:
+    - type: list
+      elements:
+        - type: primitive
+          mark: { type: decoratedSymbol, symbolColor: default, character: v }
+        - type: primitive
+          mark: { type: decoratedSymbol, symbolColor: default, character: h }
+initialState:
+  documentContents: |
+    const values: string = "hello"
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 5 }
+    - anchor: { line: 0, character: 6 }
+      active: { line: 0, character: 12 }
+    - anchor: { line: 0, character: 14 }
+      active: { line: 0, character: 20 }
+    - anchor: { line: 0, character: 24 }
+      active: { line: 0, character: 29 }
+  marks:
+    default.v:
+      start: { line: 0, character: 6 }
+      end: { line: 0, character: 12 }
+    default.h:
+      start: { line: 0, character: 24 }
+      end: { line: 0, character: 29 }
+finalState:
+  documentContents: |
+    const values: string = "hello"
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 5 }
+    - anchor: { line: 0, character: 14 }
+      active: { line: 0, character: 20 }
+  thatMark:
+    - type: UntypedTarget
+      contentRange:
+        start: { line: 0, character: 6 }
+        end: { line: 0, character: 12 }
+      isReversed: false
+      hasExplicitRange: false
+    - type: UntypedTarget
+      contentRange:
+        start: { line: 0, character: 24 }
+        end: { line: 0, character: 29 }
+      isReversed: false
+      hasExplicitRange: false
+fullTargets:
+  [
+    {
+      type: list,
+      elements:
+        [
+          {
+            type: primitive,
+            mark: { type: decoratedSymbol, symbolColor: default, character: v },
+            selectionType: token,
+            position: contents,
+            insideOutsideType: inside,
+            modifier: { type: identity },
+          },
+          {
+            type: primitive,
+            mark: { type: decoratedSymbol, symbolColor: default, character: h },
+            selectionType: token,
+            position: contents,
+            insideOutsideType: inside,
+            modifier: { type: identity },
+          },
+        ],
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/actions/highlightNothing.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/actions/highlightNothing.yml
new file mode 100644
index 0000000000..fb6d17240f
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/actions/highlightNothing.yml
@@ -0,0 +1,25 @@
+languageId: plaintext
+command:
+  version: 4
+  spokenForm: highlight nothing
+  action: { name: highlight }
+  targets:
+    - type: primitive
+      mark: { type: nothing }
+  usePrePhraseSnapshot: true
+initialState:
+  documentContents: ""
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+  marks: {}
+finalState:
+  documentContents: ""
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+  thatMark: []
+ide:
+  highlights:
+    - ranges: []
+fullTargets: [{ type: primitive, mark: { type: nothing }, modifiers: [] }]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/actions/indentVest.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/actions/indentVest.yml
new file mode 100644
index 0000000000..a6f1962216
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/actions/indentVest.yml
@@ -0,0 +1,44 @@
+languageId: typescript
+command:
+  version: 1
+  spokenForm: indent vest
+  action: indentLine
+  targets:
+    - type: primitive
+      mark: { type: decoratedSymbol, symbolColor: default, character: v }
+initialState:
+  documentContents: |
+
+    const value = "Hello world";
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+  marks:
+    default.v:
+      start: { line: 1, character: 6 }
+      end: { line: 1, character: 11 }
+finalState:
+  documentContents: |2
+
+        const value = "Hello world";
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+  thatMark:
+    - type: UntypedTarget
+      contentRange:
+        start: { line: 1, character: 10 }
+        end: { line: 1, character: 15 }
+      isReversed: false
+      hasExplicitRange: true
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: decoratedSymbol, symbolColor: default, character: v },
+      selectionType: token,
+      position: contents,
+      modifier: { type: identity },
+      insideOutsideType: inside,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/actions/insertEmptyLines/dropThis.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/actions/insertEmptyLines/dropThis.yml
new file mode 100644
index 0000000000..6f3b46d06d
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/actions/insertEmptyLines/dropThis.yml
@@ -0,0 +1,33 @@
+languageId: plaintext
+command:
+  spokenForm: drop this
+  version: 2
+  targets:
+    - type: primitive
+      mark: { type: cursor }
+  usePrePhraseSnapshot: true
+  action: { name: insertEmptyLineBefore }
+initialState:
+  documentContents: ""
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+  marks: {}
+finalState:
+  documentContents: |+
+
+  selections:
+    - anchor: { line: 1, character: 0 }
+      active: { line: 1, character: 0 }
+  thatMark:
+    - type: UntypedTarget
+      contentRange:
+        start: { line: 1, character: 0 }
+        end: { line: 1, character: 0 }
+      isReversed: false
+      hasExplicitRange: false
+ide:
+  flashes:
+    - range: { type: line, start: 0, end: 0 }
+      style: justAdded
+fullTargets: [{ type: primitive, mark: { type: cursor }, modifiers: [] }]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/actions/insertEmptyLines/dropThis10.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/actions/insertEmptyLines/dropThis10.yml
new file mode 100644
index 0000000000..5237dd955b
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/actions/insertEmptyLines/dropThis10.yml
@@ -0,0 +1,37 @@
+languageId: plaintext
+command:
+  spokenForm: drop this
+  version: 2
+  targets:
+    - type: primitive
+      mark: { type: cursor }
+  usePrePhraseSnapshot: false
+  action: { name: insertEmptyLineBefore }
+initialState:
+  documentContents: |-
+    hello
+    there
+  selections:
+    - anchor: { line: 1, character: 0 }
+      active: { line: 1, character: 0 }
+  marks: {}
+finalState:
+  documentContents: |-
+    hello
+
+    there
+  selections:
+    - anchor: { line: 2, character: 0 }
+      active: { line: 2, character: 0 }
+  thatMark:
+    - type: UntypedTarget
+      contentRange:
+        start: { line: 2, character: 0 }
+        end: { line: 2, character: 0 }
+      isReversed: false
+      hasExplicitRange: false
+ide:
+  flashes:
+    - range: { type: line, start: 1, end: 1 }
+      style: justAdded
+fullTargets: [{ type: primitive, mark: { type: cursor }, modifiers: [] }]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/actions/insertEmptyLines/dropThis11.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/actions/insertEmptyLines/dropThis11.yml
new file mode 100644
index 0000000000..438d2bec31
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/actions/insertEmptyLines/dropThis11.yml
@@ -0,0 +1,37 @@
+languageId: plaintext
+command:
+  spokenForm: drop this
+  version: 2
+  targets:
+    - type: primitive
+      mark: { type: cursor }
+  usePrePhraseSnapshot: false
+  action: { name: insertEmptyLineBefore }
+initialState:
+  documentContents: |2-
+        hello
+        there
+  selections:
+    - anchor: { line: 1, character: 0 }
+      active: { line: 1, character: 0 }
+  marks: {}
+finalState:
+  documentContents: |2-
+        hello
+
+        there
+  selections:
+    - anchor: { line: 2, character: 0 }
+      active: { line: 2, character: 0 }
+  thatMark:
+    - type: UntypedTarget
+      contentRange:
+        start: { line: 2, character: 0 }
+        end: { line: 2, character: 0 }
+      isReversed: false
+      hasExplicitRange: false
+ide:
+  flashes:
+    - range: { type: line, start: 1, end: 1 }
+      style: justAdded
+fullTargets: [{ type: primitive, mark: { type: cursor }, modifiers: [] }]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/actions/insertEmptyLines/dropThis12.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/actions/insertEmptyLines/dropThis12.yml
new file mode 100644
index 0000000000..1c882feba0
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/actions/insertEmptyLines/dropThis12.yml
@@ -0,0 +1,36 @@
+languageId: plaintext
+command:
+  spokenForm: drop this
+  version: 2
+  targets:
+    - type: primitive
+      mark: { type: cursor }
+  usePrePhraseSnapshot: true
+  action: { name: insertEmptyLineBefore }
+initialState:
+  documentContents: |2-
+        hello
+
+  selections:
+    - anchor: { line: 1, character: 0 }
+      active: { line: 1, character: 0 }
+  marks: {}
+finalState:
+  documentContents: |2-
+        hello
+
+  selections:
+    - anchor: { line: 2, character: 0 }
+      active: { line: 2, character: 0 }
+  thatMark:
+    - type: UntypedTarget
+      contentRange:
+        start: { line: 2, character: 0 }
+        end: { line: 2, character: 0 }
+      isReversed: false
+      hasExplicitRange: false
+ide:
+  flashes:
+    - range: { type: line, start: 1, end: 1 }
+      style: justAdded
+fullTargets: [{ type: primitive, mark: { type: cursor }, modifiers: [] }]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/actions/insertEmptyLines/dropThis2.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/actions/insertEmptyLines/dropThis2.yml
new file mode 100644
index 0000000000..a9177c1a2e
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/actions/insertEmptyLines/dropThis2.yml
@@ -0,0 +1,34 @@
+languageId: plaintext
+command:
+  spokenForm: drop this
+  version: 2
+  targets:
+    - type: primitive
+      mark: { type: cursor }
+  usePrePhraseSnapshot: true
+  action: { name: insertEmptyLineBefore }
+initialState:
+  documentContents: hello
+  selections:
+    - anchor: { line: 0, character: 5 }
+      active: { line: 0, character: 5 }
+  marks: {}
+finalState:
+  documentContents: |-
+
+    hello
+  selections:
+    - anchor: { line: 1, character: 5 }
+      active: { line: 1, character: 5 }
+  thatMark:
+    - type: UntypedTarget
+      contentRange:
+        start: { line: 1, character: 5 }
+        end: { line: 1, character: 5 }
+      isReversed: false
+      hasExplicitRange: false
+ide:
+  flashes:
+    - range: { type: line, start: 0, end: 0 }
+      style: justAdded
+fullTargets: [{ type: primitive, mark: { type: cursor }, modifiers: [] }]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/actions/insertEmptyLines/dropThis3.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/actions/insertEmptyLines/dropThis3.yml
new file mode 100644
index 0000000000..f7bdc59e18
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/actions/insertEmptyLines/dropThis3.yml
@@ -0,0 +1,34 @@
+languageId: plaintext
+command:
+  spokenForm: drop this
+  version: 2
+  targets:
+    - type: primitive
+      mark: { type: cursor }
+  usePrePhraseSnapshot: false
+  action: { name: insertEmptyLineBefore }
+initialState:
+  documentContents: hello
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+  marks: {}
+finalState:
+  documentContents: |-
+
+    hello
+  selections:
+    - anchor: { line: 1, character: 0 }
+      active: { line: 1, character: 0 }
+  thatMark:
+    - type: UntypedTarget
+      contentRange:
+        start: { line: 1, character: 0 }
+        end: { line: 1, character: 0 }
+      isReversed: false
+      hasExplicitRange: false
+ide:
+  flashes:
+    - range: { type: line, start: 0, end: 0 }
+      style: justAdded
+fullTargets: [{ type: primitive, mark: { type: cursor }, modifiers: [] }]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/actions/insertEmptyLines/dropThis4.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/actions/insertEmptyLines/dropThis4.yml
new file mode 100644
index 0000000000..68ed642ee7
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/actions/insertEmptyLines/dropThis4.yml
@@ -0,0 +1,34 @@
+languageId: plaintext
+command:
+  spokenForm: drop this
+  version: 2
+  targets:
+    - type: primitive
+      mark: { type: cursor }
+  usePrePhraseSnapshot: false
+  action: { name: insertEmptyLineBefore }
+initialState:
+  documentContents: "    hello"
+  selections:
+    - anchor: { line: 0, character: 4 }
+      active: { line: 0, character: 4 }
+  marks: {}
+finalState:
+  documentContents: |2-
+
+        hello
+  selections:
+    - anchor: { line: 1, character: 4 }
+      active: { line: 1, character: 4 }
+  thatMark:
+    - type: UntypedTarget
+      contentRange:
+        start: { line: 1, character: 4 }
+        end: { line: 1, character: 4 }
+      isReversed: false
+      hasExplicitRange: false
+ide:
+  flashes:
+    - range: { type: line, start: 0, end: 0 }
+      style: justAdded
+fullTargets: [{ type: primitive, mark: { type: cursor }, modifiers: [] }]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/actions/insertEmptyLines/dropThis5.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/actions/insertEmptyLines/dropThis5.yml
new file mode 100644
index 0000000000..409b895ce1
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/actions/insertEmptyLines/dropThis5.yml
@@ -0,0 +1,34 @@
+languageId: plaintext
+command:
+  spokenForm: drop this
+  version: 2
+  targets:
+    - type: primitive
+      mark: { type: cursor }
+  usePrePhraseSnapshot: false
+  action: { name: insertEmptyLineBefore }
+initialState:
+  documentContents: "    hello"
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+  marks: {}
+finalState:
+  documentContents: |2-
+
+        hello
+  selections:
+    - anchor: { line: 1, character: 0 }
+      active: { line: 1, character: 0 }
+  thatMark:
+    - type: UntypedTarget
+      contentRange:
+        start: { line: 1, character: 0 }
+        end: { line: 1, character: 0 }
+      isReversed: false
+      hasExplicitRange: false
+ide:
+  flashes:
+    - range: { type: line, start: 0, end: 0 }
+      style: justAdded
+fullTargets: [{ type: primitive, mark: { type: cursor }, modifiers: [] }]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/actions/insertEmptyLines/dropThis6.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/actions/insertEmptyLines/dropThis6.yml
new file mode 100644
index 0000000000..c6ee26de74
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/actions/insertEmptyLines/dropThis6.yml
@@ -0,0 +1,34 @@
+languageId: plaintext
+command:
+  spokenForm: drop this
+  version: 2
+  targets:
+    - type: primitive
+      mark: { type: cursor }
+  usePrePhraseSnapshot: false
+  action: { name: insertEmptyLineBefore }
+initialState:
+  documentContents: "    hello"
+  selections:
+    - anchor: { line: 0, character: 9 }
+      active: { line: 0, character: 9 }
+  marks: {}
+finalState:
+  documentContents: |2-
+
+        hello
+  selections:
+    - anchor: { line: 1, character: 9 }
+      active: { line: 1, character: 9 }
+  thatMark:
+    - type: UntypedTarget
+      contentRange:
+        start: { line: 1, character: 9 }
+        end: { line: 1, character: 9 }
+      isReversed: false
+      hasExplicitRange: false
+ide:
+  flashes:
+    - range: { type: line, start: 0, end: 0 }
+      style: justAdded
+fullTargets: [{ type: primitive, mark: { type: cursor }, modifiers: [] }]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/actions/insertEmptyLines/dropThis7.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/actions/insertEmptyLines/dropThis7.yml
new file mode 100644
index 0000000000..d222742efa
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/actions/insertEmptyLines/dropThis7.yml
@@ -0,0 +1,33 @@
+languageId: plaintext
+command:
+  spokenForm: drop this
+  version: 2
+  targets:
+    - type: primitive
+      mark: { type: cursor }
+  usePrePhraseSnapshot: false
+  action: { name: insertEmptyLineBefore }
+initialState:
+  documentContents: "    "
+  selections:
+    - anchor: { line: 0, character: 4 }
+      active: { line: 0, character: 4 }
+  marks: {}
+finalState:
+  documentContents: |2-
+
+  selections:
+    - anchor: { line: 1, character: 4 }
+      active: { line: 1, character: 4 }
+  thatMark:
+    - type: UntypedTarget
+      contentRange:
+        start: { line: 1, character: 4 }
+        end: { line: 1, character: 4 }
+      isReversed: false
+      hasExplicitRange: false
+ide:
+  flashes:
+    - range: { type: line, start: 0, end: 0 }
+      style: justAdded
+fullTargets: [{ type: primitive, mark: { type: cursor }, modifiers: [] }]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/actions/insertEmptyLines/dropThis8.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/actions/insertEmptyLines/dropThis8.yml
new file mode 100644
index 0000000000..9fb509eacb
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/actions/insertEmptyLines/dropThis8.yml
@@ -0,0 +1,33 @@
+languageId: plaintext
+command:
+  spokenForm: drop this
+  version: 2
+  targets:
+    - type: primitive
+      mark: { type: cursor }
+  usePrePhraseSnapshot: false
+  action: { name: insertEmptyLineBefore }
+initialState:
+  documentContents: "    "
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+  marks: {}
+finalState:
+  documentContents: |2-
+
+  selections:
+    - anchor: { line: 1, character: 0 }
+      active: { line: 1, character: 0 }
+  thatMark:
+    - type: UntypedTarget
+      contentRange:
+        start: { line: 1, character: 0 }
+        end: { line: 1, character: 0 }
+      isReversed: false
+      hasExplicitRange: false
+ide:
+  flashes:
+    - range: { type: line, start: 0, end: 0 }
+      style: justAdded
+fullTargets: [{ type: primitive, mark: { type: cursor }, modifiers: [] }]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/actions/insertEmptyLines/dropThis9.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/actions/insertEmptyLines/dropThis9.yml
new file mode 100644
index 0000000000..05685e1c1b
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/actions/insertEmptyLines/dropThis9.yml
@@ -0,0 +1,37 @@
+languageId: plaintext
+command:
+  spokenForm: drop this
+  version: 2
+  targets:
+    - type: primitive
+      mark: { type: cursor }
+  usePrePhraseSnapshot: false
+  action: { name: insertEmptyLineBefore }
+initialState:
+  documentContents: |-
+    hello
+    there
+  selections:
+    - anchor: { line: 1, character: 5 }
+      active: { line: 1, character: 5 }
+  marks: {}
+finalState:
+  documentContents: |-
+    hello
+
+    there
+  selections:
+    - anchor: { line: 2, character: 5 }
+      active: { line: 2, character: 5 }
+  thatMark:
+    - type: UntypedTarget
+      contentRange:
+        start: { line: 2, character: 5 }
+        end: { line: 2, character: 5 }
+      isReversed: false
+      hasExplicitRange: false
+ide:
+  flashes:
+    - range: { type: line, start: 1, end: 1 }
+      style: justAdded
+fullTargets: [{ type: primitive, mark: { type: cursor }, modifiers: [] }]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/actions/insertEmptyLines/dropVest.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/actions/insertEmptyLines/dropVest.yml
new file mode 100644
index 0000000000..a7d47fe440
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/actions/insertEmptyLines/dropVest.yml
@@ -0,0 +1,45 @@
+languageId: typescript
+command:
+  version: 1
+  spokenForm: drop vest
+  action: insertEmptyLineBefore
+  targets:
+    - type: primitive
+      mark: { type: decoratedSymbol, symbolColor: default, character: v }
+initialState:
+  documentContents: |
+
+    const value = "Hello world";
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+  marks:
+    default.v:
+      start: { line: 1, character: 6 }
+      end: { line: 1, character: 11 }
+finalState:
+  documentContents: |
+
+
+    const value = "Hello world";
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+  thatMark:
+    - type: UntypedTarget
+      contentRange:
+        start: { line: 2, character: 6 }
+        end: { line: 2, character: 11 }
+      isReversed: false
+      hasExplicitRange: true
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: decoratedSymbol, symbolColor: default, character: v },
+      selectionType: token,
+      position: contents,
+      modifier: { type: identity },
+      insideOutsideType: inside,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/actions/insertEmptyLines/dropVest2.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/actions/insertEmptyLines/dropVest2.yml
new file mode 100644
index 0000000000..917cee457a
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/actions/insertEmptyLines/dropVest2.yml
@@ -0,0 +1,43 @@
+languageId: plaintext
+command:
+  spokenForm: drop vest
+  version: 2
+  targets:
+    - type: primitive
+      mark: { type: decoratedSymbol, symbolColor: default, character: v }
+  usePrePhraseSnapshot: true
+  action: { name: insertEmptyLineBefore }
+initialState:
+  documentContents: |2
+
+        const value = "Hello world";
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+  marks:
+    default.v:
+      start: { line: 1, character: 10 }
+      end: { line: 1, character: 15 }
+finalState:
+  documentContents: |2
+
+
+        const value = "Hello world";
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+  thatMark:
+    - type: UntypedTarget
+      contentRange:
+        start: { line: 2, character: 10 }
+        end: { line: 2, character: 15 }
+      isReversed: false
+      hasExplicitRange: true
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: decoratedSymbol, symbolColor: default, character: v },
+      modifiers: [],
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/actions/insertEmptyLines/floatThis.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/actions/insertEmptyLines/floatThis.yml
new file mode 100644
index 0000000000..010e2beaa8
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/actions/insertEmptyLines/floatThis.yml
@@ -0,0 +1,33 @@
+languageId: plaintext
+command:
+  spokenForm: float this
+  version: 2
+  targets:
+    - type: primitive
+      mark: { type: cursor }
+  usePrePhraseSnapshot: true
+  action: { name: insertEmptyLineAfter }
+initialState:
+  documentContents: ""
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+  marks: {}
+finalState:
+  documentContents: |+
+
+  selections:
+    - anchor: { line: 1, character: 0 }
+      active: { line: 1, character: 0 }
+  thatMark:
+    - type: UntypedTarget
+      contentRange:
+        start: { line: 1, character: 0 }
+        end: { line: 1, character: 0 }
+      isReversed: false
+      hasExplicitRange: false
+ide:
+  flashes:
+    - range: { type: line, start: 1, end: 1 }
+      style: justAdded
+fullTargets: [{ type: primitive, mark: { type: cursor }, modifiers: [] }]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/actions/insertEmptyLines/floatThis10.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/actions/insertEmptyLines/floatThis10.yml
new file mode 100644
index 0000000000..1d307a7263
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/actions/insertEmptyLines/floatThis10.yml
@@ -0,0 +1,36 @@
+languageId: plaintext
+command:
+  spokenForm: float this
+  version: 2
+  targets:
+    - type: primitive
+      mark: { type: cursor }
+  usePrePhraseSnapshot: true
+  action: { name: insertEmptyLineAfter }
+initialState:
+  documentContents: |2-
+
+        hello
+  selections:
+    - anchor: { line: 1, character: 9 }
+      active: { line: 1, character: 9 }
+  marks: {}
+finalState:
+  documentContents: |2
+
+        hello
+  selections:
+    - anchor: { line: 2, character: 0 }
+      active: { line: 2, character: 0 }
+  thatMark:
+    - type: UntypedTarget
+      contentRange:
+        start: { line: 2, character: 0 }
+        end: { line: 2, character: 0 }
+      isReversed: false
+      hasExplicitRange: false
+ide:
+  flashes:
+    - range: { type: line, start: 2, end: 2 }
+      style: justAdded
+fullTargets: [{ type: primitive, mark: { type: cursor }, modifiers: [] }]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/actions/insertEmptyLines/floatThis11.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/actions/insertEmptyLines/floatThis11.yml
new file mode 100644
index 0000000000..04784cd241
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/actions/insertEmptyLines/floatThis11.yml
@@ -0,0 +1,35 @@
+languageId: plaintext
+command:
+  spokenForm: float this
+  version: 2
+  targets:
+    - type: primitive
+      mark: { type: cursor }
+  usePrePhraseSnapshot: true
+  action: { name: insertEmptyLineAfter }
+initialState:
+  documentContents: |
+    there
+  selections:
+    - anchor: { line: 0, character: 5 }
+      active: { line: 0, character: 5 }
+  marks: {}
+finalState:
+  documentContents: |+
+    there
+
+  selections:
+    - anchor: { line: 0, character: 5 }
+      active: { line: 0, character: 5 }
+  thatMark:
+    - type: UntypedTarget
+      contentRange:
+        start: { line: 0, character: 5 }
+        end: { line: 0, character: 5 }
+      isReversed: false
+      hasExplicitRange: false
+ide:
+  flashes:
+    - range: { type: line, start: 1, end: 1 }
+      style: justAdded
+fullTargets: [{ type: primitive, mark: { type: cursor }, modifiers: [] }]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/actions/insertEmptyLines/floatThis12.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/actions/insertEmptyLines/floatThis12.yml
new file mode 100644
index 0000000000..0cd2a1fbc0
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/actions/insertEmptyLines/floatThis12.yml
@@ -0,0 +1,35 @@
+languageId: plaintext
+command:
+  spokenForm: float this
+  version: 2
+  targets:
+    - type: primitive
+      mark: { type: cursor }
+  usePrePhraseSnapshot: true
+  action: { name: insertEmptyLineAfter }
+initialState:
+  documentContents: |2
+
+  selections:
+    - anchor: { line: 0, character: 4 }
+      active: { line: 0, character: 4 }
+  marks: {}
+finalState:
+  documentContents: |2+
+
+
+  selections:
+    - anchor: { line: 0, character: 4 }
+      active: { line: 0, character: 4 }
+  thatMark:
+    - type: UntypedTarget
+      contentRange:
+        start: { line: 0, character: 4 }
+        end: { line: 0, character: 4 }
+      isReversed: false
+      hasExplicitRange: false
+ide:
+  flashes:
+    - range: { type: line, start: 1, end: 1 }
+      style: justAdded
+fullTargets: [{ type: primitive, mark: { type: cursor }, modifiers: [] }]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/actions/insertEmptyLines/floatThis13.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/actions/insertEmptyLines/floatThis13.yml
new file mode 100644
index 0000000000..e579d330b1
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/actions/insertEmptyLines/floatThis13.yml
@@ -0,0 +1,35 @@
+languageId: plaintext
+command:
+  spokenForm: float this
+  version: 2
+  targets:
+    - type: primitive
+      mark: { type: cursor }
+  usePrePhraseSnapshot: false
+  action: { name: insertEmptyLineAfter }
+initialState:
+  documentContents: |2
+        there
+  selections:
+    - anchor: { line: 0, character: 9 }
+      active: { line: 0, character: 9 }
+  marks: {}
+finalState:
+  documentContents: |2+
+        there
+
+  selections:
+    - anchor: { line: 0, character: 9 }
+      active: { line: 0, character: 9 }
+  thatMark:
+    - type: UntypedTarget
+      contentRange:
+        start: { line: 0, character: 9 }
+        end: { line: 0, character: 9 }
+      isReversed: false
+      hasExplicitRange: false
+ide:
+  flashes:
+    - range: { type: line, start: 1, end: 1 }
+      style: justAdded
+fullTargets: [{ type: primitive, mark: { type: cursor }, modifiers: [] }]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/actions/insertEmptyLines/floatThis2.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/actions/insertEmptyLines/floatThis2.yml
new file mode 100644
index 0000000000..cdf76207cb
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/actions/insertEmptyLines/floatThis2.yml
@@ -0,0 +1,33 @@
+languageId: plaintext
+command:
+  spokenForm: float this
+  version: 2
+  targets:
+    - type: primitive
+      mark: { type: cursor }
+  usePrePhraseSnapshot: true
+  action: { name: insertEmptyLineAfter }
+initialState:
+  documentContents: hello
+  selections:
+    - anchor: { line: 0, character: 5 }
+      active: { line: 0, character: 5 }
+  marks: {}
+finalState:
+  documentContents: |
+    hello
+  selections:
+    - anchor: { line: 1, character: 0 }
+      active: { line: 1, character: 0 }
+  thatMark:
+    - type: UntypedTarget
+      contentRange:
+        start: { line: 1, character: 0 }
+        end: { line: 1, character: 0 }
+      isReversed: false
+      hasExplicitRange: false
+ide:
+  flashes:
+    - range: { type: line, start: 1, end: 1 }
+      style: justAdded
+fullTargets: [{ type: primitive, mark: { type: cursor }, modifiers: [] }]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/actions/insertEmptyLines/floatThis3.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/actions/insertEmptyLines/floatThis3.yml
new file mode 100644
index 0000000000..adb5cd26a7
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/actions/insertEmptyLines/floatThis3.yml
@@ -0,0 +1,33 @@
+languageId: plaintext
+command:
+  spokenForm: float this
+  version: 2
+  targets:
+    - type: primitive
+      mark: { type: cursor }
+  usePrePhraseSnapshot: true
+  action: { name: insertEmptyLineAfter }
+initialState:
+  documentContents: "    hello"
+  selections:
+    - anchor: { line: 0, character: 9 }
+      active: { line: 0, character: 9 }
+  marks: {}
+finalState:
+  documentContents: |2
+        hello
+  selections:
+    - anchor: { line: 1, character: 0 }
+      active: { line: 1, character: 0 }
+  thatMark:
+    - type: UntypedTarget
+      contentRange:
+        start: { line: 1, character: 0 }
+        end: { line: 1, character: 0 }
+      isReversed: false
+      hasExplicitRange: false
+ide:
+  flashes:
+    - range: { type: line, start: 1, end: 1 }
+      style: justAdded
+fullTargets: [{ type: primitive, mark: { type: cursor }, modifiers: [] }]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/actions/insertEmptyLines/floatThis4.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/actions/insertEmptyLines/floatThis4.yml
new file mode 100644
index 0000000000..47b9d4d27f
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/actions/insertEmptyLines/floatThis4.yml
@@ -0,0 +1,33 @@
+languageId: plaintext
+command:
+  spokenForm: float this
+  version: 2
+  targets:
+    - type: primitive
+      mark: { type: cursor }
+  usePrePhraseSnapshot: true
+  action: { name: insertEmptyLineAfter }
+initialState:
+  documentContents: "    "
+  selections:
+    - anchor: { line: 0, character: 4 }
+      active: { line: 0, character: 4 }
+  marks: {}
+finalState:
+  documentContents: |2
+
+  selections:
+    - anchor: { line: 1, character: 0 }
+      active: { line: 1, character: 0 }
+  thatMark:
+    - type: UntypedTarget
+      contentRange:
+        start: { line: 1, character: 0 }
+        end: { line: 1, character: 0 }
+      isReversed: false
+      hasExplicitRange: false
+ide:
+  flashes:
+    - range: { type: line, start: 1, end: 1 }
+      style: justAdded
+fullTargets: [{ type: primitive, mark: { type: cursor }, modifiers: [] }]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/actions/insertEmptyLines/floatThis5.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/actions/insertEmptyLines/floatThis5.yml
new file mode 100644
index 0000000000..c7a9ac64d9
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/actions/insertEmptyLines/floatThis5.yml
@@ -0,0 +1,36 @@
+languageId: plaintext
+command:
+  spokenForm: float this
+  version: 2
+  targets:
+    - type: primitive
+      mark: { type: cursor }
+  usePrePhraseSnapshot: true
+  action: { name: insertEmptyLineAfter }
+initialState:
+  documentContents: |2-
+        whatever
+        hello
+  selections:
+    - anchor: { line: 1, character: 9 }
+      active: { line: 1, character: 9 }
+  marks: {}
+finalState:
+  documentContents: |2
+        whatever
+        hello
+  selections:
+    - anchor: { line: 2, character: 0 }
+      active: { line: 2, character: 0 }
+  thatMark:
+    - type: UntypedTarget
+      contentRange:
+        start: { line: 2, character: 0 }
+        end: { line: 2, character: 0 }
+      isReversed: false
+      hasExplicitRange: false
+ide:
+  flashes:
+    - range: { type: line, start: 2, end: 2 }
+      style: justAdded
+fullTargets: [{ type: primitive, mark: { type: cursor }, modifiers: [] }]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/actions/insertEmptyLines/floatThis6.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/actions/insertEmptyLines/floatThis6.yml
new file mode 100644
index 0000000000..8372aeccae
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/actions/insertEmptyLines/floatThis6.yml
@@ -0,0 +1,36 @@
+languageId: plaintext
+command:
+  spokenForm: float this
+  version: 2
+  targets:
+    - type: primitive
+      mark: { type: cursor }
+  usePrePhraseSnapshot: true
+  action: { name: insertEmptyLineAfter }
+initialState:
+  documentContents: |-
+    whatever
+    hello
+  selections:
+    - anchor: { line: 1, character: 5 }
+      active: { line: 1, character: 5 }
+  marks: {}
+finalState:
+  documentContents: |
+    whatever
+    hello
+  selections:
+    - anchor: { line: 2, character: 0 }
+      active: { line: 2, character: 0 }
+  thatMark:
+    - type: UntypedTarget
+      contentRange:
+        start: { line: 2, character: 0 }
+        end: { line: 2, character: 0 }
+      isReversed: false
+      hasExplicitRange: false
+ide:
+  flashes:
+    - range: { type: line, start: 2, end: 2 }
+      style: justAdded
+fullTargets: [{ type: primitive, mark: { type: cursor }, modifiers: [] }]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/actions/insertEmptyLines/floatThis7.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/actions/insertEmptyLines/floatThis7.yml
new file mode 100644
index 0000000000..58f6b56b6e
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/actions/insertEmptyLines/floatThis7.yml
@@ -0,0 +1,35 @@
+languageId: plaintext
+command:
+  spokenForm: float this
+  version: 2
+  targets:
+    - type: primitive
+      mark: { type: cursor }
+  usePrePhraseSnapshot: true
+  action: { name: insertEmptyLineAfter }
+initialState:
+  documentContents: |
+    hello
+  selections:
+    - anchor: { line: 1, character: 0 }
+      active: { line: 1, character: 0 }
+  marks: {}
+finalState:
+  documentContents: |+
+    hello
+
+  selections:
+    - anchor: { line: 2, character: 0 }
+      active: { line: 2, character: 0 }
+  thatMark:
+    - type: UntypedTarget
+      contentRange:
+        start: { line: 2, character: 0 }
+        end: { line: 2, character: 0 }
+      isReversed: false
+      hasExplicitRange: false
+ide:
+  flashes:
+    - range: { type: line, start: 2, end: 2 }
+      style: justAdded
+fullTargets: [{ type: primitive, mark: { type: cursor }, modifiers: [] }]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/actions/insertEmptyLines/floatThis8.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/actions/insertEmptyLines/floatThis8.yml
new file mode 100644
index 0000000000..f3cde4571a
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/actions/insertEmptyLines/floatThis8.yml
@@ -0,0 +1,35 @@
+languageId: plaintext
+command:
+  spokenForm: float this
+  version: 2
+  targets:
+    - type: primitive
+      mark: { type: cursor }
+  usePrePhraseSnapshot: true
+  action: { name: insertEmptyLineAfter }
+initialState:
+  documentContents: |2
+        hello
+  selections:
+    - anchor: { line: 1, character: 0 }
+      active: { line: 1, character: 0 }
+  marks: {}
+finalState:
+  documentContents: |2+
+        hello
+
+  selections:
+    - anchor: { line: 2, character: 0 }
+      active: { line: 2, character: 0 }
+  thatMark:
+    - type: UntypedTarget
+      contentRange:
+        start: { line: 2, character: 0 }
+        end: { line: 2, character: 0 }
+      isReversed: false
+      hasExplicitRange: false
+ide:
+  flashes:
+    - range: { type: line, start: 2, end: 2 }
+      style: justAdded
+fullTargets: [{ type: primitive, mark: { type: cursor }, modifiers: [] }]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/actions/insertEmptyLines/floatThis9.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/actions/insertEmptyLines/floatThis9.yml
new file mode 100644
index 0000000000..6e94c9ba52
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/actions/insertEmptyLines/floatThis9.yml
@@ -0,0 +1,36 @@
+languageId: plaintext
+command:
+  spokenForm: float this
+  version: 2
+  targets:
+    - type: primitive
+      mark: { type: cursor }
+  usePrePhraseSnapshot: true
+  action: { name: insertEmptyLineAfter }
+initialState:
+  documentContents: |2-
+        hello
+
+  selections:
+    - anchor: { line: 1, character: 4 }
+      active: { line: 1, character: 4 }
+  marks: {}
+finalState:
+  documentContents: |2
+        hello
+
+  selections:
+    - anchor: { line: 2, character: 0 }
+      active: { line: 2, character: 0 }
+  thatMark:
+    - type: UntypedTarget
+      contentRange:
+        start: { line: 2, character: 0 }
+        end: { line: 2, character: 0 }
+      isReversed: false
+      hasExplicitRange: false
+ide:
+  flashes:
+    - range: { type: line, start: 2, end: 2 }
+      style: justAdded
+fullTargets: [{ type: primitive, mark: { type: cursor }, modifiers: [] }]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/actions/insertEmptyLines/floatVest.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/actions/insertEmptyLines/floatVest.yml
new file mode 100644
index 0000000000..93bdc5ae5e
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/actions/insertEmptyLines/floatVest.yml
@@ -0,0 +1,49 @@
+languageId: typescript
+command:
+  version: 1
+  spokenForm: float vest
+  action: insertEmptyLineAfter
+  targets:
+    - type: primitive
+      mark: { type: decoratedSymbol, symbolColor: default, character: v }
+initialState:
+  documentContents: |
+
+    const value = "Hello world";
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+  marks:
+    default.v:
+      start: { line: 1, character: 6 }
+      end: { line: 1, character: 11 }
+finalState:
+  documentContents: |+
+
+    const value = "Hello world";
+
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+  thatMark:
+    - type: UntypedTarget
+      contentRange:
+        start: { line: 1, character: 6 }
+        end: { line: 1, character: 11 }
+      isReversed: false
+      hasExplicitRange: true
+ide:
+  flashes:
+    - range: { type: line, start: 2, end: 2 }
+      style: justAdded
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: decoratedSymbol, symbolColor: default, character: v },
+      selectionType: token,
+      position: contents,
+      modifier: { type: identity },
+      insideOutsideType: inside,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/actions/insertEmptyLines/floatVest2.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/actions/insertEmptyLines/floatVest2.yml
new file mode 100644
index 0000000000..ea75f6f264
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/actions/insertEmptyLines/floatVest2.yml
@@ -0,0 +1,47 @@
+languageId: plaintext
+command:
+  spokenForm: float vest
+  version: 2
+  targets:
+    - type: primitive
+      mark: { type: decoratedSymbol, symbolColor: default, character: v }
+  usePrePhraseSnapshot: true
+  action: { name: insertEmptyLineAfter }
+initialState:
+  documentContents: |2
+
+        const value = "Hello world";
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+  marks:
+    default.v:
+      start: { line: 1, character: 10 }
+      end: { line: 1, character: 15 }
+finalState:
+  documentContents: |2+
+
+        const value = "Hello world";
+
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+  thatMark:
+    - type: UntypedTarget
+      contentRange:
+        start: { line: 1, character: 10 }
+        end: { line: 1, character: 15 }
+      isReversed: false
+      hasExplicitRange: true
+ide:
+  flashes:
+    - range: { type: line, start: 2, end: 2 }
+      style: justAdded
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: decoratedSymbol, symbolColor: default, character: v },
+      modifiers: [],
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/actions/insertEmptyLines/puffThis.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/actions/insertEmptyLines/puffThis.yml
new file mode 100644
index 0000000000..ff68507f74
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/actions/insertEmptyLines/puffThis.yml
@@ -0,0 +1,36 @@
+languageId: plaintext
+command:
+  spokenForm: puff this
+  version: 2
+  targets:
+    - type: primitive
+      mark: { type: cursor }
+  usePrePhraseSnapshot: true
+  action: { name: insertEmptyLinesAround }
+initialState:
+  documentContents: ""
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+  marks: {}
+finalState:
+  documentContents: |+
+
+
+  selections:
+    - anchor: { line: 2, character: 0 }
+      active: { line: 2, character: 0 }
+  thatMark:
+    - type: UntypedTarget
+      contentRange:
+        start: { line: 2, character: 0 }
+        end: { line: 2, character: 0 }
+      isReversed: false
+      hasExplicitRange: false
+ide:
+  flashes:
+    - range: { type: line, start: 1, end: 1 }
+      style: justAdded
+    - range: { type: line, start: 1, end: 1 }
+      style: justAdded
+fullTargets: [{ type: primitive, mark: { type: cursor }, modifiers: [] }]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/actions/insertEmptyLines/puffThis10.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/actions/insertEmptyLines/puffThis10.yml
new file mode 100644
index 0000000000..473e873214
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/actions/insertEmptyLines/puffThis10.yml
@@ -0,0 +1,38 @@
+languageId: plaintext
+command:
+  spokenForm: puff this
+  version: 2
+  targets:
+    - type: primitive
+      mark: { type: cursor }
+  usePrePhraseSnapshot: true
+  action: { name: insertEmptyLinesAround }
+initialState:
+  documentContents: |2-
+        hello
+
+  selections:
+    - anchor: { line: 1, character: 4 }
+      active: { line: 1, character: 4 }
+  marks: {}
+finalState:
+  documentContents: |2
+        hello
+
+  selections:
+    - anchor: { line: 3, character: 0 }
+      active: { line: 3, character: 0 }
+  thatMark:
+    - type: UntypedTarget
+      contentRange:
+        start: { line: 3, character: 0 }
+        end: { line: 3, character: 0 }
+      isReversed: false
+      hasExplicitRange: false
+ide:
+  flashes:
+    - range: { type: line, start: 1, end: 1 }
+      style: justAdded
+    - range: { type: line, start: 2, end: 2 }
+      style: justAdded
+fullTargets: [{ type: primitive, mark: { type: cursor }, modifiers: [] }]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/actions/insertEmptyLines/puffThis11.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/actions/insertEmptyLines/puffThis11.yml
new file mode 100644
index 0000000000..e15c845522
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/actions/insertEmptyLines/puffThis11.yml
@@ -0,0 +1,39 @@
+languageId: plaintext
+command:
+  spokenForm: puff this
+  version: 2
+  targets:
+    - type: primitive
+      mark: { type: cursor }
+  usePrePhraseSnapshot: true
+  action: { name: insertEmptyLinesAround }
+initialState:
+  documentContents: |2-
+
+        hello
+  selections:
+    - anchor: { line: 1, character: 9 }
+      active: { line: 1, character: 9 }
+  marks: {}
+finalState:
+  documentContents: |2
+
+
+        hello
+  selections:
+    - anchor: { line: 3, character: 0 }
+      active: { line: 3, character: 0 }
+  thatMark:
+    - type: UntypedTarget
+      contentRange:
+        start: { line: 3, character: 0 }
+        end: { line: 3, character: 0 }
+      isReversed: false
+      hasExplicitRange: false
+ide:
+  flashes:
+    - range: { type: line, start: 1, end: 1 }
+      style: justAdded
+    - range: { type: line, start: 2, end: 2 }
+      style: justAdded
+fullTargets: [{ type: primitive, mark: { type: cursor }, modifiers: [] }]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/actions/insertEmptyLines/puffThis12.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/actions/insertEmptyLines/puffThis12.yml
new file mode 100644
index 0000000000..64514394dd
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/actions/insertEmptyLines/puffThis12.yml
@@ -0,0 +1,38 @@
+languageId: plaintext
+command:
+  spokenForm: puff this
+  version: 2
+  targets:
+    - type: primitive
+      mark: { type: cursor }
+  usePrePhraseSnapshot: true
+  action: { name: insertEmptyLinesAround }
+initialState:
+  documentContents: |
+    there
+  selections:
+    - anchor: { line: 0, character: 5 }
+      active: { line: 0, character: 5 }
+  marks: {}
+finalState:
+  documentContents: |+
+
+    there
+
+  selections:
+    - anchor: { line: 1, character: 5 }
+      active: { line: 1, character: 5 }
+  thatMark:
+    - type: UntypedTarget
+      contentRange:
+        start: { line: 1, character: 5 }
+        end: { line: 1, character: 5 }
+      isReversed: false
+      hasExplicitRange: false
+ide:
+  flashes:
+    - range: { type: line, start: 0, end: 0 }
+      style: justAdded
+    - range: { type: line, start: 2, end: 2 }
+      style: justAdded
+fullTargets: [{ type: primitive, mark: { type: cursor }, modifiers: [] }]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/actions/insertEmptyLines/puffThis13.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/actions/insertEmptyLines/puffThis13.yml
new file mode 100644
index 0000000000..36e03fce5c
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/actions/insertEmptyLines/puffThis13.yml
@@ -0,0 +1,38 @@
+languageId: plaintext
+command:
+  spokenForm: puff this
+  version: 2
+  targets:
+    - type: primitive
+      mark: { type: cursor }
+  usePrePhraseSnapshot: false
+  action: { name: insertEmptyLinesAround }
+initialState:
+  documentContents: |
+    there
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+  marks: {}
+finalState:
+  documentContents: |+
+
+    there
+
+  selections:
+    - anchor: { line: 1, character: 0 }
+      active: { line: 1, character: 0 }
+  thatMark:
+    - type: UntypedTarget
+      contentRange:
+        start: { line: 1, character: 0 }
+        end: { line: 1, character: 0 }
+      isReversed: false
+      hasExplicitRange: false
+ide:
+  flashes:
+    - range: { type: line, start: 0, end: 0 }
+      style: justAdded
+    - range: { type: line, start: 2, end: 2 }
+      style: justAdded
+fullTargets: [{ type: primitive, mark: { type: cursor }, modifiers: [] }]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/actions/insertEmptyLines/puffThis14.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/actions/insertEmptyLines/puffThis14.yml
new file mode 100644
index 0000000000..6495470ce6
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/actions/insertEmptyLines/puffThis14.yml
@@ -0,0 +1,38 @@
+languageId: plaintext
+command:
+  spokenForm: puff this
+  version: 2
+  targets:
+    - type: primitive
+      mark: { type: cursor }
+  usePrePhraseSnapshot: false
+  action: { name: insertEmptyLinesAround }
+initialState:
+  documentContents: |2
+        there
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+  marks: {}
+finalState:
+  documentContents: |2+
+
+        there
+
+  selections:
+    - anchor: { line: 1, character: 0 }
+      active: { line: 1, character: 0 }
+  thatMark:
+    - type: UntypedTarget
+      contentRange:
+        start: { line: 1, character: 0 }
+        end: { line: 1, character: 0 }
+      isReversed: false
+      hasExplicitRange: false
+ide:
+  flashes:
+    - range: { type: line, start: 0, end: 0 }
+      style: justAdded
+    - range: { type: line, start: 2, end: 2 }
+      style: justAdded
+fullTargets: [{ type: primitive, mark: { type: cursor }, modifiers: [] }]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/actions/insertEmptyLines/puffThis15.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/actions/insertEmptyLines/puffThis15.yml
new file mode 100644
index 0000000000..17c391279f
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/actions/insertEmptyLines/puffThis15.yml
@@ -0,0 +1,38 @@
+languageId: plaintext
+command:
+  spokenForm: puff this
+  version: 2
+  targets:
+    - type: primitive
+      mark: { type: cursor }
+  usePrePhraseSnapshot: false
+  action: { name: insertEmptyLinesAround }
+initialState:
+  documentContents: |2
+        there
+  selections:
+    - anchor: { line: 0, character: 9 }
+      active: { line: 0, character: 9 }
+  marks: {}
+finalState:
+  documentContents: |2+
+
+        there
+
+  selections:
+    - anchor: { line: 1, character: 9 }
+      active: { line: 1, character: 9 }
+  thatMark:
+    - type: UntypedTarget
+      contentRange:
+        start: { line: 1, character: 9 }
+        end: { line: 1, character: 9 }
+      isReversed: false
+      hasExplicitRange: false
+ide:
+  flashes:
+    - range: { type: line, start: 0, end: 0 }
+      style: justAdded
+    - range: { type: line, start: 2, end: 2 }
+      style: justAdded
+fullTargets: [{ type: primitive, mark: { type: cursor }, modifiers: [] }]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/actions/insertEmptyLines/puffThis16.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/actions/insertEmptyLines/puffThis16.yml
new file mode 100644
index 0000000000..fa0c2e3404
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/actions/insertEmptyLines/puffThis16.yml
@@ -0,0 +1,38 @@
+languageId: plaintext
+command:
+  spokenForm: puff this
+  version: 2
+  targets:
+    - type: primitive
+      mark: { type: cursor }
+  usePrePhraseSnapshot: false
+  action: { name: insertEmptyLinesAround }
+initialState:
+  documentContents: |2
+
+  selections:
+    - anchor: { line: 0, character: 4 }
+      active: { line: 0, character: 4 }
+  marks: {}
+finalState:
+  documentContents: |2+
+
+
+
+  selections:
+    - anchor: { line: 1, character: 4 }
+      active: { line: 1, character: 4 }
+  thatMark:
+    - type: UntypedTarget
+      contentRange:
+        start: { line: 1, character: 4 }
+        end: { line: 1, character: 4 }
+      isReversed: false
+      hasExplicitRange: false
+ide:
+  flashes:
+    - range: { type: line, start: 0, end: 0 }
+      style: justAdded
+    - range: { type: line, start: 2, end: 2 }
+      style: justAdded
+fullTargets: [{ type: primitive, mark: { type: cursor }, modifiers: [] }]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/actions/insertEmptyLines/puffThis17.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/actions/insertEmptyLines/puffThis17.yml
new file mode 100644
index 0000000000..231dcf652b
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/actions/insertEmptyLines/puffThis17.yml
@@ -0,0 +1,38 @@
+languageId: plaintext
+command:
+  spokenForm: puff this
+  version: 2
+  targets:
+    - type: primitive
+      mark: { type: cursor }
+  usePrePhraseSnapshot: false
+  action: { name: insertEmptyLinesAround }
+initialState:
+  documentContents: |2
+
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+  marks: {}
+finalState:
+  documentContents: |2+
+
+
+
+  selections:
+    - anchor: { line: 1, character: 0 }
+      active: { line: 1, character: 0 }
+  thatMark:
+    - type: UntypedTarget
+      contentRange:
+        start: { line: 1, character: 0 }
+        end: { line: 1, character: 0 }
+      isReversed: false
+      hasExplicitRange: false
+ide:
+  flashes:
+    - range: { type: line, start: 0, end: 0 }
+      style: justAdded
+    - range: { type: line, start: 2, end: 2 }
+      style: justAdded
+fullTargets: [{ type: primitive, mark: { type: cursor }, modifiers: [] }]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/actions/insertEmptyLines/puffThis18.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/actions/insertEmptyLines/puffThis18.yml
new file mode 100644
index 0000000000..ff4795f4d3
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/actions/insertEmptyLines/puffThis18.yml
@@ -0,0 +1,40 @@
+languageId: plaintext
+command:
+  spokenForm: puff this
+  version: 2
+  targets:
+    - type: primitive
+      mark: { type: cursor }
+  usePrePhraseSnapshot: true
+  action: { name: insertEmptyLinesAround }
+initialState:
+  documentContents: |
+    hello
+    there
+  selections:
+    - anchor: { line: 1, character: 5 }
+      active: { line: 1, character: 5 }
+  marks: {}
+finalState:
+  documentContents: |+
+    hello
+
+    there
+
+  selections:
+    - anchor: { line: 2, character: 5 }
+      active: { line: 2, character: 5 }
+  thatMark:
+    - type: UntypedTarget
+      contentRange:
+        start: { line: 2, character: 5 }
+        end: { line: 2, character: 5 }
+      isReversed: false
+      hasExplicitRange: false
+ide:
+  flashes:
+    - range: { type: line, start: 1, end: 1 }
+      style: justAdded
+    - range: { type: line, start: 3, end: 3 }
+      style: justAdded
+fullTargets: [{ type: primitive, mark: { type: cursor }, modifiers: [] }]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/actions/insertEmptyLines/puffThis19.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/actions/insertEmptyLines/puffThis19.yml
new file mode 100644
index 0000000000..b4552c7746
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/actions/insertEmptyLines/puffThis19.yml
@@ -0,0 +1,40 @@
+languageId: plaintext
+command:
+  spokenForm: puff this
+  version: 2
+  targets:
+    - type: primitive
+      mark: { type: cursor }
+  usePrePhraseSnapshot: false
+  action: { name: insertEmptyLinesAround }
+initialState:
+  documentContents: |+
+    hello
+
+  selections:
+    - anchor: { line: 1, character: 0 }
+      active: { line: 1, character: 0 }
+  marks: {}
+finalState:
+  documentContents: |+
+    hello
+
+
+
+  selections:
+    - anchor: { line: 2, character: 0 }
+      active: { line: 2, character: 0 }
+  thatMark:
+    - type: UntypedTarget
+      contentRange:
+        start: { line: 2, character: 0 }
+        end: { line: 2, character: 0 }
+      isReversed: false
+      hasExplicitRange: false
+ide:
+  flashes:
+    - range: { type: line, start: 1, end: 1 }
+      style: justAdded
+    - range: { type: line, start: 3, end: 3 }
+      style: justAdded
+fullTargets: [{ type: primitive, mark: { type: cursor }, modifiers: [] }]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/actions/insertEmptyLines/puffThis2.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/actions/insertEmptyLines/puffThis2.yml
new file mode 100644
index 0000000000..92ca1d788f
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/actions/insertEmptyLines/puffThis2.yml
@@ -0,0 +1,36 @@
+languageId: plaintext
+command:
+  spokenForm: puff this
+  version: 2
+  targets:
+    - type: primitive
+      mark: { type: cursor }
+  usePrePhraseSnapshot: true
+  action: { name: insertEmptyLinesAround }
+initialState:
+  documentContents: hello
+  selections:
+    - anchor: { line: 0, character: 5 }
+      active: { line: 0, character: 5 }
+  marks: {}
+finalState:
+  documentContents: |
+
+    hello
+  selections:
+    - anchor: { line: 2, character: 0 }
+      active: { line: 2, character: 0 }
+  thatMark:
+    - type: UntypedTarget
+      contentRange:
+        start: { line: 2, character: 0 }
+        end: { line: 2, character: 0 }
+      isReversed: false
+      hasExplicitRange: false
+ide:
+  flashes:
+    - range: { type: line, start: 0, end: 0 }
+      style: justAdded
+    - range: { type: line, start: 1, end: 1 }
+      style: justAdded
+fullTargets: [{ type: primitive, mark: { type: cursor }, modifiers: [] }]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/actions/insertEmptyLines/puffThis20.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/actions/insertEmptyLines/puffThis20.yml
new file mode 100644
index 0000000000..3457800d74
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/actions/insertEmptyLines/puffThis20.yml
@@ -0,0 +1,42 @@
+languageId: plaintext
+command:
+  spokenForm: puff this
+  version: 2
+  targets:
+    - type: primitive
+      mark: { type: cursor }
+  usePrePhraseSnapshot: false
+  action: { name: insertEmptyLinesAround }
+initialState:
+  documentContents: |-
+    hello
+
+    there
+  selections:
+    - anchor: { line: 1, character: 0 }
+      active: { line: 1, character: 0 }
+  marks: {}
+finalState:
+  documentContents: |-
+    hello
+
+
+
+    there
+  selections:
+    - anchor: { line: 2, character: 0 }
+      active: { line: 2, character: 0 }
+  thatMark:
+    - type: UntypedTarget
+      contentRange:
+        start: { line: 2, character: 0 }
+        end: { line: 2, character: 0 }
+      isReversed: false
+      hasExplicitRange: false
+ide:
+  flashes:
+    - range: { type: line, start: 1, end: 1 }
+      style: justAdded
+    - range: { type: line, start: 3, end: 3 }
+      style: justAdded
+fullTargets: [{ type: primitive, mark: { type: cursor }, modifiers: [] }]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/actions/insertEmptyLines/puffThis21.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/actions/insertEmptyLines/puffThis21.yml
new file mode 100644
index 0000000000..42ea3c104d
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/actions/insertEmptyLines/puffThis21.yml
@@ -0,0 +1,42 @@
+languageId: plaintext
+command:
+  spokenForm: puff this
+  version: 2
+  targets:
+    - type: primitive
+      mark: { type: cursor }
+  usePrePhraseSnapshot: false
+  action: { name: insertEmptyLinesAround }
+initialState:
+  documentContents: |-
+    hello
+    now
+    there
+  selections:
+    - anchor: { line: 1, character: 3 }
+      active: { line: 1, character: 3 }
+  marks: {}
+finalState:
+  documentContents: |-
+    hello
+
+    now
+
+    there
+  selections:
+    - anchor: { line: 2, character: 3 }
+      active: { line: 2, character: 3 }
+  thatMark:
+    - type: UntypedTarget
+      contentRange:
+        start: { line: 2, character: 3 }
+        end: { line: 2, character: 3 }
+      isReversed: false
+      hasExplicitRange: false
+ide:
+  flashes:
+    - range: { type: line, start: 1, end: 1 }
+      style: justAdded
+    - range: { type: line, start: 3, end: 3 }
+      style: justAdded
+fullTargets: [{ type: primitive, mark: { type: cursor }, modifiers: [] }]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/actions/insertEmptyLines/puffThis22.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/actions/insertEmptyLines/puffThis22.yml
new file mode 100644
index 0000000000..b4721db73f
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/actions/insertEmptyLines/puffThis22.yml
@@ -0,0 +1,42 @@
+languageId: plaintext
+command:
+  spokenForm: puff this
+  version: 2
+  targets:
+    - type: primitive
+      mark: { type: cursor }
+  usePrePhraseSnapshot: false
+  action: { name: insertEmptyLinesAround }
+initialState:
+  documentContents: |2-
+        hello
+        now
+        there
+  selections:
+    - anchor: { line: 1, character: 7 }
+      active: { line: 1, character: 7 }
+  marks: {}
+finalState:
+  documentContents: |2-
+        hello
+
+        now
+
+        there
+  selections:
+    - anchor: { line: 2, character: 7 }
+      active: { line: 2, character: 7 }
+  thatMark:
+    - type: UntypedTarget
+      contentRange:
+        start: { line: 2, character: 7 }
+        end: { line: 2, character: 7 }
+      isReversed: false
+      hasExplicitRange: false
+ide:
+  flashes:
+    - range: { type: line, start: 1, end: 1 }
+      style: justAdded
+    - range: { type: line, start: 3, end: 3 }
+      style: justAdded
+fullTargets: [{ type: primitive, mark: { type: cursor }, modifiers: [] }]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/actions/insertEmptyLines/puffThis3.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/actions/insertEmptyLines/puffThis3.yml
new file mode 100644
index 0000000000..e0f4c36475
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/actions/insertEmptyLines/puffThis3.yml
@@ -0,0 +1,36 @@
+languageId: plaintext
+command:
+  spokenForm: puff this
+  version: 2
+  targets:
+    - type: primitive
+      mark: { type: cursor }
+  usePrePhraseSnapshot: true
+  action: { name: insertEmptyLinesAround }
+initialState:
+  documentContents: "    hello"
+  selections:
+    - anchor: { line: 0, character: 9 }
+      active: { line: 0, character: 9 }
+  marks: {}
+finalState:
+  documentContents: |2
+
+        hello
+  selections:
+    - anchor: { line: 2, character: 0 }
+      active: { line: 2, character: 0 }
+  thatMark:
+    - type: UntypedTarget
+      contentRange:
+        start: { line: 2, character: 0 }
+        end: { line: 2, character: 0 }
+      isReversed: false
+      hasExplicitRange: false
+ide:
+  flashes:
+    - range: { type: line, start: 0, end: 0 }
+      style: justAdded
+    - range: { type: line, start: 1, end: 1 }
+      style: justAdded
+fullTargets: [{ type: primitive, mark: { type: cursor }, modifiers: [] }]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/actions/insertEmptyLines/puffThis4.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/actions/insertEmptyLines/puffThis4.yml
new file mode 100644
index 0000000000..0679b3f099
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/actions/insertEmptyLines/puffThis4.yml
@@ -0,0 +1,35 @@
+languageId: plaintext
+command:
+  spokenForm: puff this
+  version: 2
+  targets:
+    - type: primitive
+      mark: { type: cursor }
+  usePrePhraseSnapshot: true
+  action: { name: insertEmptyLinesAround }
+initialState:
+  documentContents: "    "
+  selections:
+    - anchor: { line: 0, character: 4 }
+      active: { line: 0, character: 4 }
+  marks: {}
+finalState:
+  documentContents: |2
+
+  selections:
+    - anchor: { line: 2, character: 0 }
+      active: { line: 2, character: 0 }
+  thatMark:
+    - type: UntypedTarget
+      contentRange:
+        start: { line: 2, character: 0 }
+        end: { line: 2, character: 0 }
+      isReversed: false
+      hasExplicitRange: false
+ide:
+  flashes:
+    - range: { type: line, start: 0, end: 0 }
+      style: justAdded
+    - range: { type: line, start: 1, end: 1 }
+      style: justAdded
+fullTargets: [{ type: primitive, mark: { type: cursor }, modifiers: [] }]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/actions/insertEmptyLines/puffThis5.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/actions/insertEmptyLines/puffThis5.yml
new file mode 100644
index 0000000000..7814675742
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/actions/insertEmptyLines/puffThis5.yml
@@ -0,0 +1,39 @@
+languageId: plaintext
+command:
+  spokenForm: puff this
+  version: 2
+  targets:
+    - type: primitive
+      mark: { type: cursor }
+  usePrePhraseSnapshot: true
+  action: { name: insertEmptyLinesAround }
+initialState:
+  documentContents: |2-
+        whatever
+        hello
+  selections:
+    - anchor: { line: 1, character: 9 }
+      active: { line: 1, character: 9 }
+  marks: {}
+finalState:
+  documentContents: |2
+        whatever
+
+        hello
+  selections:
+    - anchor: { line: 3, character: 0 }
+      active: { line: 3, character: 0 }
+  thatMark:
+    - type: UntypedTarget
+      contentRange:
+        start: { line: 3, character: 0 }
+        end: { line: 3, character: 0 }
+      isReversed: false
+      hasExplicitRange: false
+ide:
+  flashes:
+    - range: { type: line, start: 1, end: 1 }
+      style: justAdded
+    - range: { type: line, start: 2, end: 2 }
+      style: justAdded
+fullTargets: [{ type: primitive, mark: { type: cursor }, modifiers: [] }]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/actions/insertEmptyLines/puffThis6.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/actions/insertEmptyLines/puffThis6.yml
new file mode 100644
index 0000000000..678c82c6b3
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/actions/insertEmptyLines/puffThis6.yml
@@ -0,0 +1,39 @@
+languageId: plaintext
+command:
+  spokenForm: puff this
+  version: 2
+  targets:
+    - type: primitive
+      mark: { type: cursor }
+  usePrePhraseSnapshot: true
+  action: { name: insertEmptyLinesAround }
+initialState:
+  documentContents: |-
+    whatever
+    hello
+  selections:
+    - anchor: { line: 1, character: 5 }
+      active: { line: 1, character: 5 }
+  marks: {}
+finalState:
+  documentContents: |
+    whatever
+
+    hello
+  selections:
+    - anchor: { line: 3, character: 0 }
+      active: { line: 3, character: 0 }
+  thatMark:
+    - type: UntypedTarget
+      contentRange:
+        start: { line: 3, character: 0 }
+        end: { line: 3, character: 0 }
+      isReversed: false
+      hasExplicitRange: false
+ide:
+  flashes:
+    - range: { type: line, start: 1, end: 1 }
+      style: justAdded
+    - range: { type: line, start: 2, end: 2 }
+      style: justAdded
+fullTargets: [{ type: primitive, mark: { type: cursor }, modifiers: [] }]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/actions/insertEmptyLines/puffThis7.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/actions/insertEmptyLines/puffThis7.yml
new file mode 100644
index 0000000000..96425dc649
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/actions/insertEmptyLines/puffThis7.yml
@@ -0,0 +1,39 @@
+languageId: plaintext
+command:
+  spokenForm: puff this
+  version: 2
+  targets:
+    - type: primitive
+      mark: { type: cursor }
+  usePrePhraseSnapshot: true
+  action: { name: insertEmptyLinesAround }
+initialState:
+  documentContents: |-
+    whatever
+    hello
+  selections:
+    - anchor: { line: 1, character: 0 }
+      active: { line: 1, character: 0 }
+  marks: {}
+finalState:
+  documentContents: |
+    whatever
+
+    hello
+  selections:
+    - anchor: { line: 2, character: 0 }
+      active: { line: 2, character: 0 }
+  thatMark:
+    - type: UntypedTarget
+      contentRange:
+        start: { line: 2, character: 0 }
+        end: { line: 2, character: 0 }
+      isReversed: false
+      hasExplicitRange: false
+ide:
+  flashes:
+    - range: { type: line, start: 1, end: 1 }
+      style: justAdded
+    - range: { type: line, start: 2, end: 2 }
+      style: justAdded
+fullTargets: [{ type: primitive, mark: { type: cursor }, modifiers: [] }]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/actions/insertEmptyLines/puffThis8.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/actions/insertEmptyLines/puffThis8.yml
new file mode 100644
index 0000000000..7ad6abcf85
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/actions/insertEmptyLines/puffThis8.yml
@@ -0,0 +1,38 @@
+languageId: plaintext
+command:
+  spokenForm: puff this
+  version: 2
+  targets:
+    - type: primitive
+      mark: { type: cursor }
+  usePrePhraseSnapshot: true
+  action: { name: insertEmptyLinesAround }
+initialState:
+  documentContents: |
+    hello
+  selections:
+    - anchor: { line: 1, character: 0 }
+      active: { line: 1, character: 0 }
+  marks: {}
+finalState:
+  documentContents: |+
+    hello
+
+
+  selections:
+    - anchor: { line: 3, character: 0 }
+      active: { line: 3, character: 0 }
+  thatMark:
+    - type: UntypedTarget
+      contentRange:
+        start: { line: 3, character: 0 }
+        end: { line: 3, character: 0 }
+      isReversed: false
+      hasExplicitRange: false
+ide:
+  flashes:
+    - range: { type: line, start: 2, end: 2 }
+      style: justAdded
+    - range: { type: line, start: 2, end: 2 }
+      style: justAdded
+fullTargets: [{ type: primitive, mark: { type: cursor }, modifiers: [] }]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/actions/insertEmptyLines/puffThis9.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/actions/insertEmptyLines/puffThis9.yml
new file mode 100644
index 0000000000..6a20023dc1
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/actions/insertEmptyLines/puffThis9.yml
@@ -0,0 +1,38 @@
+languageId: plaintext
+command:
+  spokenForm: puff this
+  version: 2
+  targets:
+    - type: primitive
+      mark: { type: cursor }
+  usePrePhraseSnapshot: true
+  action: { name: insertEmptyLinesAround }
+initialState:
+  documentContents: |2
+        hello
+  selections:
+    - anchor: { line: 1, character: 0 }
+      active: { line: 1, character: 0 }
+  marks: {}
+finalState:
+  documentContents: |2+
+        hello
+
+
+  selections:
+    - anchor: { line: 3, character: 0 }
+      active: { line: 3, character: 0 }
+  thatMark:
+    - type: UntypedTarget
+      contentRange:
+        start: { line: 3, character: 0 }
+        end: { line: 3, character: 0 }
+      isReversed: false
+      hasExplicitRange: false
+ide:
+  flashes:
+    - range: { type: line, start: 2, end: 2 }
+      style: justAdded
+    - range: { type: line, start: 2, end: 2 }
+      style: justAdded
+fullTargets: [{ type: primitive, mark: { type: cursor }, modifiers: [] }]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/actions/insertEmptyLines/puffVest.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/actions/insertEmptyLines/puffVest.yml
new file mode 100644
index 0000000000..e7038da877
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/actions/insertEmptyLines/puffVest.yml
@@ -0,0 +1,52 @@
+languageId: typescript
+command:
+  version: 1
+  spokenForm: puff vest
+  action: insertEmptyLinesAround
+  targets:
+    - type: primitive
+      mark: { type: decoratedSymbol, symbolColor: default, character: v }
+initialState:
+  documentContents: |
+
+    const value = "Hello world";
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+  marks:
+    default.v:
+      start: { line: 1, character: 6 }
+      end: { line: 1, character: 11 }
+finalState:
+  documentContents: |+
+
+
+    const value = "Hello world";
+
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+  thatMark:
+    - type: UntypedTarget
+      contentRange:
+        start: { line: 2, character: 6 }
+        end: { line: 2, character: 11 }
+      isReversed: false
+      hasExplicitRange: true
+ide:
+  flashes:
+    - range: { type: line, start: 1, end: 1 }
+      style: justAdded
+    - range: { type: line, start: 3, end: 3 }
+      style: justAdded
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: decoratedSymbol, symbolColor: default, character: v },
+      selectionType: token,
+      position: contents,
+      modifier: { type: identity },
+      insideOutsideType: inside,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/actions/insertEmptyLines/puffVest2.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/actions/insertEmptyLines/puffVest2.yml
new file mode 100644
index 0000000000..d575fa1fa6
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/actions/insertEmptyLines/puffVest2.yml
@@ -0,0 +1,50 @@
+languageId: plaintext
+command:
+  spokenForm: puff vest
+  version: 2
+  targets:
+    - type: primitive
+      mark: { type: decoratedSymbol, symbolColor: default, character: v }
+  usePrePhraseSnapshot: true
+  action: { name: insertEmptyLinesAround }
+initialState:
+  documentContents: |2
+
+        const value = "Hello world";
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+  marks:
+    default.v:
+      start: { line: 1, character: 10 }
+      end: { line: 1, character: 15 }
+finalState:
+  documentContents: |2+
+
+
+        const value = "Hello world";
+
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+  thatMark:
+    - type: UntypedTarget
+      contentRange:
+        start: { line: 2, character: 10 }
+        end: { line: 2, character: 15 }
+      isReversed: false
+      hasExplicitRange: true
+ide:
+  flashes:
+    - range: { type: line, start: 1, end: 1 }
+      style: justAdded
+    - range: { type: line, start: 3, end: 3 }
+      style: justAdded
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: decoratedSymbol, symbolColor: default, character: v },
+      modifiers: [],
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/actions/moveEveryArgMade.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/actions/moveEveryArgMade.yml
new file mode 100644
index 0000000000..c982e20aec
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/actions/moveEveryArgMade.yml
@@ -0,0 +1,72 @@
+languageId: typescript
+command:
+  version: 1
+  spokenForm: move every arg made
+  action: moveToTarget
+  targets:
+    - type: primitive
+      modifier:
+        {
+          type: containingScope,
+          scopeType: argumentOrParameter,
+          includeSiblings: true,
+        }
+      mark: { type: decoratedSymbol, symbolColor: default, character: m }
+    - { type: primitive, isImplicit: true }
+initialState:
+  documentContents: |
+    function myFunk(value: string, name: string, age: number) { };
+  selections:
+    - anchor: { line: 1, character: 0 }
+      active: { line: 1, character: 0 }
+  marks:
+    default.m:
+      start: { line: 0, character: 31 }
+      end: { line: 0, character: 35 }
+finalState:
+  documentContents: |-
+    function myFunk() { };
+    value: string, name: string, age: number
+  selections:
+    - anchor: { line: 1, character: 40 }
+      active: { line: 1, character: 40 }
+  thatMark:
+    - type: UntypedTarget
+      contentRange:
+        start: { line: 1, character: 0 }
+        end: { line: 1, character: 40 }
+      isReversed: false
+      hasExplicitRange: true
+  sourceMark:
+    - type: UntypedTarget
+      contentRange:
+        start: { line: 0, character: 16 }
+        end: { line: 0, character: 16 }
+      isReversed: false
+      hasExplicitRange: false
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: decoratedSymbol, symbolColor: default, character: m },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: null,
+      modifier:
+        {
+          type: containingScope,
+          scopeType: argumentOrParameter,
+          includeSiblings: true,
+        },
+      isImplicit: false,
+    },
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: null,
+      modifier: { type: identity },
+      isImplicit: true,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/actions/moveVest.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/actions/moveVest.yml
new file mode 100644
index 0000000000..f07829f749
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/actions/moveVest.yml
@@ -0,0 +1,60 @@
+languageId: typescript
+command:
+  version: 1
+  spokenForm: move vest
+  action: moveToTarget
+  targets:
+    - type: primitive
+      mark: { type: decoratedSymbol, symbolColor: default, character: v }
+    - { type: primitive, isImplicit: true }
+initialState:
+  documentContents: |
+
+    const value = "Hello world";
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+  marks:
+    default.v:
+      start: { line: 1, character: 6 }
+      end: { line: 1, character: 11 }
+finalState:
+  documentContents: |
+    value
+    const = "Hello world";
+  selections:
+    - anchor: { line: 0, character: 5 }
+      active: { line: 0, character: 5 }
+  thatMark:
+    - type: UntypedTarget
+      contentRange:
+        start: { line: 0, character: 0 }
+        end: { line: 0, character: 5 }
+      isReversed: false
+      hasExplicitRange: true
+  sourceMark:
+    - type: UntypedTarget
+      contentRange:
+        start: { line: 1, character: 6 }
+        end: { line: 1, character: 6 }
+      isReversed: false
+      hasExplicitRange: false
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: decoratedSymbol, symbolColor: default, character: v },
+      selectionType: token,
+      position: contents,
+      modifier: { type: identity },
+      insideOutsideType: null,
+    },
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      modifier: { type: identity },
+      insideOutsideType: inside,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/actions/moveVestToCap.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/actions/moveVestToCap.yml
new file mode 100644
index 0000000000..ce4e099a78
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/actions/moveVestToCap.yml
@@ -0,0 +1,64 @@
+languageId: typescript
+command:
+  version: 1
+  spokenForm: move vest to cap
+  action: moveToTarget
+  targets:
+    - type: primitive
+      mark: { type: decoratedSymbol, symbolColor: default, character: v }
+    - type: primitive
+      mark: { type: decoratedSymbol, symbolColor: default, character: c }
+initialState:
+  documentContents: |
+
+    const value = "Hello world";
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+  marks:
+    default.v:
+      start: { line: 1, character: 6 }
+      end: { line: 1, character: 11 }
+    default.c:
+      start: { line: 1, character: 0 }
+      end: { line: 1, character: 5 }
+finalState:
+  documentContents: |
+
+    value = "Hello world";
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+  thatMark:
+    - type: UntypedTarget
+      contentRange:
+        start: { line: 1, character: 0 }
+        end: { line: 1, character: 5 }
+      isReversed: false
+      hasExplicitRange: true
+  sourceMark:
+    - type: UntypedTarget
+      contentRange:
+        start: { line: 1, character: 6 }
+        end: { line: 1, character: 6 }
+      isReversed: false
+      hasExplicitRange: false
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: decoratedSymbol, symbolColor: default, character: v },
+      selectionType: token,
+      position: contents,
+      modifier: { type: identity },
+      insideOutsideType: null,
+    },
+    {
+      type: primitive,
+      mark: { type: decoratedSymbol, symbolColor: default, character: c },
+      selectionType: token,
+      position: contents,
+      modifier: { type: identity },
+      insideOutsideType: null,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/actions/pasteAfterArgueBat.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/actions/pasteAfterArgueBat.yml
new file mode 100644
index 0000000000..b68bc23a42
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/actions/pasteAfterArgueBat.yml
@@ -0,0 +1,54 @@
+languageId: typescript
+command:
+  spokenForm: paste after argue bat
+  version: 2
+  targets:
+    - type: primitive
+      mark: { type: decoratedSymbol, symbolColor: default, character: b }
+      modifiers:
+        - { type: position, position: after }
+        - type: containingScope
+          scopeType: { type: argumentOrParameter }
+  usePrePhraseSnapshot: true
+  action: { name: pasteFromClipboard }
+initialState:
+  documentContents: foo(bar, baz, bongo)
+  selections:
+    - anchor: { line: 0, character: 6 }
+      active: { line: 0, character: 6 }
+  marks:
+    default.b:
+      start: { line: 0, character: 14 }
+      end: { line: 0, character: 19 }
+  clipboard: baz
+finalState:
+  documentContents: foo(bar, baz, bongo, baz)
+  selections:
+    - anchor: { line: 0, character: 6 }
+      active: { line: 0, character: 6 }
+  thatMark:
+    - type: UntypedTarget
+      contentRange:
+        start: { line: 0, character: 21 }
+        end: { line: 0, character: 24 }
+      isReversed: false
+      hasExplicitRange: true
+ide:
+  flashes:
+    - range:
+        type: character
+        start: { line: 0, character: 21 }
+        end: { line: 0, character: 24 }
+      style: justAdded
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: decoratedSymbol, symbolColor: default, character: b },
+      modifiers:
+        [
+          { type: position, position: after },
+          { type: containingScope, scopeType: { type: argumentOrParameter } },
+        ],
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/actions/pasteAfterLineSpunAndAfterBlockLookAndBeforeLineSpun.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/actions/pasteAfterLineSpunAndAfterBlockLookAndBeforeLineSpun.yml
new file mode 100644
index 0000000000..f96d64c49d
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/actions/pasteAfterLineSpunAndAfterBlockLookAndBeforeLineSpun.yml
@@ -0,0 +1,133 @@
+languageId: plaintext
+command:
+  spokenForm: paste after line spun and after block look and before line spun
+  version: 2
+  targets:
+    - type: list
+      elements:
+        - type: primitive
+          mark: { type: decoratedSymbol, symbolColor: default, character: s }
+          modifiers:
+            - { type: position, position: after }
+            - type: containingScope
+              scopeType: { type: line }
+        - type: primitive
+          mark: { type: decoratedSymbol, symbolColor: default, character: l }
+          modifiers:
+            - { type: position, position: after }
+            - type: containingScope
+              scopeType: { type: paragraph }
+        - type: primitive
+          mark: { type: decoratedSymbol, symbolColor: default, character: s }
+          modifiers:
+            - { type: position, position: before }
+            - type: containingScope
+              scopeType: { type: line }
+  usePrePhraseSnapshot: true
+  action: { name: pasteFromClipboard }
+initialState:
+  documentContents: |-
+    testing
+
+    hello
+    there
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+    - anchor: { line: 3, character: 5 }
+      active: { line: 3, character: 5 }
+  marks:
+    default.s:
+      start: { line: 0, character: 0 }
+      end: { line: 0, character: 7 }
+    default.l:
+      start: { line: 2, character: 0 }
+      end: { line: 2, character: 5 }
+  clipboard: baz
+finalState:
+  documentContents: |-
+    baz
+    testing
+    baz
+
+    hello
+    there
+
+    baz
+  selections:
+    - anchor: { line: 1, character: 0 }
+      active: { line: 1, character: 0 }
+    - anchor: { line: 5, character: 5 }
+      active: { line: 5, character: 5 }
+  thatMark:
+    - type: UntypedTarget
+      contentRange:
+        start: { line: 2, character: 0 }
+        end: { line: 2, character: 3 }
+      isReversed: false
+      hasExplicitRange: true
+    - type: UntypedTarget
+      contentRange:
+        start: { line: 7, character: 0 }
+        end: { line: 7, character: 3 }
+      isReversed: false
+      hasExplicitRange: true
+    - type: UntypedTarget
+      contentRange:
+        start: { line: 0, character: 0 }
+        end: { line: 0, character: 3 }
+      isReversed: false
+      hasExplicitRange: true
+ide:
+  flashes:
+    - range:
+        type: character
+        start: { line: 2, character: 0 }
+        end: { line: 2, character: 3 }
+      style: justAdded
+    - range:
+        type: character
+        start: { line: 7, character: 0 }
+        end: { line: 7, character: 3 }
+      style: justAdded
+    - range:
+        type: character
+        start: { line: 0, character: 0 }
+        end: { line: 0, character: 3 }
+      style: justAdded
+fullTargets:
+  [
+    {
+      type: list,
+      elements:
+        [
+          {
+            type: primitive,
+            mark: { type: decoratedSymbol, symbolColor: default, character: s },
+            modifiers:
+              [
+                { type: position, position: after },
+                { type: containingScope, scopeType: { type: line } },
+              ],
+          },
+          {
+            type: primitive,
+            mark: { type: decoratedSymbol, symbolColor: default, character: l },
+            modifiers:
+              [
+                { type: position, position: after },
+                { type: containingScope, scopeType: { type: paragraph } },
+              ],
+          },
+          {
+            type: primitive,
+            mark: { type: decoratedSymbol, symbolColor: default, character: s },
+            modifiers:
+              [
+                { type: position, position: before },
+                { type: containingScope, scopeType: { type: line } },
+              ],
+          },
+        ],
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/actions/pasteAfterLineTrapAndAfterBlockTrap.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/actions/pasteAfterLineTrapAndAfterBlockTrap.yml
new file mode 100644
index 0000000000..d561cfa8b4
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/actions/pasteAfterLineTrapAndAfterBlockTrap.yml
@@ -0,0 +1,83 @@
+languageId: python
+command:
+  spokenForm: paste after line trap and after block trap
+  version: 2
+  targets:
+    - type: list
+      elements:
+        - type: primitive
+          mark: { type: decoratedSymbol, symbolColor: default, character: t }
+          modifiers:
+            - { type: position, position: after }
+            - type: containingScope
+              scopeType: { type: line }
+        - type: primitive
+          mark: { type: decoratedSymbol, symbolColor: default, character: t }
+          modifiers:
+            - { type: position, position: after }
+            - type: containingScope
+              scopeType: { type: paragraph }
+  usePrePhraseSnapshot: true
+  action: { name: pasteFromClipboard }
+initialState:
+  documentContents: |
+    if True:
+        pass
+  selections:
+    - anchor: { line: 2, character: 0 }
+      active: { line: 2, character: 0 }
+  marks:
+    default.t:
+      start: { line: 0, character: 3 }
+      end: { line: 0, character: 7 }
+  clipboard: print("hello")
+finalState:
+  documentContents: |
+    if True:
+        print("hello")
+        pass
+
+    print("hello")
+  selections:
+    - anchor: { line: 5, character: 0 }
+      active: { line: 5, character: 0 }
+  thatMark:
+    - type: UntypedTarget
+      contentRange:
+        start: { line: 1, character: 4 }
+        end: { line: 1, character: 18 }
+      isReversed: false
+      hasExplicitRange: true
+    - type: UntypedTarget
+      contentRange:
+        start: { line: 4, character: 0 }
+        end: { line: 4, character: 14 }
+      isReversed: false
+      hasExplicitRange: true
+fullTargets:
+  [
+    {
+      type: list,
+      elements:
+        [
+          {
+            type: primitive,
+            mark: { type: decoratedSymbol, symbolColor: default, character: t },
+            modifiers:
+              [
+                { type: position, position: after },
+                { type: containingScope, scopeType: { type: line } },
+              ],
+          },
+          {
+            type: primitive,
+            mark: { type: decoratedSymbol, symbolColor: default, character: t },
+            modifiers:
+              [
+                { type: position, position: after },
+                { type: containingScope, scopeType: { type: paragraph } },
+              ],
+          },
+        ],
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/actions/pasteAfterState.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/actions/pasteAfterState.yml
new file mode 100644
index 0000000000..2b7251e59f
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/actions/pasteAfterState.yml
@@ -0,0 +1,56 @@
+languageId: typescript
+command:
+  spokenForm: paste after state
+  version: 2
+  targets:
+    - type: primitive
+      modifiers:
+        - { type: position, position: after }
+        - type: containingScope
+          scopeType: { type: statement }
+  usePrePhraseSnapshot: true
+  action: { name: pasteFromClipboard }
+initialState:
+  documentContents: const whatever = "hello";
+  selections:
+    - anchor: { line: 0, character: 9 }
+      active: { line: 0, character: 9 }
+    - anchor: { line: 0, character: 21 }
+      active: { line: 0, character: 21 }
+  marks: {}
+  clipboard: const whatever = "hello";
+finalState:
+  documentContents: |-
+    const whatever = "hello";
+    const whatever = "hello";
+  selections:
+    - anchor: { line: 0, character: 9 }
+      active: { line: 0, character: 9 }
+    - anchor: { line: 0, character: 21 }
+      active: { line: 0, character: 21 }
+  thatMark:
+    - type: UntypedTarget
+      contentRange:
+        start: { line: 1, character: 0 }
+        end: { line: 1, character: 25 }
+      isReversed: false
+      hasExplicitRange: true
+ide:
+  flashes:
+    - range:
+        type: character
+        start: { line: 1, character: 0 }
+        end: { line: 1, character: 25 }
+      style: justAdded
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      modifiers:
+        [
+          { type: position, position: after },
+          { type: containingScope, scopeType: { type: statement } },
+        ],
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/actions/pasteBeforeArgueZip.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/actions/pasteBeforeArgueZip.yml
new file mode 100644
index 0000000000..56bbeadf15
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/actions/pasteBeforeArgueZip.yml
@@ -0,0 +1,54 @@
+languageId: typescript
+command:
+  spokenForm: paste before argue zip
+  version: 2
+  targets:
+    - type: primitive
+      mark: { type: decoratedSymbol, symbolColor: default, character: z }
+      modifiers:
+        - { type: position, position: before }
+        - type: containingScope
+          scopeType: { type: argumentOrParameter }
+  usePrePhraseSnapshot: true
+  action: { name: pasteFromClipboard }
+initialState:
+  documentContents: foo(bar, baz, bongo)
+  selections:
+    - anchor: { line: 0, character: 19 }
+      active: { line: 0, character: 19 }
+  marks:
+    default.z:
+      start: { line: 0, character: 9 }
+      end: { line: 0, character: 12 }
+  clipboard: baz
+finalState:
+  documentContents: foo(bar, baz, baz, bongo)
+  selections:
+    - anchor: { line: 0, character: 24 }
+      active: { line: 0, character: 24 }
+  thatMark:
+    - type: UntypedTarget
+      contentRange:
+        start: { line: 0, character: 9 }
+        end: { line: 0, character: 12 }
+      isReversed: false
+      hasExplicitRange: true
+ide:
+  flashes:
+    - range:
+        type: character
+        start: { line: 0, character: 9 }
+        end: { line: 0, character: 12 }
+      style: justAdded
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: decoratedSymbol, symbolColor: default, character: z },
+      modifiers:
+        [
+          { type: position, position: before },
+          { type: containingScope, scopeType: { type: argumentOrParameter } },
+        ],
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/actions/pasteBeforeState.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/actions/pasteBeforeState.yml
new file mode 100644
index 0000000000..2167328bdc
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/actions/pasteBeforeState.yml
@@ -0,0 +1,56 @@
+languageId: typescript
+command:
+  spokenForm: paste before state
+  version: 2
+  targets:
+    - type: primitive
+      modifiers:
+        - { type: position, position: before }
+        - type: containingScope
+          scopeType: { type: statement }
+  usePrePhraseSnapshot: true
+  action: { name: pasteFromClipboard }
+initialState:
+  documentContents: const whatever = "hello";
+  selections:
+    - anchor: { line: 0, character: 9 }
+      active: { line: 0, character: 9 }
+    - anchor: { line: 0, character: 21 }
+      active: { line: 0, character: 21 }
+  marks: {}
+  clipboard: const whatever = "hello";
+finalState:
+  documentContents: |-
+    const whatever = "hello";
+    const whatever = "hello";
+  selections:
+    - anchor: { line: 1, character: 9 }
+      active: { line: 1, character: 9 }
+    - anchor: { line: 1, character: 21 }
+      active: { line: 1, character: 21 }
+  thatMark:
+    - type: UntypedTarget
+      contentRange:
+        start: { line: 0, character: 0 }
+        end: { line: 0, character: 25 }
+      isReversed: false
+      hasExplicitRange: true
+ide:
+  flashes:
+    - range:
+        type: character
+        start: { line: 0, character: 0 }
+        end: { line: 0, character: 25 }
+      style: justAdded
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      modifiers:
+        [
+          { type: position, position: before },
+          { type: containingScope, scopeType: { type: statement } },
+        ],
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/actions/pasteCap.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/actions/pasteCap.yml
new file mode 100644
index 0000000000..e11f119350
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/actions/pasteCap.yml
@@ -0,0 +1,45 @@
+languageId: typescript
+command:
+  version: 1
+  spokenForm: paste cap
+  action: pasteFromClipboard
+  targets:
+    - type: primitive
+      mark: { type: decoratedSymbol, symbolColor: default, character: c }
+initialState:
+  documentContents: |
+
+    const value = "Hello world";
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+  clipboard: value
+  marks:
+    default.c:
+      start: { line: 1, character: 0 }
+      end: { line: 1, character: 5 }
+finalState:
+  documentContents: |
+
+    value value = "Hello world";
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+  thatMark:
+    - type: UntypedTarget
+      contentRange:
+        start: { line: 1, character: 0 }
+        end: { line: 1, character: 5 }
+      isReversed: false
+      hasExplicitRange: true
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: decoratedSymbol, symbolColor: default, character: c },
+      selectionType: token,
+      position: contents,
+      modifier: { type: identity },
+      insideOutsideType: inside,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/actions/phonesSpy.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/actions/phonesSpy.yml
new file mode 100644
index 0000000000..b17ec8f7a2
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/actions/phonesSpy.yml
@@ -0,0 +1,46 @@
+languageId: typescript
+command:
+  version: 1
+  spokenForm: phones spy
+  action: replace
+  targets:
+    - type: primitive
+      mark: { type: decoratedSymbol, symbolColor: default, character: s }
+  extraArgs:
+    - [sum]
+initialState:
+  documentContents: |
+
+    const value = "some";
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+  marks:
+    default.s:
+      start: { line: 1, character: 15 }
+      end: { line: 1, character: 19 }
+finalState:
+  documentContents: |
+
+    const value = "sum";
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+  thatMark:
+    - type: UntypedTarget
+      contentRange:
+        start: { line: 1, character: 15 }
+        end: { line: 1, character: 18 }
+      isReversed: false
+      hasExplicitRange: true
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: decoratedSymbol, symbolColor: default, character: s },
+      selectionType: token,
+      position: contents,
+      modifier: { type: identity },
+      insideOutsideType: null,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/actions/postVest.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/actions/postVest.yml
new file mode 100644
index 0000000000..84669adb65
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/actions/postVest.yml
@@ -0,0 +1,44 @@
+languageId: typescript
+command:
+  version: 1
+  spokenForm: post vest
+  action: setSelectionAfter
+  targets:
+    - type: primitive
+      mark: { type: decoratedSymbol, symbolColor: default, character: v }
+initialState:
+  documentContents: |
+
+    const value = "Hello world";
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+  marks:
+    default.v:
+      start: { line: 1, character: 6 }
+      end: { line: 1, character: 11 }
+finalState:
+  documentContents: |
+
+    const value = "Hello world";
+  selections:
+    - anchor: { line: 1, character: 11 }
+      active: { line: 1, character: 11 }
+  thatMark:
+    - type: UntypedTarget
+      contentRange:
+        start: { line: 1, character: 6 }
+        end: { line: 1, character: 11 }
+      isReversed: false
+      hasExplicitRange: false
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: decoratedSymbol, symbolColor: default, character: v },
+      selectionType: token,
+      position: contents,
+      modifier: { type: identity },
+      insideOutsideType: inside,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/actions/pourArg.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/actions/pourArg.yml
new file mode 100644
index 0000000000..ac3031294d
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/actions/pourArg.yml
@@ -0,0 +1,39 @@
+languageId: typescript
+command:
+  spokenForm: pour arg
+  version: 2
+  action: { name: editNewLineAfter }
+  targets:
+    - type: primitive
+      modifiers:
+        - type: containingScope
+          scopeType: { type: argumentOrParameter }
+  usePrePhraseSnapshot: true
+initialState:
+  documentContents: |
+    function helloWorld(foo: string, bar: number, baz: string) {}
+  selections:
+    - anchor: { line: 0, character: 40 }
+      active: { line: 0, character: 40 }
+  marks: {}
+finalState:
+  documentContents: |
+    function helloWorld(foo: string, bar: number, , baz: string) {}
+  selections:
+    - anchor: { line: 0, character: 46 }
+      active: { line: 0, character: 46 }
+  thatMark:
+    - type: UntypedTarget
+      contentRange:
+        start: { line: 0, character: 33 }
+        end: { line: 0, character: 44 }
+      isReversed: false
+      hasExplicitRange: true
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      modifiers: [{ type: containingScope, scopeType: argumentOrParameter }],
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/actions/pourArg2.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/actions/pourArg2.yml
new file mode 100644
index 0000000000..67325f6dcc
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/actions/pourArg2.yml
@@ -0,0 +1,47 @@
+languageId: typescript
+command:
+  spokenForm: pour arg
+  version: 2
+  targets:
+    - type: primitive
+      modifiers:
+        - type: containingScope
+          scopeType: { type: argumentOrParameter }
+  usePrePhraseSnapshot: true
+  action: { name: editNewLineAfter }
+initialState:
+  documentContents: |-
+    function myFunk(
+        name: string,
+        value: number
+    ) {}
+  selections:
+    - anchor: { line: 1, character: 8 }
+      active: { line: 1, character: 8 }
+  marks: {}
+finalState:
+  documentContents: |-
+    function myFunk(
+        name: string,
+        ,
+        value: number
+    ) {}
+  selections:
+    - anchor: { line: 2, character: 4 }
+      active: { line: 2, character: 4 }
+  thatMark:
+    - type: UntypedTarget
+      contentRange:
+        start: { line: 1, character: 4 }
+        end: { line: 1, character: 16 }
+      isReversed: false
+      hasExplicitRange: true
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      modifiers:
+        [{ type: containingScope, scopeType: { type: argumentOrParameter } }],
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/actions/pourArg3.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/actions/pourArg3.yml
new file mode 100644
index 0000000000..436a429406
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/actions/pourArg3.yml
@@ -0,0 +1,47 @@
+languageId: typescript
+command:
+  spokenForm: pour arg
+  version: 2
+  targets:
+    - type: primitive
+      modifiers:
+        - type: containingScope
+          scopeType: { type: argumentOrParameter }
+  usePrePhraseSnapshot: true
+  action: { name: editNewLineAfter }
+initialState:
+  documentContents: |-
+    function myFunk(
+        name: string,
+        value: number
+    ) {}
+  selections:
+    - anchor: { line: 2, character: 9 }
+      active: { line: 2, character: 9 }
+  marks: {}
+finalState:
+  documentContents: |-
+    function myFunk(
+        name: string,
+        value: number,
+
+    ) {}
+  selections:
+    - anchor: { line: 3, character: 4 }
+      active: { line: 3, character: 4 }
+  thatMark:
+    - type: UntypedTarget
+      contentRange:
+        start: { line: 2, character: 4 }
+        end: { line: 2, character: 17 }
+      isReversed: false
+      hasExplicitRange: true
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      modifiers:
+        [{ type: containingScope, scopeType: { type: argumentOrParameter } }],
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/actions/pourArg4.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/actions/pourArg4.yml
new file mode 100644
index 0000000000..b5e506e6ee
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/actions/pourArg4.yml
@@ -0,0 +1,47 @@
+languageId: typescript
+command:
+  spokenForm: pour arg
+  version: 2
+  targets:
+    - type: primitive
+      modifiers:
+        - type: containingScope
+          scopeType: { type: argumentOrParameter }
+  usePrePhraseSnapshot: true
+  action: { name: editNewLineAfter }
+initialState:
+  documentContents: |-
+    function myFunk(
+        name: string,
+        value: number,
+    ) {}
+  selections:
+    - anchor: { line: 2, character: 9 }
+      active: { line: 2, character: 9 }
+  marks: {}
+finalState:
+  documentContents: |-
+    function myFunk(
+        name: string,
+        value: number,
+        ,
+    ) {}
+  selections:
+    - anchor: { line: 3, character: 4 }
+      active: { line: 3, character: 4 }
+  thatMark:
+    - type: UntypedTarget
+      contentRange:
+        start: { line: 2, character: 4 }
+        end: { line: 2, character: 17 }
+      isReversed: false
+      hasExplicitRange: true
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      modifiers:
+        [{ type: containingScope, scopeType: { type: argumentOrParameter } }],
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/actions/pourBlock.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/actions/pourBlock.yml
new file mode 100644
index 0000000000..0cf157a37c
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/actions/pourBlock.yml
@@ -0,0 +1,41 @@
+languageId: typescript
+command:
+  spokenForm: pour block
+  version: 2
+  action: { name: editNewLineAfter }
+  targets:
+    - type: primitive
+      modifiers:
+        - type: containingScope
+          scopeType: { type: paragraph }
+  usePrePhraseSnapshot: true
+initialState:
+  documentContents: |
+    function helloWorld(foo: string, bar: number, baz: string) {}
+  selections:
+    - anchor: { line: 0, character: 40 }
+      active: { line: 0, character: 40 }
+  marks: {}
+finalState:
+  documentContents: |+
+    function helloWorld(foo: string, bar: number, baz: string) {}
+
+
+  selections:
+    - anchor: { line: 2, character: 0 }
+      active: { line: 2, character: 0 }
+  thatMark:
+    - type: UntypedTarget
+      contentRange:
+        start: { line: 0, character: 0 }
+        end: { line: 0, character: 61 }
+      isReversed: false
+      hasExplicitRange: true
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      modifiers: [{ type: containingScope, scopeType: paragraph }],
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/actions/pourBlockHarpAndLineWhale.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/actions/pourBlockHarpAndLineWhale.yml
new file mode 100644
index 0000000000..2c4dececd7
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/actions/pourBlockHarpAndLineWhale.yml
@@ -0,0 +1,82 @@
+languageId: plaintext
+command:
+  spokenForm: pour block harp and line whale
+  version: 2
+  targets:
+    - type: list
+      elements:
+        - type: primitive
+          mark: { type: decoratedSymbol, symbolColor: default, character: h }
+          modifiers:
+            - type: containingScope
+              scopeType: { type: paragraph }
+        - type: primitive
+          mark: { type: decoratedSymbol, symbolColor: default, character: w }
+          modifiers:
+            - type: containingScope
+              scopeType: { type: line }
+  usePrePhraseSnapshot: true
+  action: { name: editNewLineAfter }
+initialState:
+  documentContents: |2-
+        hello
+
+        world
+        foo
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+  marks:
+    default.h:
+      start: { line: 0, character: 4 }
+      end: { line: 0, character: 9 }
+    default.w:
+      start: { line: 2, character: 4 }
+      end: { line: 2, character: 9 }
+finalState:
+  documentContents: |2-
+        hello
+
+
+
+        world
+
+        foo
+  selections:
+    - anchor: { line: 2, character: 4 }
+      active: { line: 2, character: 4 }
+    - anchor: { line: 5, character: 4 }
+      active: { line: 5, character: 4 }
+  thatMark:
+    - type: UntypedTarget
+      contentRange:
+        start: { line: 0, character: 4 }
+        end: { line: 0, character: 9 }
+      isReversed: false
+      hasExplicitRange: true
+    - type: UntypedTarget
+      contentRange:
+        start: { line: 4, character: 4 }
+        end: { line: 4, character: 9 }
+      isReversed: false
+      hasExplicitRange: true
+fullTargets:
+  [
+    {
+      type: list,
+      elements:
+        [
+          {
+            type: primitive,
+            mark: { type: decoratedSymbol, symbolColor: default, character: h },
+            modifiers:
+              [{ type: containingScope, scopeType: { type: paragraph } }],
+          },
+          {
+            type: primitive,
+            mark: { type: decoratedSymbol, symbolColor: default, character: w },
+            modifiers: [{ type: containingScope, scopeType: { type: line } }],
+          },
+        ],
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/actions/pourHarpAndLookAndTrap.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/actions/pourHarpAndLookAndTrap.yml
new file mode 100644
index 0000000000..870cb2c370
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/actions/pourHarpAndLookAndTrap.yml
@@ -0,0 +1,69 @@
+languageId: plaintext
+command:
+  spokenForm: pour harp and look and trap
+  version: 2
+  targets:
+    - type: list
+      elements:
+        - type: primitive
+          mark: { type: decoratedSymbol, symbolColor: default, character: h }
+        - type: primitive
+          mark: { type: decoratedSymbol, symbolColor: default, character: l }
+        - type: primitive
+          mark: { type: decoratedSymbol, symbolColor: default, character: t }
+  usePrePhraseSnapshot: true
+  action: { name: editNewLineAfter }
+initialState:
+  documentContents: |
+    hello world there now
+  selections:
+    - anchor: { line: 1, character: 0 }
+      active: { line: 1, character: 0 }
+  marks:
+    default.h:
+      start: { line: 0, character: 0 }
+      end: { line: 0, character: 5 }
+    default.l:
+      start: { line: 0, character: 6 }
+      end: { line: 0, character: 11 }
+    default.t:
+      start: { line: 0, character: 12 }
+      end: { line: 0, character: 17 }
+finalState:
+  documentContents: |+
+    hello world there now
+
+  selections:
+    - anchor: { line: 1, character: 0 }
+      active: { line: 1, character: 0 }
+  thatMark:
+    - type: UntypedTarget
+      contentRange:
+        start: { line: 0, character: 0 }
+        end: { line: 0, character: 5 }
+      isReversed: false
+      hasExplicitRange: true
+fullTargets:
+  [
+    {
+      type: list,
+      elements:
+        [
+          {
+            type: primitive,
+            mark: { type: decoratedSymbol, symbolColor: default, character: h },
+            modifiers: [],
+          },
+          {
+            type: primitive,
+            mark: { type: decoratedSymbol, symbolColor: default, character: l },
+            modifiers: [],
+          },
+          {
+            type: primitive,
+            mark: { type: decoratedSymbol, symbolColor: default, character: t },
+            modifiers: [],
+          },
+        ],
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/actions/pourItem.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/actions/pourItem.yml
new file mode 100644
index 0000000000..e923c28353
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/actions/pourItem.yml
@@ -0,0 +1,49 @@
+languageId: typescript
+command:
+  spokenForm: pour item
+  version: 2
+  targets:
+    - type: primitive
+      modifiers:
+        - type: containingScope
+          scopeType: { type: collectionItem }
+  usePrePhraseSnapshot: true
+  action: { name: editNewLineAfter }
+initialState:
+  documentContents: |-
+    [
+        a,
+        b,
+        c
+    ]
+  selections:
+    - anchor: { line: 3, character: 5 }
+      active: { line: 3, character: 5 }
+  marks: {}
+finalState:
+  documentContents: |-
+    [
+        a,
+        b,
+        c,
+
+    ]
+  selections:
+    - anchor: { line: 4, character: 4 }
+      active: { line: 4, character: 4 }
+  thatMark:
+    - type: UntypedTarget
+      contentRange:
+        start: { line: 3, character: 4 }
+        end: { line: 3, character: 5 }
+      isReversed: false
+      hasExplicitRange: true
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      modifiers:
+        [{ type: containingScope, scopeType: { type: collectionItem } }],
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/actions/pourItem2.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/actions/pourItem2.yml
new file mode 100644
index 0000000000..623beb486a
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/actions/pourItem2.yml
@@ -0,0 +1,49 @@
+languageId: typescript
+command:
+  spokenForm: pour item
+  version: 2
+  targets:
+    - type: primitive
+      modifiers:
+        - type: containingScope
+          scopeType: { type: collectionItem }
+  usePrePhraseSnapshot: true
+  action: { name: editNewLineAfter }
+initialState:
+  documentContents: |-
+    [
+        a,
+        b,
+        c,
+    ]
+  selections:
+    - anchor: { line: 3, character: 5 }
+      active: { line: 3, character: 5 }
+  marks: {}
+finalState:
+  documentContents: |-
+    [
+        a,
+        b,
+        c,
+        ,
+    ]
+  selections:
+    - anchor: { line: 4, character: 4 }
+      active: { line: 4, character: 4 }
+  thatMark:
+    - type: UntypedTarget
+      contentRange:
+        start: { line: 3, character: 4 }
+        end: { line: 3, character: 5 }
+      isReversed: false
+      hasExplicitRange: true
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      modifiers:
+        [{ type: containingScope, scopeType: { type: collectionItem } }],
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/actions/pourItem3.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/actions/pourItem3.yml
new file mode 100644
index 0000000000..0176bce2eb
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/actions/pourItem3.yml
@@ -0,0 +1,49 @@
+languageId: typescript
+command:
+  spokenForm: pour item
+  version: 2
+  targets:
+    - type: primitive
+      modifiers:
+        - type: containingScope
+          scopeType: { type: collectionItem }
+  usePrePhraseSnapshot: true
+  action: { name: editNewLineAfter }
+initialState:
+  documentContents: |-
+    [
+        a,
+        b,
+        c,
+    ]
+  selections:
+    - anchor: { line: 1, character: 5 }
+      active: { line: 1, character: 5 }
+  marks: {}
+finalState:
+  documentContents: |-
+    [
+        a,
+        ,
+        b,
+        c,
+    ]
+  selections:
+    - anchor: { line: 2, character: 4 }
+      active: { line: 2, character: 4 }
+  thatMark:
+    - type: UntypedTarget
+      contentRange:
+        start: { line: 1, character: 4 }
+        end: { line: 1, character: 5 }
+      isReversed: false
+      hasExplicitRange: true
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      modifiers:
+        [{ type: containingScope, scopeType: { type: collectionItem } }],
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/actions/pourLineHarpAndBlockWhale.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/actions/pourLineHarpAndBlockWhale.yml
new file mode 100644
index 0000000000..dd1a9083e8
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/actions/pourLineHarpAndBlockWhale.yml
@@ -0,0 +1,81 @@
+languageId: plaintext
+command:
+  spokenForm: pour line harp and block whale
+  version: 2
+  targets:
+    - type: list
+      elements:
+        - type: primitive
+          mark: { type: decoratedSymbol, symbolColor: default, character: h }
+          modifiers:
+            - type: containingScope
+              scopeType: { type: line }
+        - type: primitive
+          mark: { type: decoratedSymbol, symbolColor: default, character: w }
+          modifiers:
+            - type: containingScope
+              scopeType: { type: paragraph }
+  usePrePhraseSnapshot: true
+  action: { name: editNewLineAfter }
+initialState:
+  documentContents: |2-
+        hello
+
+        world
+        foo
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+  marks:
+    default.h:
+      start: { line: 0, character: 4 }
+      end: { line: 0, character: 9 }
+    default.w:
+      start: { line: 2, character: 4 }
+      end: { line: 2, character: 9 }
+finalState:
+  documentContents: |2-
+        hello
+
+
+        world
+        foo
+
+  selections:
+    - anchor: { line: 1, character: 4 }
+      active: { line: 1, character: 4 }
+    - anchor: { line: 6, character: 4 }
+      active: { line: 6, character: 4 }
+  thatMark:
+    - type: UntypedTarget
+      contentRange:
+        start: { line: 0, character: 4 }
+        end: { line: 0, character: 9 }
+      isReversed: false
+      hasExplicitRange: true
+    - type: UntypedTarget
+      contentRange:
+        start: { line: 3, character: 4 }
+        end: { line: 4, character: 7 }
+      isReversed: false
+      hasExplicitRange: true
+fullTargets:
+  [
+    {
+      type: list,
+      elements:
+        [
+          {
+            type: primitive,
+            mark: { type: decoratedSymbol, symbolColor: default, character: h },
+            modifiers: [{ type: containingScope, scopeType: { type: line } }],
+          },
+          {
+            type: primitive,
+            mark: { type: decoratedSymbol, symbolColor: default, character: w },
+            modifiers:
+              [{ type: containingScope, scopeType: { type: paragraph } }],
+          },
+        ],
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/actions/pourThis.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/actions/pourThis.yml
new file mode 100644
index 0000000000..9d70d01e65
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/actions/pourThis.yml
@@ -0,0 +1,33 @@
+languageId: plaintext
+command:
+  spokenForm: pour this
+  version: 2
+  targets:
+    - type: primitive
+      mark: { type: cursor }
+  usePrePhraseSnapshot: true
+  action: { name: editNewLineAfter }
+initialState:
+  documentContents: hello world
+  selections:
+    - anchor: { line: 0, character: 2 }
+      active: { line: 0, character: 2 }
+    - anchor: { line: 0, character: 4 }
+      active: { line: 0, character: 4 }
+    - anchor: { line: 0, character: 8 }
+      active: { line: 0, character: 8 }
+  marks: {}
+finalState:
+  documentContents: |
+    hello world
+  selections:
+    - anchor: { line: 1, character: 0 }
+      active: { line: 1, character: 0 }
+  thatMark:
+    - type: UntypedTarget
+      contentRange:
+        start: { line: 0, character: 2 }
+        end: { line: 0, character: 2 }
+      isReversed: false
+      hasExplicitRange: false
+fullTargets: [{ type: primitive, mark: { type: cursor }, modifiers: [] }]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/actions/pourVest.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/actions/pourVest.yml
new file mode 100644
index 0000000000..63db0e2df1
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/actions/pourVest.yml
@@ -0,0 +1,45 @@
+languageId: typescript
+command:
+  version: 1
+  spokenForm: pour vest
+  action: editNewLineAfter
+  targets:
+    - type: primitive
+      mark: { type: decoratedSymbol, symbolColor: default, character: v }
+initialState:
+  documentContents: |
+
+    const value = "Hello world";
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+  marks:
+    default.v:
+      start: { line: 1, character: 6 }
+      end: { line: 1, character: 11 }
+finalState:
+  documentContents: |+
+
+    const value = "Hello world";
+
+  selections:
+    - anchor: { line: 2, character: 0 }
+      active: { line: 2, character: 0 }
+  thatMark:
+    - type: UntypedTarget
+      contentRange:
+        start: { line: 1, character: 6 }
+        end: { line: 1, character: 11 }
+      isReversed: false
+      hasExplicitRange: true
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: decoratedSymbol, symbolColor: default, character: v },
+      selectionType: token,
+      position: contents,
+      modifier: { type: identity },
+      insideOutsideType: outside,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/actions/pourVest2.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/actions/pourVest2.yml
new file mode 100644
index 0000000000..c2eaea3299
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/actions/pourVest2.yml
@@ -0,0 +1,43 @@
+languageId: plaintext
+command:
+  spokenForm: pour vest
+  version: 2
+  targets:
+    - type: primitive
+      mark: { type: decoratedSymbol, symbolColor: default, character: v }
+  usePrePhraseSnapshot: true
+  action: { name: editNewLineAfter }
+initialState:
+  documentContents: |2
+
+        const value = "Hello world";
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+  marks:
+    default.v:
+      start: { line: 1, character: 10 }
+      end: { line: 1, character: 15 }
+finalState:
+  documentContents: |2
+
+        const value = "Hello world";
+
+  selections:
+    - anchor: { line: 2, character: 4 }
+      active: { line: 2, character: 4 }
+  thatMark:
+    - type: UntypedTarget
+      contentRange:
+        start: { line: 1, character: 10 }
+        end: { line: 1, character: 15 }
+      isReversed: false
+      hasExplicitRange: true
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: decoratedSymbol, symbolColor: default, character: v },
+      modifiers: [],
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/actions/preeVest.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/actions/preeVest.yml
new file mode 100644
index 0000000000..26a2b3c751
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/actions/preeVest.yml
@@ -0,0 +1,44 @@
+languageId: typescript
+command:
+  version: 1
+  spokenForm: pree vest
+  action: setSelectionBefore
+  targets:
+    - type: primitive
+      mark: { type: decoratedSymbol, symbolColor: default, character: v }
+initialState:
+  documentContents: |
+
+    const value = "Hello world";
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+  marks:
+    default.v:
+      start: { line: 1, character: 6 }
+      end: { line: 1, character: 11 }
+finalState:
+  documentContents: |
+
+    const value = "Hello world";
+  selections:
+    - anchor: { line: 1, character: 6 }
+      active: { line: 1, character: 6 }
+  thatMark:
+    - type: UntypedTarget
+      contentRange:
+        start: { line: 1, character: 6 }
+        end: { line: 1, character: 11 }
+      isReversed: false
+      hasExplicitRange: false
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: decoratedSymbol, symbolColor: default, character: v },
+      selectionType: token,
+      position: contents,
+      modifier: { type: identity },
+      insideOutsideType: inside,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/actions/reformatHarpAsSnake.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/actions/reformatHarpAsSnake.yml
new file mode 100644
index 0000000000..f1e08758e8
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/actions/reformatHarpAsSnake.yml
@@ -0,0 +1,47 @@
+languageId: typescript
+command:
+  version: 1
+  spokenForm: reformat harp as snake
+  action: getText
+  targets:
+    - type: primitive
+      mark: { type: decoratedSymbol, symbolColor: default, character: h }
+  extraArgs:
+    - { showDecorations: false, ensureSingleTarget: null }
+initialState:
+  documentContents: |
+
+    const value = "helloWorld";
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+  marks:
+    default.h:
+      start: { line: 1, character: 15 }
+      end: { line: 1, character: 25 }
+finalState:
+  documentContents: |
+
+    const value = "helloWorld";
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+  thatMark:
+    - type: UntypedTarget
+      contentRange:
+        start: { line: 1, character: 15 }
+        end: { line: 1, character: 25 }
+      isReversed: false
+      hasExplicitRange: false
+returnValue: [helloWorld]
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: decoratedSymbol, symbolColor: default, character: h },
+      selectionType: token,
+      position: contents,
+      modifier: { type: identity },
+      insideOutsideType: inside,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/actions/reformatHarpAsSnake2.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/actions/reformatHarpAsSnake2.yml
new file mode 100644
index 0000000000..af33d43b85
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/actions/reformatHarpAsSnake2.yml
@@ -0,0 +1,46 @@
+languageId: typescript
+command:
+  version: 1
+  spokenForm: reformat harp as snake
+  action: replace
+  targets:
+    - type: primitive
+      mark: { type: decoratedSymbol, symbolColor: default, character: h }
+  extraArgs:
+    - [hello_world]
+initialState:
+  documentContents: |
+
+    const value = "helloWorld";
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+  marks:
+    default.h:
+      start: { line: 1, character: 15 }
+      end: { line: 1, character: 25 }
+finalState:
+  documentContents: |
+
+    const value = "hello_world";
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+  thatMark:
+    - type: UntypedTarget
+      contentRange:
+        start: { line: 1, character: 15 }
+        end: { line: 1, character: 26 }
+      isReversed: false
+      hasExplicitRange: true
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: decoratedSymbol, symbolColor: default, character: h },
+      selectionType: token,
+      position: contents,
+      modifier: { type: identity },
+      insideOutsideType: null,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/actions/replaceAirAndBatAndCapWithCount.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/actions/replaceAirAndBatAndCapWithCount.yml
new file mode 100644
index 0000000000..88e59f8f1b
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/actions/replaceAirAndBatAndCapWithCount.yml
@@ -0,0 +1,96 @@
+languageId: typescript
+command:
+  version: 1
+  spokenForm: replace air and bat and cap with count
+  action: replace
+  targets:
+    - type: list
+      elements:
+        - type: primitive
+          mark: { type: decoratedSymbol, symbolColor: default, character: a }
+        - type: primitive
+          mark: { type: decoratedSymbol, symbolColor: default, character: b }
+        - type: primitive
+          mark: { type: decoratedSymbol, symbolColor: default, character: c }
+  extraArgs:
+    - { start: 0 }
+initialState:
+  documentContents: |
+
+    a
+    b
+    c
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+  marks:
+    default.a:
+      start: { line: 1, character: 0 }
+      end: { line: 1, character: 1 }
+    default.b:
+      start: { line: 2, character: 0 }
+      end: { line: 2, character: 1 }
+    default.c:
+      start: { line: 3, character: 0 }
+      end: { line: 3, character: 1 }
+finalState:
+  documentContents: |
+
+    0
+    1
+    2
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+  thatMark:
+    - type: UntypedTarget
+      contentRange:
+        start: { line: 1, character: 0 }
+        end: { line: 1, character: 1 }
+      isReversed: false
+      hasExplicitRange: true
+    - type: UntypedTarget
+      contentRange:
+        start: { line: 2, character: 0 }
+        end: { line: 2, character: 1 }
+      isReversed: false
+      hasExplicitRange: true
+    - type: UntypedTarget
+      contentRange:
+        start: { line: 3, character: 0 }
+        end: { line: 3, character: 1 }
+      isReversed: false
+      hasExplicitRange: true
+fullTargets:
+  [
+    {
+      type: list,
+      elements:
+        [
+          {
+            type: primitive,
+            mark: { type: decoratedSymbol, symbolColor: default, character: a },
+            selectionType: token,
+            position: contents,
+            modifier: { type: identity },
+            insideOutsideType: null,
+          },
+          {
+            type: primitive,
+            mark: { type: decoratedSymbol, symbolColor: default, character: b },
+            selectionType: token,
+            position: contents,
+            modifier: { type: identity },
+            insideOutsideType: null,
+          },
+          {
+            type: primitive,
+            mark: { type: decoratedSymbol, symbolColor: default, character: c },
+            selectionType: token,
+            position: contents,
+            modifier: { type: identity },
+            insideOutsideType: null,
+          },
+        ],
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/actions/replaceVestWithWhatever.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/actions/replaceVestWithWhatever.yml
new file mode 100644
index 0000000000..de36d6c760
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/actions/replaceVestWithWhatever.yml
@@ -0,0 +1,46 @@
+languageId: typescript
+command:
+  version: 1
+  spokenForm: replace vest with whatever
+  action: replace
+  targets:
+    - type: primitive
+      mark: { type: decoratedSymbol, symbolColor: default, character: v }
+  extraArgs:
+    - [whatever]
+initialState:
+  documentContents: |
+
+    const value = "hello_world";
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+  marks:
+    default.v:
+      start: { line: 1, character: 6 }
+      end: { line: 1, character: 11 }
+finalState:
+  documentContents: |
+
+    const whatever = "hello_world";
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+  thatMark:
+    - type: UntypedTarget
+      contentRange:
+        start: { line: 1, character: 6 }
+        end: { line: 1, character: 14 }
+      isReversed: false
+      hasExplicitRange: true
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: decoratedSymbol, symbolColor: default, character: v },
+      selectionType: token,
+      position: contents,
+      modifier: { type: identity },
+      insideOutsideType: null,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/actions/reverseAirAndBatAndCap.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/actions/reverseAirAndBatAndCap.yml
new file mode 100644
index 0000000000..014a981b8b
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/actions/reverseAirAndBatAndCap.yml
@@ -0,0 +1,90 @@
+languageId: typescript
+command:
+  version: 1
+  spokenForm: reverse air and bat and cap
+  action: reverseTargets
+  targets:
+    - type: list
+      elements:
+        - type: primitive
+          mark: { type: decoratedSymbol, symbolColor: default, character: a }
+        - type: primitive
+          mark: { type: decoratedSymbol, symbolColor: default, character: b }
+        - type: primitive
+          mark: { type: decoratedSymbol, symbolColor: default, character: c }
+initialState:
+  documentContents: |
+
+    const value = ["a", "b", "c"]
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+  marks:
+    default.a:
+      start: { line: 1, character: 16 }
+      end: { line: 1, character: 17 }
+    default.b:
+      start: { line: 1, character: 21 }
+      end: { line: 1, character: 22 }
+    default.c:
+      start: { line: 1, character: 26 }
+      end: { line: 1, character: 27 }
+finalState:
+  documentContents: |
+
+    const value = ["c", "b", "a"]
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+  thatMark:
+    - type: UntypedTarget
+      contentRange:
+        start: { line: 1, character: 16 }
+        end: { line: 1, character: 17 }
+      isReversed: false
+      hasExplicitRange: true
+    - type: UntypedTarget
+      contentRange:
+        start: { line: 1, character: 21 }
+        end: { line: 1, character: 22 }
+      isReversed: false
+      hasExplicitRange: true
+    - type: UntypedTarget
+      contentRange:
+        start: { line: 1, character: 26 }
+        end: { line: 1, character: 27 }
+      isReversed: false
+      hasExplicitRange: true
+fullTargets:
+  [
+    {
+      type: list,
+      elements:
+        [
+          {
+            type: primitive,
+            mark: { type: decoratedSymbol, symbolColor: default, character: a },
+            selectionType: token,
+            position: contents,
+            modifier: { type: identity },
+            insideOutsideType: inside,
+          },
+          {
+            type: primitive,
+            mark: { type: decoratedSymbol, symbolColor: default, character: b },
+            selectionType: token,
+            position: contents,
+            modifier: { type: identity },
+            insideOutsideType: inside,
+          },
+          {
+            type: primitive,
+            mark: { type: decoratedSymbol, symbolColor: default, character: c },
+            selectionType: token,
+            position: contents,
+            modifier: { type: identity },
+            insideOutsideType: inside,
+          },
+        ],
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/actions/roundWrapThis.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/actions/roundWrapThis.yml
new file mode 100644
index 0000000000..d9f1164316
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/actions/roundWrapThis.yml
@@ -0,0 +1,49 @@
+languageId: typescript
+command:
+  version: 1
+  spokenForm: round wrap this
+  action: wrapWithPairedDelimiter
+  targets:
+    - type: primitive
+      mark: { type: cursor }
+  extraArgs: [(, )]
+initialState:
+  documentContents: |
+
+    const value = "Hello world";
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+  marks: {}
+finalState:
+  documentContents: |
+    ()
+    const value = "Hello world";
+  selections:
+    - anchor: { line: 0, character: 1 }
+      active: { line: 0, character: 1 }
+  thatMark:
+    - type: UntypedTarget
+      contentRange:
+        start: { line: 0, character: 0 }
+        end: { line: 0, character: 2 }
+      isReversed: false
+      hasExplicitRange: true
+  sourceMark:
+    - type: UntypedTarget
+      contentRange:
+        start: { line: 0, character: 1 }
+        end: { line: 0, character: 1 }
+      isReversed: false
+      hasExplicitRange: false
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      modifier: { type: identity },
+      insideOutsideType: inside,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/actions/roundWrapVest.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/actions/roundWrapVest.yml
new file mode 100644
index 0000000000..20901e2dd9
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/actions/roundWrapVest.yml
@@ -0,0 +1,52 @@
+languageId: typescript
+command:
+  version: 1
+  spokenForm: round wrap vest
+  action: wrapWithPairedDelimiter
+  targets:
+    - type: primitive
+      mark: { type: decoratedSymbol, symbolColor: default, character: v }
+  extraArgs: [(, )]
+initialState:
+  documentContents: |
+
+    const value = "Hello world";
+  selections:
+    - anchor: { line: 1, character: 11 }
+      active: { line: 1, character: 11 }
+  marks:
+    default.v:
+      start: { line: 1, character: 6 }
+      end: { line: 1, character: 11 }
+finalState:
+  documentContents: |
+
+    const (value) = "Hello world";
+  selections:
+    - anchor: { line: 1, character: 12 }
+      active: { line: 1, character: 12 }
+  thatMark:
+    - type: UntypedTarget
+      contentRange:
+        start: { line: 1, character: 6 }
+        end: { line: 1, character: 13 }
+      isReversed: false
+      hasExplicitRange: true
+  sourceMark:
+    - type: UntypedTarget
+      contentRange:
+        start: { line: 1, character: 7 }
+        end: { line: 1, character: 12 }
+      isReversed: false
+      hasExplicitRange: true
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: decoratedSymbol, symbolColor: default, character: v },
+      selectionType: token,
+      position: contents,
+      modifier: { type: identity },
+      insideOutsideType: inside,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/actions/roundWrapVest2.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/actions/roundWrapVest2.yml
new file mode 100644
index 0000000000..9c64a58dd6
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/actions/roundWrapVest2.yml
@@ -0,0 +1,52 @@
+languageId: typescript
+command:
+  version: 1
+  spokenForm: round wrap vest
+  action: wrapWithPairedDelimiter
+  targets:
+    - type: primitive
+      mark: { type: decoratedSymbol, symbolColor: default, character: v }
+  extraArgs: [(, )]
+initialState:
+  documentContents: |
+
+    const value = "Hello world";
+  selections:
+    - anchor: { line: 1, character: 12 }
+      active: { line: 1, character: 12 }
+  marks:
+    default.v:
+      start: { line: 1, character: 6 }
+      end: { line: 1, character: 11 }
+finalState:
+  documentContents: |
+
+    const (value) = "Hello world";
+  selections:
+    - anchor: { line: 1, character: 14 }
+      active: { line: 1, character: 14 }
+  thatMark:
+    - type: UntypedTarget
+      contentRange:
+        start: { line: 1, character: 6 }
+        end: { line: 1, character: 13 }
+      isReversed: false
+      hasExplicitRange: true
+  sourceMark:
+    - type: UntypedTarget
+      contentRange:
+        start: { line: 1, character: 7 }
+        end: { line: 1, character: 12 }
+      isReversed: false
+      hasExplicitRange: true
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: decoratedSymbol, symbolColor: default, character: v },
+      selectionType: token,
+      position: contents,
+      modifier: { type: identity },
+      insideOutsideType: inside,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/actions/shuffleThis.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/actions/shuffleThis.yml
new file mode 100644
index 0000000000..55c1c2ea16
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/actions/shuffleThis.yml
@@ -0,0 +1,38 @@
+languageId: plaintext
+command:
+  version: 1
+  spokenForm: shuffle this
+  action: randomizeTargets
+  targets:
+    - type: primitive
+      mark: { type: cursor }
+initialState:
+  documentContents: hello
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 5 }
+  marks: {}
+finalState:
+  documentContents: hello
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 5 }
+  thatMark:
+    - type: UntypedTarget
+      contentRange:
+        start: { line: 0, character: 0 }
+        end: { line: 0, character: 5 }
+      isReversed: false
+      hasExplicitRange: true
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier: { type: identity },
+      isImplicit: false,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/actions/snippets/duplicatedDuplicatedWrapThis.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/actions/snippets/duplicatedDuplicatedWrapThis.yml
new file mode 100644
index 0000000000..05f47ece01
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/actions/snippets/duplicatedDuplicatedWrapThis.yml
@@ -0,0 +1,32 @@
+languageId: plaintext
+command:
+  spokenForm: duplicated duplicated wrap this
+  version: 2
+  targets:
+    - type: primitive
+      mark: { type: cursor }
+  usePrePhraseSnapshot: true
+  action:
+    name: wrapWithSnippet
+    args: [duplicatedVariableTest.duplicated]
+initialState:
+  documentContents: Hello world
+  selections:
+    - anchor: { line: 0, character: 11 }
+      active: { line: 0, character: 0 }
+  marks: {}
+finalState:
+  documentContents: >-
+    This variable: 'Hello world' is duplicated here: 'Hello world', but '' is
+    unique!
+  selections:
+    - anchor: { line: 0, character: 69 }
+      active: { line: 0, character: 69 }
+  thatMark:
+    - type: UntypedTarget
+      contentRange:
+        start: { line: 0, character: 0 }
+        end: { line: 0, character: 81 }
+      isReversed: true
+      hasExplicitRange: true
+fullTargets: [{ type: primitive, mark: { type: cursor }, modifiers: [] }]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/actions/snippets/duplicatedUniqueWrapThis.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/actions/snippets/duplicatedUniqueWrapThis.yml
new file mode 100644
index 0000000000..1698150e7f
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/actions/snippets/duplicatedUniqueWrapThis.yml
@@ -0,0 +1,32 @@
+languageId: plaintext
+command:
+  spokenForm: duplicated unique wrap this
+  version: 2
+  targets:
+    - type: primitive
+      mark: { type: cursor }
+  usePrePhraseSnapshot: true
+  action:
+    name: wrapWithSnippet
+    args: [duplicatedVariableTest.unique]
+initialState:
+  documentContents: Hello world
+  selections:
+    - anchor: { line: 0, character: 11 }
+      active: { line: 0, character: 0 }
+  marks: {}
+finalState:
+  documentContents: "This variable: '' is duplicated here: '', but 'Hello world' is unique!"
+  selections:
+    - anchor: { line: 0, character: 16 }
+      active: { line: 0, character: 16 }
+    - anchor: { line: 0, character: 39 }
+      active: { line: 0, character: 39 }
+  thatMark:
+    - type: UntypedTarget
+      contentRange:
+        start: { line: 0, character: 0 }
+        end: { line: 0, character: 70 }
+      isReversed: true
+      hasExplicitRange: true
+fullTargets: [{ type: primitive, mark: { type: cursor }, modifiers: [] }]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/actions/snippets/snipDuplicatedDuplicated.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/actions/snippets/snipDuplicatedDuplicated.yml
new file mode 100644
index 0000000000..9532a1645c
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/actions/snippets/snipDuplicatedDuplicated.yml
@@ -0,0 +1,38 @@
+languageId: plaintext
+command:
+  spokenForm: snip duplicated duplicated
+  version: 2
+  targets:
+    - { type: primitive, isImplicit: true }
+  usePrePhraseSnapshot: true
+  action:
+    name: insertSnippet
+    args: [duplicatedVariableTest]
+initialState:
+  documentContents: ""
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+  marks: {}
+finalState:
+  documentContents: "This variable: '' is duplicated here: '', but '' is unique!"
+  selections:
+    - anchor: { line: 0, character: 16 }
+      active: { line: 0, character: 16 }
+    - anchor: { line: 0, character: 39 }
+      active: { line: 0, character: 39 }
+  thatMark:
+    - type: UntypedTarget
+      contentRange:
+        start: { line: 0, character: 0 }
+        end: { line: 0, character: 59 }
+      isReversed: false
+      hasExplicitRange: true
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      modifiers: [{ type: toRawSelection }],
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/actions/snippets/snipDuplicatedDuplicatedHelloWorld.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/actions/snippets/snipDuplicatedDuplicatedHelloWorld.yml
new file mode 100644
index 0000000000..a9778534f6
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/actions/snippets/snipDuplicatedDuplicatedHelloWorld.yml
@@ -0,0 +1,40 @@
+languageId: plaintext
+command:
+  spokenForm: snip duplicated duplicated hello world
+  version: 2
+  targets:
+    - { type: primitive, isImplicit: true }
+  usePrePhraseSnapshot: true
+  action:
+    name: insertSnippet
+    args:
+      - duplicatedVariableTest
+      - { duplicated: hello world }
+initialState:
+  documentContents: ""
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+  marks: {}
+finalState:
+  documentContents: >-
+    This variable: 'hello_world' is duplicated here: 'hello_world', but '' is
+    unique!
+  selections:
+    - anchor: { line: 0, character: 69 }
+      active: { line: 0, character: 69 }
+  thatMark:
+    - type: UntypedTarget
+      contentRange:
+        start: { line: 0, character: 0 }
+        end: { line: 0, character: 81 }
+      isReversed: false
+      hasExplicitRange: true
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      modifiers: [{ type: toRawSelection }],
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/actions/snippets/snipDuplicatedUniqueHelloWorld.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/actions/snippets/snipDuplicatedUniqueHelloWorld.yml
new file mode 100644
index 0000000000..2a52421f4c
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/actions/snippets/snipDuplicatedUniqueHelloWorld.yml
@@ -0,0 +1,40 @@
+languageId: plaintext
+command:
+  spokenForm: snip duplicated unique hello world
+  version: 2
+  targets:
+    - { type: primitive, isImplicit: true }
+  usePrePhraseSnapshot: true
+  action:
+    name: insertSnippet
+    args:
+      - duplicatedVariableTest
+      - { unique: hello world }
+initialState:
+  documentContents: ""
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+  marks: {}
+finalState:
+  documentContents: "This variable: '' is duplicated here: '', but 'helloWorld' is unique!"
+  selections:
+    - anchor: { line: 0, character: 16 }
+      active: { line: 0, character: 16 }
+    - anchor: { line: 0, character: 39 }
+      active: { line: 0, character: 39 }
+  thatMark:
+    - type: UntypedTarget
+      contentRange:
+        start: { line: 0, character: 0 }
+        end: { line: 0, character: 69 }
+      isReversed: false
+      hasExplicitRange: true
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      modifiers: [{ type: toRawSelection }],
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/actions/snippets/snipFunk.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/actions/snippets/snipFunk.yml
new file mode 100644
index 0000000000..ca8a2d85ce
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/actions/snippets/snipFunk.yml
@@ -0,0 +1,39 @@
+languageId: typescript
+command:
+  version: 1
+  spokenForm: snip funk
+  action: insertSnippet
+  targets:
+    - { type: primitive, isImplicit: true }
+  extraArgs: [functionDeclaration]
+initialState:
+  documentContents: ""
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+finalState:
+  documentContents: |-
+    function () {
+
+    }
+  selections:
+    - anchor: { line: 0, character: 9 }
+      active: { line: 0, character: 9 }
+  thatMark:
+    - type: UntypedTarget
+      contentRange:
+        start: { line: 0, character: 0 }
+        end: { line: 2, character: 1 }
+      isReversed: false
+      hasExplicitRange: true
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier: { type: identity },
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/actions/snippets/snipFunkAfterFineAndZip.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/actions/snippets/snipFunkAfterFineAndZip.yml
new file mode 100644
index 0000000000..6b7fd70713
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/actions/snippets/snipFunkAfterFineAndZip.yml
@@ -0,0 +1,78 @@
+languageId: typescript
+command:
+  spokenForm: snip funk after fine and zip
+  version: 2
+  targets:
+    - type: list
+      elements:
+        - type: primitive
+          mark: { type: decoratedSymbol, symbolColor: default, character: f }
+          modifiers:
+            - { type: position, position: after }
+        - type: primitive
+          mark: { type: decoratedSymbol, symbolColor: default, character: z }
+  usePrePhraseSnapshot: true
+  action:
+    name: insertSnippet
+    args: [functionDeclaration]
+initialState:
+  documentContents: |-
+    const foo = "bar";
+    const baz = "bongo";
+  selections:
+    - anchor: { line: 1, character: 18 }
+      active: { line: 1, character: 18 }
+  marks:
+    default.f:
+      start: { line: 0, character: 6 }
+      end: { line: 0, character: 9 }
+    default.z:
+      start: { line: 1, character: 6 }
+      end: { line: 1, character: 9 }
+finalState:
+  documentContents: |-
+    const foo = "bar";
+    function () {
+
+    }
+    const baz = "bongo";
+    function () {
+
+    }
+  selections:
+    - anchor: { line: 1, character: 9 }
+      active: { line: 1, character: 9 }
+    - anchor: { line: 5, character: 9 }
+      active: { line: 5, character: 9 }
+  thatMark:
+    - type: UntypedTarget
+      contentRange:
+        start: { line: 1, character: 0 }
+        end: { line: 3, character: 1 }
+      isReversed: false
+      hasExplicitRange: true
+    - type: UntypedTarget
+      contentRange:
+        start: { line: 5, character: 0 }
+        end: { line: 7, character: 1 }
+      isReversed: false
+      hasExplicitRange: true
+fullTargets:
+  [
+    {
+      type: list,
+      elements:
+        [
+          {
+            type: primitive,
+            mark: { type: decoratedSymbol, symbolColor: default, character: f },
+            modifiers: [{ type: position, position: after }],
+          },
+          {
+            type: primitive,
+            mark: { type: decoratedSymbol, symbolColor: default, character: z },
+            modifiers: [{ type: position, position: after }],
+          },
+        ],
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/actions/snippets/snipFunkAfterMadeAndBeforeFineAndZip.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/actions/snippets/snipFunkAfterMadeAndBeforeFineAndZip.yml
new file mode 100644
index 0000000000..5296092961
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/actions/snippets/snipFunkAfterMadeAndBeforeFineAndZip.yml
@@ -0,0 +1,103 @@
+languageId: typescript
+command:
+  spokenForm: snip funk after made and before fine and zip
+  version: 2
+  targets:
+    - type: list
+      elements:
+        - type: primitive
+          mark: { type: decoratedSymbol, symbolColor: default, character: m }
+          modifiers:
+            - { type: position, position: after }
+        - type: primitive
+          modifiers:
+            - { type: position, position: before }
+          mark: { type: decoratedSymbol, symbolColor: default, character: f }
+        - type: primitive
+          mark: { type: decoratedSymbol, symbolColor: default, character: z }
+  usePrePhraseSnapshot: true
+  action:
+    name: insertSnippet
+    args: [functionDeclaration]
+initialState:
+  documentContents: |
+    const foo = "bar";
+    const baz = "bongo";
+    const bazman = "bongo";
+  selections:
+    - anchor: { line: 2, character: 12 }
+      active: { line: 2, character: 12 }
+  marks:
+    default.m:
+      start: { line: 2, character: 6 }
+      end: { line: 2, character: 12 }
+    default.f:
+      start: { line: 0, character: 6 }
+      end: { line: 0, character: 9 }
+    default.z:
+      start: { line: 1, character: 6 }
+      end: { line: 1, character: 9 }
+finalState:
+  documentContents: |
+    function () {
+
+    }
+    const foo = "bar";
+    function () {
+
+    }
+    const baz = "bongo";
+    const bazman = "bongo";
+    function () {
+
+    }
+  selections:
+    - anchor: { line: 9, character: 9 }
+      active: { line: 9, character: 9 }
+    - anchor: { line: 0, character: 9 }
+      active: { line: 0, character: 9 }
+    - anchor: { line: 4, character: 9 }
+      active: { line: 4, character: 9 }
+  thatMark:
+    - type: UntypedTarget
+      contentRange:
+        start: { line: 9, character: 0 }
+        end: { line: 11, character: 1 }
+      isReversed: false
+      hasExplicitRange: true
+    - type: UntypedTarget
+      contentRange:
+        start: { line: 0, character: 0 }
+        end: { line: 2, character: 1 }
+      isReversed: false
+      hasExplicitRange: true
+    - type: UntypedTarget
+      contentRange:
+        start: { line: 4, character: 0 }
+        end: { line: 6, character: 1 }
+      isReversed: false
+      hasExplicitRange: true
+fullTargets:
+  [
+    {
+      type: list,
+      elements:
+        [
+          {
+            type: primitive,
+            mark: { type: decoratedSymbol, symbolColor: default, character: m },
+            modifiers: [{ type: position, position: after }],
+          },
+          {
+            type: primitive,
+            mark: { type: decoratedSymbol, symbolColor: default, character: f },
+            modifiers: [{ type: position, position: before }],
+          },
+          {
+            type: primitive,
+            mark: { type: decoratedSymbol, symbolColor: default, character: z },
+            modifiers: [{ type: position, position: before }],
+          },
+        ],
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/actions/snippets/snipFunkAfterThis.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/actions/snippets/snipFunkAfterThis.yml
new file mode 100644
index 0000000000..18b73c6ff7
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/actions/snippets/snipFunkAfterThis.yml
@@ -0,0 +1,43 @@
+languageId: typescript
+command:
+  spokenForm: snip funk after this
+  version: 2
+  targets:
+    - type: primitive
+      mark: { type: cursor }
+      modifiers:
+        - { type: position, position: after }
+  usePrePhraseSnapshot: true
+  action:
+    name: insertSnippet
+    args: [functionDeclaration]
+initialState:
+  documentContents: '    const foo = "bar";'
+  selections:
+    - anchor: { line: 0, character: 21 }
+      active: { line: 0, character: 21 }
+  marks: {}
+finalState:
+  documentContents: |2-
+        const foo = "bar";
+        function () {
+
+        }
+  selections:
+    - anchor: { line: 1, character: 13 }
+      active: { line: 1, character: 13 }
+  thatMark:
+    - type: UntypedTarget
+      contentRange:
+        start: { line: 1, character: 4 }
+        end: { line: 3, character: 5 }
+      isReversed: false
+      hasExplicitRange: true
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      modifiers: [{ type: position, position: after }],
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/actions/snippets/snipFunkAfterThis2.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/actions/snippets/snipFunkAfterThis2.yml
new file mode 100644
index 0000000000..006903bee0
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/actions/snippets/snipFunkAfterThis2.yml
@@ -0,0 +1,47 @@
+languageId: typescript
+command:
+  spokenForm: snip funk after this
+  version: 2
+  targets:
+    - type: primitive
+      mark: { type: cursor }
+      modifiers:
+        - { type: position, position: after }
+  usePrePhraseSnapshot: true
+  action:
+    name: insertSnippet
+    args: [functionDeclaration]
+initialState:
+  documentContents: const foo = "bar";
+  selections:
+    - anchor: { line: 0, character: 7 }
+      active: { line: 0, character: 7 }
+    - anchor: { line: 0, character: 13 }
+      active: { line: 0, character: 13 }
+    - anchor: { line: 0, character: 10 }
+      active: { line: 0, character: 10 }
+  marks: {}
+finalState:
+  documentContents: |-
+    const foo = "bar";
+    function () {
+
+    }
+  selections:
+    - anchor: { line: 1, character: 9 }
+      active: { line: 1, character: 9 }
+  thatMark:
+    - type: UntypedTarget
+      contentRange:
+        start: { line: 1, character: 0 }
+        end: { line: 3, character: 1 }
+      isReversed: false
+      hasExplicitRange: true
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      modifiers: [{ type: position, position: after }],
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/actions/snippets/snipFunkAfterThis3.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/actions/snippets/snipFunkAfterThis3.yml
new file mode 100644
index 0000000000..b30a715144
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/actions/snippets/snipFunkAfterThis3.yml
@@ -0,0 +1,50 @@
+languageId: typescript
+command:
+  spokenForm: snip funk after this
+  version: 2
+  targets:
+    - type: primitive
+      mark: { type: cursor }
+      modifiers:
+        - { type: position, position: after }
+  usePrePhraseSnapshot: true
+  action:
+    name: insertSnippet
+    args: [functionDeclaration]
+initialState:
+  documentContents: |-
+    function helloWorld() {
+        const whatever = "hello";
+    }
+  selections:
+    - anchor: { line: 1, character: 19 }
+      active: { line: 1, character: 19 }
+  marks: {}
+finalState:
+  documentContents: |-
+    function helloWorld() {
+        const whatever = "hello";
+    }
+
+    function () {
+
+    }
+  selections:
+    - anchor: { line: 4, character: 9 }
+      active: { line: 4, character: 9 }
+  thatMark:
+    - type: UntypedTarget
+      contentRange:
+        start: { line: 4, character: 0 }
+        end: { line: 6, character: 1 }
+      isReversed: false
+      hasExplicitRange: true
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      modifiers: [],
+      positionModifier: { type: position, position: after },
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/actions/snippets/snipFunkAfterThis4.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/actions/snippets/snipFunkAfterThis4.yml
new file mode 100644
index 0000000000..1f1d96534e
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/actions/snippets/snipFunkAfterThis4.yml
@@ -0,0 +1,43 @@
+languageId: typescript
+command:
+  version: 1
+  spokenForm: snip funk after this
+  action: insertSnippet
+  targets:
+    - type: primitive
+      position: after
+      mark: { type: cursor }
+  extraArgs: [functionDeclaration]
+initialState:
+  documentContents: const foo = "bar";
+  selections:
+    - anchor: { line: 0, character: 12 }
+      active: { line: 0, character: 12 }
+finalState:
+  documentContents: |-
+    const foo = "bar";
+    function () {
+
+    }
+  selections:
+    - anchor: { line: 1, character: 9 }
+      active: { line: 1, character: 9 }
+  thatMark:
+    - type: UntypedTarget
+      contentRange:
+        start: { line: 1, character: 0 }
+        end: { line: 3, character: 1 }
+      isReversed: false
+      hasExplicitRange: true
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: after,
+      insideOutsideType: outside,
+      modifier:
+        { type: containingScope, scopeType: statement, includeSiblings: false },
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/actions/snippets/snipFunkAfterZipAndBeforeFine.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/actions/snippets/snipFunkAfterZipAndBeforeFine.yml
new file mode 100644
index 0000000000..229b796fe5
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/actions/snippets/snipFunkAfterZipAndBeforeFine.yml
@@ -0,0 +1,80 @@
+languageId: typescript
+command:
+  spokenForm: snip funk after zip and before fine
+  version: 2
+  targets:
+    - type: list
+      elements:
+        - type: primitive
+          mark: { type: decoratedSymbol, symbolColor: default, character: z }
+          modifiers:
+            - { type: position, position: after }
+        - type: primitive
+          modifiers:
+            - { type: position, position: before }
+          mark: { type: decoratedSymbol, symbolColor: default, character: f }
+  usePrePhraseSnapshot: true
+  action:
+    name: insertSnippet
+    args: [functionDeclaration]
+initialState:
+  documentContents: |-
+    const foo = "bar";
+    const baz = "bongo";
+  selections:
+    - anchor: { line: 1, character: 20 }
+      active: { line: 1, character: 20 }
+  marks:
+    default.z:
+      start: { line: 1, character: 6 }
+      end: { line: 1, character: 9 }
+    default.f:
+      start: { line: 0, character: 6 }
+      end: { line: 0, character: 9 }
+finalState:
+  documentContents: |-
+    function () {
+
+    }
+    const foo = "bar";
+    const baz = "bongo";
+    function () {
+
+    }
+  selections:
+    - anchor: { line: 5, character: 9 }
+      active: { line: 5, character: 9 }
+    - anchor: { line: 0, character: 9 }
+      active: { line: 0, character: 9 }
+  thatMark:
+    - type: UntypedTarget
+      contentRange:
+        start: { line: 5, character: 0 }
+        end: { line: 7, character: 1 }
+      isReversed: false
+      hasExplicitRange: true
+    - type: UntypedTarget
+      contentRange:
+        start: { line: 0, character: 0 }
+        end: { line: 2, character: 1 }
+      isReversed: false
+      hasExplicitRange: true
+fullTargets:
+  [
+    {
+      type: list,
+      elements:
+        [
+          {
+            type: primitive,
+            mark: { type: decoratedSymbol, symbolColor: default, character: z },
+            modifiers: [{ type: position, position: after }],
+          },
+          {
+            type: primitive,
+            mark: { type: decoratedSymbol, symbolColor: default, character: f },
+            modifiers: [{ type: position, position: before }],
+          },
+        ],
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/actions/snippets/snipFunkBeforeThis.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/actions/snippets/snipFunkBeforeThis.yml
new file mode 100644
index 0000000000..420acfeaa4
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/actions/snippets/snipFunkBeforeThis.yml
@@ -0,0 +1,43 @@
+languageId: typescript
+command:
+  spokenForm: snip funk before this
+  version: 2
+  targets:
+    - type: primitive
+      mark: { type: cursor }
+      modifiers:
+        - { type: position, position: before }
+  usePrePhraseSnapshot: true
+  action:
+    name: insertSnippet
+    args: [functionDeclaration]
+initialState:
+  documentContents: const foo = "bar";
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+  marks: {}
+finalState:
+  documentContents: |-
+    function () {
+
+    }
+    const foo = "bar";
+  selections:
+    - anchor: { line: 0, character: 9 }
+      active: { line: 0, character: 9 }
+  thatMark:
+    - type: UntypedTarget
+      contentRange:
+        start: { line: 0, character: 0 }
+        end: { line: 2, character: 1 }
+      isReversed: false
+      hasExplicitRange: true
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      modifiers: [{ type: position, position: before }],
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/actions/snippets/snipFunkBeforeThis2.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/actions/snippets/snipFunkBeforeThis2.yml
new file mode 100644
index 0000000000..4e836fcb62
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/actions/snippets/snipFunkBeforeThis2.yml
@@ -0,0 +1,43 @@
+languageId: typescript
+command:
+  spokenForm: snip funk before this
+  version: 2
+  targets:
+    - type: primitive
+      mark: { type: cursor }
+      modifiers:
+        - { type: position, position: before }
+  usePrePhraseSnapshot: true
+  action:
+    name: insertSnippet
+    args: [functionDeclaration]
+initialState:
+  documentContents: '    const foo = "bar";'
+  selections:
+    - anchor: { line: 0, character: 4 }
+      active: { line: 0, character: 4 }
+  marks: {}
+finalState:
+  documentContents: |2-
+        function () {
+
+        }
+        const foo = "bar";
+  selections:
+    - anchor: { line: 0, character: 13 }
+      active: { line: 0, character: 13 }
+  thatMark:
+    - type: UntypedTarget
+      contentRange:
+        start: { line: 0, character: 4 }
+        end: { line: 2, character: 5 }
+      isReversed: false
+      hasExplicitRange: true
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      modifiers: [{ type: position, position: before }],
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/actions/snippets/snipFunkBeforeThis3.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/actions/snippets/snipFunkBeforeThis3.yml
new file mode 100644
index 0000000000..ec3339b267
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/actions/snippets/snipFunkBeforeThis3.yml
@@ -0,0 +1,47 @@
+languageId: typescript
+command:
+  spokenForm: snip funk before this
+  version: 2
+  targets:
+    - type: primitive
+      mark: { type: cursor }
+      modifiers:
+        - { type: position, position: before }
+  usePrePhraseSnapshot: true
+  action:
+    name: insertSnippet
+    args: [functionDeclaration]
+initialState:
+  documentContents: const foo = "bar";
+  selections:
+    - anchor: { line: 0, character: 7 }
+      active: { line: 0, character: 7 }
+    - anchor: { line: 0, character: 13 }
+      active: { line: 0, character: 13 }
+    - anchor: { line: 0, character: 10 }
+      active: { line: 0, character: 10 }
+  marks: {}
+finalState:
+  documentContents: |-
+    function () {
+
+    }
+    const foo = "bar";
+  selections:
+    - anchor: { line: 0, character: 9 }
+      active: { line: 0, character: 9 }
+  thatMark:
+    - type: UntypedTarget
+      contentRange:
+        start: { line: 0, character: 0 }
+        end: { line: 2, character: 1 }
+      isReversed: false
+      hasExplicitRange: true
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      modifiers: [{ type: position, position: before }],
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/actions/snippets/snipFunkHelloWorld.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/actions/snippets/snipFunkHelloWorld.yml
new file mode 100644
index 0000000000..b34a7a4fbe
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/actions/snippets/snipFunkHelloWorld.yml
@@ -0,0 +1,41 @@
+languageId: typescript
+command:
+  version: 1
+  spokenForm: snip funk hello world
+  action: insertSnippet
+  targets:
+    - { type: primitive, isImplicit: true }
+  extraArgs:
+    - functionDeclaration
+    - { name: hello world }
+initialState:
+  documentContents: ""
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+finalState:
+  documentContents: |-
+    function helloWorld() {
+
+    }
+  selections:
+    - anchor: { line: 0, character: 20 }
+      active: { line: 0, character: 20 }
+  thatMark:
+    - type: UntypedTarget
+      contentRange:
+        start: { line: 0, character: 0 }
+        end: { line: 2, character: 1 }
+      isReversed: false
+      hasExplicitRange: true
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier: { type: identity },
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/actions/snippets/snipFunkHelloWorld2.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/actions/snippets/snipFunkHelloWorld2.yml
new file mode 100644
index 0000000000..d6aa9348f9
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/actions/snippets/snipFunkHelloWorld2.yml
@@ -0,0 +1,40 @@
+languageId: python
+command:
+  version: 1
+  spokenForm: snip funk hello world
+  action: insertSnippet
+  targets:
+    - { type: primitive, isImplicit: true }
+  extraArgs:
+    - functionDeclaration
+    - { name: hello world }
+initialState:
+  documentContents: ""
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+finalState:
+  documentContents: |-
+    def hello_world():
+
+  selections:
+    - anchor: { line: 0, character: 16 }
+      active: { line: 0, character: 16 }
+  thatMark:
+    - type: UntypedTarget
+      contentRange:
+        start: { line: 0, character: 0 }
+        end: { line: 1, character: 4 }
+      isReversed: false
+      hasExplicitRange: true
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier: { type: identity },
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/actions/snippets/snipIf.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/actions/snippets/snipIf.yml
new file mode 100644
index 0000000000..5342de1f9f
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/actions/snippets/snipIf.yml
@@ -0,0 +1,46 @@
+languageId: typescript
+command:
+  version: 1
+  spokenForm: snip if
+  action: insertSnippet
+  targets:
+    - { type: primitive, isImplicit: true }
+  extraArgs: [ifStatement]
+initialState:
+  documentContents: |-
+    function whatever() {
+
+    }
+  selections:
+    - anchor: { line: 1, character: 4 }
+      active: { line: 1, character: 4 }
+  marks: {}
+finalState:
+  documentContents: |-
+    function whatever() {
+        if () {
+
+        }
+    }
+  selections:
+    - anchor: { line: 1, character: 8 }
+      active: { line: 1, character: 8 }
+  thatMark:
+    - type: UntypedTarget
+      contentRange:
+        start: { line: 1, character: 4 }
+        end: { line: 3, character: 5 }
+      isReversed: false
+      hasExplicitRange: true
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier: { type: identity },
+      isImplicit: true,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/actions/snippets/snipMakeFunk.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/actions/snippets/snipMakeFunk.yml
new file mode 100644
index 0000000000..4db78aaf5c
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/actions/snippets/snipMakeFunk.yml
@@ -0,0 +1,76 @@
+languageId: typescript
+command:
+  spokenForm: snip make funk
+  version: 2
+  targets:
+    - type: primitive
+      modifiers:
+        - type: containingScope
+          scopeType: { type: namedFunction }
+  usePrePhraseSnapshot: true
+  action:
+    name: generateSnippet
+    args: [snippetTest1]
+initialState:
+  documentContents: |2-
+        function helloWorld() {
+            const whatever = "hello";
+
+            if (whatever == null) {
+                console.log("hello")
+            }
+        }
+  selections:
+    - anchor: { line: 0, character: 13 }
+      active: { line: 0, character: 23 }
+    - anchor: { line: 3, character: 8 }
+      active: { line: 5, character: 9 }
+  marks: {}
+finalState:
+  documentContents: |-
+    {
+      "snippetTest1": {
+        "definitions": [
+          {
+            "scope": {
+              "langIds": [
+                "typescript"
+              ]
+            },
+            "body": [
+              "function $variable1() {",
+              "\tconst whatever = \"hello\";",
+              "",
+              "\t$variable2",
+              "}"
+            ]
+          }
+        ],
+        "description": "",
+        "variables": {
+          "variable1": {},
+          "variable2": {}
+        }
+      }
+    }
+  selections:
+    - anchor: { line: 10, character: 21 }
+      active: { line: 10, character: 30 }
+    - anchor: { line: 20, character: 7 }
+      active: { line: 20, character: 16 }
+  thatMark:
+    - type: UntypedTarget
+      contentRange:
+        start: { line: 0, character: 4 }
+        end: { line: 6, character: 5 }
+      isReversed: false
+      hasExplicitRange: true
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      modifiers:
+        [{ type: containingScope, scopeType: { type: namedFunction } }],
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/actions/snippets/snipMakeState.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/actions/snippets/snipMakeState.yml
new file mode 100644
index 0000000000..ad063f1b8a
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/actions/snippets/snipMakeState.yml
@@ -0,0 +1,66 @@
+languageId: typescript
+command:
+  spokenForm: snip make state
+  version: 2
+  targets:
+    - type: primitive
+      modifiers:
+        - type: containingScope
+          scopeType: { type: statement }
+  usePrePhraseSnapshot: true
+  action:
+    name: generateSnippet
+    args: [snippetTest1]
+initialState:
+  documentContents: |-
+    if () {
+        console.log("hello")
+    }
+  selections:
+    - anchor: { line: 0, character: 4 }
+      active: { line: 0, character: 4 }
+  marks: {}
+finalState:
+  documentContents: |-
+    {
+      "snippetTest1": {
+        "definitions": [
+          {
+            "scope": {
+              "langIds": [
+                "typescript"
+              ]
+            },
+            "body": [
+              "if ($variable1) {",
+              "\tconsole.log(\"hello\")",
+              "}"
+            ]
+          }
+        ],
+        "description": "",
+        "variables": {
+          "variable1": {}
+        }
+      }
+    }
+  selections:
+    - anchor: { line: 10, character: 16 }
+      active: { line: 10, character: 25 }
+    - anchor: { line: 18, character: 7 }
+      active: { line: 18, character: 16 }
+  thatMark:
+    - type: UntypedTarget
+      contentRange:
+        start: { line: 0, character: 0 }
+        end: { line: 2, character: 1 }
+      isReversed: false
+      hasExplicitRange: true
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      modifiers: [{ type: containingScope, scopeType: { type: statement } }],
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/actions/snippets/snipSpaghetti.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/actions/snippets/snipSpaghetti.yml
new file mode 100644
index 0000000000..3a64bbf03a
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/actions/snippets/snipSpaghetti.yml
@@ -0,0 +1,37 @@
+languageId: plaintext
+command:
+  version: 1
+  spokenForm: snip spaghetti
+  action: insertSnippet
+  targets:
+    - { type: primitive, isImplicit: true }
+  extraArgs: [spaghetti]
+initialState:
+  documentContents: ""
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+  marks: {}
+finalState:
+  documentContents: My friend  likes to eat spaghetti!
+  selections:
+    - anchor: { line: 0, character: 10 }
+      active: { line: 0, character: 10 }
+  thatMark:
+    - type: UntypedTarget
+      contentRange:
+        start: { line: 0, character: 0 }
+        end: { line: 0, character: 34 }
+      isReversed: false
+      hasExplicitRange: true
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier: { type: identity },
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/actions/snippets/snipSpaghettiGraceHopper.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/actions/snippets/snipSpaghettiGraceHopper.yml
new file mode 100644
index 0000000000..3b879bb25d
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/actions/snippets/snipSpaghettiGraceHopper.yml
@@ -0,0 +1,39 @@
+languageId: plaintext
+command:
+  version: 1
+  spokenForm: snip spaghetti grace hopper
+  action: insertSnippet
+  targets:
+    - { type: primitive, isImplicit: true }
+  extraArgs:
+    - spaghetti
+    - { foo: grace hopper }
+initialState:
+  documentContents: ""
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+  marks: {}
+finalState:
+  documentContents: My friend grace_hopper likes to eat spaghetti!
+  selections:
+    - anchor: { line: 0, character: 46 }
+      active: { line: 0, character: 46 }
+  thatMark:
+    - type: UntypedTarget
+      contentRange:
+        start: { line: 0, character: 0 }
+        end: { line: 0, character: 46 }
+      isReversed: false
+      hasExplicitRange: true
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier: { type: identity },
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/actions/snippets/spaghettiWrapPastGust.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/actions/snippets/spaghettiWrapPastGust.yml
new file mode 100644
index 0000000000..05a337e454
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/actions/snippets/spaghettiWrapPastGust.yml
@@ -0,0 +1,61 @@
+languageId: plaintext
+command:
+  version: 1
+  spokenForm: spaghetti wrap past gust
+  action: wrapWithSnippet
+  targets:
+    - type: range
+      start: { type: primitive }
+      end:
+        type: primitive
+        mark: { type: decoratedSymbol, symbolColor: default, character: g }
+      excludeStart: false
+      excludeEnd: false
+  extraArgs: [spaghetti.foo]
+initialState:
+  documentContents: grace hopper
+  selections:
+    - anchor: { line: 0, character: 12 }
+      active: { line: 0, character: 12 }
+  marks:
+    default.g:
+      start: { line: 0, character: 0 }
+      end: { line: 0, character: 5 }
+finalState:
+  documentContents: My friend grace hopper likes to eat spaghetti!
+  selections:
+    - anchor: { line: 0, character: 46 }
+      active: { line: 0, character: 46 }
+  thatMark:
+    - type: UntypedTarget
+      contentRange:
+        start: { line: 0, character: 0 }
+        end: { line: 0, character: 46 }
+      isReversed: true
+      hasExplicitRange: true
+fullTargets:
+  [
+    {
+      type: range,
+      excludeAnchor: false,
+      excludeActive: false,
+      anchor:
+        {
+          type: primitive,
+          mark: { type: cursor },
+          selectionType: token,
+          position: contents,
+          insideOutsideType: inside,
+          modifier: { type: identity },
+        },
+      active:
+        {
+          type: primitive,
+          mark: { type: decoratedSymbol, symbolColor: default, character: g },
+          selectionType: token,
+          position: contents,
+          insideOutsideType: inside,
+          modifier: { type: identity },
+        },
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/actions/sortAirAndCapAndBat.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/actions/sortAirAndCapAndBat.yml
new file mode 100644
index 0000000000..53cb7af629
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/actions/sortAirAndCapAndBat.yml
@@ -0,0 +1,90 @@
+languageId: typescript
+command:
+  version: 1
+  spokenForm: sort air and cap and bat
+  action: sortTargets
+  targets:
+    - type: list
+      elements:
+        - type: primitive
+          mark: { type: decoratedSymbol, symbolColor: default, character: a }
+        - type: primitive
+          mark: { type: decoratedSymbol, symbolColor: default, character: c }
+        - type: primitive
+          mark: { type: decoratedSymbol, symbolColor: default, character: b }
+initialState:
+  documentContents: |
+
+    const value = ["a", "c", "b"]
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+  marks:
+    default.a:
+      start: { line: 1, character: 16 }
+      end: { line: 1, character: 17 }
+    default.c:
+      start: { line: 1, character: 21 }
+      end: { line: 1, character: 22 }
+    default.b:
+      start: { line: 1, character: 26 }
+      end: { line: 1, character: 27 }
+finalState:
+  documentContents: |
+
+    const value = ["a", "b", "c"]
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+  thatMark:
+    - type: UntypedTarget
+      contentRange:
+        start: { line: 1, character: 16 }
+        end: { line: 1, character: 17 }
+      isReversed: false
+      hasExplicitRange: true
+    - type: UntypedTarget
+      contentRange:
+        start: { line: 1, character: 21 }
+        end: { line: 1, character: 22 }
+      isReversed: false
+      hasExplicitRange: true
+    - type: UntypedTarget
+      contentRange:
+        start: { line: 1, character: 26 }
+        end: { line: 1, character: 27 }
+      isReversed: false
+      hasExplicitRange: true
+fullTargets:
+  [
+    {
+      type: list,
+      elements:
+        [
+          {
+            type: primitive,
+            mark: { type: decoratedSymbol, symbolColor: default, character: a },
+            selectionType: token,
+            position: contents,
+            modifier: { type: identity },
+            insideOutsideType: inside,
+          },
+          {
+            type: primitive,
+            mark: { type: decoratedSymbol, symbolColor: default, character: c },
+            selectionType: token,
+            position: contents,
+            modifier: { type: identity },
+            insideOutsideType: inside,
+          },
+          {
+            type: primitive,
+            mark: { type: decoratedSymbol, symbolColor: default, character: b },
+            selectionType: token,
+            position: contents,
+            modifier: { type: identity },
+            insideOutsideType: inside,
+          },
+        ],
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/actions/sortEveryItem.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/actions/sortEveryItem.yml
new file mode 100644
index 0000000000..749ff47e0b
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/actions/sortEveryItem.yml
@@ -0,0 +1,55 @@
+languageId: markdown
+command:
+  spokenForm: sort every item
+  version: 3
+  targets:
+    - type: primitive
+      modifiers:
+        - type: everyScope
+          scopeType: { type: collectionItem }
+  usePrePhraseSnapshot: true
+  action: { name: sortTargets }
+initialState:
+  documentContents: 90, 11, 9, 3
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+  marks: {}
+finalState:
+  documentContents: 3, 9, 11, 90
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+  thatMark:
+    - type: UntypedTarget
+      contentRange:
+        start: { line: 0, character: 0 }
+        end: { line: 0, character: 1 }
+      isReversed: false
+      hasExplicitRange: true
+    - type: UntypedTarget
+      contentRange:
+        start: { line: 0, character: 3 }
+        end: { line: 0, character: 4 }
+      isReversed: false
+      hasExplicitRange: true
+    - type: UntypedTarget
+      contentRange:
+        start: { line: 0, character: 6 }
+        end: { line: 0, character: 8 }
+      isReversed: false
+      hasExplicitRange: true
+    - type: UntypedTarget
+      contentRange:
+        start: { line: 0, character: 10 }
+        end: { line: 0, character: 12 }
+      isReversed: false
+      hasExplicitRange: true
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      modifiers: [{ type: everyScope, scopeType: { type: collectionItem } }],
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/actions/sortEveryItem2.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/actions/sortEveryItem2.yml
new file mode 100644
index 0000000000..d08ae49eee
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/actions/sortEveryItem2.yml
@@ -0,0 +1,61 @@
+languageId: markdown
+command:
+  spokenForm: sort every item
+  version: 3
+  targets:
+    - type: primitive
+      modifiers:
+        - type: everyScope
+          scopeType: { type: collectionItem }
+  usePrePhraseSnapshot: true
+  action: { name: sortTargets }
+initialState:
+  documentContents: z, a, b, e, E
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+  marks: {}
+finalState:
+  documentContents: a, b, E, e, z
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+  thatMark:
+    - type: UntypedTarget
+      contentRange:
+        start: { line: 0, character: 0 }
+        end: { line: 0, character: 1 }
+      isReversed: false
+      hasExplicitRange: true
+    - type: UntypedTarget
+      contentRange:
+        start: { line: 0, character: 3 }
+        end: { line: 0, character: 4 }
+      isReversed: false
+      hasExplicitRange: true
+    - type: UntypedTarget
+      contentRange:
+        start: { line: 0, character: 6 }
+        end: { line: 0, character: 7 }
+      isReversed: false
+      hasExplicitRange: true
+    - type: UntypedTarget
+      contentRange:
+        start: { line: 0, character: 9 }
+        end: { line: 0, character: 10 }
+      isReversed: false
+      hasExplicitRange: true
+    - type: UntypedTarget
+      contentRange:
+        start: { line: 0, character: 12 }
+        end: { line: 0, character: 13 }
+      isReversed: false
+      hasExplicitRange: true
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      modifiers: [{ type: everyScope, scopeType: { type: collectionItem } }],
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/actions/sortThis.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/actions/sortThis.yml
new file mode 100644
index 0000000000..fd7da20940
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/actions/sortThis.yml
@@ -0,0 +1,54 @@
+languageId: plaintext
+command:
+  spokenForm: sort this
+  version: 2
+  targets:
+    - type: primitive
+      mark: { type: cursor }
+  usePrePhraseSnapshot: true
+  action: { name: sortTargets }
+initialState:
+  documentContents: |-
+    2
+    1
+    3
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 1 }
+    - anchor: { line: 1, character: 0 }
+      active: { line: 1, character: 1 }
+    - anchor: { line: 2, character: 0 }
+      active: { line: 2, character: 1 }
+  marks: {}
+finalState:
+  documentContents: |-
+    1
+    2
+    3
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 1 }
+    - anchor: { line: 1, character: 0 }
+      active: { line: 1, character: 1 }
+    - anchor: { line: 2, character: 0 }
+      active: { line: 2, character: 1 }
+  thatMark:
+    - type: UntypedTarget
+      contentRange:
+        start: { line: 0, character: 0 }
+        end: { line: 0, character: 1 }
+      isReversed: false
+      hasExplicitRange: true
+    - type: UntypedTarget
+      contentRange:
+        start: { line: 1, character: 0 }
+        end: { line: 1, character: 1 }
+      isReversed: false
+      hasExplicitRange: true
+    - type: UntypedTarget
+      contentRange:
+        start: { line: 2, character: 0 }
+        end: { line: 2, character: 1 }
+      isReversed: false
+      hasExplicitRange: true
+fullTargets: [{ type: primitive, mark: { type: cursor }, modifiers: [] }]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/actions/sortThis2.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/actions/sortThis2.yml
new file mode 100644
index 0000000000..cdad3207cf
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/actions/sortThis2.yml
@@ -0,0 +1,54 @@
+languageId: plaintext
+command:
+  spokenForm: sort this
+  version: 2
+  targets:
+    - type: primitive
+      mark: { type: cursor }
+  usePrePhraseSnapshot: true
+  action: { name: sortTargets }
+initialState:
+  documentContents: |-
+    2
+    1
+    3
+  selections:
+    - anchor: { line: 2, character: 0 }
+      active: { line: 2, character: 1 }
+    - anchor: { line: 1, character: 0 }
+      active: { line: 1, character: 1 }
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 1 }
+  marks: {}
+finalState:
+  documentContents: |-
+    1
+    2
+    3
+  selections:
+    - anchor: { line: 2, character: 0 }
+      active: { line: 2, character: 1 }
+    - anchor: { line: 1, character: 0 }
+      active: { line: 1, character: 1 }
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 1 }
+  thatMark:
+    - type: UntypedTarget
+      contentRange:
+        start: { line: 0, character: 0 }
+        end: { line: 0, character: 1 }
+      isReversed: false
+      hasExplicitRange: true
+    - type: UntypedTarget
+      contentRange:
+        start: { line: 1, character: 0 }
+        end: { line: 1, character: 1 }
+      isReversed: false
+      hasExplicitRange: true
+    - type: UntypedTarget
+      contentRange:
+        start: { line: 2, character: 0 }
+        end: { line: 2, character: 1 }
+      isReversed: false
+      hasExplicitRange: true
+fullTargets: [{ type: primitive, mark: { type: cursor }, modifiers: [] }]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/actions/squareRepackHarp.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/actions/squareRepackHarp.yml
new file mode 100644
index 0000000000..4f4f0db384
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/actions/squareRepackHarp.yml
@@ -0,0 +1,50 @@
+languageId: plaintext
+command:
+  version: 1
+  spokenForm: square repack harp
+  action: rewrapWithPairedDelimiter
+  targets:
+    - type: primitive
+      mark: { type: decoratedSymbol, symbolColor: default, character: h }
+  extraArgs: ["[", "]"]
+initialState:
+  documentContents: |
+    (hello)
+  selections:
+    - anchor: { line: 1, character: 0 }
+      active: { line: 1, character: 0 }
+  marks:
+    default.h:
+      start: { line: 0, character: 1 }
+      end: { line: 0, character: 6 }
+finalState:
+  documentContents: |
+    [hello]
+  selections:
+    - anchor: { line: 1, character: 0 }
+      active: { line: 1, character: 0 }
+  thatMark:
+    - type: UntypedTarget
+      contentRange:
+        start: { line: 0, character: 0 }
+        end: { line: 0, character: 7 }
+      isReversed: false
+      hasExplicitRange: true
+  sourceMark:
+    - type: UntypedTarget
+      contentRange:
+        start: { line: 0, character: 1 }
+        end: { line: 0, character: 6 }
+      isReversed: false
+      hasExplicitRange: true
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: decoratedSymbol, symbolColor: default, character: h },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier: { type: surroundingPair, delimiter: any },
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/actions/squareRepackLeper.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/actions/squareRepackLeper.yml
new file mode 100644
index 0000000000..26f4172be1
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/actions/squareRepackLeper.yml
@@ -0,0 +1,50 @@
+languageId: plaintext
+command:
+  version: 1
+  spokenForm: square repack leper
+  action: rewrapWithPairedDelimiter
+  targets:
+    - type: primitive
+      mark: { type: decoratedSymbol, symbolColor: default, character: ( }
+  extraArgs: ["[", "]"]
+initialState:
+  documentContents: |
+    (hello)
+  selections:
+    - anchor: { line: 1, character: 0 }
+      active: { line: 1, character: 0 }
+  marks:
+    default.(:
+      start: { line: 0, character: 0 }
+      end: { line: 0, character: 1 }
+finalState:
+  documentContents: |
+    [hello]
+  selections:
+    - anchor: { line: 1, character: 0 }
+      active: { line: 1, character: 0 }
+  thatMark:
+    - type: UntypedTarget
+      contentRange:
+        start: { line: 0, character: 0 }
+        end: { line: 0, character: 7 }
+      isReversed: false
+      hasExplicitRange: true
+  sourceMark:
+    - type: UntypedTarget
+      contentRange:
+        start: { line: 0, character: 0 }
+        end: { line: 0, character: 1 }
+      isReversed: false
+      hasExplicitRange: true
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: decoratedSymbol, symbolColor: default, character: ( },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier: { type: surroundingPair, delimiter: any },
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/actions/squareRepackPair.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/actions/squareRepackPair.yml
new file mode 100644
index 0000000000..076de57901
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/actions/squareRepackPair.yml
@@ -0,0 +1,47 @@
+languageId: plaintext
+command:
+  version: 1
+  spokenForm: square repack pair
+  action: rewrapWithPairedDelimiter
+  targets:
+    - type: primitive
+      modifier: { type: surroundingPair, delimiter: any }
+  extraArgs: ["[", "]"]
+initialState:
+  documentContents: |
+    (hello)
+  selections:
+    - anchor: { line: 0, character: 2 }
+      active: { line: 0, character: 2 }
+  marks: {}
+finalState:
+  documentContents: |
+    [hello]
+  selections:
+    - anchor: { line: 0, character: 2 }
+      active: { line: 0, character: 2 }
+  thatMark:
+    - type: UntypedTarget
+      contentRange:
+        start: { line: 0, character: 0 }
+        end: { line: 0, character: 7 }
+      isReversed: false
+      hasExplicitRange: true
+  sourceMark:
+    - type: UntypedTarget
+      contentRange:
+        start: { line: 0, character: 0 }
+        end: { line: 0, character: 7 }
+      isReversed: false
+      hasExplicitRange: true
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier: { type: surroundingPair, delimiter: any },
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/actions/squareRepackThis.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/actions/squareRepackThis.yml
new file mode 100644
index 0000000000..2a3f3abf25
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/actions/squareRepackThis.yml
@@ -0,0 +1,45 @@
+languageId: plaintext
+command:
+  version: 1
+  spokenForm: square repack this
+  action: rewrapWithPairedDelimiter
+  targets:
+    - type: primitive
+      mark: { type: cursor }
+  extraArgs: ["[", "]"]
+initialState:
+  documentContents: (hello)
+  selections:
+    - anchor: { line: 0, character: 4 }
+      active: { line: 0, character: 4 }
+  marks: {}
+finalState:
+  documentContents: "[hello]"
+  selections:
+    - anchor: { line: 0, character: 4 }
+      active: { line: 0, character: 4 }
+  thatMark:
+    - type: UntypedTarget
+      contentRange:
+        start: { line: 0, character: 0 }
+        end: { line: 0, character: 7 }
+      isReversed: false
+      hasExplicitRange: true
+  sourceMark:
+    - type: UntypedTarget
+      contentRange:
+        start: { line: 0, character: 4 }
+        end: { line: 0, character: 4 }
+      isReversed: false
+      hasExplicitRange: false
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier: { type: surroundingPair, delimiter: any },
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/actions/swapVestWithCap.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/actions/swapVestWithCap.yml
new file mode 100644
index 0000000000..ef96869b64
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/actions/swapVestWithCap.yml
@@ -0,0 +1,64 @@
+languageId: typescript
+command:
+  version: 1
+  spokenForm: swap vest with cap
+  action: swapTargets
+  targets:
+    - type: primitive
+      mark: { type: decoratedSymbol, symbolColor: default, character: v }
+    - type: primitive
+      mark: { type: decoratedSymbol, symbolColor: default, character: c }
+initialState:
+  documentContents: |
+
+    const value = "Hello world";
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+  marks:
+    default.v:
+      start: { line: 1, character: 6 }
+      end: { line: 1, character: 11 }
+    default.c:
+      start: { line: 1, character: 0 }
+      end: { line: 1, character: 5 }
+finalState:
+  documentContents: |
+
+    value const = "Hello world";
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+  thatMark:
+    - type: UntypedTarget
+      contentRange:
+        start: { line: 1, character: 0 }
+        end: { line: 1, character: 5 }
+      isReversed: false
+      hasExplicitRange: true
+    - type: UntypedTarget
+      contentRange:
+        start: { line: 1, character: 6 }
+        end: { line: 1, character: 11 }
+      isReversed: false
+      hasExplicitRange: true
+  sourceMark: []
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: decoratedSymbol, symbolColor: default, character: v },
+      selectionType: token,
+      position: contents,
+      modifier: { type: identity },
+      insideOutsideType: null,
+    },
+    {
+      type: primitive,
+      mark: { type: decoratedSymbol, symbolColor: default, character: c },
+      selectionType: token,
+      position: contents,
+      modifier: { type: identity },
+      insideOutsideType: null,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/actions/swapWithVest.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/actions/swapWithVest.yml
new file mode 100644
index 0000000000..6d610dd4c8
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/actions/swapWithVest.yml
@@ -0,0 +1,60 @@
+languageId: typescript
+command:
+  version: 1
+  spokenForm: swap with vest
+  action: swapTargets
+  targets:
+    - { type: primitive }
+    - type: primitive
+      mark: { type: decoratedSymbol, symbolColor: default, character: v }
+initialState:
+  documentContents: |
+
+    const value = "Hello world";
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+  marks:
+    default.v:
+      start: { line: 1, character: 6 }
+      end: { line: 1, character: 11 }
+finalState:
+  documentContents: |
+    value
+    const  = "Hello world";
+  selections:
+    - anchor: { line: 0, character: 5 }
+      active: { line: 0, character: 5 }
+  thatMark:
+    - type: UntypedTarget
+      contentRange:
+        start: { line: 1, character: 6 }
+        end: { line: 1, character: 6 }
+      isReversed: false
+      hasExplicitRange: false
+    - type: UntypedTarget
+      contentRange:
+        start: { line: 0, character: 0 }
+        end: { line: 0, character: 5 }
+      isReversed: false
+      hasExplicitRange: true
+  sourceMark: []
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      modifier: { type: identity },
+      insideOutsideType: null,
+    },
+    {
+      type: primitive,
+      mark: { type: decoratedSymbol, symbolColor: default, character: v },
+      selectionType: token,
+      position: contents,
+      modifier: { type: identity },
+      insideOutsideType: null,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/actions/takeVest.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/actions/takeVest.yml
new file mode 100644
index 0000000000..d6d4d00fd3
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/actions/takeVest.yml
@@ -0,0 +1,44 @@
+languageId: typescript
+command:
+  version: 1
+  spokenForm: take vest
+  action: setSelection
+  targets:
+    - type: primitive
+      mark: { type: decoratedSymbol, symbolColor: default, character: v }
+initialState:
+  documentContents: |
+
+    const value = "Hello world";
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+  marks:
+    default.v:
+      start: { line: 1, character: 6 }
+      end: { line: 1, character: 11 }
+finalState:
+  documentContents: |
+
+    const value = "Hello world";
+  selections:
+    - anchor: { line: 1, character: 6 }
+      active: { line: 1, character: 11 }
+  thatMark:
+    - type: UntypedTarget
+      contentRange:
+        start: { line: 1, character: 6 }
+        end: { line: 1, character: 11 }
+      isReversed: false
+      hasExplicitRange: false
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: decoratedSymbol, symbolColor: default, character: v },
+      selectionType: token,
+      position: contents,
+      modifier: { type: identity },
+      insideOutsideType: inside,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/compoundTargets/bringAirToAfterBatVerticalPastFine.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/compoundTargets/bringAirToAfterBatVerticalPastFine.yml
new file mode 100644
index 0000000000..b83349ab43
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/compoundTargets/bringAirToAfterBatVerticalPastFine.yml
@@ -0,0 +1,84 @@
+languageId: plaintext
+command:
+  version: 1
+  spokenForm: bring air to after bat vertical past fine
+  action: replaceWithTarget
+  targets:
+    - type: primitive
+      mark: { type: decoratedSymbol, symbolColor: default, character: a }
+    - type: range
+      start:
+        type: primitive
+        position: after
+        mark: { type: decoratedSymbol, symbolColor: default, character: b }
+      end:
+        type: primitive
+        mark: { type: decoratedSymbol, symbolColor: default, character: f }
+      excludeStart: false
+      excludeEnd: false
+      rangeType: vertical
+initialState:
+  documentContents: |
+    a
+
+    b   c
+    d   e
+    f   g
+  selections:
+    - anchor: { line: 5, character: 0 }
+      active: { line: 5, character: 0 }
+  marks:
+    default.a:
+      start: { line: 0, character: 0 }
+      end: { line: 0, character: 1 }
+    default.b:
+      start: { line: 2, character: 0 }
+      end: { line: 2, character: 1 }
+    default.f:
+      start: { line: 4, character: 0 }
+      end: { line: 4, character: 1 }
+finalState:
+  documentContents: |
+    a
+
+    b a   c
+    d a   e
+    f a   g
+  selections:
+    - anchor: { line: 5, character: 0 }
+      active: { line: 5, character: 0 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: decoratedSymbol, symbolColor: default, character: a },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: null,
+      modifier: { type: identity },
+    },
+    {
+      type: range,
+      excludeAnchor: false,
+      excludeActive: false,
+      rangeType: vertical,
+      anchor:
+        {
+          type: primitive,
+          mark: { type: decoratedSymbol, symbolColor: default, character: b },
+          selectionType: token,
+          position: after,
+          insideOutsideType: null,
+          modifier: { type: identity },
+        },
+      active:
+        {
+          type: primitive,
+          mark: { type: decoratedSymbol, symbolColor: default, character: f },
+          selectionType: token,
+          position: after,
+          insideOutsideType: null,
+          modifier: { type: identity },
+        },
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/compoundTargets/bringAirToBatVerticalPastFine.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/compoundTargets/bringAirToBatVerticalPastFine.yml
new file mode 100644
index 0000000000..511610c227
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/compoundTargets/bringAirToBatVerticalPastFine.yml
@@ -0,0 +1,83 @@
+languageId: plaintext
+command:
+  version: 1
+  spokenForm: bring air to bat vertical past fine
+  action: replaceWithTarget
+  targets:
+    - type: primitive
+      mark: { type: decoratedSymbol, symbolColor: default, character: a }
+    - type: range
+      start:
+        type: primitive
+        mark: { type: decoratedSymbol, symbolColor: default, character: b }
+      end:
+        type: primitive
+        mark: { type: decoratedSymbol, symbolColor: default, character: f }
+      excludeStart: false
+      excludeEnd: false
+      rangeType: vertical
+initialState:
+  documentContents: |
+    a
+
+    b   c
+    d   e
+    f   g
+  selections:
+    - anchor: { line: 5, character: 0 }
+      active: { line: 5, character: 0 }
+  marks:
+    default.a:
+      start: { line: 0, character: 0 }
+      end: { line: 0, character: 1 }
+    default.b:
+      start: { line: 2, character: 0 }
+      end: { line: 2, character: 1 }
+    default.f:
+      start: { line: 4, character: 0 }
+      end: { line: 4, character: 1 }
+finalState:
+  documentContents: |
+    a
+
+    a   c
+    a   e
+    a   g
+  selections:
+    - anchor: { line: 5, character: 0 }
+      active: { line: 5, character: 0 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: decoratedSymbol, symbolColor: default, character: a },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: null,
+      modifier: { type: identity },
+    },
+    {
+      type: range,
+      excludeAnchor: false,
+      excludeActive: false,
+      rangeType: vertical,
+      anchor:
+        {
+          type: primitive,
+          mark: { type: decoratedSymbol, symbolColor: default, character: b },
+          selectionType: token,
+          position: contents,
+          insideOutsideType: null,
+          modifier: { type: identity },
+        },
+      active:
+        {
+          type: primitive,
+          mark: { type: decoratedSymbol, symbolColor: default, character: f },
+          selectionType: token,
+          position: contents,
+          insideOutsideType: null,
+          modifier: { type: identity },
+        },
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/compoundTargets/bringAirToBeforeBatVerticalPastFine.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/compoundTargets/bringAirToBeforeBatVerticalPastFine.yml
new file mode 100644
index 0000000000..805ae03424
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/compoundTargets/bringAirToBeforeBatVerticalPastFine.yml
@@ -0,0 +1,84 @@
+languageId: plaintext
+command:
+  version: 1
+  spokenForm: bring air to before bat vertical past fine
+  action: replaceWithTarget
+  targets:
+    - type: primitive
+      mark: { type: decoratedSymbol, symbolColor: default, character: a }
+    - type: range
+      start:
+        type: primitive
+        position: before
+        mark: { type: decoratedSymbol, symbolColor: default, character: b }
+      end:
+        type: primitive
+        mark: { type: decoratedSymbol, symbolColor: default, character: f }
+      excludeStart: false
+      excludeEnd: false
+      rangeType: vertical
+initialState:
+  documentContents: |
+    a
+
+    b   c
+    d   e
+    f   g
+  selections:
+    - anchor: { line: 5, character: 0 }
+      active: { line: 5, character: 0 }
+  marks:
+    default.a:
+      start: { line: 0, character: 0 }
+      end: { line: 0, character: 1 }
+    default.b:
+      start: { line: 2, character: 0 }
+      end: { line: 2, character: 1 }
+    default.f:
+      start: { line: 4, character: 0 }
+      end: { line: 4, character: 1 }
+finalState:
+  documentContents: |
+    a
+
+    a b   c
+    a d   e
+    a f   g
+  selections:
+    - anchor: { line: 5, character: 0 }
+      active: { line: 5, character: 0 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: decoratedSymbol, symbolColor: default, character: a },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: null,
+      modifier: { type: identity },
+    },
+    {
+      type: range,
+      excludeAnchor: false,
+      excludeActive: false,
+      rangeType: vertical,
+      anchor:
+        {
+          type: primitive,
+          mark: { type: decoratedSymbol, symbolColor: default, character: b },
+          selectionType: token,
+          position: before,
+          insideOutsideType: null,
+          modifier: { type: identity },
+        },
+      active:
+        {
+          type: primitive,
+          mark: { type: decoratedSymbol, symbolColor: default, character: f },
+          selectionType: token,
+          position: before,
+          insideOutsideType: null,
+          modifier: { type: identity },
+        },
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/compoundTargets/bringAirToEndOfBatVerticalPastFine.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/compoundTargets/bringAirToEndOfBatVerticalPastFine.yml
new file mode 100644
index 0000000000..b0720bc0b0
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/compoundTargets/bringAirToEndOfBatVerticalPastFine.yml
@@ -0,0 +1,85 @@
+languageId: plaintext
+command:
+  version: 1
+  spokenForm: bring air to end of bat vertical past fine
+  action: replaceWithTarget
+  targets:
+    - type: primitive
+      mark: { type: decoratedSymbol, symbolColor: default, character: a }
+    - type: range
+      start:
+        type: primitive
+        position: after
+        insideOutsideType: inside
+        mark: { type: decoratedSymbol, symbolColor: default, character: b }
+      end:
+        type: primitive
+        mark: { type: decoratedSymbol, symbolColor: default, character: f }
+      excludeStart: false
+      excludeEnd: false
+      rangeType: vertical
+initialState:
+  documentContents: |
+    a
+
+    b   c
+    d   e
+    f   g
+  selections:
+    - anchor: { line: 5, character: 0 }
+      active: { line: 5, character: 0 }
+  marks:
+    default.a:
+      start: { line: 0, character: 0 }
+      end: { line: 0, character: 1 }
+    default.b:
+      start: { line: 2, character: 0 }
+      end: { line: 2, character: 1 }
+    default.f:
+      start: { line: 4, character: 0 }
+      end: { line: 4, character: 1 }
+finalState:
+  documentContents: |
+    a
+
+    ba   c
+    da   e
+    fa   g
+  selections:
+    - anchor: { line: 5, character: 0 }
+      active: { line: 5, character: 0 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: decoratedSymbol, symbolColor: default, character: a },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: null,
+      modifier: { type: identity },
+    },
+    {
+      type: range,
+      excludeAnchor: false,
+      excludeActive: false,
+      rangeType: vertical,
+      anchor:
+        {
+          type: primitive,
+          mark: { type: decoratedSymbol, symbolColor: default, character: b },
+          selectionType: token,
+          position: after,
+          insideOutsideType: inside,
+          modifier: { type: identity },
+        },
+      active:
+        {
+          type: primitive,
+          mark: { type: decoratedSymbol, symbolColor: default, character: f },
+          selectionType: token,
+          position: after,
+          insideOutsideType: inside,
+          modifier: { type: identity },
+        },
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/compoundTargets/bringAirToStartOfBatVerticalPastFine.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/compoundTargets/bringAirToStartOfBatVerticalPastFine.yml
new file mode 100644
index 0000000000..2c5650e655
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/compoundTargets/bringAirToStartOfBatVerticalPastFine.yml
@@ -0,0 +1,85 @@
+languageId: plaintext
+command:
+  version: 1
+  spokenForm: bring air to start of bat vertical past fine
+  action: replaceWithTarget
+  targets:
+    - type: primitive
+      mark: { type: decoratedSymbol, symbolColor: default, character: a }
+    - type: range
+      start:
+        type: primitive
+        position: before
+        insideOutsideType: inside
+        mark: { type: decoratedSymbol, symbolColor: default, character: b }
+      end:
+        type: primitive
+        mark: { type: decoratedSymbol, symbolColor: default, character: f }
+      excludeStart: false
+      excludeEnd: false
+      rangeType: vertical
+initialState:
+  documentContents: |
+    a
+
+    b   c
+    d   e
+    f   g
+  selections:
+    - anchor: { line: 5, character: 0 }
+      active: { line: 5, character: 0 }
+  marks:
+    default.a:
+      start: { line: 0, character: 0 }
+      end: { line: 0, character: 1 }
+    default.b:
+      start: { line: 2, character: 0 }
+      end: { line: 2, character: 1 }
+    default.f:
+      start: { line: 4, character: 0 }
+      end: { line: 4, character: 1 }
+finalState:
+  documentContents: |
+    a
+
+    ab   c
+    ad   e
+    af   g
+  selections:
+    - anchor: { line: 5, character: 0 }
+      active: { line: 5, character: 0 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: decoratedSymbol, symbolColor: default, character: a },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: null,
+      modifier: { type: identity },
+    },
+    {
+      type: range,
+      excludeAnchor: false,
+      excludeActive: false,
+      rangeType: vertical,
+      anchor:
+        {
+          type: primitive,
+          mark: { type: decoratedSymbol, symbolColor: default, character: b },
+          selectionType: token,
+          position: before,
+          insideOutsideType: inside,
+          modifier: { type: identity },
+        },
+      active:
+        {
+          type: primitive,
+          mark: { type: decoratedSymbol, symbolColor: default, character: f },
+          selectionType: token,
+          position: before,
+          insideOutsideType: inside,
+          modifier: { type: identity },
+        },
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/compoundTargets/chuckBlockEachBetweenLook.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/compoundTargets/chuckBlockEachBetweenLook.yml
new file mode 100644
index 0000000000..fc6297b39e
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/compoundTargets/chuckBlockEachBetweenLook.yml
@@ -0,0 +1,70 @@
+languageId: typescript
+command:
+  spokenForm: chuck block each between look
+  version: 2
+  targets:
+    - type: range
+      anchor:
+        type: primitive
+        mark: { type: decoratedSymbol, symbolColor: default, character: e }
+        modifiers:
+          - type: containingScope
+            scopeType: { type: paragraph }
+      active:
+        type: primitive
+        mark: { type: decoratedSymbol, symbolColor: default, character: l }
+      excludeAnchor: true
+      excludeActive: true
+  usePrePhraseSnapshot: true
+  action: { name: remove }
+initialState:
+  documentContents: |-
+    hello there
+    hello there
+
+
+        hello there
+        hello there
+            hello
+  selections:
+    - anchor: { line: 4, character: 9 }
+      active: { line: 4, character: 9 }
+  marks:
+    default.e:
+      start: { line: 1, character: 6 }
+      end: { line: 1, character: 11 }
+    default.l:
+      start: { line: 4, character: 4 }
+      end: { line: 4, character: 9 }
+finalState:
+  documentContents: |-
+    hello there
+    hello there
+        hello there
+        hello there
+            hello
+  selections:
+    - anchor: { line: 2, character: 9 }
+      active: { line: 2, character: 9 }
+fullTargets:
+  [
+    {
+      type: range,
+      excludeAnchor: true,
+      excludeActive: true,
+      rangeType: continuous,
+      anchor:
+        {
+          type: primitive,
+          mark: { type: decoratedSymbol, symbolColor: default, character: e },
+          modifiers:
+            &ref_0 [{ type: containingScope, scopeType: { type: paragraph } }],
+        },
+      active:
+        {
+          type: primitive,
+          mark: { type: decoratedSymbol, symbolColor: default, character: l },
+          modifiers: *ref_0,
+        },
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/compoundTargets/chuckBlockEachUntilLook.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/compoundTargets/chuckBlockEachUntilLook.yml
new file mode 100644
index 0000000000..2c36c9e145
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/compoundTargets/chuckBlockEachUntilLook.yml
@@ -0,0 +1,68 @@
+languageId: typescript
+command:
+  spokenForm: chuck block each until look
+  version: 2
+  targets:
+    - type: range
+      anchor:
+        type: primitive
+        mark: { type: decoratedSymbol, symbolColor: default, character: e }
+        modifiers:
+          - type: containingScope
+            scopeType: { type: paragraph }
+      active:
+        type: primitive
+        mark: { type: decoratedSymbol, symbolColor: default, character: l }
+      excludeAnchor: false
+      excludeActive: true
+  usePrePhraseSnapshot: true
+  action: { name: remove }
+initialState:
+  documentContents: |-
+    hello there
+    hello there
+
+
+        hello there
+        hello there
+            hello
+  selections:
+    - anchor: { line: 4, character: 9 }
+      active: { line: 4, character: 9 }
+  marks:
+    default.e:
+      start: { line: 1, character: 6 }
+      end: { line: 1, character: 11 }
+    default.l:
+      start: { line: 4, character: 4 }
+      end: { line: 4, character: 9 }
+finalState:
+  documentContents: |2-
+        hello there
+        hello there
+            hello
+  selections:
+    - anchor: { line: 0, character: 9 }
+      active: { line: 0, character: 9 }
+fullTargets:
+  [
+    {
+      type: range,
+      excludeAnchor: false,
+      excludeActive: true,
+      rangeType: continuous,
+      anchor:
+        {
+          type: primitive,
+          mark: { type: decoratedSymbol, symbolColor: default, character: e },
+          modifiers:
+            &ref_0 [{ type: containingScope, scopeType: { type: paragraph } }],
+        },
+      active:
+        {
+          type: primitive,
+          mark: { type: decoratedSymbol, symbolColor: default, character: l },
+          modifiers: *ref_0,
+        },
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/compoundTargets/chuckLineEachBetweenLook.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/compoundTargets/chuckLineEachBetweenLook.yml
new file mode 100644
index 0000000000..edaf4bb117
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/compoundTargets/chuckLineEachBetweenLook.yml
@@ -0,0 +1,70 @@
+languageId: plaintext
+command:
+  spokenForm: chuck line each between look
+  version: 2
+  targets:
+    - type: range
+      anchor:
+        type: primitive
+        mark: { type: decoratedSymbol, symbolColor: default, character: e }
+        modifiers:
+          - type: containingScope
+            scopeType: { type: line }
+      active:
+        type: primitive
+        mark: { type: decoratedSymbol, symbolColor: default, character: l }
+      excludeAnchor: true
+      excludeActive: true
+  usePrePhraseSnapshot: true
+  action: { name: remove }
+initialState:
+  documentContents: |-
+    hello there
+    hello there
+
+
+        hello there
+        hello there
+            hello
+  selections:
+    - anchor: { line: 4, character: 9 }
+      active: { line: 4, character: 9 }
+  marks:
+    default.e:
+      start: { line: 1, character: 6 }
+      end: { line: 1, character: 11 }
+    default.l:
+      start: { line: 4, character: 4 }
+      end: { line: 4, character: 9 }
+finalState:
+  documentContents: |-
+    hello there
+    hello there
+        hello there
+        hello there
+            hello
+  selections:
+    - anchor: { line: 2, character: 9 }
+      active: { line: 2, character: 9 }
+fullTargets:
+  [
+    {
+      type: range,
+      excludeAnchor: true,
+      excludeActive: true,
+      rangeType: continuous,
+      anchor:
+        {
+          type: primitive,
+          mark: { type: decoratedSymbol, symbolColor: default, character: e },
+          modifiers:
+            &ref_0 [{ type: containingScope, scopeType: { type: line } }],
+        },
+      active:
+        {
+          type: primitive,
+          mark: { type: decoratedSymbol, symbolColor: default, character: l },
+          modifiers: *ref_0,
+        },
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/compoundTargets/chuckLineEachBetweenLook2.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/compoundTargets/chuckLineEachBetweenLook2.yml
new file mode 100644
index 0000000000..0456c09913
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/compoundTargets/chuckLineEachBetweenLook2.yml
@@ -0,0 +1,69 @@
+languageId: plaintext
+command:
+  spokenForm: chuck line each between look
+  version: 2
+  targets:
+    - type: range
+      anchor:
+        type: primitive
+        mark: { type: decoratedSymbol, symbolColor: default, character: e }
+        modifiers:
+          - type: containingScope
+            scopeType: { type: line }
+      active:
+        type: primitive
+        mark: { type: decoratedSymbol, symbolColor: default, character: l }
+      excludeAnchor: true
+      excludeActive: true
+  usePrePhraseSnapshot: true
+  action: { name: remove }
+initialState:
+  documentContents: |-
+    hello there
+    hello there
+
+        hello there
+        hello there
+            hello
+  selections:
+    - anchor: { line: 3, character: 9 }
+      active: { line: 3, character: 9 }
+  marks:
+    default.e:
+      start: { line: 1, character: 6 }
+      end: { line: 1, character: 11 }
+    default.l:
+      start: { line: 3, character: 4 }
+      end: { line: 3, character: 9 }
+finalState:
+  documentContents: |-
+    hello there
+    hello there
+        hello there
+        hello there
+            hello
+  selections:
+    - anchor: { line: 2, character: 9 }
+      active: { line: 2, character: 9 }
+fullTargets:
+  [
+    {
+      type: range,
+      excludeAnchor: true,
+      excludeActive: true,
+      rangeType: continuous,
+      anchor:
+        {
+          type: primitive,
+          mark: { type: decoratedSymbol, symbolColor: default, character: e },
+          modifiers:
+            &ref_0 [{ type: containingScope, scopeType: { type: line } }],
+        },
+      active:
+        {
+          type: primitive,
+          mark: { type: decoratedSymbol, symbolColor: default, character: l },
+          modifiers: *ref_0,
+        },
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/compoundTargets/chuckLineEachUntilLook.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/compoundTargets/chuckLineEachUntilLook.yml
new file mode 100644
index 0000000000..8c6c309c5e
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/compoundTargets/chuckLineEachUntilLook.yml
@@ -0,0 +1,69 @@
+languageId: plaintext
+command:
+  spokenForm: chuck line each until look
+  version: 2
+  targets:
+    - type: range
+      anchor:
+        type: primitive
+        mark: { type: decoratedSymbol, symbolColor: default, character: e }
+        modifiers:
+          - type: containingScope
+            scopeType: { type: line }
+      active:
+        type: primitive
+        mark: { type: decoratedSymbol, symbolColor: default, character: l }
+      excludeAnchor: false
+      excludeActive: true
+  usePrePhraseSnapshot: true
+  action: { name: remove }
+initialState:
+  documentContents: |-
+    hello there
+    hello there
+
+
+        hello there
+        hello there
+            hello
+  selections:
+    - anchor: { line: 4, character: 9 }
+      active: { line: 4, character: 9 }
+  marks:
+    default.e:
+      start: { line: 1, character: 6 }
+      end: { line: 1, character: 11 }
+    default.l:
+      start: { line: 4, character: 4 }
+      end: { line: 4, character: 9 }
+finalState:
+  documentContents: |-
+    hello there
+        hello there
+        hello there
+            hello
+  selections:
+    - anchor: { line: 1, character: 9 }
+      active: { line: 1, character: 9 }
+fullTargets:
+  [
+    {
+      type: range,
+      excludeAnchor: false,
+      excludeActive: true,
+      rangeType: continuous,
+      anchor:
+        {
+          type: primitive,
+          mark: { type: decoratedSymbol, symbolColor: default, character: e },
+          modifiers:
+            &ref_0 [{ type: containingScope, scopeType: { type: line } }],
+        },
+      active:
+        {
+          type: primitive,
+          mark: { type: decoratedSymbol, symbolColor: default, character: l },
+          modifiers: *ref_0,
+        },
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/compoundTargets/chuckLineHarpBetweenFine.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/compoundTargets/chuckLineHarpBetweenFine.yml
new file mode 100644
index 0000000000..545e185324
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/compoundTargets/chuckLineHarpBetweenFine.yml
@@ -0,0 +1,66 @@
+languageId: plaintext
+command:
+  spokenForm: chuck line harp between fine
+  version: 2
+  targets:
+    - type: range
+      anchor:
+        type: primitive
+        mark: { type: decoratedSymbol, symbolColor: default, character: h }
+        modifiers:
+          - type: containingScope
+            scopeType: { type: line }
+      active:
+        type: primitive
+        mark: { type: decoratedSymbol, symbolColor: default, character: f }
+      excludeAnchor: true
+      excludeActive: true
+  usePrePhraseSnapshot: true
+  action: { name: remove }
+initialState:
+  documentContents: |
+
+    hello world
+
+
+    foo bar
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+  marks:
+    default.h:
+      start: { line: 1, character: 0 }
+      end: { line: 1, character: 5 }
+    default.f:
+      start: { line: 4, character: 0 }
+      end: { line: 4, character: 3 }
+finalState:
+  documentContents: |
+
+    hello world
+    foo bar
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+fullTargets:
+  [
+    {
+      type: range,
+      excludeAnchor: true,
+      excludeActive: true,
+      rangeType: continuous,
+      anchor:
+        {
+          type: primitive,
+          mark: { type: decoratedSymbol, symbolColor: default, character: h },
+          modifiers:
+            &ref_0 [{ type: containingScope, scopeType: { type: line } }],
+        },
+      active:
+        {
+          type: primitive,
+          mark: { type: decoratedSymbol, symbolColor: default, character: f },
+          modifiers: *ref_0,
+        },
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/compoundTargets/chuckLineRiskSliceMade.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/compoundTargets/chuckLineRiskSliceMade.yml
new file mode 100644
index 0000000000..24af7c6831
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/compoundTargets/chuckLineRiskSliceMade.yml
@@ -0,0 +1,65 @@
+languageId: plaintext
+command:
+  spokenForm: chuck line risk slice made
+  version: 2
+  targets:
+    - type: range
+      anchor:
+        type: primitive
+        mark: { type: decoratedSymbol, symbolColor: default, character: r }
+        modifiers:
+          - type: containingScope
+            scopeType: { type: line }
+      active:
+        type: primitive
+        mark: { type: decoratedSymbol, symbolColor: default, character: m }
+      excludeAnchor: false
+      excludeActive: false
+      rangeType: vertical
+  usePrePhraseSnapshot: true
+  action: { name: remove }
+initialState:
+  documentContents: |-
+    short
+    something longer
+    something even longer
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+  marks:
+    default.r:
+      start: { line: 0, character: 0 }
+      end: { line: 0, character: 5 }
+    default.m:
+      start: { line: 2, character: 0 }
+      end: { line: 2, character: 9 }
+finalState:
+  documentContents: |-
+
+    hing longer
+    hing even longer
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+fullTargets:
+  [
+    {
+      type: range,
+      excludeAnchor: false,
+      excludeActive: false,
+      rangeType: vertical,
+      anchor:
+        {
+          type: primitive,
+          mark: { type: decoratedSymbol, symbolColor: default, character: r },
+          modifiers:
+            &ref_0 [{ type: containingScope, scopeType: { type: line } }],
+        },
+      active:
+        {
+          type: primitive,
+          mark: { type: decoratedSymbol, symbolColor: default, character: m },
+          modifiers: *ref_0,
+        },
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/compoundTargets/clearJustThisPastBatt.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/compoundTargets/clearJustThisPastBatt.yml
new file mode 100644
index 0000000000..597601f1c3
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/compoundTargets/clearJustThisPastBatt.yml
@@ -0,0 +1,50 @@
+languageId: plaintext
+command:
+  spokenForm: clear just this past batt
+  version: 3
+  targets:
+    - type: range
+      anchor:
+        type: primitive
+        mark: { type: cursor }
+        modifiers:
+          - { type: toRawSelection }
+      active:
+        type: primitive
+        mark: { type: decoratedSymbol, symbolColor: default, character: b }
+      excludeAnchor: false
+      excludeActive: false
+  usePrePhraseSnapshot: true
+  action: { name: clearAndSetSelection }
+initialState:
+  documentContents: |-
+    aa
+    bb
+  selections:
+    - anchor: { line: 0, character: 1 }
+      active: { line: 0, character: 1 }
+  marks:
+    default.b:
+      start: { line: 1, character: 0 }
+      end: { line: 1, character: 2 }
+finalState:
+  documentContents: a
+  selections:
+    - anchor: { line: 0, character: 1 }
+      active: { line: 0, character: 1 }
+fullTargets:
+  [
+    {
+      type: range,
+      excludeAnchor: false,
+      excludeActive: false,
+      rangeType: continuous,
+      anchor: { type: primitive, mark: { type: cursor }, modifiers: [] },
+      active:
+        {
+          type: primitive,
+          mark: { type: decoratedSymbol, symbolColor: default, character: b },
+          modifiers: [],
+        },
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/compoundTargets/clearJustThisPastEndOfToken.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/compoundTargets/clearJustThisPastEndOfToken.yml
new file mode 100644
index 0000000000..360a1b425f
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/compoundTargets/clearJustThisPastEndOfToken.yml
@@ -0,0 +1,57 @@
+languageId: plaintext
+command:
+  spokenForm: clear just this past end of token
+  version: 3
+  targets:
+    - type: range
+      anchor:
+        type: primitive
+        modifiers:
+          - { type: toRawSelection }
+        mark: { type: cursor }
+      active:
+        type: primitive
+        modifiers:
+          - { type: position, position: end }
+          - type: containingScope
+            scopeType: { type: token }
+      excludeAnchor: false
+      excludeActive: false
+  usePrePhraseSnapshot: true
+  action: { name: clearAndSetSelection }
+initialState:
+  documentContents: hello there
+  selections:
+    - anchor: { line: 0, character: 8 }
+      active: { line: 0, character: 8 }
+  marks: {}
+finalState:
+  documentContents: hello th
+  selections:
+    - anchor: { line: 0, character: 8 }
+      active: { line: 0, character: 8 }
+fullTargets:
+  [
+    {
+      type: range,
+      excludeAnchor: false,
+      excludeActive: false,
+      rangeType: continuous,
+      anchor:
+        {
+          type: primitive,
+          mark: { type: cursor },
+          modifiers: [{ type: toRawSelection }],
+        },
+      active:
+        {
+          type: primitive,
+          mark: { type: cursor },
+          modifiers: [{ type: containingScope, scopeType: { type: token } }],
+          positionModifier: { type: position, position: end },
+        },
+    },
+  ]
+ide:
+  messages:
+    - { type: warning, id: deprecatedPositionInference }
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/compoundTargets/clearJustThisPastStartOfToken.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/compoundTargets/clearJustThisPastStartOfToken.yml
new file mode 100644
index 0000000000..cf867f84f3
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/compoundTargets/clearJustThisPastStartOfToken.yml
@@ -0,0 +1,57 @@
+languageId: plaintext
+command:
+  spokenForm: clear just this past start of token
+  version: 3
+  targets:
+    - type: range
+      anchor:
+        type: primitive
+        modifiers:
+          - { type: toRawSelection }
+        mark: { type: cursor }
+      active:
+        type: primitive
+        modifiers:
+          - { type: position, position: start }
+          - type: containingScope
+            scopeType: { type: token }
+      excludeAnchor: false
+      excludeActive: false
+  usePrePhraseSnapshot: true
+  action: { name: clearAndSetSelection }
+initialState:
+  documentContents: hello there
+  selections:
+    - anchor: { line: 0, character: 8 }
+      active: { line: 0, character: 8 }
+  marks: {}
+finalState:
+  documentContents: hello ere
+  selections:
+    - anchor: { line: 0, character: 6 }
+      active: { line: 0, character: 6 }
+fullTargets:
+  [
+    {
+      type: range,
+      excludeAnchor: false,
+      excludeActive: false,
+      rangeType: continuous,
+      anchor:
+        {
+          type: primitive,
+          mark: { type: cursor },
+          modifiers: [{ type: toRawSelection }],
+        },
+      active:
+        {
+          type: primitive,
+          mark: { type: cursor },
+          modifiers: [{ type: containingScope, scopeType: { type: token } }],
+          positionModifier: { type: position, position: start },
+        },
+    },
+  ]
+ide:
+  messages:
+    - { type: warning, id: deprecatedPositionInference }
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/compoundTargets/clearJustThisPastTrap.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/compoundTargets/clearJustThisPastTrap.yml
new file mode 100644
index 0000000000..173b5cd696
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/compoundTargets/clearJustThisPastTrap.yml
@@ -0,0 +1,53 @@
+languageId: plaintext
+command:
+  spokenForm: clear just this past trap
+  version: 3
+  targets:
+    - type: range
+      anchor:
+        type: primitive
+        modifiers:
+          - { type: toRawSelection }
+        mark: { type: cursor }
+      active:
+        type: primitive
+        mark: { type: decoratedSymbol, symbolColor: default, character: t }
+      excludeAnchor: false
+      excludeActive: false
+  usePrePhraseSnapshot: true
+  action: { name: clearAndSetSelection }
+initialState:
+  documentContents: hello there
+  selections:
+    - anchor: { line: 0, character: 3 }
+      active: { line: 0, character: 3 }
+  marks:
+    default.t:
+      start: { line: 0, character: 6 }
+      end: { line: 0, character: 11 }
+finalState:
+  documentContents: hel
+  selections:
+    - anchor: { line: 0, character: 3 }
+      active: { line: 0, character: 3 }
+fullTargets:
+  [
+    {
+      type: range,
+      excludeAnchor: false,
+      excludeActive: false,
+      rangeType: continuous,
+      anchor:
+        {
+          type: primitive,
+          mark: { type: cursor },
+          modifiers: [{ type: toRawSelection }],
+        },
+      active:
+        {
+          type: primitive,
+          mark: { type: decoratedSymbol, symbolColor: default, character: t },
+          modifiers: [{ type: toRawSelection }],
+        },
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/compoundTargets/clearPastBatt.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/compoundTargets/clearPastBatt.yml
new file mode 100644
index 0000000000..fe46812a5e
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/compoundTargets/clearPastBatt.yml
@@ -0,0 +1,46 @@
+languageId: plaintext
+command:
+  spokenForm: clear past batt
+  version: 3
+  targets:
+    - type: range
+      anchor: { type: primitive, isImplicit: true }
+      active:
+        type: primitive
+        mark: { type: decoratedSymbol, symbolColor: default, character: b }
+      excludeAnchor: false
+      excludeActive: false
+  usePrePhraseSnapshot: true
+  action: { name: clearAndSetSelection }
+initialState:
+  documentContents: |-
+    aa
+    bb
+  selections:
+    - anchor: { line: 0, character: 1 }
+      active: { line: 0, character: 1 }
+  marks:
+    default.b:
+      start: { line: 1, character: 0 }
+      end: { line: 1, character: 2 }
+finalState:
+  documentContents: a
+  selections:
+    - anchor: { line: 0, character: 1 }
+      active: { line: 0, character: 1 }
+fullTargets:
+  [
+    {
+      type: range,
+      excludeAnchor: false,
+      excludeActive: false,
+      rangeType: continuous,
+      anchor: { type: primitive, mark: { type: cursor }, modifiers: [] },
+      active:
+        {
+          type: primitive,
+          mark: { type: decoratedSymbol, symbolColor: default, character: b },
+          modifiers: [],
+        },
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/compoundTargets/clearPastEndOfToken.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/compoundTargets/clearPastEndOfToken.yml
new file mode 100644
index 0000000000..85c2b2ec3d
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/compoundTargets/clearPastEndOfToken.yml
@@ -0,0 +1,57 @@
+languageId: plaintext
+command:
+  version: 1
+  spokenForm: clear past end of token
+  action: clearAndSetSelection
+  targets:
+    - type: range
+      start: { type: primitive, isImplicit: true }
+      end:
+        {
+          type: primitive,
+          position: after,
+          insideOutsideType: inside,
+          selectionType: token,
+        }
+      excludeStart: false
+      excludeEnd: false
+initialState:
+  documentContents: hello there
+  selections:
+    - anchor: { line: 0, character: 8 }
+      active: { line: 0, character: 8 }
+  marks: {}
+finalState:
+  documentContents: hello th
+  selections:
+    - anchor: { line: 0, character: 8 }
+      active: { line: 0, character: 8 }
+fullTargets:
+  [
+    {
+      type: range,
+      excludeStart: false,
+      excludeEnd: false,
+      start:
+        {
+          type: primitive,
+          mark: { type: cursor },
+          selectionType: token,
+          position: contents,
+          modifier: { type: identity },
+          insideOutsideType: inside,
+        },
+      end:
+        {
+          type: primitive,
+          mark: { type: cursorToken },
+          selectionType: token,
+          position: after,
+          modifier: { type: identity },
+          insideOutsideType: inside,
+        },
+    },
+  ]
+ide:
+  messages:
+    - { type: warning, id: deprecatedPositionInference }
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/compoundTargets/clearPastStartOfToken.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/compoundTargets/clearPastStartOfToken.yml
new file mode 100644
index 0000000000..d356a49bd6
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/compoundTargets/clearPastStartOfToken.yml
@@ -0,0 +1,57 @@
+languageId: plaintext
+command:
+  version: 1
+  spokenForm: clear past start of token
+  action: clearAndSetSelection
+  targets:
+    - type: range
+      start: { type: primitive, isImplicit: true }
+      end:
+        {
+          type: primitive,
+          position: before,
+          insideOutsideType: inside,
+          selectionType: token,
+        }
+      excludeStart: false
+      excludeEnd: false
+initialState:
+  documentContents: hello there
+  selections:
+    - anchor: { line: 0, character: 8 }
+      active: { line: 0, character: 8 }
+  marks: {}
+finalState:
+  documentContents: hello ere
+  selections:
+    - anchor: { line: 0, character: 6 }
+      active: { line: 0, character: 6 }
+fullTargets:
+  [
+    {
+      type: range,
+      excludeStart: false,
+      excludeEnd: false,
+      start:
+        {
+          type: primitive,
+          mark: { type: cursor },
+          selectionType: token,
+          position: contents,
+          modifier: { type: identity },
+          insideOutsideType: inside,
+        },
+      end:
+        {
+          type: primitive,
+          mark: { type: cursorToken },
+          selectionType: token,
+          position: before,
+          modifier: { type: identity },
+          insideOutsideType: inside,
+        },
+    },
+  ]
+ide:
+  messages:
+    - { type: warning, id: deprecatedPositionInference }
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/compoundTargets/clearPastTrap.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/compoundTargets/clearPastTrap.yml
new file mode 100644
index 0000000000..e815c04974
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/compoundTargets/clearPastTrap.yml
@@ -0,0 +1,53 @@
+languageId: plaintext
+command:
+  version: 1
+  spokenForm: clear past trap
+  action: clearAndSetSelection
+  targets:
+    - type: range
+      start: { type: primitive, isImplicit: true }
+      end:
+        type: primitive
+        mark: { type: decoratedSymbol, symbolColor: default, character: t }
+      excludeStart: false
+      excludeEnd: false
+initialState:
+  documentContents: hello there
+  selections:
+    - anchor: { line: 0, character: 3 }
+      active: { line: 0, character: 3 }
+  marks:
+    default.t:
+      start: { line: 0, character: 6 }
+      end: { line: 0, character: 11 }
+finalState:
+  documentContents: hel
+  selections:
+    - anchor: { line: 0, character: 3 }
+      active: { line: 0, character: 3 }
+fullTargets:
+  [
+    {
+      type: range,
+      excludeStart: false,
+      excludeEnd: false,
+      start:
+        {
+          type: primitive,
+          mark: { type: cursor },
+          selectionType: token,
+          position: contents,
+          modifier: { type: identity },
+          insideOutsideType: inside,
+        },
+      end:
+        {
+          type: primitive,
+          mark: { type: decoratedSymbol, symbolColor: default, character: t },
+          selectionType: token,
+          position: contents,
+          modifier: { type: identity },
+          insideOutsideType: inside,
+        },
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/compoundTargets/clearThisPastBatt.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/compoundTargets/clearThisPastBatt.yml
new file mode 100644
index 0000000000..90a81abef8
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/compoundTargets/clearThisPastBatt.yml
@@ -0,0 +1,48 @@
+languageId: plaintext
+command:
+  spokenForm: clear this past batt
+  version: 3
+  targets:
+    - type: range
+      anchor:
+        type: primitive
+        mark: { type: cursor }
+      active:
+        type: primitive
+        mark: { type: decoratedSymbol, symbolColor: default, character: b }
+      excludeAnchor: false
+      excludeActive: false
+  usePrePhraseSnapshot: true
+  action: { name: clearAndSetSelection }
+initialState:
+  documentContents: |-
+    aa
+    bb
+  selections:
+    - anchor: { line: 0, character: 1 }
+      active: { line: 0, character: 1 }
+  marks:
+    default.b:
+      start: { line: 1, character: 0 }
+      end: { line: 1, character: 2 }
+finalState:
+  documentContents: ""
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+fullTargets:
+  [
+    {
+      type: range,
+      excludeAnchor: false,
+      excludeActive: false,
+      rangeType: continuous,
+      anchor: { type: primitive, mark: { type: cursor }, modifiers: [] },
+      active:
+        {
+          type: primitive,
+          mark: { type: decoratedSymbol, symbolColor: default, character: b },
+          modifiers: [],
+        },
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/compoundTargets/clearThisPastEndOfToken.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/compoundTargets/clearThisPastEndOfToken.yml
new file mode 100644
index 0000000000..0f04285f36
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/compoundTargets/clearThisPastEndOfToken.yml
@@ -0,0 +1,50 @@
+languageId: plaintext
+command:
+  spokenForm: clear this past end of token
+  version: 3
+  targets:
+    - type: range
+      anchor:
+        type: primitive
+        mark: { type: cursor }
+      active:
+        type: primitive
+        modifiers:
+          - { type: position, position: end }
+          - type: containingScope
+            scopeType: { type: token }
+      excludeAnchor: false
+      excludeActive: false
+  usePrePhraseSnapshot: true
+  action: { name: clearAndSetSelection }
+initialState:
+  documentContents: hello there
+  selections:
+    - anchor: { line: 0, character: 8 }
+      active: { line: 0, character: 8 }
+  marks: {}
+finalState:
+  documentContents: "hello "
+  selections:
+    - anchor: { line: 0, character: 6 }
+      active: { line: 0, character: 6 }
+fullTargets:
+  [
+    {
+      type: range,
+      excludeAnchor: false,
+      excludeActive: false,
+      rangeType: continuous,
+      anchor: { type: primitive, mark: { type: cursor }, modifiers: [] },
+      active:
+        {
+          type: primitive,
+          mark: { type: cursor },
+          modifiers: [{ type: containingScope, scopeType: { type: token } }],
+          positionModifier: { type: position, position: end },
+        },
+    },
+  ]
+ide:
+  messages:
+    - { type: warning, id: deprecatedPositionInference }
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/compoundTargets/clearThisPastStartOfToken.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/compoundTargets/clearThisPastStartOfToken.yml
new file mode 100644
index 0000000000..4e77fb17f0
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/compoundTargets/clearThisPastStartOfToken.yml
@@ -0,0 +1,50 @@
+languageId: plaintext
+command:
+  spokenForm: clear this past start of token
+  version: 3
+  targets:
+    - type: range
+      anchor:
+        type: primitive
+        mark: { type: cursor }
+      active:
+        type: primitive
+        modifiers:
+          - { type: position, position: start }
+          - type: containingScope
+            scopeType: { type: token }
+      excludeAnchor: false
+      excludeActive: false
+  usePrePhraseSnapshot: true
+  action: { name: clearAndSetSelection }
+initialState:
+  documentContents: hello there
+  selections:
+    - anchor: { line: 0, character: 8 }
+      active: { line: 0, character: 8 }
+  marks: {}
+finalState:
+  documentContents: "hello "
+  selections:
+    - anchor: { line: 0, character: 6 }
+      active: { line: 0, character: 6 }
+fullTargets:
+  [
+    {
+      type: range,
+      excludeAnchor: false,
+      excludeActive: false,
+      rangeType: continuous,
+      anchor: { type: primitive, mark: { type: cursor }, modifiers: [] },
+      active:
+        {
+          type: primitive,
+          mark: { type: cursor },
+          modifiers: [{ type: containingScope, scopeType: { type: token } }],
+          positionModifier: { type: position, position: start },
+        },
+    },
+  ]
+ide:
+  messages:
+    - { type: warning, id: deprecatedPositionInference }
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/compoundTargets/clearThisPastTrap.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/compoundTargets/clearThisPastTrap.yml
new file mode 100644
index 0000000000..6f07bdc64f
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/compoundTargets/clearThisPastTrap.yml
@@ -0,0 +1,46 @@
+languageId: plaintext
+command:
+  spokenForm: clear this past trap
+  version: 3
+  targets:
+    - type: range
+      anchor:
+        type: primitive
+        mark: { type: cursor }
+      active:
+        type: primitive
+        mark: { type: decoratedSymbol, symbolColor: default, character: t }
+      excludeAnchor: false
+      excludeActive: false
+  usePrePhraseSnapshot: true
+  action: { name: clearAndSetSelection }
+initialState:
+  documentContents: hello there
+  selections:
+    - anchor: { line: 0, character: 3 }
+      active: { line: 0, character: 3 }
+  marks:
+    default.t:
+      start: { line: 0, character: 6 }
+      end: { line: 0, character: 11 }
+finalState:
+  documentContents: ""
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+fullTargets:
+  [
+    {
+      type: range,
+      excludeAnchor: false,
+      excludeActive: false,
+      rangeType: continuous,
+      anchor: { type: primitive, mark: { type: cursor }, modifiers: [] },
+      active:
+        {
+          type: primitive,
+          mark: { type: decoratedSymbol, symbolColor: default, character: t },
+          modifiers: [],
+        },
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/compoundTargets/clearThisSliceBatt.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/compoundTargets/clearThisSliceBatt.yml
new file mode 100644
index 0000000000..f4a6189d78
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/compoundTargets/clearThisSliceBatt.yml
@@ -0,0 +1,53 @@
+languageId: plaintext
+command:
+  spokenForm: clear this slice batt
+  version: 3
+  targets:
+    - type: range
+      anchor:
+        type: primitive
+        mark: { type: cursor }
+      active:
+        type: primitive
+        mark: { type: decoratedSymbol, symbolColor: default, character: b }
+      excludeAnchor: false
+      excludeActive: false
+      rangeType: vertical
+  usePrePhraseSnapshot: true
+  action: { name: clearAndSetSelection }
+initialState:
+  documentContents: |-
+    aa
+    bb
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 1 }
+  marks:
+    default.b:
+      start: { line: 1, character: 0 }
+      end: { line: 1, character: 2 }
+finalState:
+  documentContents: |-
+    a
+    b
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+    - anchor: { line: 1, character: 0 }
+      active: { line: 1, character: 0 }
+fullTargets:
+  [
+    {
+      type: range,
+      excludeAnchor: false,
+      excludeActive: false,
+      rangeType: vertical,
+      anchor: { type: primitive, mark: { type: cursor }, modifiers: [] },
+      active:
+        {
+          type: primitive,
+          mark: { type: decoratedSymbol, symbolColor: default, character: b },
+          modifiers: [],
+        },
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/compoundTargets/postBatVerticalUntilFine.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/compoundTargets/postBatVerticalUntilFine.yml
new file mode 100644
index 0000000000..d628ceb4eb
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/compoundTargets/postBatVerticalUntilFine.yml
@@ -0,0 +1,72 @@
+languageId: plaintext
+command:
+  version: 1
+  spokenForm: post bat vertical until fine
+  action: setSelectionAfter
+  targets:
+    - type: range
+      start:
+        type: primitive
+        mark: { type: decoratedSymbol, symbolColor: default, character: b }
+      end:
+        type: primitive
+        mark: { type: decoratedSymbol, symbolColor: default, character: f }
+      excludeStart: false
+      excludeEnd: true
+      rangeType: vertical
+initialState:
+  documentContents: |
+    a
+
+    b   c
+    d   e
+    f   g
+  selections:
+    - anchor: { line: 5, character: 0 }
+      active: { line: 5, character: 0 }
+  marks:
+    default.b:
+      start: { line: 2, character: 0 }
+      end: { line: 2, character: 1 }
+    default.f:
+      start: { line: 4, character: 0 }
+      end: { line: 4, character: 1 }
+finalState:
+  documentContents: |
+    a
+
+    b   c
+    d   e
+    f   g
+  selections:
+    - anchor: { line: 2, character: 1 }
+      active: { line: 2, character: 1 }
+    - anchor: { line: 3, character: 1 }
+      active: { line: 3, character: 1 }
+fullTargets:
+  [
+    {
+      type: range,
+      excludeAnchor: false,
+      excludeActive: true,
+      rangeType: vertical,
+      anchor:
+        {
+          type: primitive,
+          mark: { type: decoratedSymbol, symbolColor: default, character: b },
+          selectionType: token,
+          position: contents,
+          insideOutsideType: inside,
+          modifier: { type: identity },
+        },
+      active:
+        {
+          type: primitive,
+          mark: { type: decoratedSymbol, symbolColor: default, character: f },
+          selectionType: token,
+          position: contents,
+          insideOutsideType: inside,
+          modifier: { type: identity },
+        },
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/compoundTargets/preBatVerticalBetweenFine.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/compoundTargets/preBatVerticalBetweenFine.yml
new file mode 100644
index 0000000000..66fe346460
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/compoundTargets/preBatVerticalBetweenFine.yml
@@ -0,0 +1,70 @@
+languageId: plaintext
+command:
+  version: 1
+  spokenForm: pre bat vertical between fine
+  action: setSelectionBefore
+  targets:
+    - type: range
+      start:
+        type: primitive
+        mark: { type: decoratedSymbol, symbolColor: default, character: b }
+      end:
+        type: primitive
+        mark: { type: decoratedSymbol, symbolColor: default, character: f }
+      excludeStart: true
+      excludeEnd: true
+      rangeType: vertical
+initialState:
+  documentContents: |
+    a
+
+    b   c
+    d   e
+    f   g
+  selections:
+    - anchor: { line: 5, character: 0 }
+      active: { line: 5, character: 0 }
+  marks:
+    default.b:
+      start: { line: 2, character: 0 }
+      end: { line: 2, character: 1 }
+    default.f:
+      start: { line: 4, character: 0 }
+      end: { line: 4, character: 1 }
+finalState:
+  documentContents: |
+    a
+
+    b   c
+    d   e
+    f   g
+  selections:
+    - anchor: { line: 3, character: 0 }
+      active: { line: 3, character: 0 }
+fullTargets:
+  [
+    {
+      type: range,
+      excludeAnchor: true,
+      excludeActive: true,
+      rangeType: vertical,
+      anchor:
+        {
+          type: primitive,
+          mark: { type: decoratedSymbol, symbolColor: default, character: b },
+          selectionType: token,
+          position: contents,
+          insideOutsideType: inside,
+          modifier: { type: identity },
+        },
+      active:
+        {
+          type: primitive,
+          mark: { type: decoratedSymbol, symbolColor: default, character: f },
+          selectionType: token,
+          position: contents,
+          insideOutsideType: inside,
+          modifier: { type: identity },
+        },
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/compoundTargets/takeBatVerticalPastFine.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/compoundTargets/takeBatVerticalPastFine.yml
new file mode 100644
index 0000000000..36e8ea9ed3
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/compoundTargets/takeBatVerticalPastFine.yml
@@ -0,0 +1,74 @@
+languageId: plaintext
+command:
+  version: 1
+  spokenForm: take bat vertical past fine
+  action: setSelection
+  targets:
+    - type: range
+      start:
+        type: primitive
+        mark: { type: decoratedSymbol, symbolColor: default, character: b }
+      end:
+        type: primitive
+        mark: { type: decoratedSymbol, symbolColor: default, character: f }
+      excludeStart: false
+      excludeEnd: false
+      rangeType: vertical
+initialState:
+  documentContents: |
+    a
+
+    b   c
+    d   e
+    f   g
+  selections:
+    - anchor: { line: 5, character: 0 }
+      active: { line: 5, character: 0 }
+  marks:
+    default.b:
+      start: { line: 2, character: 0 }
+      end: { line: 2, character: 1 }
+    default.f:
+      start: { line: 4, character: 0 }
+      end: { line: 4, character: 1 }
+finalState:
+  documentContents: |
+    a
+
+    b   c
+    d   e
+    f   g
+  selections:
+    - anchor: { line: 2, character: 0 }
+      active: { line: 2, character: 1 }
+    - anchor: { line: 3, character: 0 }
+      active: { line: 3, character: 1 }
+    - anchor: { line: 4, character: 0 }
+      active: { line: 4, character: 1 }
+fullTargets:
+  [
+    {
+      type: range,
+      excludeAnchor: false,
+      excludeActive: false,
+      rangeType: vertical,
+      anchor:
+        {
+          type: primitive,
+          mark: { type: decoratedSymbol, symbolColor: default, character: b },
+          selectionType: token,
+          position: contents,
+          insideOutsideType: inside,
+          modifier: { type: identity },
+        },
+      active:
+        {
+          type: primitive,
+          mark: { type: decoratedSymbol, symbolColor: default, character: f },
+          selectionType: token,
+          position: contents,
+          insideOutsideType: inside,
+          modifier: { type: identity },
+        },
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/compoundTargets/takeCapAndVestAndHarp.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/compoundTargets/takeCapAndVestAndHarp.yml
new file mode 100644
index 0000000000..30c0aff9f6
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/compoundTargets/takeCapAndVestAndHarp.yml
@@ -0,0 +1,75 @@
+languageId: typescript
+command:
+  version: 1
+  spokenForm: take cap and vest and harp
+  action: setSelection
+  targets:
+    - type: list
+      elements:
+        - type: primitive
+          mark: { type: decoratedSymbol, symbolColor: default, character: c }
+        - type: primitive
+          mark: { type: decoratedSymbol, symbolColor: default, character: v }
+        - type: primitive
+          mark: { type: decoratedSymbol, symbolColor: default, character: h }
+initialState:
+  documentContents: |
+
+    const value = "Hello world";
+  selections:
+    - anchor: { line: 1, character: 0 }
+      active: { line: 1, character: 20 }
+  marks:
+    default.c:
+      start: { line: 1, character: 0 }
+      end: { line: 1, character: 5 }
+    default.v:
+      start: { line: 1, character: 6 }
+      end: { line: 1, character: 11 }
+    default.h:
+      start: { line: 1, character: 15 }
+      end: { line: 1, character: 20 }
+finalState:
+  documentContents: |
+
+    const value = "Hello world";
+  selections:
+    - anchor: { line: 1, character: 0 }
+      active: { line: 1, character: 5 }
+    - anchor: { line: 1, character: 6 }
+      active: { line: 1, character: 11 }
+    - anchor: { line: 1, character: 15 }
+      active: { line: 1, character: 20 }
+fullTargets:
+  [
+    {
+      type: list,
+      elements:
+        [
+          {
+            type: primitive,
+            mark: { type: decoratedSymbol, symbolColor: default, character: c },
+            selectionType: token,
+            position: contents,
+            modifier: { type: identity },
+            insideOutsideType: inside,
+          },
+          {
+            type: primitive,
+            mark: { type: decoratedSymbol, symbolColor: default, character: v },
+            selectionType: token,
+            position: contents,
+            modifier: { type: identity },
+            insideOutsideType: inside,
+          },
+          {
+            type: primitive,
+            mark: { type: decoratedSymbol, symbolColor: default, character: h },
+            selectionType: token,
+            position: contents,
+            modifier: { type: identity },
+            insideOutsideType: inside,
+          },
+        ],
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/compoundTargets/takeCapPastHarp.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/compoundTargets/takeCapPastHarp.yml
new file mode 100644
index 0000000000..4fb94e7fe3
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/compoundTargets/takeCapPastHarp.yml
@@ -0,0 +1,62 @@
+languageId: typescript
+command:
+  version: 1
+  spokenForm: take cap past harp
+  action: setSelection
+  targets:
+    - type: range
+      start:
+        type: primitive
+        mark: { type: decoratedSymbol, symbolColor: default, character: c }
+      end:
+        type: primitive
+        mark: { type: decoratedSymbol, symbolColor: default, character: h }
+      excludeStart: false
+      excludeEnd: false
+initialState:
+  documentContents: |
+
+    const value = "Hello world";
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+  marks:
+    default.c:
+      start: { line: 1, character: 0 }
+      end: { line: 1, character: 5 }
+    default.h:
+      start: { line: 1, character: 15 }
+      end: { line: 1, character: 20 }
+finalState:
+  documentContents: |
+
+    const value = "Hello world";
+  selections:
+    - anchor: { line: 1, character: 0 }
+      active: { line: 1, character: 20 }
+fullTargets:
+  [
+    {
+      type: range,
+      excludeStart: false,
+      excludeEnd: false,
+      start:
+        {
+          type: primitive,
+          mark: { type: decoratedSymbol, symbolColor: default, character: c },
+          selectionType: token,
+          position: contents,
+          modifier: { type: identity },
+          insideOutsideType: inside,
+        },
+      end:
+        {
+          type: primitive,
+          mark: { type: decoratedSymbol, symbolColor: default, character: h },
+          selectionType: token,
+          position: contents,
+          modifier: { type: identity },
+          insideOutsideType: inside,
+        },
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/compoundTargets/takeFineVerticalPastBat.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/compoundTargets/takeFineVerticalPastBat.yml
new file mode 100644
index 0000000000..5af5d880d2
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/compoundTargets/takeFineVerticalPastBat.yml
@@ -0,0 +1,74 @@
+languageId: typescript
+command:
+  version: 1
+  spokenForm: take fine vertical past bat
+  action: setSelection
+  targets:
+    - type: range
+      start:
+        type: primitive
+        mark: { type: decoratedSymbol, symbolColor: default, character: f }
+      end:
+        type: primitive
+        mark: { type: decoratedSymbol, symbolColor: default, character: b }
+      excludeStart: false
+      excludeEnd: false
+      rangeType: vertical
+initialState:
+  documentContents: |
+    a
+
+    b   c
+    d   e
+    f   g
+  selections:
+    - anchor: { line: 5, character: 0 }
+      active: { line: 5, character: 0 }
+  marks:
+    default.f:
+      start: { line: 4, character: 0 }
+      end: { line: 4, character: 1 }
+    default.b:
+      start: { line: 2, character: 0 }
+      end: { line: 2, character: 1 }
+finalState:
+  documentContents: |
+    a
+
+    b   c
+    d   e
+    f   g
+  selections:
+    - anchor: { line: 4, character: 0 }
+      active: { line: 4, character: 1 }
+    - anchor: { line: 3, character: 0 }
+      active: { line: 3, character: 1 }
+    - anchor: { line: 2, character: 0 }
+      active: { line: 2, character: 1 }
+fullTargets:
+  [
+    {
+      type: range,
+      excludeAnchor: false,
+      excludeActive: false,
+      rangeType: vertical,
+      anchor:
+        {
+          type: primitive,
+          mark: { type: decoratedSymbol, symbolColor: default, character: f },
+          selectionType: token,
+          position: contents,
+          insideOutsideType: inside,
+          modifier: { type: identity },
+        },
+      active:
+        {
+          type: primitive,
+          mark: { type: decoratedSymbol, symbolColor: default, character: b },
+          selectionType: token,
+          position: contents,
+          insideOutsideType: inside,
+          modifier: { type: identity },
+        },
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/compoundTargets/takeHarpAndVestAndCap.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/compoundTargets/takeHarpAndVestAndCap.yml
new file mode 100644
index 0000000000..777a84bab6
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/compoundTargets/takeHarpAndVestAndCap.yml
@@ -0,0 +1,75 @@
+languageId: typescript
+command:
+  version: 1
+  spokenForm: take harp and vest and cap
+  action: setSelection
+  targets:
+    - type: list
+      elements:
+        - type: primitive
+          mark: { type: decoratedSymbol, symbolColor: default, character: h }
+        - type: primitive
+          mark: { type: decoratedSymbol, symbolColor: default, character: v }
+        - type: primitive
+          mark: { type: decoratedSymbol, symbolColor: default, character: c }
+initialState:
+  documentContents: |
+
+    const value = "Hello world";
+  selections:
+    - anchor: { line: 1, character: 20 }
+      active: { line: 1, character: 0 }
+  marks:
+    default.h:
+      start: { line: 1, character: 15 }
+      end: { line: 1, character: 20 }
+    default.v:
+      start: { line: 1, character: 6 }
+      end: { line: 1, character: 11 }
+    default.c:
+      start: { line: 1, character: 0 }
+      end: { line: 1, character: 5 }
+finalState:
+  documentContents: |
+
+    const value = "Hello world";
+  selections:
+    - anchor: { line: 1, character: 15 }
+      active: { line: 1, character: 20 }
+    - anchor: { line: 1, character: 6 }
+      active: { line: 1, character: 11 }
+    - anchor: { line: 1, character: 0 }
+      active: { line: 1, character: 5 }
+fullTargets:
+  [
+    {
+      type: list,
+      elements:
+        [
+          {
+            type: primitive,
+            mark: { type: decoratedSymbol, symbolColor: default, character: h },
+            selectionType: token,
+            position: contents,
+            modifier: { type: identity },
+            insideOutsideType: inside,
+          },
+          {
+            type: primitive,
+            mark: { type: decoratedSymbol, symbolColor: default, character: v },
+            selectionType: token,
+            position: contents,
+            modifier: { type: identity },
+            insideOutsideType: inside,
+          },
+          {
+            type: primitive,
+            mark: { type: decoratedSymbol, symbolColor: default, character: c },
+            selectionType: token,
+            position: contents,
+            modifier: { type: identity },
+            insideOutsideType: inside,
+          },
+        ],
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/compoundTargets/takeHarpPastCap.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/compoundTargets/takeHarpPastCap.yml
new file mode 100644
index 0000000000..df2853ab14
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/compoundTargets/takeHarpPastCap.yml
@@ -0,0 +1,62 @@
+languageId: typescript
+command:
+  version: 1
+  spokenForm: take harp past cap
+  action: setSelection
+  targets:
+    - type: range
+      start:
+        type: primitive
+        mark: { type: decoratedSymbol, symbolColor: default, character: h }
+      end:
+        type: primitive
+        mark: { type: decoratedSymbol, symbolColor: default, character: c }
+      excludeStart: false
+      excludeEnd: false
+initialState:
+  documentContents: |
+
+    const value = "Hello world";
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+  marks:
+    default.h:
+      start: { line: 1, character: 15 }
+      end: { line: 1, character: 20 }
+    default.c:
+      start: { line: 1, character: 0 }
+      end: { line: 1, character: 5 }
+finalState:
+  documentContents: |
+
+    const value = "Hello world";
+  selections:
+    - anchor: { line: 1, character: 20 }
+      active: { line: 1, character: 0 }
+fullTargets:
+  [
+    {
+      type: range,
+      excludeStart: false,
+      excludeEnd: false,
+      start:
+        {
+          type: primitive,
+          mark: { type: decoratedSymbol, symbolColor: default, character: h },
+          selectionType: token,
+          position: contents,
+          modifier: { type: identity },
+          insideOutsideType: inside,
+        },
+      end:
+        {
+          type: primitive,
+          mark: { type: decoratedSymbol, symbolColor: default, character: c },
+          selectionType: token,
+          position: contents,
+          modifier: { type: identity },
+          insideOutsideType: inside,
+        },
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/compoundTargets/takeLineVestAndAir.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/compoundTargets/takeLineVestAndAir.yml
new file mode 100644
index 0000000000..3d892d4b4b
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/compoundTargets/takeLineVestAndAir.yml
@@ -0,0 +1,55 @@
+languageId: typescript
+command:
+  version: 1
+  spokenForm: take line vest and air
+  action: setSelection
+  targets:
+    - type: list
+      elements:
+        - type: primitive
+          selectionType: line
+          mark: { type: decoratedSymbol, symbolColor: default, character: v }
+        - type: primitive
+          mark: { type: decoratedSymbol, symbolColor: default, character: a }
+initialState:
+  documentContents: "    value = {a:2}"
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+  marks:
+    default.v:
+      start: { line: 0, character: 4 }
+      end: { line: 0, character: 9 }
+    default.a:
+      start: { line: 0, character: 13 }
+      end: { line: 0, character: 14 }
+finalState:
+  documentContents: "    value = {a:2}"
+  selections:
+    - anchor: { line: 0, character: 4 }
+      active: { line: 0, character: 17 }
+fullTargets:
+  [
+    {
+      type: list,
+      elements:
+        [
+          {
+            type: primitive,
+            mark: { type: decoratedSymbol, symbolColor: default, character: v },
+            selectionType: line,
+            position: contents,
+            insideOutsideType: inside,
+            modifier: { type: identity },
+          },
+          {
+            type: primitive,
+            mark: { type: decoratedSymbol, symbolColor: default, character: a },
+            selectionType: line,
+            position: contents,
+            insideOutsideType: inside,
+            modifier: { type: identity },
+          },
+        ],
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/compoundTargets/takeTokenPastTrap.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/compoundTargets/takeTokenPastTrap.yml
new file mode 100644
index 0000000000..204c32fdae
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/compoundTargets/takeTokenPastTrap.yml
@@ -0,0 +1,53 @@
+languageId: typescript
+command:
+  version: 1
+  spokenForm: take token past trap
+  action: setSelection
+  targets:
+    - type: range
+      start: { type: primitive, selectionType: token }
+      end:
+        type: primitive
+        mark: { type: decoratedSymbol, symbolColor: default, character: t }
+      excludeStart: false
+      excludeEnd: false
+initialState:
+  documentContents: hello there
+  selections:
+    - anchor: { line: 0, character: 3 }
+      active: { line: 0, character: 3 }
+  marks:
+    default.t:
+      start: { line: 0, character: 6 }
+      end: { line: 0, character: 11 }
+finalState:
+  documentContents: hello there
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 11 }
+fullTargets:
+  [
+    {
+      type: range,
+      excludeStart: false,
+      excludeEnd: false,
+      start:
+        {
+          type: primitive,
+          mark: { type: cursorToken },
+          selectionType: token,
+          position: contents,
+          modifier: { type: identity },
+          insideOutsideType: inside,
+        },
+      end:
+        {
+          type: primitive,
+          mark: { type: decoratedSymbol, symbolColor: default, character: t },
+          selectionType: token,
+          position: contents,
+          modifier: { type: identity },
+          insideOutsideType: inside,
+        },
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/compoundTargets/takeVerticalPastFine.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/compoundTargets/takeVerticalPastFine.yml
new file mode 100644
index 0000000000..5ec97e0a74
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/compoundTargets/takeVerticalPastFine.yml
@@ -0,0 +1,69 @@
+languageId: typescript
+command:
+  version: 1
+  spokenForm: take vertical past fine
+  action: setSelection
+  targets:
+    - type: range
+      start: { type: primitive }
+      end:
+        type: primitive
+        mark: { type: decoratedSymbol, symbolColor: default, character: f }
+      excludeStart: false
+      excludeEnd: false
+      rangeType: vertical
+initialState:
+  documentContents: |
+    a
+
+    b   c
+    d   e
+    f   g
+  selections:
+    - anchor: { line: 2, character: 1 }
+      active: { line: 2, character: 0 }
+  marks:
+    default.f:
+      start: { line: 4, character: 0 }
+      end: { line: 4, character: 1 }
+finalState:
+  documentContents: |
+    a
+
+    b   c
+    d   e
+    f   g
+  selections:
+    - anchor: { line: 2, character: 1 }
+      active: { line: 2, character: 0 }
+    - anchor: { line: 3, character: 1 }
+      active: { line: 3, character: 0 }
+    - anchor: { line: 4, character: 1 }
+      active: { line: 4, character: 0 }
+fullTargets:
+  [
+    {
+      type: range,
+      excludeAnchor: false,
+      excludeActive: false,
+      rangeType: vertical,
+      anchor:
+        {
+          type: primitive,
+          mark: { type: cursor },
+          selectionType: token,
+          position: contents,
+          insideOutsideType: inside,
+          modifier: { type: identity },
+        },
+      active:
+        {
+          type: primitive,
+          mark: { type: decoratedSymbol, symbolColor: default, character: f },
+          selectionType: token,
+          position: contents,
+          insideOutsideType: inside,
+          modifier: { type: identity },
+        },
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/compoundTargets/takeVestTweenWhale.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/compoundTargets/takeVestTweenWhale.yml
new file mode 100644
index 0000000000..9611c1dd19
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/compoundTargets/takeVestTweenWhale.yml
@@ -0,0 +1,62 @@
+languageId: typescript
+command:
+  version: 1
+  spokenForm: take vest tween whale
+  action: setSelection
+  targets:
+    - type: range
+      start:
+        type: primitive
+        mark: { type: decoratedSymbol, symbolColor: default, character: v }
+      end:
+        type: primitive
+        mark: { type: decoratedSymbol, symbolColor: default, character: w }
+      excludeStart: true
+      excludeEnd: true
+initialState:
+  documentContents: |
+
+    const value = "Hello world";
+  selections:
+    - anchor: { line: 1, character: 26 }
+      active: { line: 1, character: 11 }
+  marks:
+    default.v:
+      start: { line: 1, character: 6 }
+      end: { line: 1, character: 11 }
+    default.w:
+      start: { line: 1, character: 21 }
+      end: { line: 1, character: 26 }
+finalState:
+  documentContents: |
+
+    const value = "Hello world";
+  selections:
+    - anchor: { line: 1, character: 11 }
+      active: { line: 1, character: 21 }
+fullTargets:
+  [
+    {
+      type: range,
+      excludeStart: true,
+      excludeEnd: true,
+      start:
+        {
+          type: primitive,
+          mark: { type: decoratedSymbol, symbolColor: default, character: v },
+          selectionType: token,
+          position: contents,
+          modifier: { type: identity },
+          insideOutsideType: inside,
+        },
+      end:
+        {
+          type: primitive,
+          mark: { type: decoratedSymbol, symbolColor: default, character: w },
+          selectionType: token,
+          position: contents,
+          modifier: { type: identity },
+          insideOutsideType: inside,
+        },
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/compoundTargets/takeVestUntilWhale.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/compoundTargets/takeVestUntilWhale.yml
new file mode 100644
index 0000000000..a9b8ebcf48
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/compoundTargets/takeVestUntilWhale.yml
@@ -0,0 +1,62 @@
+languageId: typescript
+command:
+  version: 1
+  spokenForm: take vest until whale
+  action: setSelection
+  targets:
+    - type: range
+      start:
+        type: primitive
+        mark: { type: decoratedSymbol, symbolColor: default, character: v }
+      end:
+        type: primitive
+        mark: { type: decoratedSymbol, symbolColor: default, character: w }
+      excludeStart: false
+      excludeEnd: true
+initialState:
+  documentContents: |
+
+    const value = "Hello world";
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+  marks:
+    default.v:
+      start: { line: 1, character: 6 }
+      end: { line: 1, character: 11 }
+    default.w:
+      start: { line: 1, character: 21 }
+      end: { line: 1, character: 26 }
+finalState:
+  documentContents: |
+
+    const value = "Hello world";
+  selections:
+    - anchor: { line: 1, character: 6 }
+      active: { line: 1, character: 21 }
+fullTargets:
+  [
+    {
+      type: range,
+      excludeStart: false,
+      excludeEnd: true,
+      start:
+        {
+          type: primitive,
+          mark: { type: decoratedSymbol, symbolColor: default, character: v },
+          selectionType: token,
+          position: contents,
+          modifier: { type: identity },
+          insideOutsideType: inside,
+        },
+      end:
+        {
+          type: primitive,
+          mark: { type: decoratedSymbol, symbolColor: default, character: w },
+          selectionType: token,
+          position: contents,
+          modifier: { type: identity },
+          insideOutsideType: inside,
+        },
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/compoundTargets/takeWhaleTweenVest.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/compoundTargets/takeWhaleTweenVest.yml
new file mode 100644
index 0000000000..4bab518277
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/compoundTargets/takeWhaleTweenVest.yml
@@ -0,0 +1,62 @@
+languageId: typescript
+command:
+  version: 1
+  spokenForm: take whale tween vest
+  action: setSelection
+  targets:
+    - type: range
+      start:
+        type: primitive
+        mark: { type: decoratedSymbol, symbolColor: default, character: w }
+      end:
+        type: primitive
+        mark: { type: decoratedSymbol, symbolColor: default, character: v }
+      excludeStart: true
+      excludeEnd: true
+initialState:
+  documentContents: |
+
+    const value = "Hello world";
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+  marks:
+    default.w:
+      start: { line: 1, character: 21 }
+      end: { line: 1, character: 26 }
+    default.v:
+      start: { line: 1, character: 6 }
+      end: { line: 1, character: 11 }
+finalState:
+  documentContents: |
+
+    const value = "Hello world";
+  selections:
+    - anchor: { line: 1, character: 21 }
+      active: { line: 1, character: 11 }
+fullTargets:
+  [
+    {
+      type: range,
+      excludeStart: true,
+      excludeEnd: true,
+      start:
+        {
+          type: primitive,
+          mark: { type: decoratedSymbol, symbolColor: default, character: w },
+          selectionType: token,
+          position: contents,
+          modifier: { type: identity },
+          insideOutsideType: inside,
+        },
+      end:
+        {
+          type: primitive,
+          mark: { type: decoratedSymbol, symbolColor: default, character: v },
+          selectionType: token,
+          position: contents,
+          modifier: { type: identity },
+          insideOutsideType: inside,
+        },
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/compoundTargets/takeWhaleUntilVest.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/compoundTargets/takeWhaleUntilVest.yml
new file mode 100644
index 0000000000..67230e6486
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/compoundTargets/takeWhaleUntilVest.yml
@@ -0,0 +1,62 @@
+languageId: typescript
+command:
+  version: 1
+  spokenForm: take whale until vest
+  action: setSelection
+  targets:
+    - type: range
+      start:
+        type: primitive
+        mark: { type: decoratedSymbol, symbolColor: default, character: w }
+      end:
+        type: primitive
+        mark: { type: decoratedSymbol, symbolColor: default, character: v }
+      excludeStart: false
+      excludeEnd: true
+initialState:
+  documentContents: |
+
+    const value = "Hello world";
+  selections:
+    - anchor: { line: 1, character: 6 }
+      active: { line: 1, character: 21 }
+  marks:
+    default.w:
+      start: { line: 1, character: 21 }
+      end: { line: 1, character: 26 }
+    default.v:
+      start: { line: 1, character: 6 }
+      end: { line: 1, character: 11 }
+finalState:
+  documentContents: |
+
+    const value = "Hello world";
+  selections:
+    - anchor: { line: 1, character: 26 }
+      active: { line: 1, character: 11 }
+fullTargets:
+  [
+    {
+      type: range,
+      excludeStart: false,
+      excludeEnd: true,
+      start:
+        {
+          type: primitive,
+          mark: { type: decoratedSymbol, symbolColor: default, character: w },
+          selectionType: token,
+          position: contents,
+          modifier: { type: identity },
+          insideOutsideType: inside,
+        },
+      end:
+        {
+          type: primitive,
+          mark: { type: decoratedSymbol, symbolColor: default, character: v },
+          selectionType: token,
+          position: contents,
+          modifier: { type: identity },
+          insideOutsideType: inside,
+        },
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/containingScope/clearToken.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/containingScope/clearToken.yml
new file mode 100644
index 0000000000..155b56f403
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/containingScope/clearToken.yml
@@ -0,0 +1,30 @@
+languageId: plaintext
+command:
+  spokenForm: clear token
+  version: 3
+  targets:
+    - type: primitive
+      modifiers:
+        - type: containingScope
+          scopeType: { type: token }
+  usePrePhraseSnapshot: true
+  action: { name: clearAndSetSelection }
+initialState:
+  documentContents: foo.
+  selections:
+    - anchor: { line: 0, character: 3 }
+      active: { line: 0, character: 4 }
+  marks: {}
+finalState:
+  documentContents: foo
+  selections:
+    - anchor: { line: 0, character: 3 }
+      active: { line: 0, character: 3 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      modifiers: [{ type: containingScope, scopeType: { type: token } }],
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/containingScope/clearWord.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/containingScope/clearWord.yml
new file mode 100644
index 0000000000..723e9664ee
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/containingScope/clearWord.yml
@@ -0,0 +1,30 @@
+languageId: plaintext
+command:
+  spokenForm: clear word
+  version: 3
+  targets:
+    - type: primitive
+      modifiers:
+        - type: containingScope
+          scopeType: { type: word }
+  usePrePhraseSnapshot: true
+  action: { name: clearAndSetSelection }
+initialState:
+  documentContents: aaaBbb.
+  selections:
+    - anchor: { line: 0, character: 6 }
+      active: { line: 0, character: 6 }
+  marks: {}
+finalState:
+  documentContents: aaa.
+  selections:
+    - anchor: { line: 0, character: 3 }
+      active: { line: 0, character: 3 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      modifiers: [{ type: containingScope, scopeType: { type: word } }],
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/containingScope/clearWord2.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/containingScope/clearWord2.yml
new file mode 100644
index 0000000000..64c1bf1f55
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/containingScope/clearWord2.yml
@@ -0,0 +1,30 @@
+languageId: plaintext
+command:
+  spokenForm: clear word
+  version: 3
+  targets:
+    - type: primitive
+      modifiers:
+        - type: containingScope
+          scopeType: { type: word }
+  usePrePhraseSnapshot: true
+  action: { name: clearAndSetSelection }
+initialState:
+  documentContents: .aaaBbb
+  selections:
+    - anchor: { line: 0, character: 1 }
+      active: { line: 0, character: 1 }
+  marks: {}
+finalState:
+  documentContents: .Bbb
+  selections:
+    - anchor: { line: 0, character: 1 }
+      active: { line: 0, character: 1 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      modifiers: [{ type: containingScope, scopeType: { type: word } }],
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/customRegex/clearWhite.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/customRegex/clearWhite.yml
new file mode 100644
index 0000000000..7aa981ead9
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/customRegex/clearWhite.yml
@@ -0,0 +1,36 @@
+languageId: plaintext
+command:
+  spokenForm: clear white
+  version: 3
+  targets:
+    - type: primitive
+      modifiers:
+        - type: containingScope
+          scopeType: { type: customRegex, regex: '\p{Zs}+' }
+  usePrePhraseSnapshot: true
+  action: { name: clearAndSetSelection }
+initialState:
+  documentContents: '"  "'
+  selections:
+    - anchor: { line: 0, character: 2 }
+      active: { line: 0, character: 2 }
+  marks: {}
+finalState:
+  documentContents: '""'
+  selections:
+    - anchor: { line: 0, character: 1 }
+      active: { line: 0, character: 1 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      modifiers:
+        [
+          {
+            type: containingScope,
+            scopeType: { type: customRegex, regex: '\p{Zs}+' },
+          },
+        ],
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/decorations/carveLineHarp.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/decorations/carveLineHarp.yml
new file mode 100644
index 0000000000..fadc5f4e6b
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/decorations/carveLineHarp.yml
@@ -0,0 +1,45 @@
+languageId: plaintext
+command:
+  version: 4
+  spokenForm: carve line harp
+  action: { name: cutToClipboard }
+  targets:
+    - type: primitive
+      modifiers:
+        - type: containingScope
+          scopeType: { type: line }
+      mark: { type: decoratedSymbol, symbolColor: default, character: h }
+  usePrePhraseSnapshot: true
+initialState:
+  documentContents: |2
+        hello world
+  selections:
+    - anchor: { line: 1, character: 0 }
+      active: { line: 1, character: 0 }
+  marks:
+    default.h:
+      start: { line: 0, character: 4 }
+      end: { line: 0, character: 9 }
+finalState:
+  documentContents: ""
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+  clipboard: "hello world"
+ide:
+  flashes:
+    - style: referenced
+      range:
+        type: character
+        start: { line: 0, character: 4 }
+        end: { line: 0, character: 15 }
+    - style: pendingDelete
+      range: { type: line, start: 0, end: 0 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: decoratedSymbol, symbolColor: default, character: h },
+      modifiers: [{ type: containingScope, scopeType: { type: line } }],
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/decorations/chuckBlockAir.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/decorations/chuckBlockAir.yml
new file mode 100644
index 0000000000..f07fb4fd28
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/decorations/chuckBlockAir.yml
@@ -0,0 +1,50 @@
+languageId: plaintext
+command:
+  spokenForm: chuck block air
+  version: 2
+  targets:
+    - type: primitive
+      mark: { type: decoratedSymbol, symbolColor: default, character: a }
+      modifiers:
+        - type: containingScope
+          scopeType: { type: paragraph }
+  usePrePhraseSnapshot: true
+  action: { name: remove }
+initialState:
+  documentContents: |
+
+    a
+    a
+
+
+    b   c
+    d   e
+    f   g
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+  marks:
+    default.a:
+      start: { line: 1, character: 0 }
+      end: { line: 1, character: 1 }
+finalState:
+  documentContents: |
+
+    b   c
+    d   e
+    f   g
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+ide:
+  flashes:
+    - range: { type: line, start: 1, end: 4 }
+      style: pendingDelete
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: decoratedSymbol, symbolColor: default, character: a },
+      modifiers: [{ type: containingScope, scopeType: { type: paragraph } }],
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/decorations/chuckBlockAirUntilBatt.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/decorations/chuckBlockAirUntilBatt.yml
new file mode 100644
index 0000000000..0827eec297
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/decorations/chuckBlockAirUntilBatt.yml
@@ -0,0 +1,73 @@
+languageId: plaintext
+command:
+  spokenForm: chuck block air until batt
+  version: 2
+  targets:
+    - type: range
+      anchor:
+        type: primitive
+        mark: { type: decoratedSymbol, symbolColor: default, character: a }
+        modifiers:
+          - type: containingScope
+            scopeType: { type: paragraph }
+      active:
+        type: primitive
+        mark: { type: decoratedSymbol, symbolColor: default, character: b }
+      excludeAnchor: false
+      excludeActive: true
+  usePrePhraseSnapshot: true
+  action: { name: remove }
+initialState:
+  documentContents: |
+
+    a
+    a
+
+
+    b   c
+    d   e
+    f   g
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+  marks:
+    default.a:
+      start: { line: 1, character: 0 }
+      end: { line: 1, character: 1 }
+    default.b:
+      start: { line: 5, character: 0 }
+      end: { line: 5, character: 1 }
+finalState:
+  documentContents: |
+    b   c
+    d   e
+    f   g
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+ide:
+  flashes:
+    - range: { type: line, start: 0, end: 4 }
+      style: pendingDelete
+fullTargets:
+  [
+    {
+      type: range,
+      excludeAnchor: false,
+      excludeActive: true,
+      rangeType: continuous,
+      anchor:
+        {
+          type: primitive,
+          mark: { type: decoratedSymbol, symbolColor: default, character: a },
+          modifiers:
+            &ref_0 [{ type: containingScope, scopeType: { type: paragraph } }],
+        },
+      active:
+        {
+          type: primitive,
+          mark: { type: decoratedSymbol, symbolColor: default, character: b },
+          modifiers: *ref_0,
+        },
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/decorations/chuckBlockBatt.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/decorations/chuckBlockBatt.yml
new file mode 100644
index 0000000000..fb27711802
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/decorations/chuckBlockBatt.yml
@@ -0,0 +1,50 @@
+languageId: plaintext
+command:
+  spokenForm: chuck block batt
+  version: 2
+  targets:
+    - type: primitive
+      mark: { type: decoratedSymbol, symbolColor: default, character: b }
+      modifiers:
+        - type: containingScope
+          scopeType: { type: paragraph }
+  usePrePhraseSnapshot: true
+  action: { name: remove }
+initialState:
+  documentContents: |
+
+    a
+    a
+
+
+    b   c
+    d   e
+    f   g
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+  marks:
+    default.b:
+      start: { line: 5, character: 0 }
+      end: { line: 5, character: 1 }
+finalState:
+  documentContents: |+
+
+    a
+    a
+
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+ide:
+  flashes:
+    - range: { type: line, start: 5, end: 8 }
+      style: pendingDelete
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: decoratedSymbol, symbolColor: default, character: b },
+      modifiers: [{ type: containingScope, scopeType: { type: paragraph } }],
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/decorations/chuckBlockBatt2.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/decorations/chuckBlockBatt2.yml
new file mode 100644
index 0000000000..15fd4fdb67
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/decorations/chuckBlockBatt2.yml
@@ -0,0 +1,42 @@
+languageId: plaintext
+command:
+  spokenForm: chuck block batt
+  version: 2
+  targets:
+    - type: primitive
+      mark: { type: decoratedSymbol, symbolColor: default, character: b }
+      modifiers:
+        - type: containingScope
+          scopeType: { type: paragraph }
+  usePrePhraseSnapshot: true
+  action: { name: remove }
+initialState:
+  documentContents: |-
+
+    b   c
+    d   e
+    f   g
+  selections:
+    - anchor: { line: 3, character: 5 }
+      active: { line: 3, character: 5 }
+  marks:
+    default.b:
+      start: { line: 1, character: 0 }
+      end: { line: 1, character: 1 }
+finalState:
+  documentContents: ""
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+ide:
+  flashes:
+    - range: { type: line, start: 0, end: 3 }
+      style: pendingDelete
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: decoratedSymbol, symbolColor: default, character: b },
+      modifiers: [{ type: containingScope, scopeType: { type: paragraph } }],
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/decorations/chuckBlockBattUntilAir.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/decorations/chuckBlockBattUntilAir.yml
new file mode 100644
index 0000000000..8b85873681
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/decorations/chuckBlockBattUntilAir.yml
@@ -0,0 +1,73 @@
+languageId: plaintext
+command:
+  spokenForm: chuck block batt until air
+  version: 2
+  targets:
+    - type: range
+      anchor:
+        type: primitive
+        mark: { type: decoratedSymbol, symbolColor: default, character: b }
+        modifiers:
+          - type: containingScope
+            scopeType: { type: paragraph }
+      active:
+        type: primitive
+        mark: { type: decoratedSymbol, symbolColor: default, character: a }
+      excludeAnchor: false
+      excludeActive: true
+  usePrePhraseSnapshot: true
+  action: { name: remove }
+initialState:
+  documentContents: |
+
+    a
+    a
+
+
+    b   c
+    d   e
+    f   g
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+  marks:
+    default.b:
+      start: { line: 5, character: 0 }
+      end: { line: 5, character: 1 }
+    default.a:
+      start: { line: 1, character: 0 }
+      end: { line: 1, character: 1 }
+finalState:
+  documentContents: |-
+
+    a
+    a
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+ide:
+  flashes:
+    - range: { type: line, start: 3, end: 8 }
+      style: pendingDelete
+fullTargets:
+  [
+    {
+      type: range,
+      excludeAnchor: false,
+      excludeActive: true,
+      rangeType: continuous,
+      anchor:
+        {
+          type: primitive,
+          mark: { type: decoratedSymbol, symbolColor: default, character: b },
+          modifiers:
+            &ref_0 [{ type: containingScope, scopeType: { type: paragraph } }],
+        },
+      active:
+        {
+          type: primitive,
+          mark: { type: decoratedSymbol, symbolColor: default, character: a },
+          modifiers: *ref_0,
+        },
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/decorations/chuckFine.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/decorations/chuckFine.yml
new file mode 100644
index 0000000000..bcf5f0588b
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/decorations/chuckFine.yml
@@ -0,0 +1,44 @@
+languageId: plaintext
+command:
+  spokenForm: chuck fine
+  version: 2
+  targets:
+    - type: primitive
+      mark: { type: decoratedSymbol, symbolColor: default, character: f }
+  usePrePhraseSnapshot: true
+  action: { name: remove }
+initialState:
+  documentContents: |2
+
+        foo ooo
+        bar
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+  marks:
+    default.f:
+      start: { line: 1, character: 4 }
+      end: { line: 1, character: 7 }
+finalState:
+  documentContents: |2
+
+        ooo
+        bar
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+ide:
+  flashes:
+    - range:
+        type: character
+        start: { line: 1, character: 4 }
+        end: { line: 1, character: 8 }
+      style: pendingDelete
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: decoratedSymbol, symbolColor: default, character: f },
+      modifiers: [],
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/decorations/chuckLineFine.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/decorations/chuckLineFine.yml
new file mode 100644
index 0000000000..05ccb2c757
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/decorations/chuckLineFine.yml
@@ -0,0 +1,43 @@
+languageId: plaintext
+command:
+  spokenForm: chuck line fine
+  version: 2
+  targets:
+    - type: primitive
+      mark: { type: decoratedSymbol, symbolColor: default, character: f }
+      modifiers:
+        - type: containingScope
+          scopeType: { type: line }
+  usePrePhraseSnapshot: true
+  action: { name: remove }
+initialState:
+  documentContents: |2
+
+        foo ooo
+        bar
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+  marks:
+    default.f:
+      start: { line: 1, character: 4 }
+      end: { line: 1, character: 7 }
+finalState:
+  documentContents: |2
+
+        bar
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+ide:
+  flashes:
+    - range: { type: line, start: 1, end: 1 }
+      style: pendingDelete
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: decoratedSymbol, symbolColor: default, character: f },
+      modifiers: [{ type: containingScope, scopeType: { type: line } }],
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/decorations/chuckLineFineBetweenRisk.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/decorations/chuckLineFineBetweenRisk.yml
new file mode 100644
index 0000000000..efce0f63ef
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/decorations/chuckLineFineBetweenRisk.yml
@@ -0,0 +1,70 @@
+languageId: plaintext
+command:
+  spokenForm: chuck line fine between risk
+  version: 2
+  targets:
+    - type: range
+      anchor:
+        type: primitive
+        mark: { type: decoratedSymbol, symbolColor: default, character: f }
+        modifiers:
+          - type: containingScope
+            scopeType: { type: line }
+      active:
+        type: primitive
+        mark: { type: decoratedSymbol, symbolColor: default, character: r }
+      excludeAnchor: true
+      excludeActive: true
+  usePrePhraseSnapshot: true
+  action: { name: remove }
+initialState:
+  documentContents: |2
+
+        foo ooo
+    aa
+    bb
+        bar
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+  marks:
+    default.f:
+      start: { line: 1, character: 4 }
+      end: { line: 1, character: 7 }
+    default.r:
+      start: { line: 4, character: 4 }
+      end: { line: 4, character: 7 }
+finalState:
+  documentContents: |2
+
+        foo ooo
+        bar
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+ide:
+  flashes:
+    - range: { type: line, start: 2, end: 3 }
+      style: pendingDelete
+fullTargets:
+  [
+    {
+      type: range,
+      excludeAnchor: true,
+      excludeActive: true,
+      rangeType: continuous,
+      anchor:
+        {
+          type: primitive,
+          mark: { type: decoratedSymbol, symbolColor: default, character: f },
+          modifiers:
+            &ref_0 [{ type: containingScope, scopeType: { type: line } }],
+        },
+      active:
+        {
+          type: primitive,
+          mark: { type: decoratedSymbol, symbolColor: default, character: r },
+          modifiers: *ref_0,
+        },
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/decorations/clearBlockFine.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/decorations/clearBlockFine.yml
new file mode 100644
index 0000000000..a5ec09604d
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/decorations/clearBlockFine.yml
@@ -0,0 +1,45 @@
+languageId: plaintext
+command:
+  spokenForm: clear block fine
+  version: 2
+  targets:
+    - type: primitive
+      mark: { type: decoratedSymbol, symbolColor: default, character: f }
+      modifiers:
+        - type: containingScope
+          scopeType: { type: paragraph }
+  usePrePhraseSnapshot: true
+  action: { name: clearAndSetSelection }
+initialState:
+  documentContents: |2
+
+        foo ooo
+        bar
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+  marks:
+    default.f:
+      start: { line: 1, character: 4 }
+      end: { line: 1, character: 7 }
+finalState:
+  documentContents: |2
+
+  selections:
+    - anchor: { line: 1, character: 4 }
+      active: { line: 1, character: 4 }
+ide:
+  flashes:
+    - range:
+        type: character
+        start: { line: 1, character: 4 }
+        end: { line: 2, character: 7 }
+      style: pendingDelete
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: decoratedSymbol, symbolColor: default, character: f },
+      modifiers: [{ type: containingScope, scopeType: { type: paragraph } }],
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/decorations/clearFine.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/decorations/clearFine.yml
new file mode 100644
index 0000000000..6e555f2f1e
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/decorations/clearFine.yml
@@ -0,0 +1,44 @@
+languageId: plaintext
+command:
+  spokenForm: clear fine
+  version: 2
+  targets:
+    - type: primitive
+      mark: { type: decoratedSymbol, symbolColor: default, character: f }
+  usePrePhraseSnapshot: true
+  action: { name: clearAndSetSelection }
+initialState:
+  documentContents: |2
+
+        foo ooo
+        bar
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+  marks:
+    default.f:
+      start: { line: 1, character: 4 }
+      end: { line: 1, character: 7 }
+finalState:
+  documentContents: |2
+
+         ooo
+        bar
+  selections:
+    - anchor: { line: 1, character: 4 }
+      active: { line: 1, character: 4 }
+ide:
+  flashes:
+    - range:
+        type: character
+        start: { line: 1, character: 4 }
+        end: { line: 1, character: 7 }
+      style: pendingDelete
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: decoratedSymbol, symbolColor: default, character: f },
+      modifiers: [],
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/decorations/clearLineFine.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/decorations/clearLineFine.yml
new file mode 100644
index 0000000000..364375c8d8
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/decorations/clearLineFine.yml
@@ -0,0 +1,47 @@
+languageId: plaintext
+command:
+  spokenForm: clear line fine
+  version: 2
+  targets:
+    - type: primitive
+      mark: { type: decoratedSymbol, symbolColor: default, character: f }
+      modifiers:
+        - type: containingScope
+          scopeType: { type: line }
+  usePrePhraseSnapshot: true
+  action: { name: clearAndSetSelection }
+initialState:
+  documentContents: |2
+
+        foo ooo
+        bar
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+  marks:
+    default.f:
+      start: { line: 1, character: 4 }
+      end: { line: 1, character: 7 }
+finalState:
+  documentContents: |2
+
+
+        bar
+  selections:
+    - anchor: { line: 1, character: 4 }
+      active: { line: 1, character: 4 }
+ide:
+  flashes:
+    - range:
+        type: character
+        start: { line: 1, character: 4 }
+        end: { line: 1, character: 11 }
+      style: pendingDelete
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: decoratedSymbol, symbolColor: default, character: f },
+      modifiers: [{ type: containingScope, scopeType: { type: line } }],
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/decorations/config.json b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/decorations/config.json
similarity index 100%
rename from packages/cursorless-vscode-e2e/suite/fixtures/recorded/decorations/config.json
rename to packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/decorations/config.json
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/decorations/cutFine.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/decorations/cutFine.yml
new file mode 100644
index 0000000000..d43980e428
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/decorations/cutFine.yml
@@ -0,0 +1,47 @@
+languageId: plaintext
+command:
+  spokenForm: cut fine
+  version: 2
+  targets:
+    - type: primitive
+      mark: { type: decoratedSymbol, symbolColor: default, character: f }
+  usePrePhraseSnapshot: true
+  action: { name: cutToClipboard }
+initialState:
+  documentContents: |2
+
+        foo bar
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+  marks:
+    default.f:
+      start: { line: 1, character: 4 }
+      end: { line: 1, character: 7 }
+finalState:
+  documentContents: |2
+
+        bar
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+ide:
+  flashes:
+    - range:
+        type: character
+        start: { line: 1, character: 4 }
+        end: { line: 1, character: 7 }
+      style: referenced
+    - range:
+        type: character
+        start: { line: 1, character: 7 }
+        end: { line: 1, character: 8 }
+      style: pendingDelete
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: decoratedSymbol, symbolColor: default, character: f },
+      modifiers: [],
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/decorations/highlightFine.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/decorations/highlightFine.yml
new file mode 100644
index 0000000000..87183275d5
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/decorations/highlightFine.yml
@@ -0,0 +1,50 @@
+languageId: plaintext
+command:
+  spokenForm: highlight fine
+  version: 2
+  targets:
+    - type: primitive
+      mark: { type: decoratedSymbol, symbolColor: default, character: f }
+  usePrePhraseSnapshot: true
+  action: { name: highlight }
+initialState:
+  documentContents: |2
+
+        foo
+        bar
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+  marks:
+    default.f:
+      start: { line: 1, character: 4 }
+      end: { line: 1, character: 7 }
+finalState:
+  documentContents: |2
+
+        foo
+        bar
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+  thatMark:
+    - type: UntypedTarget
+      contentRange:
+        start: { line: 1, character: 4 }
+        end: { line: 1, character: 7 }
+      isReversed: false
+      hasExplicitRange: false
+ide:
+  highlights:
+    - ranges:
+        - type: character
+          start: { line: 1, character: 4 }
+          end: { line: 1, character: 7 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: decoratedSymbol, symbolColor: default, character: f },
+      modifiers: [],
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/decorations/highlightLineFine.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/decorations/highlightLineFine.yml
new file mode 100644
index 0000000000..a62415092d
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/decorations/highlightLineFine.yml
@@ -0,0 +1,51 @@
+languageId: plaintext
+command:
+  spokenForm: highlight line fine
+  version: 2
+  targets:
+    - type: primitive
+      mark: { type: decoratedSymbol, symbolColor: default, character: f }
+      modifiers:
+        - type: containingScope
+          scopeType: { type: line }
+  usePrePhraseSnapshot: true
+  action: { name: highlight }
+initialState:
+  documentContents: |2
+
+        foo
+        bar
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+  marks:
+    default.f:
+      start: { line: 1, character: 4 }
+      end: { line: 1, character: 7 }
+finalState:
+  documentContents: |2
+
+        foo
+        bar
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+  thatMark:
+    - type: LineTarget
+      contentRange:
+        start: { line: 1, character: 4 }
+        end: { line: 1, character: 7 }
+      isReversed: false
+      hasExplicitRange: true
+ide:
+  highlights:
+    - ranges:
+        - { type: line, start: 1, end: 1 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: decoratedSymbol, symbolColor: default, character: f },
+      modifiers: [{ type: containingScope, scopeType: { type: line } }],
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/decorations/moveLineAir.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/decorations/moveLineAir.yml
new file mode 100644
index 0000000000..cfbc8e8bd5
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/decorations/moveLineAir.yml
@@ -0,0 +1,60 @@
+languageId: plaintext
+command:
+  spokenForm: move line air
+  version: 2
+  targets:
+    - type: primitive
+      mark: { type: decoratedSymbol, symbolColor: default, character: a }
+      modifiers:
+        - type: containingScope
+          scopeType: { type: line }
+    - { type: primitive, isImplicit: true }
+  usePrePhraseSnapshot: true
+  action: { name: moveToTarget }
+initialState:
+  documentContents: |
+    a a a
+    b b b
+    c c c
+  selections:
+    - anchor: { line: 3, character: 0 }
+      active: { line: 3, character: 0 }
+  marks:
+    default.a:
+      start: { line: 0, character: 0 }
+      end: { line: 0, character: 1 }
+finalState:
+  documentContents: |-
+    b b b
+    c c c
+    a a a
+  selections:
+    - anchor: { line: 2, character: 5 }
+      active: { line: 2, character: 5 }
+ide:
+  flashes:
+    - range: { type: line, start: 0, end: 0 }
+      style: pendingDelete
+    - range:
+        type: character
+        start: { line: 3, character: 0 }
+        end: { line: 3, character: 0 }
+      style: pendingModification0
+    - range:
+        type: character
+        start: { line: 2, character: 0 }
+        end: { line: 2, character: 5 }
+      style: pendingModification0
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: decoratedSymbol, symbolColor: default, character: a },
+      modifiers: [{ type: containingScope, scopeType: { type: line } }],
+    },
+    {
+      type: primitive,
+      mark: { type: cursor },
+      modifiers: [{ type: toRawSelection }],
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/hatTokenMap/bringAirToThirdCarWhaleTakeWhale.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/hatTokenMap/bringAirToThirdCarWhaleTakeWhale.yml
new file mode 100644
index 0000000000..65f615ff85
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/hatTokenMap/bringAirToThirdCarWhaleTakeWhale.yml
@@ -0,0 +1,72 @@
+languageId: plaintext
+command:
+  version: 1
+  spokenForm: bring air to third car whale take whale
+  action: replaceWithTarget
+  targets:
+    - type: primitive
+      mark: { type: decoratedSymbol, symbolColor: default, character: a }
+    - type: primitive
+      selectionType: token
+      modifier:
+        {
+          type: subpiece,
+          pieceType: character,
+          anchor: 2,
+          active: 2,
+          excludeAnchor: false,
+          excludeActive: false,
+        }
+      mark: { type: decoratedSymbol, symbolColor: default, character: w }
+marksToCheck: [default.w]
+initialState:
+  documentContents: hello. world whatever
+  selections:
+    - anchor: { line: 0, character: 13 }
+      active: { line: 0, character: 13 }
+  marks:
+    default.a:
+      start: { line: 0, character: 13 }
+      end: { line: 0, character: 21 }
+    default.w:
+      start: { line: 0, character: 7 }
+      end: { line: 0, character: 12 }
+finalState:
+  documentContents: hello. wowhateverld whatever
+  selections:
+    - anchor: { line: 0, character: 20 }
+      active: { line: 0, character: 20 }
+  marks:
+    default.a:
+      start: { line: 0, character: 20 }
+      end: { line: 0, character: 28 }
+    default.w:
+      start: { line: 0, character: 7 }
+      end: { line: 0, character: 19 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: decoratedSymbol, symbolColor: default, character: a },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: null,
+      modifier: { type: identity },
+    },
+    {
+      type: primitive,
+      mark: { type: decoratedSymbol, symbolColor: default, character: w },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: null,
+      modifier:
+        {
+          type: subpiece,
+          pieceType: character,
+          anchor: 2,
+          active: 2,
+          excludeAnchor: false,
+          excludeActive: false,
+        },
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/hatTokenMap/bringCommaToEndOfPointTakePoint.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/hatTokenMap/bringCommaToEndOfPointTakePoint.yml
new file mode 100644
index 0000000000..763ee39922
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/hatTokenMap/bringCommaToEndOfPointTakePoint.yml
@@ -0,0 +1,56 @@
+languageId: typescript
+command:
+  version: 1
+  spokenForm: bring comma to end of point take point
+  action: replaceWithTarget
+  targets:
+    - type: primitive
+      mark: { type: decoratedSymbol, symbolColor: default, character: "," }
+    - type: primitive
+      position: after
+      insideOutsideType: inside
+      mark: { type: decoratedSymbol, symbolColor: default, character: . }
+marksToCheck: [default..]
+initialState:
+  documentContents: " . , hello"
+  selections:
+    - anchor: { line: 0, character: 10 }
+      active: { line: 0, character: 10 }
+  marks:
+    default.,:
+      start: { line: 0, character: 3 }
+      end: { line: 0, character: 4 }
+    default..:
+      start: { line: 0, character: 1 }
+      end: { line: 0, character: 2 }
+finalState:
+  documentContents: " ., , hello"
+  selections:
+    - anchor: { line: 0, character: 11 }
+      active: { line: 0, character: 11 }
+  marks:
+    default.,:
+      start: { line: 0, character: 4 }
+      end: { line: 0, character: 5 }
+    default..:
+      start: { line: 0, character: 1 }
+      end: { line: 0, character: 2 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: decoratedSymbol, symbolColor: default, character: "," },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: null,
+      modifier: { type: identity },
+    },
+    {
+      type: primitive,
+      mark: { type: decoratedSymbol, symbolColor: default, character: . },
+      selectionType: token,
+      position: after,
+      insideOutsideType: inside,
+      modifier: { type: identity },
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/hatTokenMap/bringCommaToStartOfPointTakePoint.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/hatTokenMap/bringCommaToStartOfPointTakePoint.yml
new file mode 100644
index 0000000000..1c9fa452af
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/hatTokenMap/bringCommaToStartOfPointTakePoint.yml
@@ -0,0 +1,56 @@
+languageId: typescript
+command:
+  version: 1
+  spokenForm: bring comma to start of point take point
+  action: replaceWithTarget
+  targets:
+    - type: primitive
+      mark: { type: decoratedSymbol, symbolColor: default, character: "," }
+    - type: primitive
+      position: before
+      insideOutsideType: inside
+      mark: { type: decoratedSymbol, symbolColor: default, character: . }
+marksToCheck: [default..]
+initialState:
+  documentContents: " . , hello"
+  selections:
+    - anchor: { line: 0, character: 10 }
+      active: { line: 0, character: 10 }
+  marks:
+    default.,:
+      start: { line: 0, character: 3 }
+      end: { line: 0, character: 4 }
+    default..:
+      start: { line: 0, character: 1 }
+      end: { line: 0, character: 2 }
+finalState:
+  documentContents: " ,. , hello"
+  selections:
+    - anchor: { line: 0, character: 11 }
+      active: { line: 0, character: 11 }
+  marks:
+    default.,:
+      start: { line: 0, character: 4 }
+      end: { line: 0, character: 5 }
+    default..:
+      start: { line: 0, character: 2 }
+      end: { line: 0, character: 3 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: decoratedSymbol, symbolColor: default, character: "," },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: null,
+      modifier: { type: identity },
+    },
+    {
+      type: primitive,
+      mark: { type: decoratedSymbol, symbolColor: default, character: . },
+      selectionType: token,
+      position: before,
+      insideOutsideType: inside,
+      modifier: { type: identity },
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/hatTokenMap/bringHarpAfterWhaleTakeWhale.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/hatTokenMap/bringHarpAfterWhaleTakeWhale.yml
new file mode 100644
index 0000000000..ed430429d2
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/hatTokenMap/bringHarpAfterWhaleTakeWhale.yml
@@ -0,0 +1,55 @@
+languageId: plaintext
+command:
+  version: 1
+  spokenForm: bring harp after whale take whale
+  action: replaceWithTarget
+  targets:
+    - type: primitive
+      mark: { type: decoratedSymbol, symbolColor: default, character: h }
+    - type: primitive
+      mark: { type: decoratedSymbol, symbolColor: default, character: w }
+      position: after
+marksToCheck: [default.w]
+initialState:
+  documentContents: hello world
+  selections:
+    - anchor: { line: 0, character: 11 }
+      active: { line: 0, character: 11 }
+  marks:
+    default.h:
+      start: { line: 0, character: 0 }
+      end: { line: 0, character: 5 }
+    default.w:
+      start: { line: 0, character: 6 }
+      end: { line: 0, character: 11 }
+finalState:
+  documentContents: hello world hello
+  selections:
+    - anchor: { line: 0, character: 11 }
+      active: { line: 0, character: 11 }
+  marks:
+    default.h:
+      start: { line: 0, character: 0 }
+      end: { line: 0, character: 5 }
+    default.w:
+      start: { line: 0, character: 6 }
+      end: { line: 0, character: 11 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: decoratedSymbol, symbolColor: default, character: h },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: null,
+      modifier: { type: identity },
+    },
+    {
+      type: primitive,
+      mark: { type: decoratedSymbol, symbolColor: default, character: w },
+      selectionType: token,
+      position: after,
+      insideOutsideType: null,
+      modifier: { type: identity },
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/hatTokenMap/bringHarpAndPointToEndOfThisAndEndOfWhaleTakeWhale.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/hatTokenMap/bringHarpAndPointToEndOfThisAndEndOfWhaleTakeWhale.yml
new file mode 100644
index 0000000000..1df700a880
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/hatTokenMap/bringHarpAndPointToEndOfThisAndEndOfWhaleTakeWhale.yml
@@ -0,0 +1,100 @@
+languageId: plaintext
+command:
+  version: 1
+  spokenForm: bring harp and point to end of this and end of whale take whale
+  action: replaceWithTarget
+  targets:
+    - type: list
+      elements:
+        - type: primitive
+          mark: { type: decoratedSymbol, symbolColor: default, character: h }
+        - type: primitive
+          mark: { type: decoratedSymbol, symbolColor: default, character: . }
+    - type: list
+      elements:
+        - type: primitive
+          position: after
+          insideOutsideType: inside
+          mark: { type: cursor }
+        - type: primitive
+          position: after
+          insideOutsideType: inside
+          mark: { type: decoratedSymbol, symbolColor: default, character: w }
+marksToCheck: [default.w]
+initialState:
+  documentContents: hello. world
+  selections:
+    - anchor: { line: 0, character: 12 }
+      active: { line: 0, character: 12 }
+  marks:
+    default.h:
+      start: { line: 0, character: 0 }
+      end: { line: 0, character: 5 }
+    default..:
+      start: { line: 0, character: 5 }
+      end: { line: 0, character: 6 }
+    default.w:
+      start: { line: 0, character: 7 }
+      end: { line: 0, character: 12 }
+finalState:
+  documentContents: hello. worldhello.
+  selections:
+    - anchor: { line: 0, character: 18 }
+      active: { line: 0, character: 18 }
+  marks:
+    default.h:
+      start: { line: 0, character: 0 }
+      end: { line: 0, character: 5 }
+    default..:
+      start: { line: 0, character: 5 }
+      end: { line: 0, character: 6 }
+    default.w:
+      start: { line: 0, character: 7 }
+      end: { line: 0, character: 17 }
+fullTargets:
+  [
+    {
+      type: list,
+      elements:
+        [
+          {
+            type: primitive,
+            mark: { type: decoratedSymbol, symbolColor: default, character: h },
+            selectionType: token,
+            position: contents,
+            insideOutsideType: null,
+            modifier: { type: identity },
+          },
+          {
+            type: primitive,
+            mark: { type: decoratedSymbol, symbolColor: default, character: . },
+            selectionType: token,
+            position: contents,
+            insideOutsideType: null,
+            modifier: { type: identity },
+          },
+        ],
+    },
+    {
+      type: list,
+      elements:
+        [
+          {
+            type: primitive,
+            mark: { type: cursor },
+            selectionType: token,
+            position: after,
+            insideOutsideType: inside,
+            modifier: { type: identity },
+          },
+          {
+            type: primitive,
+            mark: { type: decoratedSymbol, symbolColor: default, character: w },
+            selectionType: token,
+            position: after,
+            insideOutsideType: inside,
+            modifier: { type: identity },
+          },
+        ],
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/hatTokenMap/bringHarpAndPointToJustThisAndStartOfWhaleTakeWhale.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/hatTokenMap/bringHarpAndPointToJustThisAndStartOfWhaleTakeWhale.yml
new file mode 100644
index 0000000000..a8972a4d78
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/hatTokenMap/bringHarpAndPointToJustThisAndStartOfWhaleTakeWhale.yml
@@ -0,0 +1,100 @@
+languageId: plaintext
+command:
+  version: 3
+  spokenForm: bring harp and point to just this and start of whale take whale
+  action: { name: replaceWithTarget }
+  targets:
+    - type: list
+      elements:
+        - type: primitive
+          mark: { type: decoratedSymbol, symbolColor: default, character: h }
+        - type: primitive
+          mark: { type: decoratedSymbol, symbolColor: default, character: . }
+    - type: list
+      elements:
+        - type: primitive
+          modifiers:
+            - { type: toRawSelection }
+          mark: { type: cursor }
+        - type: primitive
+          modifiers:
+            - { type: position, position: start }
+          mark: { type: decoratedSymbol, symbolColor: default, character: w }
+marksToCheck: [default.w]
+initialState:
+  documentContents: hello. world
+  selections:
+    - anchor: { line: 0, character: 7 }
+      active: { line: 0, character: 7 }
+  marks:
+    default.h:
+      start: { line: 0, character: 0 }
+      end: { line: 0, character: 5 }
+    default..:
+      start: { line: 0, character: 5 }
+      end: { line: 0, character: 6 }
+    default.w:
+      start: { line: 0, character: 7 }
+      end: { line: 0, character: 12 }
+finalState:
+  documentContents: hello. hello.world
+  selections:
+    - anchor: { line: 0, character: 13 }
+      active: { line: 0, character: 13 }
+  marks:
+    default.h:
+      start: { line: 0, character: 0 }
+      end: { line: 0, character: 5 }
+    default..:
+      start: { line: 0, character: 5 }
+      end: { line: 0, character: 6 }
+    default.w:
+      start: { line: 0, character: 8 }
+      end: { line: 0, character: 18 }
+fullTargets:
+  [
+    {
+      type: list,
+      elements:
+        [
+          {
+            type: primitive,
+            mark: { type: decoratedSymbol, symbolColor: default, character: h },
+            selectionType: token,
+            position: contents,
+            insideOutsideType: null,
+            modifier: { type: identity },
+          },
+          {
+            type: primitive,
+            mark: { type: decoratedSymbol, symbolColor: default, character: . },
+            selectionType: token,
+            position: contents,
+            insideOutsideType: null,
+            modifier: { type: identity },
+          },
+        ],
+    },
+    {
+      type: list,
+      elements:
+        [
+          {
+            type: primitive,
+            mark: { type: cursor },
+            selectionType: token,
+            position: contents,
+            insideOutsideType: null,
+            modifier: { type: identity },
+          },
+          {
+            type: primitive,
+            mark: { type: decoratedSymbol, symbolColor: default, character: w },
+            selectionType: token,
+            position: before,
+            insideOutsideType: inside,
+            modifier: { type: identity },
+          },
+        ],
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/hatTokenMap/bringHarpBeforeWhaleTakeWhale.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/hatTokenMap/bringHarpBeforeWhaleTakeWhale.yml
new file mode 100644
index 0000000000..8139b3973c
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/hatTokenMap/bringHarpBeforeWhaleTakeWhale.yml
@@ -0,0 +1,55 @@
+languageId: plaintext
+command:
+  version: 1
+  spokenForm: bring harp before whale take whale
+  action: replaceWithTarget
+  targets:
+    - type: primitive
+      mark: { type: decoratedSymbol, symbolColor: default, character: h }
+    - type: primitive
+      mark: { type: decoratedSymbol, symbolColor: default, character: w }
+      position: before
+marksToCheck: [default.w]
+initialState:
+  documentContents: hello. world whatever
+  selections:
+    - anchor: { line: 0, character: 13 }
+      active: { line: 0, character: 13 }
+  marks:
+    default.h:
+      start: { line: 0, character: 0 }
+      end: { line: 0, character: 5 }
+    default.w:
+      start: { line: 0, character: 7 }
+      end: { line: 0, character: 12 }
+finalState:
+  documentContents: hello. hello world whatever
+  selections:
+    - anchor: { line: 0, character: 19 }
+      active: { line: 0, character: 19 }
+  marks:
+    default.h:
+      start: { line: 0, character: 0 }
+      end: { line: 0, character: 5 }
+    default.w:
+      start: { line: 0, character: 13 }
+      end: { line: 0, character: 18 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: decoratedSymbol, symbolColor: default, character: h },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: null,
+      modifier: { type: identity },
+    },
+    {
+      type: primitive,
+      mark: { type: decoratedSymbol, symbolColor: default, character: w },
+      selectionType: token,
+      position: before,
+      insideOutsideType: null,
+      modifier: { type: identity },
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/hatTokenMap/bringHarpTakeWhale.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/hatTokenMap/bringHarpTakeWhale.yml
new file mode 100644
index 0000000000..d44db81671
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/hatTokenMap/bringHarpTakeWhale.yml
@@ -0,0 +1,53 @@
+languageId: plaintext
+command:
+  version: 1
+  spokenForm: bring harp take whale
+  action: replaceWithTarget
+  targets:
+    - type: primitive
+      mark: { type: decoratedSymbol, symbolColor: default, character: h }
+    - { type: primitive, isImplicit: true }
+marksToCheck: [default.w]
+initialState:
+  documentContents: hello world
+  selections:
+    - anchor: { line: 0, character: 11 }
+      active: { line: 0, character: 11 }
+  marks:
+    default.h:
+      start: { line: 0, character: 0 }
+      end: { line: 0, character: 5 }
+    default.w:
+      start: { line: 0, character: 6 }
+      end: { line: 0, character: 11 }
+finalState:
+  documentContents: hello worldhello
+  selections:
+    - anchor: { line: 0, character: 16 }
+      active: { line: 0, character: 16 }
+  marks:
+    default.h:
+      start: { line: 0, character: 0 }
+      end: { line: 0, character: 5 }
+    default.w:
+      start: { line: 0, character: 6 }
+      end: { line: 0, character: 16 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: decoratedSymbol, symbolColor: default, character: h },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: null,
+      modifier: { type: identity },
+    },
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier: { type: identity },
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/hatTokenMap/bringHarpToEndOfPointTakePoint.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/hatTokenMap/bringHarpToEndOfPointTakePoint.yml
new file mode 100644
index 0000000000..b51ebfb767
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/hatTokenMap/bringHarpToEndOfPointTakePoint.yml
@@ -0,0 +1,56 @@
+languageId: typescript
+command:
+  version: 1
+  spokenForm: bring harp to end of point take point
+  action: replaceWithTarget
+  targets:
+    - type: primitive
+      mark: { type: decoratedSymbol, symbolColor: default, character: h }
+    - type: primitive
+      position: after
+      insideOutsideType: inside
+      mark: { type: decoratedSymbol, symbolColor: default, character: . }
+marksToCheck: [default..]
+initialState:
+  documentContents: " . , hello"
+  selections:
+    - anchor: { line: 0, character: 10 }
+      active: { line: 0, character: 10 }
+  marks:
+    default.h:
+      start: { line: 0, character: 5 }
+      end: { line: 0, character: 10 }
+    default..:
+      start: { line: 0, character: 1 }
+      end: { line: 0, character: 2 }
+finalState:
+  documentContents: " .hello , hello"
+  selections:
+    - anchor: { line: 0, character: 15 }
+      active: { line: 0, character: 15 }
+  marks:
+    default.h:
+      start: { line: 0, character: 10 }
+      end: { line: 0, character: 15 }
+    default..:
+      start: { line: 0, character: 1 }
+      end: { line: 0, character: 2 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: decoratedSymbol, symbolColor: default, character: h },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: null,
+      modifier: { type: identity },
+    },
+    {
+      type: primitive,
+      mark: { type: decoratedSymbol, symbolColor: default, character: . },
+      selectionType: token,
+      position: after,
+      insideOutsideType: inside,
+      modifier: { type: identity },
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/hatTokenMap/bringHarpToStartOfPointTakePoint.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/hatTokenMap/bringHarpToStartOfPointTakePoint.yml
new file mode 100644
index 0000000000..dc41348419
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/hatTokenMap/bringHarpToStartOfPointTakePoint.yml
@@ -0,0 +1,56 @@
+languageId: typescript
+command:
+  version: 1
+  spokenForm: bring harp to start of point take point
+  action: replaceWithTarget
+  targets:
+    - type: primitive
+      mark: { type: decoratedSymbol, symbolColor: default, character: h }
+    - type: primitive
+      position: before
+      insideOutsideType: inside
+      mark: { type: decoratedSymbol, symbolColor: default, character: . }
+marksToCheck: [default..]
+initialState:
+  documentContents: " . , hello"
+  selections:
+    - anchor: { line: 0, character: 10 }
+      active: { line: 0, character: 10 }
+  marks:
+    default.h:
+      start: { line: 0, character: 5 }
+      end: { line: 0, character: 10 }
+    default..:
+      start: { line: 0, character: 1 }
+      end: { line: 0, character: 2 }
+finalState:
+  documentContents: " hello. , hello"
+  selections:
+    - anchor: { line: 0, character: 15 }
+      active: { line: 0, character: 15 }
+  marks:
+    default.h:
+      start: { line: 0, character: 10 }
+      end: { line: 0, character: 15 }
+    default..:
+      start: { line: 0, character: 6 }
+      end: { line: 0, character: 7 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: decoratedSymbol, symbolColor: default, character: h },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: null,
+      modifier: { type: identity },
+    },
+    {
+      type: primitive,
+      mark: { type: decoratedSymbol, symbolColor: default, character: . },
+      selectionType: token,
+      position: before,
+      insideOutsideType: inside,
+      modifier: { type: identity },
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/hatTokenMap/bringHarpToStartOfWhaleTakeWhale.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/hatTokenMap/bringHarpToStartOfWhaleTakeWhale.yml
new file mode 100644
index 0000000000..2f62f9ad29
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/hatTokenMap/bringHarpToStartOfWhaleTakeWhale.yml
@@ -0,0 +1,56 @@
+languageId: plaintext
+command:
+  version: 1
+  spokenForm: bring harp to start of whale take whale
+  action: replaceWithTarget
+  targets:
+    - type: primitive
+      mark: { type: decoratedSymbol, symbolColor: default, character: h }
+    - type: primitive
+      position: before
+      insideOutsideType: inside
+      mark: { type: decoratedSymbol, symbolColor: default, character: w }
+marksToCheck: [default.w]
+initialState:
+  documentContents: hello. world whatever
+  selections:
+    - anchor: { line: 0, character: 13 }
+      active: { line: 0, character: 13 }
+  marks:
+    default.h:
+      start: { line: 0, character: 0 }
+      end: { line: 0, character: 5 }
+    default.w:
+      start: { line: 0, character: 7 }
+      end: { line: 0, character: 12 }
+finalState:
+  documentContents: hello. helloworld whatever
+  selections:
+    - anchor: { line: 0, character: 18 }
+      active: { line: 0, character: 18 }
+  marks:
+    default.h:
+      start: { line: 0, character: 0 }
+      end: { line: 0, character: 5 }
+    default.w:
+      start: { line: 0, character: 7 }
+      end: { line: 0, character: 17 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: decoratedSymbol, symbolColor: default, character: h },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: null,
+      modifier: { type: identity },
+    },
+    {
+      type: primitive,
+      mark: { type: decoratedSymbol, symbolColor: default, character: w },
+      selectionType: token,
+      position: before,
+      insideOutsideType: inside,
+      modifier: { type: identity },
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/hatTokenMap/bringPointAfterFirstCarWhaleTakeWhale.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/hatTokenMap/bringPointAfterFirstCarWhaleTakeWhale.yml
new file mode 100644
index 0000000000..6efa463b4f
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/hatTokenMap/bringPointAfterFirstCarWhaleTakeWhale.yml
@@ -0,0 +1,73 @@
+languageId: plaintext
+command:
+  version: 1
+  spokenForm: bring point after first car whale take whale
+  action: replaceWithTarget
+  targets:
+    - type: primitive
+      mark: { type: decoratedSymbol, symbolColor: default, character: . }
+    - type: primitive
+      selectionType: token
+      modifier:
+        {
+          type: subpiece,
+          pieceType: character,
+          anchor: 0,
+          active: 0,
+          excludeAnchor: false,
+          excludeActive: false,
+        }
+      mark: { type: decoratedSymbol, symbolColor: default, character: w }
+      position: after
+marksToCheck: [default.w]
+initialState:
+  documentContents: hello. world whatever
+  selections:
+    - anchor: { line: 0, character: 13 }
+      active: { line: 0, character: 13 }
+  marks:
+    default..:
+      start: { line: 0, character: 5 }
+      end: { line: 0, character: 6 }
+    default.w:
+      start: { line: 0, character: 7 }
+      end: { line: 0, character: 12 }
+finalState:
+  documentContents: hello. w.orld whatever
+  selections:
+    - anchor: { line: 0, character: 14 }
+      active: { line: 0, character: 14 }
+  marks:
+    default..:
+      start: { line: 0, character: 5 }
+      end: { line: 0, character: 6 }
+    default.w:
+      start: { line: 0, character: 7 }
+      end: { line: 0, character: 13 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: decoratedSymbol, symbolColor: default, character: . },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: null,
+      modifier: { type: identity },
+    },
+    {
+      type: primitive,
+      mark: { type: decoratedSymbol, symbolColor: default, character: w },
+      selectionType: token,
+      position: after,
+      insideOutsideType: null,
+      modifier:
+        {
+          type: subpiece,
+          pieceType: character,
+          anchor: 0,
+          active: 0,
+          excludeAnchor: false,
+          excludeActive: false,
+        },
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/hatTokenMap/bringPointAndHarpToEndOfSecondCarWhaleAndEndOfJustWhaleTakeWhale.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/hatTokenMap/bringPointAndHarpToEndOfSecondCarWhaleAndEndOfJustWhaleTakeWhale.yml
new file mode 100644
index 0000000000..0aa6a71bb4
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/hatTokenMap/bringPointAndHarpToEndOfSecondCarWhaleAndEndOfJustWhaleTakeWhale.yml
@@ -0,0 +1,118 @@
+languageId: plaintext
+command:
+  spokenForm: >-
+    bring point and harp to end of second car whale and end of just whale take
+    whale
+  version: 2
+  targets:
+    - type: list
+      elements:
+        - type: primitive
+          mark: { type: decoratedSymbol, symbolColor: default, character: . }
+        - type: primitive
+          mark: { type: decoratedSymbol, symbolColor: default, character: h }
+    - type: list
+      elements:
+        - type: primitive
+          mark: { type: decoratedSymbol, symbolColor: default, character: w }
+          modifiers:
+            - { type: position, position: end }
+            - type: ordinalRange
+              scopeType: { type: character }
+              anchor: 1
+              active: 1
+              excludeAnchor: false
+              excludeActive: false
+        - type: primitive
+          mark: { type: decoratedSymbol, symbolColor: default, character: w }
+          modifiers:
+            - { type: position, position: end }
+            - { type: toRawSelection }
+  usePrePhraseSnapshot: false
+  action: { name: replaceWithTarget }
+marksToCheck: [default.w]
+initialState:
+  documentContents: hello. world
+  selections:
+    - anchor: { line: 0, character: 12 }
+      active: { line: 0, character: 12 }
+  marks:
+    default..:
+      start: { line: 0, character: 5 }
+      end: { line: 0, character: 6 }
+    default.h:
+      start: { line: 0, character: 0 }
+      end: { line: 0, character: 5 }
+    default.w:
+      start: { line: 0, character: 7 }
+      end: { line: 0, character: 12 }
+finalState:
+  documentContents: hello. wo.rldhello
+  selections:
+    - anchor: { line: 0, character: 18 }
+      active: { line: 0, character: 18 }
+  marks:
+    default..:
+      start: { line: 0, character: 5 }
+      end: { line: 0, character: 6 }
+    default.h:
+      start: { line: 0, character: 0 }
+      end: { line: 0, character: 5 }
+    default.w:
+      start: { line: 0, character: 7 }
+      end: { line: 0, character: 18 }
+fullTargets:
+  [
+    {
+      type: list,
+      elements:
+        [
+          {
+            type: primitive,
+            mark: { type: decoratedSymbol, symbolColor: default, character: . },
+            selectionType: token,
+            position: contents,
+            insideOutsideType: null,
+            modifier: { type: identity },
+          },
+          {
+            type: primitive,
+            mark: { type: decoratedSymbol, symbolColor: default, character: h },
+            selectionType: token,
+            position: contents,
+            insideOutsideType: null,
+            modifier: { type: identity },
+          },
+        ],
+    },
+    {
+      type: list,
+      elements:
+        [
+          {
+            type: primitive,
+            mark: { type: decoratedSymbol, symbolColor: default, character: w },
+            selectionType: token,
+            position: after,
+            insideOutsideType: inside,
+            modifier:
+              {
+                type: subpiece,
+                pieceType: character,
+                anchor: 1,
+                active: 1,
+                excludeAnchor: false,
+                excludeActive: false,
+              },
+          },
+          {
+            type: primitive,
+            mark: { type: decoratedSymbol, symbolColor: default, character: w },
+            selectionType: token,
+            position: after,
+            insideOutsideType: inside,
+            modifier: { type: identity },
+          },
+        ],
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/hatTokenMap/bringPointAndHarpToEndOfThisAndEndOfWhaleTakeWhale.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/hatTokenMap/bringPointAndHarpToEndOfThisAndEndOfWhaleTakeWhale.yml
new file mode 100644
index 0000000000..92e367e8f9
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/hatTokenMap/bringPointAndHarpToEndOfThisAndEndOfWhaleTakeWhale.yml
@@ -0,0 +1,100 @@
+languageId: plaintext
+command:
+  version: 1
+  spokenForm: bring point and harp to end of this and end of whale take whale
+  action: replaceWithTarget
+  targets:
+    - type: list
+      elements:
+        - type: primitive
+          mark: { type: decoratedSymbol, symbolColor: default, character: . }
+        - type: primitive
+          mark: { type: decoratedSymbol, symbolColor: default, character: h }
+    - type: list
+      elements:
+        - type: primitive
+          position: after
+          insideOutsideType: inside
+          mark: { type: cursor }
+        - type: primitive
+          position: after
+          insideOutsideType: inside
+          mark: { type: decoratedSymbol, symbolColor: default, character: w }
+marksToCheck: [default.w]
+initialState:
+  documentContents: hello. world
+  selections:
+    - anchor: { line: 0, character: 12 }
+      active: { line: 0, character: 12 }
+  marks:
+    default..:
+      start: { line: 0, character: 5 }
+      end: { line: 0, character: 6 }
+    default.h:
+      start: { line: 0, character: 0 }
+      end: { line: 0, character: 5 }
+    default.w:
+      start: { line: 0, character: 7 }
+      end: { line: 0, character: 12 }
+finalState:
+  documentContents: hello. world.hello
+  selections:
+    - anchor: { line: 0, character: 18 }
+      active: { line: 0, character: 18 }
+  marks:
+    default..:
+      start: { line: 0, character: 5 }
+      end: { line: 0, character: 6 }
+    default.h:
+      start: { line: 0, character: 0 }
+      end: { line: 0, character: 5 }
+    default.w:
+      start: { line: 0, character: 7 }
+      end: { line: 0, character: 12 }
+fullTargets:
+  [
+    {
+      type: list,
+      elements:
+        [
+          {
+            type: primitive,
+            mark: { type: decoratedSymbol, symbolColor: default, character: . },
+            selectionType: token,
+            position: contents,
+            insideOutsideType: null,
+            modifier: { type: identity },
+          },
+          {
+            type: primitive,
+            mark: { type: decoratedSymbol, symbolColor: default, character: h },
+            selectionType: token,
+            position: contents,
+            insideOutsideType: null,
+            modifier: { type: identity },
+          },
+        ],
+    },
+    {
+      type: list,
+      elements:
+        [
+          {
+            type: primitive,
+            mark: { type: cursor },
+            selectionType: token,
+            position: after,
+            insideOutsideType: inside,
+            modifier: { type: identity },
+          },
+          {
+            type: primitive,
+            mark: { type: decoratedSymbol, symbolColor: default, character: w },
+            selectionType: token,
+            position: after,
+            insideOutsideType: inside,
+            modifier: { type: identity },
+          },
+        ],
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/hatTokenMap/bringPointAndHarpToStartOfSecondCarWhaleAndStartOfJustWhaleTakeWhale.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/hatTokenMap/bringPointAndHarpToStartOfSecondCarWhaleAndStartOfJustWhaleTakeWhale.yml
new file mode 100644
index 0000000000..db8f98a539
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/hatTokenMap/bringPointAndHarpToStartOfSecondCarWhaleAndStartOfJustWhaleTakeWhale.yml
@@ -0,0 +1,118 @@
+languageId: plaintext
+command:
+  spokenForm: >-
+    bring point and harp to start of second car whale and start of just whale
+    take whale
+  version: 2
+  targets:
+    - type: list
+      elements:
+        - type: primitive
+          mark: { type: decoratedSymbol, symbolColor: default, character: . }
+        - type: primitive
+          mark: { type: decoratedSymbol, symbolColor: default, character: h }
+    - type: list
+      elements:
+        - type: primitive
+          mark: { type: decoratedSymbol, symbolColor: default, character: w }
+          modifiers:
+            - { type: position, position: start }
+            - type: ordinalRange
+              scopeType: { type: character }
+              anchor: 1
+              active: 1
+              excludeAnchor: false
+              excludeActive: false
+        - type: primitive
+          mark: { type: decoratedSymbol, symbolColor: default, character: w }
+          modifiers:
+            - { type: position, position: start }
+            - { type: toRawSelection }
+  usePrePhraseSnapshot: false
+  action: { name: replaceWithTarget }
+marksToCheck: [default.w]
+initialState:
+  documentContents: hello. world
+  selections:
+    - anchor: { line: 0, character: 12 }
+      active: { line: 0, character: 12 }
+  marks:
+    default..:
+      start: { line: 0, character: 5 }
+      end: { line: 0, character: 6 }
+    default.h:
+      start: { line: 0, character: 0 }
+      end: { line: 0, character: 5 }
+    default.w:
+      start: { line: 0, character: 7 }
+      end: { line: 0, character: 12 }
+finalState:
+  documentContents: hello. hellow.orld
+  selections:
+    - anchor: { line: 0, character: 18 }
+      active: { line: 0, character: 18 }
+  marks:
+    default..:
+      start: { line: 0, character: 5 }
+      end: { line: 0, character: 6 }
+    default.h:
+      start: { line: 0, character: 0 }
+      end: { line: 0, character: 5 }
+    default.w:
+      start: { line: 0, character: 7 }
+      end: { line: 0, character: 18 }
+fullTargets:
+  [
+    {
+      type: list,
+      elements:
+        [
+          {
+            type: primitive,
+            mark: { type: decoratedSymbol, symbolColor: default, character: . },
+            selectionType: token,
+            position: contents,
+            insideOutsideType: null,
+            modifier: { type: identity },
+          },
+          {
+            type: primitive,
+            mark: { type: decoratedSymbol, symbolColor: default, character: h },
+            selectionType: token,
+            position: contents,
+            insideOutsideType: null,
+            modifier: { type: identity },
+          },
+        ],
+    },
+    {
+      type: list,
+      elements:
+        [
+          {
+            type: primitive,
+            mark: { type: decoratedSymbol, symbolColor: default, character: w },
+            selectionType: token,
+            position: before,
+            insideOutsideType: inside,
+            modifier:
+              {
+                type: subpiece,
+                pieceType: character,
+                anchor: 1,
+                active: 1,
+                excludeAnchor: false,
+                excludeActive: false,
+              },
+          },
+          {
+            type: primitive,
+            mark: { type: decoratedSymbol, symbolColor: default, character: w },
+            selectionType: token,
+            position: before,
+            insideOutsideType: inside,
+            modifier: { type: identity },
+          },
+        ],
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/hatTokenMap/bringPointAndHarpToThisAndStartOfWhaleTakeWhale.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/hatTokenMap/bringPointAndHarpToThisAndStartOfWhaleTakeWhale.yml
new file mode 100644
index 0000000000..63b3e7a1f4
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/hatTokenMap/bringPointAndHarpToThisAndStartOfWhaleTakeWhale.yml
@@ -0,0 +1,100 @@
+languageId: plaintext
+command:
+  version: 3
+  spokenForm: bring point and harp to this and start of whale take whale
+  action: { name: replaceWithTarget }
+  targets:
+    - type: list
+      elements:
+        - type: primitive
+          mark: { type: decoratedSymbol, symbolColor: default, character: . }
+        - type: primitive
+          mark: { type: decoratedSymbol, symbolColor: default, character: h }
+    - type: list
+      elements:
+        - type: primitive
+          modifiers:
+            - { type: toRawSelection }
+          mark: { type: cursor }
+        - type: primitive
+          modifiers:
+            - { type: position, position: start }
+          mark: { type: decoratedSymbol, symbolColor: default, character: w }
+marksToCheck: [default.w]
+initialState:
+  documentContents: hello. world
+  selections:
+    - anchor: { line: 0, character: 7 }
+      active: { line: 0, character: 7 }
+  marks:
+    default..:
+      start: { line: 0, character: 5 }
+      end: { line: 0, character: 6 }
+    default.h:
+      start: { line: 0, character: 0 }
+      end: { line: 0, character: 5 }
+    default.w:
+      start: { line: 0, character: 7 }
+      end: { line: 0, character: 12 }
+finalState:
+  documentContents: hello. .helloworld
+  selections:
+    - anchor: { line: 0, character: 13 }
+      active: { line: 0, character: 13 }
+  marks:
+    default..:
+      start: { line: 0, character: 5 }
+      end: { line: 0, character: 6 }
+    default.h:
+      start: { line: 0, character: 0 }
+      end: { line: 0, character: 5 }
+    default.w:
+      start: { line: 0, character: 8 }
+      end: { line: 0, character: 18 }
+fullTargets:
+  [
+    {
+      type: list,
+      elements:
+        [
+          {
+            type: primitive,
+            mark: { type: decoratedSymbol, symbolColor: default, character: . },
+            selectionType: token,
+            position: contents,
+            insideOutsideType: null,
+            modifier: { type: identity },
+          },
+          {
+            type: primitive,
+            mark: { type: decoratedSymbol, symbolColor: default, character: h },
+            selectionType: token,
+            position: contents,
+            insideOutsideType: null,
+            modifier: { type: identity },
+          },
+        ],
+    },
+    {
+      type: list,
+      elements:
+        [
+          {
+            type: primitive,
+            mark: { type: cursor },
+            selectionType: token,
+            position: contents,
+            insideOutsideType: null,
+            modifier: { type: identity },
+          },
+          {
+            type: primitive,
+            mark: { type: decoratedSymbol, symbolColor: default, character: w },
+            selectionType: token,
+            position: before,
+            insideOutsideType: inside,
+            modifier: { type: identity },
+          },
+        ],
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/hatTokenMap/bringPointAndPointToEndOfSecondCarWhaleAndEndOfJustWhaleTakeWhale.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/hatTokenMap/bringPointAndPointToEndOfSecondCarWhaleAndEndOfJustWhaleTakeWhale.yml
new file mode 100644
index 0000000000..30e34407fe
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/hatTokenMap/bringPointAndPointToEndOfSecondCarWhaleAndEndOfJustWhaleTakeWhale.yml
@@ -0,0 +1,112 @@
+languageId: plaintext
+command:
+  spokenForm: >-
+    bring point and point to end of second car whale and end of just whale take
+    whale
+  version: 2
+  targets:
+    - type: list
+      elements:
+        - type: primitive
+          mark: { type: decoratedSymbol, symbolColor: default, character: . }
+        - type: primitive
+          mark: { type: decoratedSymbol, symbolColor: default, character: . }
+    - type: list
+      elements:
+        - type: primitive
+          mark: { type: decoratedSymbol, symbolColor: default, character: w }
+          modifiers:
+            - { type: position, position: end }
+            - type: ordinalRange
+              scopeType: { type: character }
+              anchor: 1
+              active: 1
+              excludeAnchor: false
+              excludeActive: false
+        - type: primitive
+          mark: { type: decoratedSymbol, symbolColor: default, character: w }
+          modifiers:
+            - { type: position, position: end }
+            - { type: toRawSelection }
+  usePrePhraseSnapshot: false
+  action: { name: replaceWithTarget }
+marksToCheck: [default.w]
+initialState:
+  documentContents: hello. world
+  selections:
+    - anchor: { line: 0, character: 12 }
+      active: { line: 0, character: 12 }
+  marks:
+    default..:
+      start: { line: 0, character: 5 }
+      end: { line: 0, character: 6 }
+    default.w:
+      start: { line: 0, character: 7 }
+      end: { line: 0, character: 12 }
+finalState:
+  documentContents: hello. wo.rld.
+  selections:
+    - anchor: { line: 0, character: 14 }
+      active: { line: 0, character: 14 }
+  marks:
+    default..:
+      start: { line: 0, character: 5 }
+      end: { line: 0, character: 6 }
+    default.w:
+      start: { line: 0, character: 7 }
+      end: { line: 0, character: 13 }
+fullTargets:
+  [
+    {
+      type: list,
+      elements:
+        [
+          {
+            type: primitive,
+            mark: { type: decoratedSymbol, symbolColor: default, character: . },
+            selectionType: token,
+            position: contents,
+            insideOutsideType: null,
+            modifier: { type: identity },
+          },
+          {
+            type: primitive,
+            mark: { type: decoratedSymbol, symbolColor: default, character: . },
+            selectionType: token,
+            position: contents,
+            insideOutsideType: null,
+            modifier: { type: identity },
+          },
+        ],
+    },
+    {
+      type: list,
+      elements:
+        [
+          {
+            type: primitive,
+            mark: { type: decoratedSymbol, symbolColor: default, character: w },
+            selectionType: token,
+            position: after,
+            insideOutsideType: inside,
+            modifier:
+              {
+                type: subpiece,
+                pieceType: character,
+                anchor: 1,
+                active: 1,
+                excludeAnchor: false,
+                excludeActive: false,
+              },
+          },
+          {
+            type: primitive,
+            mark: { type: decoratedSymbol, symbolColor: default, character: w },
+            selectionType: token,
+            position: after,
+            insideOutsideType: inside,
+            modifier: { type: identity },
+          },
+        ],
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/hatTokenMap/bringPointAndPointToStartOfSecondCarWhaleAndStartOfJustWhaleTakeWhale.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/hatTokenMap/bringPointAndPointToStartOfSecondCarWhaleAndStartOfJustWhaleTakeWhale.yml
new file mode 100644
index 0000000000..a8de726d48
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/hatTokenMap/bringPointAndPointToStartOfSecondCarWhaleAndStartOfJustWhaleTakeWhale.yml
@@ -0,0 +1,112 @@
+languageId: plaintext
+command:
+  spokenForm: >-
+    bring point and point to start of second car whale and start of just whale
+    take whale
+  version: 2
+  targets:
+    - type: list
+      elements:
+        - type: primitive
+          mark: { type: decoratedSymbol, symbolColor: default, character: . }
+        - type: primitive
+          mark: { type: decoratedSymbol, symbolColor: default, character: . }
+    - type: list
+      elements:
+        - type: primitive
+          mark: { type: decoratedSymbol, symbolColor: default, character: w }
+          modifiers:
+            - { type: position, position: start }
+            - type: ordinalRange
+              scopeType: { type: character }
+              anchor: 1
+              active: 1
+              excludeAnchor: false
+              excludeActive: false
+        - type: primitive
+          mark: { type: decoratedSymbol, symbolColor: default, character: w }
+          modifiers:
+            - { type: position, position: start }
+            - { type: toRawSelection }
+  usePrePhraseSnapshot: false
+  action: { name: replaceWithTarget }
+marksToCheck: [default.w]
+initialState:
+  documentContents: hello. world
+  selections:
+    - anchor: { line: 0, character: 12 }
+      active: { line: 0, character: 12 }
+  marks:
+    default..:
+      start: { line: 0, character: 5 }
+      end: { line: 0, character: 6 }
+    default.w:
+      start: { line: 0, character: 7 }
+      end: { line: 0, character: 12 }
+finalState:
+  documentContents: hello. .w.orld
+  selections:
+    - anchor: { line: 0, character: 14 }
+      active: { line: 0, character: 14 }
+  marks:
+    default..:
+      start: { line: 0, character: 5 }
+      end: { line: 0, character: 6 }
+    default.w:
+      start: { line: 0, character: 8 }
+      end: { line: 0, character: 14 }
+fullTargets:
+  [
+    {
+      type: list,
+      elements:
+        [
+          {
+            type: primitive,
+            mark: { type: decoratedSymbol, symbolColor: default, character: . },
+            selectionType: token,
+            position: contents,
+            insideOutsideType: null,
+            modifier: { type: identity },
+          },
+          {
+            type: primitive,
+            mark: { type: decoratedSymbol, symbolColor: default, character: . },
+            selectionType: token,
+            position: contents,
+            insideOutsideType: null,
+            modifier: { type: identity },
+          },
+        ],
+    },
+    {
+      type: list,
+      elements:
+        [
+          {
+            type: primitive,
+            mark: { type: decoratedSymbol, symbolColor: default, character: w },
+            selectionType: token,
+            position: before,
+            insideOutsideType: inside,
+            modifier:
+              {
+                type: subpiece,
+                pieceType: character,
+                anchor: 1,
+                active: 1,
+                excludeAnchor: false,
+                excludeActive: false,
+              },
+          },
+          {
+            type: primitive,
+            mark: { type: decoratedSymbol, symbolColor: default, character: w },
+            selectionType: token,
+            position: before,
+            insideOutsideType: inside,
+            modifier: { type: identity },
+          },
+        ],
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/hatTokenMap/bringPointToEndOfWhaleTakeWhale.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/hatTokenMap/bringPointToEndOfWhaleTakeWhale.yml
new file mode 100644
index 0000000000..f6d448292e
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/hatTokenMap/bringPointToEndOfWhaleTakeWhale.yml
@@ -0,0 +1,56 @@
+languageId: plaintext
+command:
+  version: 1
+  spokenForm: bring point to end of whale take whale
+  action: replaceWithTarget
+  targets:
+    - type: primitive
+      mark: { type: decoratedSymbol, symbolColor: default, character: . }
+    - type: primitive
+      position: after
+      insideOutsideType: inside
+      mark: { type: decoratedSymbol, symbolColor: default, character: w }
+marksToCheck: [default.w]
+initialState:
+  documentContents: hello. world whatever
+  selections:
+    - anchor: { line: 0, character: 13 }
+      active: { line: 0, character: 13 }
+  marks:
+    default..:
+      start: { line: 0, character: 5 }
+      end: { line: 0, character: 6 }
+    default.w:
+      start: { line: 0, character: 7 }
+      end: { line: 0, character: 12 }
+finalState:
+  documentContents: hello. world. whatever
+  selections:
+    - anchor: { line: 0, character: 14 }
+      active: { line: 0, character: 14 }
+  marks:
+    default..:
+      start: { line: 0, character: 5 }
+      end: { line: 0, character: 6 }
+    default.w:
+      start: { line: 0, character: 7 }
+      end: { line: 0, character: 12 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: decoratedSymbol, symbolColor: default, character: . },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: null,
+      modifier: { type: identity },
+    },
+    {
+      type: primitive,
+      mark: { type: decoratedSymbol, symbolColor: default, character: w },
+      selectionType: token,
+      position: after,
+      insideOutsideType: inside,
+      modifier: { type: identity },
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/hatTokenMap/bringPointToStartOfWhaleTakeWhale.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/hatTokenMap/bringPointToStartOfWhaleTakeWhale.yml
new file mode 100644
index 0000000000..9f5cf3a070
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/hatTokenMap/bringPointToStartOfWhaleTakeWhale.yml
@@ -0,0 +1,56 @@
+languageId: plaintext
+command:
+  version: 1
+  spokenForm: bring point to start of whale take whale
+  action: replaceWithTarget
+  targets:
+    - type: primitive
+      mark: { type: decoratedSymbol, symbolColor: default, character: . }
+    - type: primitive
+      position: before
+      insideOutsideType: inside
+      mark: { type: decoratedSymbol, symbolColor: default, character: w }
+marksToCheck: [default.w]
+initialState:
+  documentContents: hello. world whatever
+  selections:
+    - anchor: { line: 0, character: 13 }
+      active: { line: 0, character: 13 }
+  marks:
+    default..:
+      start: { line: 0, character: 5 }
+      end: { line: 0, character: 6 }
+    default.w:
+      start: { line: 0, character: 7 }
+      end: { line: 0, character: 12 }
+finalState:
+  documentContents: hello. .world whatever
+  selections:
+    - anchor: { line: 0, character: 14 }
+      active: { line: 0, character: 14 }
+  marks:
+    default..:
+      start: { line: 0, character: 5 }
+      end: { line: 0, character: 6 }
+    default.w:
+      start: { line: 0, character: 8 }
+      end: { line: 0, character: 13 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: decoratedSymbol, symbolColor: default, character: . },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: null,
+      modifier: { type: identity },
+    },
+    {
+      type: primitive,
+      mark: { type: decoratedSymbol, symbolColor: default, character: w },
+      selectionType: token,
+      position: before,
+      insideOutsideType: inside,
+      modifier: { type: identity },
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/hatTokenMap/bringPointToThirdCarWhaleTakeWhale.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/hatTokenMap/bringPointToThirdCarWhaleTakeWhale.yml
new file mode 100644
index 0000000000..2379f123f5
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/hatTokenMap/bringPointToThirdCarWhaleTakeWhale.yml
@@ -0,0 +1,72 @@
+languageId: plaintext
+command:
+  version: 1
+  spokenForm: bring point to third car whale take whale
+  action: replaceWithTarget
+  targets:
+    - type: primitive
+      mark: { type: decoratedSymbol, symbolColor: default, character: . }
+    - type: primitive
+      selectionType: token
+      modifier:
+        {
+          type: subpiece,
+          pieceType: character,
+          anchor: 2,
+          active: 2,
+          excludeAnchor: false,
+          excludeActive: false,
+        }
+      mark: { type: decoratedSymbol, symbolColor: default, character: w }
+marksToCheck: [default.w]
+initialState:
+  documentContents: hello. world whatever
+  selections:
+    - anchor: { line: 0, character: 13 }
+      active: { line: 0, character: 13 }
+  marks:
+    default..:
+      start: { line: 0, character: 5 }
+      end: { line: 0, character: 6 }
+    default.w:
+      start: { line: 0, character: 7 }
+      end: { line: 0, character: 12 }
+finalState:
+  documentContents: hello. wo.ld whatever
+  selections:
+    - anchor: { line: 0, character: 13 }
+      active: { line: 0, character: 13 }
+  marks:
+    default..:
+      start: { line: 0, character: 5 }
+      end: { line: 0, character: 6 }
+    default.w:
+      start: { line: 0, character: 7 }
+      end: { line: 0, character: 12 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: decoratedSymbol, symbolColor: default, character: . },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: null,
+      modifier: { type: identity },
+    },
+    {
+      type: primitive,
+      mark: { type: decoratedSymbol, symbolColor: default, character: w },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: null,
+      modifier:
+        {
+          type: subpiece,
+          pieceType: character,
+          anchor: 2,
+          active: 2,
+          excludeAnchor: false,
+          excludeActive: false,
+        },
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/hatTokenMap/chuckFirstTwoCarWhaleTakeWhale.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/hatTokenMap/chuckFirstTwoCarWhaleTakeWhale.yml
new file mode 100644
index 0000000000..efe2e8d7e5
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/hatTokenMap/chuckFirstTwoCarWhaleTakeWhale.yml
@@ -0,0 +1,40 @@
+languageId: plaintext
+command:
+  version: 1
+  spokenForm: chuck first two car whale take whale
+  action: remove
+  targets:
+    - type: primitive
+      selectionType: token
+      modifier: { type: subpiece, pieceType: character, anchor: 0, active: 1 }
+      mark: { type: decoratedSymbol, symbolColor: default, character: w }
+marksToCheck: [default.w]
+initialState:
+  documentContents: hello world
+  selections:
+    - anchor: { line: 0, character: 11 }
+      active: { line: 0, character: 11 }
+  marks:
+    default.w:
+      start: { line: 0, character: 6 }
+      end: { line: 0, character: 11 }
+finalState:
+  documentContents: hello rld
+  selections:
+    - anchor: { line: 0, character: 9 }
+      active: { line: 0, character: 9 }
+  marks:
+    default.w:
+      start: { line: 0, character: 6 }
+      end: { line: 0, character: 9 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: decoratedSymbol, symbolColor: default, character: w },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: outside,
+      modifier: { type: subpiece, pieceType: character, anchor: 0, active: 1 },
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/hatTokenMap/chuckFourthCarWhalePastThirdCarAirTakeWhale.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/hatTokenMap/chuckFourthCarWhalePastThirdCarAirTakeWhale.yml
new file mode 100644
index 0000000000..c0b855e492
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/hatTokenMap/chuckFourthCarWhalePastThirdCarAirTakeWhale.yml
@@ -0,0 +1,102 @@
+languageId: plaintext
+command:
+  version: 1
+  spokenForm: chuck fourth car whale past third car air take whale
+  action: remove
+  targets:
+    - type: range
+      start:
+        type: primitive
+        selectionType: token
+        modifier:
+          {
+            type: subpiece,
+            pieceType: character,
+            anchor: 3,
+            active: 3,
+            excludeAnchor: false,
+            excludeActive: false,
+          }
+        mark: { type: decoratedSymbol, symbolColor: default, character: w }
+      end:
+        type: primitive
+        selectionType: token
+        modifier:
+          {
+            type: subpiece,
+            pieceType: character,
+            anchor: 2,
+            active: 2,
+            excludeAnchor: false,
+            excludeActive: false,
+          }
+        mark: { type: decoratedSymbol, symbolColor: default, character: a }
+      excludeStart: false
+      excludeEnd: false
+marksToCheck: [default.w]
+initialState:
+  documentContents: hello world whatever
+  selections:
+    - anchor: { line: 0, character: 20 }
+      active: { line: 0, character: 20 }
+  marks:
+    default.w:
+      start: { line: 0, character: 6 }
+      end: { line: 0, character: 11 }
+    default.a:
+      start: { line: 0, character: 12 }
+      end: { line: 0, character: 20 }
+finalState:
+  documentContents: hello wortever
+  selections:
+    - anchor: { line: 0, character: 14 }
+      active: { line: 0, character: 14 }
+  marks:
+    default.w:
+      start: { line: 0, character: 6 }
+      end: { line: 0, character: 9 }
+    default.a:
+      start: { line: 0, character: 9 }
+      end: { line: 0, character: 14 }
+fullTargets:
+  [
+    {
+      type: range,
+      excludeAnchor: false,
+      excludeActive: false,
+      anchor:
+        {
+          type: primitive,
+          mark: { type: decoratedSymbol, symbolColor: default, character: w },
+          selectionType: token,
+          position: contents,
+          insideOutsideType: outside,
+          modifier:
+            {
+              type: subpiece,
+              pieceType: character,
+              anchor: 3,
+              active: 3,
+              excludeAnchor: false,
+              excludeActive: false,
+            },
+        },
+      active:
+        {
+          type: primitive,
+          mark: { type: decoratedSymbol, symbolColor: default, character: a },
+          selectionType: token,
+          position: contents,
+          insideOutsideType: outside,
+          modifier:
+            {
+              type: subpiece,
+              pieceType: character,
+              anchor: 2,
+              active: 2,
+              excludeAnchor: false,
+              excludeActive: false,
+            },
+        },
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/hatTokenMap/chuckHarpPastAirTakeWhale.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/hatTokenMap/chuckHarpPastAirTakeWhale.yml
new file mode 100644
index 0000000000..28d2d95c82
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/hatTokenMap/chuckHarpPastAirTakeWhale.yml
@@ -0,0 +1,72 @@
+languageId: plaintext
+command:
+  version: 1
+  spokenForm: chuck harp past air take whale
+  action: remove
+  targets:
+    - type: range
+      start:
+        type: primitive
+        mark: { type: decoratedSymbol, symbolColor: default, character: h }
+      end:
+        type: primitive
+        mark: { type: decoratedSymbol, symbolColor: default, character: a }
+      excludeStart: false
+      excludeEnd: false
+marksToCheck: [default.w]
+initialState:
+  documentContents: hello world whatever
+  selections:
+    - anchor: { line: 0, character: 20 }
+      active: { line: 0, character: 20 }
+  marks:
+    default.h:
+      start: { line: 0, character: 0 }
+      end: { line: 0, character: 5 }
+    default.a:
+      start: { line: 0, character: 12 }
+      end: { line: 0, character: 20 }
+    default.w:
+      start: { line: 0, character: 6 }
+      end: { line: 0, character: 11 }
+finalState:
+  documentContents: ""
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+  marks:
+    default.h:
+      start: { line: 0, character: 0 }
+      end: { line: 0, character: 0 }
+    default.a:
+      start: { line: 0, character: 0 }
+      end: { line: 0, character: 0 }
+    default.w:
+      start: { line: 0, character: 0 }
+      end: { line: 0, character: 0 }
+fullTargets:
+  [
+    {
+      type: range,
+      excludeAnchor: false,
+      excludeActive: false,
+      anchor:
+        {
+          type: primitive,
+          mark: { type: decoratedSymbol, symbolColor: default, character: h },
+          selectionType: token,
+          position: contents,
+          insideOutsideType: outside,
+          modifier: { type: identity },
+        },
+      active:
+        {
+          type: primitive,
+          mark: { type: decoratedSymbol, symbolColor: default, character: a },
+          selectionType: token,
+          position: contents,
+          insideOutsideType: outside,
+          modifier: { type: identity },
+        },
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/hatTokenMap/chuckLastTwoCarWhaleTakeWhale.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/hatTokenMap/chuckLastTwoCarWhaleTakeWhale.yml
new file mode 100644
index 0000000000..a901289246
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/hatTokenMap/chuckLastTwoCarWhaleTakeWhale.yml
@@ -0,0 +1,41 @@
+languageId: plaintext
+command:
+  version: 1
+  spokenForm: chuck last two car whale take whale
+  action: remove
+  targets:
+    - type: primitive
+      selectionType: token
+      modifier: { type: subpiece, pieceType: character, anchor: -2, active: -1 }
+      mark: { type: decoratedSymbol, symbolColor: default, character: w }
+marksToCheck: [default.w]
+initialState:
+  documentContents: hello. world whatever
+  selections:
+    - anchor: { line: 0, character: 13 }
+      active: { line: 0, character: 13 }
+  marks:
+    default.w:
+      start: { line: 0, character: 7 }
+      end: { line: 0, character: 12 }
+finalState:
+  documentContents: hello. wor whatever
+  selections:
+    - anchor: { line: 0, character: 11 }
+      active: { line: 0, character: 11 }
+  marks:
+    default.w:
+      start: { line: 0, character: 7 }
+      end: { line: 0, character: 10 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: decoratedSymbol, symbolColor: default, character: w },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: outside,
+      modifier:
+        { type: subpiece, pieceType: character, anchor: -2, active: -1 },
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/hatTokenMap/chuckSecondPastThirdCarWhaleTakeWhale.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/hatTokenMap/chuckSecondPastThirdCarWhaleTakeWhale.yml
new file mode 100644
index 0000000000..4eff633837
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/hatTokenMap/chuckSecondPastThirdCarWhaleTakeWhale.yml
@@ -0,0 +1,56 @@
+languageId: plaintext
+command:
+  version: 1
+  spokenForm: chuck second past third car whale take whale
+  action: remove
+  targets:
+    - type: primitive
+      selectionType: token
+      modifier:
+        {
+          type: subpiece,
+          pieceType: character,
+          anchor: 1,
+          active: 2,
+          excludeAnchor: false,
+          excludeActive: false,
+        }
+      mark: { type: decoratedSymbol, symbolColor: default, character: w }
+marksToCheck: [default.w]
+initialState:
+  documentContents: hello. world whatever
+  selections:
+    - anchor: { line: 0, character: 13 }
+      active: { line: 0, character: 13 }
+  marks:
+    default.w:
+      start: { line: 0, character: 7 }
+      end: { line: 0, character: 12 }
+finalState:
+  documentContents: hello. wld whatever
+  selections:
+    - anchor: { line: 0, character: 11 }
+      active: { line: 0, character: 11 }
+  marks:
+    default.w:
+      start: { line: 0, character: 7 }
+      end: { line: 0, character: 10 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: decoratedSymbol, symbolColor: default, character: w },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: outside,
+      modifier:
+        {
+          type: subpiece,
+          pieceType: character,
+          anchor: 1,
+          active: 2,
+          excludeAnchor: false,
+          excludeActive: false,
+        },
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/hatTokenMap/chuckThirdCarHarpPastSecondCarWhaleTakeWhale.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/hatTokenMap/chuckThirdCarHarpPastSecondCarWhaleTakeWhale.yml
new file mode 100644
index 0000000000..ad51305cde
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/hatTokenMap/chuckThirdCarHarpPastSecondCarWhaleTakeWhale.yml
@@ -0,0 +1,102 @@
+languageId: plaintext
+command:
+  version: 1
+  spokenForm: chuck third car harp past second car whale take whale
+  action: remove
+  targets:
+    - type: range
+      start:
+        type: primitive
+        selectionType: token
+        modifier:
+          {
+            type: subpiece,
+            pieceType: character,
+            anchor: 2,
+            active: 2,
+            excludeAnchor: false,
+            excludeActive: false,
+          }
+        mark: { type: decoratedSymbol, symbolColor: default, character: h }
+      end:
+        type: primitive
+        selectionType: token
+        modifier:
+          {
+            type: subpiece,
+            pieceType: character,
+            anchor: 1,
+            active: 1,
+            excludeAnchor: false,
+            excludeActive: false,
+          }
+        mark: { type: decoratedSymbol, symbolColor: default, character: w }
+      excludeStart: false
+      excludeEnd: false
+marksToCheck: [default.w]
+initialState:
+  documentContents: hello world whatever
+  selections:
+    - anchor: { line: 0, character: 20 }
+      active: { line: 0, character: 20 }
+  marks:
+    default.h:
+      start: { line: 0, character: 0 }
+      end: { line: 0, character: 5 }
+    default.w:
+      start: { line: 0, character: 6 }
+      end: { line: 0, character: 11 }
+finalState:
+  documentContents: herld whatever
+  selections:
+    - anchor: { line: 0, character: 14 }
+      active: { line: 0, character: 14 }
+  marks:
+    default.h:
+      start: { line: 0, character: 0 }
+      end: { line: 0, character: 2 }
+    default.w:
+      start: { line: 0, character: 2 }
+      end: { line: 0, character: 5 }
+fullTargets:
+  [
+    {
+      type: range,
+      excludeAnchor: false,
+      excludeActive: false,
+      anchor:
+        {
+          type: primitive,
+          mark: { type: decoratedSymbol, symbolColor: default, character: h },
+          selectionType: token,
+          position: contents,
+          insideOutsideType: outside,
+          modifier:
+            {
+              type: subpiece,
+              pieceType: character,
+              anchor: 2,
+              active: 2,
+              excludeAnchor: false,
+              excludeActive: false,
+            },
+        },
+      active:
+        {
+          type: primitive,
+          mark: { type: decoratedSymbol, symbolColor: default, character: w },
+          selectionType: token,
+          position: contents,
+          insideOutsideType: outside,
+          modifier:
+            {
+              type: subpiece,
+              pieceType: character,
+              anchor: 1,
+              active: 1,
+              excludeAnchor: false,
+              excludeActive: false,
+            },
+        },
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/hatTokenMap/clearBlueSpecial.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/hatTokenMap/clearBlueSpecial.yml
new file mode 100644
index 0000000000..e7f802390d
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/hatTokenMap/clearBlueSpecial.yml
@@ -0,0 +1,33 @@
+languageId: plaintext
+command:
+  spokenForm: clear blue special
+  version: 2
+  targets:
+    - type: primitive
+      mark: { type: decoratedSymbol, symbolColor: blue, character: � }
+  usePrePhraseSnapshot: true
+  action: { name: clearAndSetSelection }
+initialState:
+  documentContents: |
+    😄🙃🙁
+  selections:
+    - anchor: { line: 1, character: 0 }
+      active: { line: 1, character: 0 }
+  marks:
+    blue.�:
+      start: { line: 0, character: 2 }
+      end: { line: 0, character: 4 }
+finalState:
+  documentContents: |
+    😄🙁
+  selections:
+    - anchor: { line: 0, character: 2 }
+      active: { line: 0, character: 2 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: decoratedSymbol, symbolColor: blue, character: � },
+      modifiers: [],
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/hatTokenMap/clearNear.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/hatTokenMap/clearNear.yml
new file mode 100644
index 0000000000..f3cc4b8019
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/hatTokenMap/clearNear.yml
@@ -0,0 +1,33 @@
+languageId: plaintext
+command:
+  spokenForm: clear near
+  version: 2
+  targets:
+    - type: primitive
+      mark: { type: decoratedSymbol, symbolColor: default, character: "n" }
+  usePrePhraseSnapshot: true
+  action: { name: clearAndSetSelection }
+initialState:
+  documentContents: |
+    ñ
+  selections:
+    - anchor: { line: 1, character: 0 }
+      active: { line: 1, character: 0 }
+  marks:
+    default.n:
+      start: { line: 0, character: 0 }
+      end: { line: 0, character: 2 }
+finalState:
+  documentContents: |+
+
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: decoratedSymbol, symbolColor: default, character: "n" },
+      modifiers: [],
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/hatTokenMap/clearNear2.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/hatTokenMap/clearNear2.yml
new file mode 100644
index 0000000000..d50d7aa665
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/hatTokenMap/clearNear2.yml
@@ -0,0 +1,37 @@
+languageId: plaintext
+command:
+  spokenForm: clear near
+  version: 2
+  targets:
+    - type: primitive
+      mark: { type: decoratedSymbol, symbolColor: default, character: "n" }
+  usePrePhraseSnapshot: true
+  action: { name: clearAndSetSelection }
+initialState:
+  documentContents: |
+    ñ
+    ñ
+    n
+  selections:
+    - anchor: { line: 3, character: 0 }
+      active: { line: 3, character: 0 }
+  marks:
+    default.n:
+      start: { line: 2, character: 0 }
+      end: { line: 2, character: 1 }
+finalState:
+  documentContents: |+
+    ñ
+    ñ
+
+  selections:
+    - anchor: { line: 2, character: 0 }
+      active: { line: 2, character: 0 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: decoratedSymbol, symbolColor: default, character: "n" },
+      modifiers: [],
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/hatTokenMap/clearNear3.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/hatTokenMap/clearNear3.yml
new file mode 100644
index 0000000000..939f2a2a06
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/hatTokenMap/clearNear3.yml
@@ -0,0 +1,33 @@
+languageId: plaintext
+command:
+  spokenForm: clear near
+  version: 2
+  targets:
+    - type: primitive
+      mark: { type: decoratedSymbol, symbolColor: default, character: "n" }
+  usePrePhraseSnapshot: true
+  action: { name: clearAndSetSelection }
+initialState:
+  documentContents: |
+    ñoñería
+  selections:
+    - anchor: { line: 1, character: 0 }
+      active: { line: 1, character: 0 }
+  marks:
+    default.n:
+      start: { line: 0, character: 0 }
+      end: { line: 0, character: 8 }
+finalState:
+  documentContents: |+
+
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: decoratedSymbol, symbolColor: default, character: "n" },
+      modifiers: [],
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/hatTokenMap/clearSpecial.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/hatTokenMap/clearSpecial.yml
new file mode 100644
index 0000000000..95a8030694
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/hatTokenMap/clearSpecial.yml
@@ -0,0 +1,33 @@
+languageId: plaintext
+command:
+  spokenForm: clear special
+  version: 2
+  targets:
+    - type: primitive
+      mark: { type: decoratedSymbol, symbolColor: default, character: � }
+  usePrePhraseSnapshot: true
+  action: { name: clearAndSetSelection }
+initialState:
+  documentContents: |
+    😄
+  selections:
+    - anchor: { line: 1, character: 0 }
+      active: { line: 1, character: 0 }
+  marks:
+    default.�:
+      start: { line: 0, character: 0 }
+      end: { line: 0, character: 2 }
+finalState:
+  documentContents: |+
+
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: decoratedSymbol, symbolColor: default, character: � },
+      modifiers: [],
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/hatTokenMap/config.json b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/hatTokenMap/config.json
similarity index 100%
rename from packages/cursorless-vscode-e2e/suite/fixtures/recorded/hatTokenMap/config.json
rename to packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/hatTokenMap/config.json
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/hatTokenMap/moveFourthCarHarpPastSecondCarWhaleToEndOfJustWhaleTakeWhale.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/hatTokenMap/moveFourthCarHarpPastSecondCarWhaleToEndOfJustWhaleTakeWhale.yml
new file mode 100644
index 0000000000..a680a7e83b
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/hatTokenMap/moveFourthCarHarpPastSecondCarWhaleToEndOfJustWhaleTakeWhale.yml
@@ -0,0 +1,110 @@
+languageId: plaintext
+command:
+  spokenForm: move fourth car harp past second car whale to end of just whale take whale
+  version: 2
+  targets:
+    - type: range
+      anchor:
+        type: primitive
+        mark: { type: decoratedSymbol, symbolColor: default, character: h }
+        modifiers:
+          - type: ordinalRange
+            scopeType: { type: character }
+            anchor: 3
+            active: 3
+            excludeAnchor: false
+            excludeActive: false
+      active:
+        type: primitive
+        mark: { type: decoratedSymbol, symbolColor: default, character: w }
+        modifiers:
+          - type: ordinalRange
+            scopeType: { type: character }
+            anchor: 1
+            active: 1
+            excludeAnchor: false
+            excludeActive: false
+      excludeAnchor: false
+      excludeActive: false
+    - type: primitive
+      mark: { type: decoratedSymbol, symbolColor: default, character: w }
+      modifiers:
+        - { type: position, position: end }
+        - { type: toRawSelection }
+  usePrePhraseSnapshot: false
+  action: { name: moveToTarget }
+marksToCheck: [default.w]
+initialState:
+  documentContents: hello world whatever
+  selections:
+    - anchor: { line: 0, character: 20 }
+      active: { line: 0, character: 20 }
+  marks:
+    default.h:
+      start: { line: 0, character: 0 }
+      end: { line: 0, character: 5 }
+    default.w:
+      start: { line: 0, character: 6 }
+      end: { line: 0, character: 11 }
+finalState:
+  documentContents: helrldlo wo whatever
+  selections:
+    - anchor: { line: 0, character: 20 }
+      active: { line: 0, character: 20 }
+  marks:
+    default.h:
+      start: { line: 0, character: 0 }
+      end: { line: 0, character: 3 }
+    default.w:
+      start: { line: 0, character: 3 }
+      end: { line: 0, character: 8 }
+fullTargets:
+  [
+    {
+      type: range,
+      excludeAnchor: false,
+      excludeActive: false,
+      anchor:
+        {
+          type: primitive,
+          mark: { type: decoratedSymbol, symbolColor: default, character: h },
+          selectionType: token,
+          position: contents,
+          insideOutsideType: null,
+          modifier:
+            {
+              type: subpiece,
+              pieceType: character,
+              anchor: 3,
+              active: 3,
+              excludeAnchor: false,
+              excludeActive: false,
+            },
+        },
+      active:
+        {
+          type: primitive,
+          mark: { type: decoratedSymbol, symbolColor: default, character: w },
+          selectionType: token,
+          position: contents,
+          insideOutsideType: null,
+          modifier:
+            {
+              type: subpiece,
+              pieceType: character,
+              anchor: 1,
+              active: 1,
+              excludeAnchor: false,
+              excludeActive: false,
+            },
+        },
+    },
+    {
+      type: primitive,
+      mark: { type: decoratedSymbol, symbolColor: default, character: w },
+      selectionType: token,
+      position: after,
+      insideOutsideType: inside,
+      modifier: { type: identity },
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/hatTokenMap/sendEmoji.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/hatTokenMap/sendEmoji.yml
new file mode 100644
index 0000000000..0acee1a33e
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/hatTokenMap/sendEmoji.yml
@@ -0,0 +1,33 @@
+languageId: plaintext
+command:
+  spokenForm: clear special
+  version: 2
+  targets:
+    - type: primitive
+      mark: { type: decoratedSymbol, symbolColor: default, character: 😄 }
+  usePrePhraseSnapshot: true
+  action: { name: clearAndSetSelection }
+initialState:
+  documentContents: |
+    😄
+  selections:
+    - anchor: { line: 1, character: 0 }
+      active: { line: 1, character: 0 }
+  marks:
+    default.�:
+      start: { line: 0, character: 0 }
+      end: { line: 0, character: 2 }
+finalState:
+  documentContents: |+
+
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: decoratedSymbol, symbolColor: default, character: � },
+      modifiers: [],
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/hatTokenMap/takeHarp.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/hatTokenMap/takeHarp.yml
new file mode 100644
index 0000000000..323df2c58f
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/hatTokenMap/takeHarp.yml
@@ -0,0 +1,39 @@
+languageId: plaintext
+command:
+  version: 1
+  spokenForm: take harp
+  action: setSelection
+  targets:
+    - type: primitive
+      mark: { type: decoratedSymbol, symbolColor: default, character: h }
+initialState:
+  documentContents: hello world
+  selections:
+    - anchor: { line: 0, character: 11 }
+      active: { line: 0, character: 11 }
+  marks:
+    default.h:
+      start: { line: 0, character: 0 }
+      end: { line: 0, character: 5 }
+finalState:
+  documentContents: hello world
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 5 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark:
+        {
+          type: decoratedSymbol,
+          symbolColor: default,
+          character: h,
+          usePrePhraseSnapshot: true,
+        },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier: { type: identity },
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/headTail/chuckHeadAir.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/headTail/chuckHeadAir.yml
new file mode 100644
index 0000000000..1c2c25d40b
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/headTail/chuckHeadAir.yml
@@ -0,0 +1,33 @@
+languageId: plaintext
+command:
+  spokenForm: chuck head air
+  version: 2
+  targets:
+    - type: primitive
+      mark: { type: decoratedSymbol, symbolColor: default, character: a }
+      modifiers:
+        - { type: extendThroughStartOf }
+  usePrePhraseSnapshot: true
+  action: { name: remove }
+initialState:
+  documentContents: "    hello world whatever"
+  selections:
+    - anchor: { line: 0, character: 24 }
+      active: { line: 0, character: 24 }
+  marks:
+    default.a:
+      start: { line: 0, character: 16 }
+      end: { line: 0, character: 24 }
+finalState:
+  documentContents: ""
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: decoratedSymbol, symbolColor: default, character: a },
+      modifiers: [{ type: extendThroughStartOf }],
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/headTail/chuckHeadWhale.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/headTail/chuckHeadWhale.yml
new file mode 100644
index 0000000000..28872f3d37
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/headTail/chuckHeadWhale.yml
@@ -0,0 +1,33 @@
+languageId: plaintext
+command:
+  spokenForm: chuck head whale
+  version: 2
+  targets:
+    - type: primitive
+      mark: { type: decoratedSymbol, symbolColor: default, character: w }
+      modifiers:
+        - { type: extendThroughStartOf }
+  usePrePhraseSnapshot: true
+  action: { name: remove }
+initialState:
+  documentContents: "    hello world whatever"
+  selections:
+    - anchor: { line: 0, character: 24 }
+      active: { line: 0, character: 24 }
+  marks:
+    default.w:
+      start: { line: 0, character: 10 }
+      end: { line: 0, character: 15 }
+finalState:
+  documentContents: "    whatever"
+  selections:
+    - anchor: { line: 0, character: 12 }
+      active: { line: 0, character: 12 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: decoratedSymbol, symbolColor: default, character: w },
+      modifiers: [{ type: extendThroughStartOf }],
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/headTail/chuckTailHarp.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/headTail/chuckTailHarp.yml
new file mode 100644
index 0000000000..1675fc01bc
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/headTail/chuckTailHarp.yml
@@ -0,0 +1,33 @@
+languageId: plaintext
+command:
+  spokenForm: chuck tail harp
+  version: 2
+  targets:
+    - type: primitive
+      mark: { type: decoratedSymbol, symbolColor: default, character: h }
+      modifiers:
+        - { type: extendThroughEndOf }
+  usePrePhraseSnapshot: true
+  action: { name: remove }
+initialState:
+  documentContents: "    hello world whatever"
+  selections:
+    - anchor: { line: 0, character: 24 }
+      active: { line: 0, character: 24 }
+  marks:
+    default.h:
+      start: { line: 0, character: 4 }
+      end: { line: 0, character: 9 }
+finalState:
+  documentContents: ""
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: decoratedSymbol, symbolColor: default, character: h },
+      modifiers: [{ type: extendThroughEndOf }],
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/headTail/chuckTailWhale.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/headTail/chuckTailWhale.yml
new file mode 100644
index 0000000000..2bf68aaece
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/headTail/chuckTailWhale.yml
@@ -0,0 +1,33 @@
+languageId: plaintext
+command:
+  spokenForm: chuck tail whale
+  version: 2
+  targets:
+    - type: primitive
+      mark: { type: decoratedSymbol, symbolColor: default, character: w }
+      modifiers:
+        - { type: extendThroughEndOf }
+  usePrePhraseSnapshot: true
+  action: { name: remove }
+initialState:
+  documentContents: "    hello world whatever"
+  selections:
+    - anchor: { line: 0, character: 24 }
+      active: { line: 0, character: 24 }
+  marks:
+    default.w:
+      start: { line: 0, character: 10 }
+      end: { line: 0, character: 15 }
+finalState:
+  documentContents: "    hello"
+  selections:
+    - anchor: { line: 0, character: 9 }
+      active: { line: 0, character: 9 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: decoratedSymbol, symbolColor: default, character: w },
+      modifiers: [{ type: extendThroughEndOf }],
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/headTail/clearHeadAir.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/headTail/clearHeadAir.yml
new file mode 100644
index 0000000000..7f617a5334
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/headTail/clearHeadAir.yml
@@ -0,0 +1,33 @@
+languageId: plaintext
+command:
+  spokenForm: clear head air
+  version: 2
+  targets:
+    - type: primitive
+      mark: { type: decoratedSymbol, symbolColor: default, character: a }
+      modifiers:
+        - { type: extendThroughStartOf }
+  usePrePhraseSnapshot: true
+  action: { name: clearAndSetSelection }
+initialState:
+  documentContents: "    hello world whatever"
+  selections:
+    - anchor: { line: 0, character: 24 }
+      active: { line: 0, character: 24 }
+  marks:
+    default.a:
+      start: { line: 0, character: 16 }
+      end: { line: 0, character: 24 }
+finalState:
+  documentContents: "    "
+  selections:
+    - anchor: { line: 0, character: 4 }
+      active: { line: 0, character: 4 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: decoratedSymbol, symbolColor: default, character: a },
+      modifiers: [{ type: extendThroughStartOf }],
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/headTail/clearTailHarp.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/headTail/clearTailHarp.yml
new file mode 100644
index 0000000000..1960121d3d
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/headTail/clearTailHarp.yml
@@ -0,0 +1,33 @@
+languageId: plaintext
+command:
+  spokenForm: clear tail harp
+  version: 2
+  targets:
+    - type: primitive
+      mark: { type: decoratedSymbol, symbolColor: default, character: h }
+      modifiers:
+        - { type: extendThroughEndOf }
+  usePrePhraseSnapshot: true
+  action: { name: clearAndSetSelection }
+initialState:
+  documentContents: "    hello world whatever"
+  selections:
+    - anchor: { line: 0, character: 24 }
+      active: { line: 0, character: 24 }
+  marks:
+    default.h:
+      start: { line: 0, character: 4 }
+      end: { line: 0, character: 9 }
+finalState:
+  documentContents: "    "
+  selections:
+    - anchor: { line: 0, character: 4 }
+      active: { line: 0, character: 4 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: decoratedSymbol, symbolColor: default, character: h },
+      modifiers: [{ type: extendThroughEndOf }],
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/headTail/takeHead.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/headTail/takeHead.yml
new file mode 100644
index 0000000000..4aff5dfb80
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/headTail/takeHead.yml
@@ -0,0 +1,38 @@
+languageId: typescript
+command:
+  version: 1
+  spokenForm: take head
+  action: setSelection
+  targets:
+    - type: primitive
+      modifier: { type: head }
+initialState:
+  documentContents: |
+
+    const value = "Hello world";
+
+    const value = "Hello world";
+  selections:
+    - anchor: { line: 1, character: 9 }
+      active: { line: 1, character: 9 }
+  marks: {}
+finalState:
+  documentContents: |
+
+    const value = "Hello world";
+
+    const value = "Hello world";
+  selections:
+    - anchor: { line: 1, character: 9 }
+      active: { line: 1, character: 0 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      modifier: { type: head },
+      insideOutsideType: inside,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/headTail/takeHeadVest.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/headTail/takeHeadVest.yml
new file mode 100644
index 0000000000..7a78e05886
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/headTail/takeHeadVest.yml
@@ -0,0 +1,42 @@
+languageId: typescript
+command:
+  version: 1
+  spokenForm: take head vest
+  action: setSelection
+  targets:
+    - type: primitive
+      modifier: { type: head }
+      mark: { type: decoratedSymbol, symbolColor: default, character: v }
+initialState:
+  documentContents: |
+
+    const value = "Hello world";
+
+    const value = "Hello world";
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+  marks:
+    default.v:
+      start: { line: 1, character: 6 }
+      end: { line: 1, character: 11 }
+finalState:
+  documentContents: |
+
+    const value = "Hello world";
+
+    const value = "Hello world";
+  selections:
+    - anchor: { line: 1, character: 11 }
+      active: { line: 1, character: 0 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: decoratedSymbol, symbolColor: default, character: v },
+      selectionType: token,
+      position: contents,
+      modifier: { type: head },
+      insideOutsideType: inside,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/headTail/takeTail.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/headTail/takeTail.yml
new file mode 100644
index 0000000000..c922b181fc
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/headTail/takeTail.yml
@@ -0,0 +1,38 @@
+languageId: typescript
+command:
+  version: 1
+  spokenForm: take tail
+  action: setSelection
+  targets:
+    - type: primitive
+      modifier: { type: tail }
+initialState:
+  documentContents: |
+
+    const value = "Hello world";
+
+    const value = "Hello world";
+  selections:
+    - anchor: { line: 1, character: 6 }
+      active: { line: 1, character: 6 }
+  marks: {}
+finalState:
+  documentContents: |
+
+    const value = "Hello world";
+
+    const value = "Hello world";
+  selections:
+    - anchor: { line: 1, character: 6 }
+      active: { line: 1, character: 28 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      modifier: { type: tail },
+      insideOutsideType: inside,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/headTail/takeTailVest.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/headTail/takeTailVest.yml
new file mode 100644
index 0000000000..a6eee09225
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/headTail/takeTailVest.yml
@@ -0,0 +1,42 @@
+languageId: typescript
+command:
+  version: 1
+  spokenForm: take tail vest
+  action: setSelection
+  targets:
+    - type: primitive
+      modifier: { type: tail }
+      mark: { type: decoratedSymbol, symbolColor: default, character: v }
+initialState:
+  documentContents: |
+
+    const value = "Hello world";
+
+    const value = "Hello world";
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+  marks:
+    default.v:
+      start: { line: 1, character: 6 }
+      end: { line: 1, character: 11 }
+finalState:
+  documentContents: |
+
+    const value = "Hello world";
+
+    const value = "Hello world";
+  selections:
+    - anchor: { line: 1, character: 6 }
+      active: { line: 1, character: 28 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: decoratedSymbol, symbolColor: default, character: v },
+      selectionType: token,
+      position: contents,
+      modifier: { type: tail },
+      insideOutsideType: inside,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/implicitExpansion/bringHarp.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/implicitExpansion/bringHarp.yml
new file mode 100644
index 0000000000..1fc1a6f6a8
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/implicitExpansion/bringHarp.yml
@@ -0,0 +1,40 @@
+languageId: plaintext
+command:
+  version: 4
+  spokenForm: bring harp
+  action: { name: replaceWithTarget }
+  targets:
+    - type: primitive
+      mark: { type: decoratedSymbol, symbolColor: default, character: h }
+    - { type: implicit }
+  usePrePhraseSnapshot: true
+initialState:
+  documentContents: |
+    hello
+  selections:
+    - anchor: { line: 1, character: 0 }
+      active: { line: 1, character: 0 }
+  marks:
+    default.h:
+      start: { line: 0, character: 0 }
+      end: { line: 0, character: 5 }
+finalState:
+  documentContents: |-
+    hello
+    hello
+  selections:
+    - anchor: { line: 1, character: 5 }
+      active: { line: 1, character: 5 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: decoratedSymbol, symbolColor: default, character: h },
+      modifiers: [],
+    },
+    {
+      type: primitive,
+      mark: { type: cursor },
+      modifiers: [{ type: toRawSelection }],
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/implicitExpansion/bringHarpToThis.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/implicitExpansion/bringHarpToThis.yml
new file mode 100644
index 0000000000..af0fa95370
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/implicitExpansion/bringHarpToThis.yml
@@ -0,0 +1,34 @@
+languageId: plaintext
+command:
+  version: 4
+  spokenForm: bring harp to this
+  action: { name: replaceWithTarget }
+  targets:
+    - type: primitive
+      mark: { type: decoratedSymbol, symbolColor: default, character: h }
+    - type: primitive
+      mark: { type: cursor }
+  usePrePhraseSnapshot: true
+initialState:
+  documentContents: hello world
+  selections:
+    - anchor: { line: 0, character: 8 }
+      active: { line: 0, character: 8 }
+  marks:
+    default.h:
+      start: { line: 0, character: 0 }
+      end: { line: 0, character: 5 }
+finalState:
+  documentContents: hello hello
+  selections:
+    - anchor: { line: 0, character: 8 }
+      active: { line: 0, character: 8 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: decoratedSymbol, symbolColor: default, character: h },
+      modifiers: [],
+    },
+    { type: primitive, mark: { type: cursor }, modifiers: [] },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/implicitExpansion/bringThisToWhale.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/implicitExpansion/bringThisToWhale.yml
new file mode 100644
index 0000000000..cc0779eb21
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/implicitExpansion/bringThisToWhale.yml
@@ -0,0 +1,34 @@
+languageId: plaintext
+command:
+  version: 4
+  spokenForm: bring this to whale
+  action: { name: replaceWithTarget }
+  targets:
+    - type: primitive
+      mark: { type: cursor }
+    - type: primitive
+      mark: { type: decoratedSymbol, symbolColor: default, character: w }
+  usePrePhraseSnapshot: true
+initialState:
+  documentContents: hello world
+  selections:
+    - anchor: { line: 0, character: 2 }
+      active: { line: 0, character: 2 }
+  marks:
+    default.w:
+      start: { line: 0, character: 6 }
+      end: { line: 0, character: 11 }
+finalState:
+  documentContents: hello hello
+  selections:
+    - anchor: { line: 0, character: 2 }
+      active: { line: 0, character: 2 }
+fullTargets:
+  [
+    { type: primitive, mark: { type: cursor }, modifiers: [] },
+    {
+      type: primitive,
+      mark: { type: decoratedSymbol, symbolColor: default, character: w },
+      modifiers: [],
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/implicitExpansion/chuckBoundingThat.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/implicitExpansion/chuckBoundingThat.yml
new file mode 100644
index 0000000000..3cd2f0ebe1
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/implicitExpansion/chuckBoundingThat.yml
@@ -0,0 +1,37 @@
+languageId: plaintext
+command:
+  spokenForm: chuck bounding that
+  version: 2
+  targets:
+    - type: primitive
+      modifiers:
+        - { type: excludeInterior }
+      mark: { type: that }
+  usePrePhraseSnapshot: true
+  action: { name: remove }
+initialState:
+  documentContents: (hello )
+  selections:
+    - anchor: { line: 0, character: 8 }
+      active: { line: 0, character: 8 }
+  marks: {}
+  thatMark:
+    - type: UntypedTarget
+      contentRange:
+        start: { line: 0, character: 7 }
+        end: { line: 0, character: 7 }
+      isReversed: false
+      hasExplicitRange: false
+finalState:
+  documentContents: hello
+  selections:
+    - anchor: { line: 0, character: 5 }
+      active: { line: 0, character: 5 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: that },
+      modifiers: [{ type: excludeInterior }],
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/implicitExpansion/chuckCoreThat.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/implicitExpansion/chuckCoreThat.yml
new file mode 100644
index 0000000000..b7d3e14bb4
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/implicitExpansion/chuckCoreThat.yml
@@ -0,0 +1,37 @@
+languageId: plaintext
+command:
+  spokenForm: chuck core that
+  version: 2
+  targets:
+    - type: primitive
+      modifiers:
+        - { type: interiorOnly }
+      mark: { type: that }
+  usePrePhraseSnapshot: true
+  action: { name: remove }
+initialState:
+  documentContents: (hello )
+  selections:
+    - anchor: { line: 0, character: 8 }
+      active: { line: 0, character: 8 }
+  marks: {}
+  thatMark:
+    - type: UntypedTarget
+      contentRange:
+        start: { line: 0, character: 7 }
+        end: { line: 0, character: 7 }
+      isReversed: false
+      hasExplicitRange: false
+finalState:
+  documentContents: ()
+  selections:
+    - anchor: { line: 0, character: 2 }
+      active: { line: 0, character: 2 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: that },
+      modifiers: [{ type: interiorOnly }],
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/implicitExpansion/chuckLeadingThat.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/implicitExpansion/chuckLeadingThat.yml
new file mode 100644
index 0000000000..fd5fa6f438
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/implicitExpansion/chuckLeadingThat.yml
@@ -0,0 +1,31 @@
+languageId: plaintext
+command:
+  spokenForm: chuck leading that
+  version: 2
+  targets:
+    - type: primitive
+      modifiers:
+        - { type: leading }
+      mark: { type: that }
+  usePrePhraseSnapshot: true
+  action: { name: remove }
+initialState:
+  documentContents: " hello"
+  selections:
+    - anchor: { line: 0, character: 6 }
+      active: { line: 0, character: 6 }
+  marks: {}
+  thatMark:
+    - type: UntypedTarget
+      contentRange:
+        start: { line: 0, character: 6 }
+        end: { line: 0, character: 6 }
+      isReversed: false
+      hasExplicitRange: false
+finalState:
+  documentContents: hello
+  selections:
+    - anchor: { line: 0, character: 5 }
+      active: { line: 0, character: 5 }
+fullTargets:
+  [{ type: primitive, mark: { type: that }, modifiers: [{ type: leading }] }]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/implicitExpansion/chuckSecondWordThat.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/implicitExpansion/chuckSecondWordThat.yml
new file mode 100644
index 0000000000..81a874c074
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/implicitExpansion/chuckSecondWordThat.yml
@@ -0,0 +1,52 @@
+languageId: plaintext
+command:
+  spokenForm: chuck second word that
+  version: 2
+  targets:
+    - type: primitive
+      modifiers:
+        - type: ordinalRange
+          scopeType: { type: word }
+          anchor: 1
+          active: 1
+          excludeAnchor: false
+          excludeActive: false
+      mark: { type: that }
+  usePrePhraseSnapshot: true
+  action: { name: remove }
+initialState:
+  documentContents: helloWorld
+  selections:
+    - anchor: { line: 0, character: 10 }
+      active: { line: 0, character: 10 }
+  marks: {}
+  thatMark:
+    - type: UntypedTarget
+      contentRange:
+        start: { line: 0, character: 10 }
+        end: { line: 0, character: 10 }
+      isReversed: false
+      hasExplicitRange: false
+finalState:
+  documentContents: hello
+  selections:
+    - anchor: { line: 0, character: 5 }
+      active: { line: 0, character: 5 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: that },
+      modifiers:
+        [
+          {
+            type: ordinalRange,
+            scopeType: { type: word },
+            anchor: 1,
+            active: 1,
+            excludeAnchor: false,
+            excludeActive: false,
+          },
+        ],
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/implicitExpansion/clearBoundingThat.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/implicitExpansion/clearBoundingThat.yml
new file mode 100644
index 0000000000..92ed047544
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/implicitExpansion/clearBoundingThat.yml
@@ -0,0 +1,41 @@
+languageId: plaintext
+command:
+  spokenForm: clear bounding that
+  version: 2
+  targets:
+    - type: primitive
+      modifiers:
+        - { type: excludeInterior }
+      mark: { type: that }
+  usePrePhraseSnapshot: true
+  action: { name: clearAndSetSelection }
+initialState:
+  documentContents: |
+    (hello now)
+  selections:
+    - anchor: { line: 1, character: 0 }
+      active: { line: 1, character: 0 }
+  marks: {}
+  thatMark:
+    - type: UntypedTarget
+      contentRange:
+        start: { line: 0, character: 1 }
+        end: { line: 0, character: 6 }
+      isReversed: false
+      hasExplicitRange: true
+finalState:
+  documentContents: |
+    hello now
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+    - anchor: { line: 0, character: 9 }
+      active: { line: 0, character: 9 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: that },
+      modifiers: [{ type: excludeInterior }],
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/implicitExpansion/clearBounds.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/implicitExpansion/clearBounds.yml
new file mode 100644
index 0000000000..c197bf2976
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/implicitExpansion/clearBounds.yml
@@ -0,0 +1,31 @@
+languageId: plaintext
+command:
+  spokenForm: clear bounds
+  version: 2
+  targets:
+    - type: primitive
+      modifiers:
+        - { type: excludeInterior }
+  usePrePhraseSnapshot: true
+  action: { name: clearAndSetSelection }
+initialState:
+  documentContents: (aaa bbb)
+  selections:
+    - anchor: { line: 0, character: 1 }
+      active: { line: 0, character: 1 }
+  marks: {}
+finalState:
+  documentContents: aaa bbb
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+    - anchor: { line: 0, character: 7 }
+      active: { line: 0, character: 7 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      modifiers: [{ type: excludeInterior }],
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/implicitExpansion/clearBounds2.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/implicitExpansion/clearBounds2.yml
new file mode 100644
index 0000000000..7179c92add
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/implicitExpansion/clearBounds2.yml
@@ -0,0 +1,31 @@
+languageId: plaintext
+command:
+  spokenForm: clear bounds
+  version: 2
+  targets:
+    - type: primitive
+      modifiers:
+        - { type: excludeInterior }
+  usePrePhraseSnapshot: true
+  action: { name: clearAndSetSelection }
+initialState:
+  documentContents: (aaa bbb)
+  selections:
+    - anchor: { line: 0, character: 1 }
+      active: { line: 0, character: 4 }
+  marks: {}
+finalState:
+  documentContents: aaa bbb
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+    - anchor: { line: 0, character: 7 }
+      active: { line: 0, character: 7 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      modifiers: [{ type: excludeInterior }],
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/implicitExpansion/clearBoundsAir.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/implicitExpansion/clearBoundsAir.yml
new file mode 100644
index 0000000000..bfa2dca74d
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/implicitExpansion/clearBoundsAir.yml
@@ -0,0 +1,35 @@
+languageId: plaintext
+command:
+  spokenForm: clear bounds air
+  version: 2
+  targets:
+    - type: primitive
+      mark: { type: decoratedSymbol, symbolColor: default, character: a }
+      modifiers:
+        - { type: excludeInterior }
+  usePrePhraseSnapshot: true
+  action: { name: clearAndSetSelection }
+initialState:
+  documentContents: (aaa bbb)
+  selections:
+    - anchor: { line: 0, character: 1 }
+      active: { line: 0, character: 1 }
+  marks:
+    default.a:
+      start: { line: 0, character: 1 }
+      end: { line: 0, character: 4 }
+finalState:
+  documentContents: aaa bbb
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+    - anchor: { line: 0, character: 7 }
+      active: { line: 0, character: 7 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: decoratedSymbol, symbolColor: default, character: a },
+      modifiers: [{ type: excludeInterior }],
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/implicitExpansion/clearBoundsToken.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/implicitExpansion/clearBoundsToken.yml
new file mode 100644
index 0000000000..2e68dd77c9
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/implicitExpansion/clearBoundsToken.yml
@@ -0,0 +1,31 @@
+languageId: plaintext
+command:
+  spokenForm: clear bounds token
+  version: 2
+  targets:
+    - type: primitive
+      modifiers:
+        - { type: excludeInterior }
+        - type: containingScope
+          scopeType: { type: token }
+  usePrePhraseSnapshot: true
+  action: { name: clearAndSetSelection }
+initialState:
+  documentContents: (aaa)
+  selections:
+    - anchor: { line: 0, character: 1 }
+      active: { line: 0, character: 1 }
+  marks: {}
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      modifiers:
+        [
+          { type: excludeInterior },
+          { type: containingScope, scopeType: { type: token } },
+        ],
+    },
+  ]
+thrownError: { name: NoContainingScopeError }
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/implicitExpansion/clearCore.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/implicitExpansion/clearCore.yml
new file mode 100644
index 0000000000..c290a29529
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/implicitExpansion/clearCore.yml
@@ -0,0 +1,29 @@
+languageId: plaintext
+command:
+  spokenForm: clear core
+  version: 2
+  targets:
+    - type: primitive
+      modifiers:
+        - { type: interiorOnly }
+  usePrePhraseSnapshot: true
+  action: { name: clearAndSetSelection }
+initialState:
+  documentContents: (aaa bbb)
+  selections:
+    - anchor: { line: 0, character: 1 }
+      active: { line: 0, character: 1 }
+  marks: {}
+finalState:
+  documentContents: ()
+  selections:
+    - anchor: { line: 0, character: 1 }
+      active: { line: 0, character: 1 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      modifiers: [{ type: interiorOnly }],
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/implicitExpansion/clearCore2.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/implicitExpansion/clearCore2.yml
new file mode 100644
index 0000000000..e99c5d0564
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/implicitExpansion/clearCore2.yml
@@ -0,0 +1,29 @@
+languageId: plaintext
+command:
+  spokenForm: clear core
+  version: 2
+  targets:
+    - type: primitive
+      modifiers:
+        - { type: interiorOnly }
+  usePrePhraseSnapshot: true
+  action: { name: clearAndSetSelection }
+initialState:
+  documentContents: (aaa bbb)
+  selections:
+    - anchor: { line: 0, character: 1 }
+      active: { line: 0, character: 4 }
+  marks: {}
+finalState:
+  documentContents: ()
+  selections:
+    - anchor: { line: 0, character: 1 }
+      active: { line: 0, character: 1 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      modifiers: [{ type: interiorOnly }],
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/implicitExpansion/clearCoreAir.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/implicitExpansion/clearCoreAir.yml
new file mode 100644
index 0000000000..7ac3869cbf
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/implicitExpansion/clearCoreAir.yml
@@ -0,0 +1,33 @@
+languageId: plaintext
+command:
+  spokenForm: clear core air
+  version: 2
+  targets:
+    - type: primitive
+      mark: { type: decoratedSymbol, symbolColor: default, character: a }
+      modifiers:
+        - { type: interiorOnly }
+  usePrePhraseSnapshot: true
+  action: { name: clearAndSetSelection }
+initialState:
+  documentContents: (aaa bbb)
+  selections:
+    - anchor: { line: 0, character: 1 }
+      active: { line: 0, character: 1 }
+  marks:
+    default.a:
+      start: { line: 0, character: 1 }
+      end: { line: 0, character: 4 }
+finalState:
+  documentContents: ()
+  selections:
+    - anchor: { line: 0, character: 1 }
+      active: { line: 0, character: 1 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: decoratedSymbol, symbolColor: default, character: a },
+      modifiers: [{ type: interiorOnly }],
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/implicitExpansion/clearCoreThat.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/implicitExpansion/clearCoreThat.yml
new file mode 100644
index 0000000000..186c1e1d62
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/implicitExpansion/clearCoreThat.yml
@@ -0,0 +1,39 @@
+languageId: plaintext
+command:
+  spokenForm: clear core that
+  version: 2
+  targets:
+    - type: primitive
+      modifiers:
+        - { type: interiorOnly }
+      mark: { type: that }
+  usePrePhraseSnapshot: true
+  action: { name: clearAndSetSelection }
+initialState:
+  documentContents: |
+    (hello now)
+  selections:
+    - anchor: { line: 1, character: 0 }
+      active: { line: 1, character: 0 }
+  marks: {}
+  thatMark:
+    - type: UntypedTarget
+      contentRange:
+        start: { line: 0, character: 1 }
+        end: { line: 0, character: 6 }
+      isReversed: false
+      hasExplicitRange: true
+finalState:
+  documentContents: |
+    ()
+  selections:
+    - anchor: { line: 0, character: 1 }
+      active: { line: 0, character: 1 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: that },
+      modifiers: [{ type: interiorOnly }],
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/implicitExpansion/clearCoreToken.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/implicitExpansion/clearCoreToken.yml
new file mode 100644
index 0000000000..309ba8ace6
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/implicitExpansion/clearCoreToken.yml
@@ -0,0 +1,31 @@
+languageId: plaintext
+command:
+  spokenForm: clear core token
+  version: 2
+  targets:
+    - type: primitive
+      modifiers:
+        - { type: interiorOnly }
+        - type: containingScope
+          scopeType: { type: token }
+  usePrePhraseSnapshot: true
+  action: { name: clearAndSetSelection }
+initialState:
+  documentContents: (aaa)
+  selections:
+    - anchor: { line: 0, character: 1 }
+      active: { line: 0, character: 1 }
+  marks: {}
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      modifiers:
+        [
+          { type: interiorOnly },
+          { type: containingScope, scopeType: { type: token } },
+        ],
+    },
+  ]
+thrownError: { name: NoContainingScopeError }
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/implicitExpansion/clearEveryItem.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/implicitExpansion/clearEveryItem.yml
new file mode 100644
index 0000000000..91ec6d3159
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/implicitExpansion/clearEveryItem.yml
@@ -0,0 +1,36 @@
+languageId: plaintext
+command:
+  spokenForm: clear every item
+  version: 2
+  targets:
+    - type: primitive
+      modifiers:
+        - type: everyScope
+          scopeType: { type: collectionItem }
+  usePrePhraseSnapshot: true
+  action: { name: clearAndSetSelection }
+initialState:
+  documentContents: a, b, c, d
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+  marks: {}
+finalState:
+  documentContents: ", , , "
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+    - anchor: { line: 0, character: 2 }
+      active: { line: 0, character: 2 }
+    - anchor: { line: 0, character: 4 }
+      active: { line: 0, character: 4 }
+    - anchor: { line: 0, character: 6 }
+      active: { line: 0, character: 6 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      modifiers: [{ type: everyScope, scopeType: { type: collectionItem } }],
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/implicitExpansion/clearEveryItem2.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/implicitExpansion/clearEveryItem2.yml
new file mode 100644
index 0000000000..ff1905c3a5
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/implicitExpansion/clearEveryItem2.yml
@@ -0,0 +1,32 @@
+languageId: plaintext
+command:
+  spokenForm: clear every item
+  version: 2
+  targets:
+    - type: primitive
+      modifiers:
+        - type: everyScope
+          scopeType: { type: collectionItem }
+  usePrePhraseSnapshot: true
+  action: { name: clearAndSetSelection }
+initialState:
+  documentContents: a, b, c, d
+  selections:
+    - anchor: { line: 0, character: 3 }
+      active: { line: 0, character: 7 }
+  marks: {}
+finalState:
+  documentContents: a, , , d
+  selections:
+    - anchor: { line: 0, character: 3 }
+      active: { line: 0, character: 3 }
+    - anchor: { line: 0, character: 5 }
+      active: { line: 0, character: 5 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      modifiers: [{ type: everyScope, scopeType: { type: collectionItem } }],
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/implicitExpansion/clearEveryItemAir.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/implicitExpansion/clearEveryItemAir.yml
new file mode 100644
index 0000000000..765bebc366
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/implicitExpansion/clearEveryItemAir.yml
@@ -0,0 +1,40 @@
+languageId: plaintext
+command:
+  spokenForm: clear every item air
+  version: 2
+  targets:
+    - type: primitive
+      mark: { type: decoratedSymbol, symbolColor: default, character: a }
+      modifiers:
+        - type: everyScope
+          scopeType: { type: collectionItem }
+  usePrePhraseSnapshot: true
+  action: { name: clearAndSetSelection }
+initialState:
+  documentContents: a, b, c, d
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+  marks:
+    default.a:
+      start: { line: 0, character: 0 }
+      end: { line: 0, character: 1 }
+finalState:
+  documentContents: ", , , "
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+    - anchor: { line: 0, character: 2 }
+      active: { line: 0, character: 2 }
+    - anchor: { line: 0, character: 4 }
+      active: { line: 0, character: 4 }
+    - anchor: { line: 0, character: 6 }
+      active: { line: 0, character: 6 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: decoratedSymbol, symbolColor: default, character: a },
+      modifiers: [{ type: everyScope, scopeType: { type: collectionItem } }],
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/implicitExpansion/clearEveryLine.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/implicitExpansion/clearEveryLine.yml
new file mode 100644
index 0000000000..e9193f0428
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/implicitExpansion/clearEveryLine.yml
@@ -0,0 +1,43 @@
+languageId: plaintext
+command:
+  spokenForm: clear every line
+  version: 2
+  targets:
+    - type: primitive
+      modifiers:
+        - type: everyScope
+          scopeType: { type: line }
+  usePrePhraseSnapshot: true
+  action: { name: clearAndSetSelection }
+initialState:
+  documentContents: |-
+    a
+    b
+    c
+    d
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+  marks: {}
+finalState:
+  documentContents: |+
+
+
+
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+    - anchor: { line: 1, character: 0 }
+      active: { line: 1, character: 0 }
+    - anchor: { line: 2, character: 0 }
+      active: { line: 2, character: 0 }
+    - anchor: { line: 3, character: 0 }
+      active: { line: 3, character: 0 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      modifiers: [{ type: everyScope, scopeType: { type: line } }],
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/implicitExpansion/clearEveryLine2.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/implicitExpansion/clearEveryLine2.yml
new file mode 100644
index 0000000000..591adc0220
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/implicitExpansion/clearEveryLine2.yml
@@ -0,0 +1,40 @@
+languageId: plaintext
+command:
+  spokenForm: clear every line
+  version: 2
+  targets:
+    - type: primitive
+      modifiers:
+        - type: everyScope
+          scopeType: { type: line }
+  usePrePhraseSnapshot: true
+  action: { name: clearAndSetSelection }
+initialState:
+  documentContents: |-
+    a
+    b
+    c
+    d
+  selections:
+    - anchor: { line: 1, character: 0 }
+      active: { line: 2, character: 1 }
+  marks: {}
+finalState:
+  documentContents: |-
+    a
+
+
+    d
+  selections:
+    - anchor: { line: 1, character: 0 }
+      active: { line: 1, character: 0 }
+    - anchor: { line: 2, character: 0 }
+      active: { line: 2, character: 0 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      modifiers: [{ type: everyScope, scopeType: { type: line } }],
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/implicitExpansion/clearEveryLineAir.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/implicitExpansion/clearEveryLineAir.yml
new file mode 100644
index 0000000000..3dca8723b8
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/implicitExpansion/clearEveryLineAir.yml
@@ -0,0 +1,47 @@
+languageId: plaintext
+command:
+  spokenForm: clear every line air
+  version: 2
+  targets:
+    - type: primitive
+      mark: { type: decoratedSymbol, symbolColor: default, character: a }
+      modifiers:
+        - type: everyScope
+          scopeType: { type: line }
+  usePrePhraseSnapshot: true
+  action: { name: clearAndSetSelection }
+initialState:
+  documentContents: |-
+    a
+    b
+    c
+    d
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+  marks:
+    default.a:
+      start: { line: 0, character: 0 }
+      end: { line: 0, character: 1 }
+finalState:
+  documentContents: |+
+
+
+
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+    - anchor: { line: 1, character: 0 }
+      active: { line: 1, character: 0 }
+    - anchor: { line: 2, character: 0 }
+      active: { line: 2, character: 0 }
+    - anchor: { line: 3, character: 0 }
+      active: { line: 3, character: 0 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: decoratedSymbol, symbolColor: default, character: a },
+      modifiers: [{ type: everyScope, scopeType: { type: line } }],
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/implicitExpansion/clearEveryLineFunk.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/implicitExpansion/clearEveryLineFunk.yml
new file mode 100644
index 0000000000..f617180372
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/implicitExpansion/clearEveryLineFunk.yml
@@ -0,0 +1,48 @@
+languageId: typescript
+command:
+  spokenForm: clear every line funk
+  version: 2
+  targets:
+    - type: primitive
+      modifiers:
+        - type: everyScope
+          scopeType: { type: line }
+        - type: containingScope
+          scopeType: { type: namedFunction }
+  usePrePhraseSnapshot: true
+  action: { name: clearAndSetSelection }
+initialState:
+  documentContents: |
+
+    function myFunk() {
+      // aaa
+    }
+  selections:
+    - anchor: { line: 2, character: 5 }
+      active: { line: 2, character: 5 }
+  marks: {}
+finalState:
+  documentContents: |2+
+
+
+
+
+  selections:
+    - anchor: { line: 1, character: 0 }
+      active: { line: 1, character: 0 }
+    - anchor: { line: 2, character: 2 }
+      active: { line: 2, character: 2 }
+    - anchor: { line: 3, character: 0 }
+      active: { line: 3, character: 0 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      modifiers:
+        [
+          { type: everyScope, scopeType: { type: line } },
+          { type: containingScope, scopeType: { type: namedFunction } },
+        ],
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/implicitExpansion/clearEveryLineThat.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/implicitExpansion/clearEveryLineThat.yml
new file mode 100644
index 0000000000..4971fa97bc
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/implicitExpansion/clearEveryLineThat.yml
@@ -0,0 +1,43 @@
+languageId: plaintext
+command:
+  spokenForm: clear every line that
+  version: 2
+  targets:
+    - type: primitive
+      modifiers:
+        - type: everyScope
+          scopeType: { type: line }
+      mark: { type: that }
+  usePrePhraseSnapshot: true
+  action: { name: clearAndSetSelection }
+initialState:
+  documentContents: |-
+    hello
+    whatever
+  selections:
+    - anchor: { line: 1, character: 8 }
+      active: { line: 1, character: 8 }
+  marks: {}
+  thatMark:
+    - type: UntypedTarget
+      contentRange:
+        start: { line: 0, character: 5 }
+        end: { line: 0, character: 5 }
+      isReversed: false
+      hasExplicitRange: false
+finalState:
+  documentContents: |+
+
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+    - anchor: { line: 1, character: 0 }
+      active: { line: 1, character: 0 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: that },
+      modifiers: [{ type: everyScope, scopeType: { type: line } }],
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/implicitExpansion/clearEveryLineThat2.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/implicitExpansion/clearEveryLineThat2.yml
new file mode 100644
index 0000000000..9b0173a656
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/implicitExpansion/clearEveryLineThat2.yml
@@ -0,0 +1,48 @@
+languageId: plaintext
+command:
+  spokenForm: clear every line that
+  version: 2
+  targets:
+    - type: primitive
+      modifiers:
+        - type: everyScope
+          scopeType: { type: line }
+      mark: { type: that }
+  usePrePhraseSnapshot: true
+  action: { name: clearAndSetSelection }
+initialState:
+  documentContents: |-
+    hello
+    world
+    testing
+    again
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+  marks: {}
+  thatMark:
+    - type: UntypedTarget
+      contentRange:
+        start: { line: 1, character: 0 }
+        end: { line: 2, character: 7 }
+      isReversed: false
+      hasExplicitRange: true
+finalState:
+  documentContents: |-
+    hello
+
+
+    again
+  selections:
+    - anchor: { line: 1, character: 0 }
+      active: { line: 1, character: 0 }
+    - anchor: { line: 2, character: 0 }
+      active: { line: 2, character: 0 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: that },
+      modifiers: [{ type: everyScope, scopeType: { type: line } }],
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/implicitExpansion/clearFirstCarSecondWordHarp.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/implicitExpansion/clearFirstCarSecondWordHarp.yml
new file mode 100644
index 0000000000..9d593abdc4
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/implicitExpansion/clearFirstCarSecondWordHarp.yml
@@ -0,0 +1,62 @@
+languageId: plaintext
+command:
+  spokenForm: clear first car second word harp
+  version: 2
+  targets:
+    - type: primitive
+      modifiers:
+        - type: ordinalRange
+          scopeType: { type: character }
+          anchor: 0
+          active: 0
+          excludeAnchor: false
+          excludeActive: false
+        - type: ordinalRange
+          scopeType: { type: word }
+          anchor: 1
+          active: 1
+          excludeAnchor: false
+          excludeActive: false
+      mark: { type: decoratedSymbol, symbolColor: default, character: h }
+  usePrePhraseSnapshot: true
+  action: { name: clearAndSetSelection }
+initialState:
+  documentContents: helloWorld
+  selections:
+    - anchor: { line: 0, character: 10 }
+      active: { line: 0, character: 10 }
+  marks:
+    default.h:
+      start: { line: 0, character: 0 }
+      end: { line: 0, character: 10 }
+finalState:
+  documentContents: helloorld
+  selections:
+    - anchor: { line: 0, character: 5 }
+      active: { line: 0, character: 5 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: decoratedSymbol, symbolColor: default, character: h },
+      modifiers:
+        [
+          {
+            type: ordinalRange,
+            scopeType: { type: character },
+            anchor: 0,
+            active: 0,
+            excludeAnchor: false,
+            excludeActive: false,
+          },
+          {
+            type: ordinalRange,
+            scopeType: { type: word },
+            anchor: 1,
+            active: 1,
+            excludeAnchor: false,
+            excludeActive: false,
+          },
+        ],
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/implicitExpansion/clearFirstWordPastTrap.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/implicitExpansion/clearFirstWordPastTrap.yml
new file mode 100644
index 0000000000..256456ca97
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/implicitExpansion/clearFirstWordPastTrap.yml
@@ -0,0 +1,69 @@
+languageId: plaintext
+command:
+  spokenForm: clear first word past trap
+  version: 2
+  targets:
+    - type: range
+      anchor:
+        type: primitive
+        modifiers:
+          - type: ordinalRange
+            scopeType: { type: word }
+            anchor: 0
+            active: 0
+            excludeAnchor: false
+            excludeActive: false
+      active:
+        type: primitive
+        mark: { type: decoratedSymbol, symbolColor: default, character: t }
+      excludeAnchor: false
+      excludeActive: false
+  usePrePhraseSnapshot: true
+  action: { name: clearAndSetSelection }
+initialState:
+  documentContents: |-
+    helloWorld
+    testingThere
+  selections:
+    - anchor: { line: 0, character: 7 }
+      active: { line: 0, character: 7 }
+  marks:
+    default.t:
+      start: { line: 1, character: 0 }
+      end: { line: 1, character: 12 }
+finalState:
+  documentContents: There
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+fullTargets:
+  [
+    {
+      type: range,
+      excludeAnchor: false,
+      excludeActive: false,
+      rangeType: continuous,
+      anchor:
+        {
+          type: primitive,
+          mark: { type: cursor },
+          modifiers:
+            [
+              &ref_0 {
+                type: ordinalRange,
+                scopeType: { type: word },
+                anchor: 0,
+                active: 0,
+                excludeAnchor: false,
+                excludeActive: false,
+              },
+            ],
+        },
+      active:
+        {
+          type: primitive,
+          mark: { type: decoratedSymbol, symbolColor: default, character: t },
+          modifiers: [*ref_0],
+        },
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/implicitExpansion/clearFirstWordThat.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/implicitExpansion/clearFirstWordThat.yml
new file mode 100644
index 0000000000..29643079bd
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/implicitExpansion/clearFirstWordThat.yml
@@ -0,0 +1,48 @@
+languageId: plaintext
+command:
+  spokenForm: clear first word that
+  version: 3
+  targets:
+    - type: primitive
+      modifiers:
+        - type: ordinalScope
+          scopeType: { type: word }
+          start: 0
+          length: 1
+      mark: { type: that }
+  usePrePhraseSnapshot: true
+  action: { name: clearAndSetSelection }
+initialState:
+  documentContents: aaaBbbCcc ddd
+  selections:
+    - anchor: { line: 0, character: 13 }
+      active: { line: 0, character: 13 }
+  marks: {}
+  thatMark:
+    - type: UntypedTarget
+      contentRange:
+        start: { line: 0, character: 3 }
+        end: { line: 0, character: 9 }
+      isReversed: false
+      hasExplicitRange: true
+finalState:
+  documentContents: aaaCcc ddd
+  selections:
+    - anchor: { line: 0, character: 3 }
+      active: { line: 0, character: 3 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: that },
+      modifiers:
+        [
+          {
+            type: ordinalScope,
+            scopeType: { type: word },
+            start: 0,
+            length: 1,
+          },
+        ],
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/implicitExpansion/clearLeadingPastWhale.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/implicitExpansion/clearLeadingPastWhale.yml
new file mode 100644
index 0000000000..34b613227e
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/implicitExpansion/clearLeadingPastWhale.yml
@@ -0,0 +1,54 @@
+languageId: plaintext
+command:
+  spokenForm: clear leading past whale
+  version: 2
+  targets:
+    - type: range
+      anchor:
+        type: primitive
+        modifiers:
+          - { type: leading }
+      active:
+        type: primitive
+        mark: { type: decoratedSymbol, symbolColor: default, character: w }
+      excludeAnchor: false
+      excludeActive: false
+  usePrePhraseSnapshot: true
+  action: { name: clearAndSetSelection }
+initialState:
+  documentContents: |2-
+     hello
+     world
+  selections:
+    - anchor: { line: 0, character: 3 }
+      active: { line: 0, character: 3 }
+  marks:
+    default.w:
+      start: { line: 1, character: 1 }
+      end: { line: 1, character: 6 }
+finalState:
+  documentContents: world
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+fullTargets:
+  [
+    {
+      type: range,
+      excludeAnchor: false,
+      excludeActive: false,
+      rangeType: continuous,
+      anchor:
+        {
+          type: primitive,
+          mark: { type: cursor },
+          modifiers: [{ type: leading }],
+        },
+      active:
+        {
+          type: primitive,
+          mark: { type: decoratedSymbol, symbolColor: default, character: w },
+          modifiers: [{ type: leading }],
+        },
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/implicitExpansion/clearLeadingSecondWord.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/implicitExpansion/clearLeadingSecondWord.yml
new file mode 100644
index 0000000000..b037eccdcf
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/implicitExpansion/clearLeadingSecondWord.yml
@@ -0,0 +1,42 @@
+languageId: plaintext
+command:
+  spokenForm: clear leading second word
+  version: 2
+  targets:
+    - type: primitive
+      modifiers:
+        - { type: leading }
+        - type: ordinalRange
+          scopeType: { type: word }
+          anchor: 1
+          active: 1
+          excludeAnchor: false
+          excludeActive: false
+  usePrePhraseSnapshot: true
+  action: { name: clearAndSetSelection }
+initialState:
+  documentContents: helloWorld
+  selections:
+    - anchor: { line: 0, character: 10 }
+      active: { line: 0, character: 10 }
+  marks: {}
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      modifiers:
+        [
+          { type: leading },
+          {
+            type: ordinalRange,
+            scopeType: { type: word },
+            anchor: 1,
+            active: 1,
+            excludeAnchor: false,
+            excludeActive: false,
+          },
+        ],
+    },
+  ]
+thrownError: { name: NoDelimiterError }
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/implicitExpansion/clearPastTrap.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/implicitExpansion/clearPastTrap.yml
new file mode 100644
index 0000000000..1daa9cd578
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/implicitExpansion/clearPastTrap.yml
@@ -0,0 +1,49 @@
+languageId: plaintext
+command:
+  version: 4
+  spokenForm: clear past trap
+  action: { name: clearAndSetSelection }
+  targets:
+    - type: range
+      anchor: { type: implicit }
+      active:
+        type: primitive
+        mark: { type: decoratedSymbol, symbolColor: default, character: t }
+      excludeAnchor: false
+      excludeActive: false
+  usePrePhraseSnapshot: true
+initialState:
+  documentContents: hello world testing
+  selections:
+    - anchor: { line: 0, character: 8 }
+      active: { line: 0, character: 8 }
+  marks:
+    default.t:
+      start: { line: 0, character: 12 }
+      end: { line: 0, character: 19 }
+finalState:
+  documentContents: hello wo
+  selections:
+    - anchor: { line: 0, character: 8 }
+      active: { line: 0, character: 8 }
+fullTargets:
+  [
+    {
+      type: range,
+      excludeAnchor: false,
+      excludeActive: false,
+      rangeType: continuous,
+      anchor:
+        {
+          type: primitive,
+          mark: { type: cursor },
+          modifiers: [{ type: toRawSelection }],
+        },
+      active:
+        {
+          type: primitive,
+          mark: { type: decoratedSymbol, symbolColor: default, character: t },
+          modifiers: [],
+        },
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/implicitExpansion/clearSecondWord.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/implicitExpansion/clearSecondWord.yml
new file mode 100644
index 0000000000..7d1c0c39f5
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/implicitExpansion/clearSecondWord.yml
@@ -0,0 +1,44 @@
+languageId: plaintext
+command:
+  spokenForm: clear second word
+  version: 2
+  targets:
+    - type: primitive
+      modifiers:
+        - type: ordinalRange
+          scopeType: { type: word }
+          anchor: 1
+          active: 1
+          excludeAnchor: false
+          excludeActive: false
+  usePrePhraseSnapshot: true
+  action: { name: clearAndSetSelection }
+initialState:
+  documentContents: aaaBbbCccDdd
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+  marks: {}
+finalState:
+  documentContents: aaaCccDdd
+  selections:
+    - anchor: { line: 0, character: 3 }
+      active: { line: 0, character: 3 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      modifiers:
+        [
+          {
+            type: ordinalRange,
+            scopeType: { type: word },
+            anchor: 1,
+            active: 1,
+            excludeAnchor: false,
+            excludeActive: false,
+          },
+        ],
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/implicitExpansion/clearSecondWord2.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/implicitExpansion/clearSecondWord2.yml
new file mode 100644
index 0000000000..37a42781a4
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/implicitExpansion/clearSecondWord2.yml
@@ -0,0 +1,44 @@
+languageId: plaintext
+command:
+  spokenForm: clear second word
+  version: 2
+  targets:
+    - type: primitive
+      modifiers:
+        - type: ordinalRange
+          scopeType: { type: word }
+          anchor: 1
+          active: 1
+          excludeAnchor: false
+          excludeActive: false
+  usePrePhraseSnapshot: true
+  action: { name: clearAndSetSelection }
+initialState:
+  documentContents: aaaBbbCccDdd
+  selections:
+    - anchor: { line: 0, character: 3 }
+      active: { line: 0, character: 9 }
+  marks: {}
+finalState:
+  documentContents: aaaBbbDdd
+  selections:
+    - anchor: { line: 0, character: 6 }
+      active: { line: 0, character: 6 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      modifiers:
+        [
+          {
+            type: ordinalRange,
+            scopeType: { type: word },
+            anchor: 1,
+            active: 1,
+            excludeAnchor: false,
+            excludeActive: false,
+          },
+        ],
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/implicitExpansion/clearSecondWordAir.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/implicitExpansion/clearSecondWordAir.yml
new file mode 100644
index 0000000000..9c7f1b9436
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/implicitExpansion/clearSecondWordAir.yml
@@ -0,0 +1,48 @@
+languageId: plaintext
+command:
+  spokenForm: clear second word air
+  version: 2
+  targets:
+    - type: primitive
+      mark: { type: decoratedSymbol, symbolColor: default, character: a }
+      modifiers:
+        - type: ordinalRange
+          scopeType: { type: word }
+          anchor: 1
+          active: 1
+          excludeAnchor: false
+          excludeActive: false
+  usePrePhraseSnapshot: true
+  action: { name: clearAndSetSelection }
+initialState:
+  documentContents: aaaBbbCccDdd
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+  marks:
+    default.a:
+      start: { line: 0, character: 0 }
+      end: { line: 0, character: 12 }
+finalState:
+  documentContents: aaaCccDdd
+  selections:
+    - anchor: { line: 0, character: 3 }
+      active: { line: 0, character: 3 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: decoratedSymbol, symbolColor: default, character: a },
+      modifiers:
+        [
+          {
+            type: ordinalRange,
+            scopeType: { type: word },
+            anchor: 1,
+            active: 1,
+            excludeAnchor: false,
+            excludeActive: false,
+          },
+        ],
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/implicitExpansion/clearThisSliceBat.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/implicitExpansion/clearThisSliceBat.yml
new file mode 100644
index 0000000000..55514334d0
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/implicitExpansion/clearThisSliceBat.yml
@@ -0,0 +1,52 @@
+languageId: plaintext
+command:
+  version: 4
+  spokenForm: clear this slice bat
+  action: { name: clearAndSetSelection }
+  targets:
+    - type: range
+      anchor:
+        type: primitive
+        mark: { type: cursor }
+      active:
+        type: primitive
+        mark: { type: decoratedSymbol, symbolColor: default, character: b }
+      excludeAnchor: false
+      excludeActive: false
+      rangeType: vertical
+  usePrePhraseSnapshot: true
+initialState:
+  documentContents: |-
+    aa
+    bb
+  selections:
+    - anchor: { line: 0, character: 1 }
+      active: { line: 0, character: 1 }
+  marks:
+    default.b:
+      start: { line: 1, character: 0 }
+      end: { line: 1, character: 2 }
+finalState:
+  documentContents: |+
+
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+    - anchor: { line: 1, character: 0 }
+      active: { line: 1, character: 0 }
+fullTargets:
+  [
+    {
+      type: range,
+      excludeAnchor: false,
+      excludeActive: false,
+      rangeType: vertical,
+      anchor: { type: primitive, mark: { type: cursor }, modifiers: [] },
+      active:
+        {
+          type: primitive,
+          mark: { type: decoratedSymbol, symbolColor: default, character: b },
+          modifiers: [],
+        },
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/implicitExpansion/clearTrailing.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/implicitExpansion/clearTrailing.yml
new file mode 100644
index 0000000000..ea2c3be6a1
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/implicitExpansion/clearTrailing.yml
@@ -0,0 +1,23 @@
+languageId: plaintext
+command:
+  spokenForm: clear trailing
+  version: 2
+  targets:
+    - type: primitive
+      modifiers:
+        - { type: trailing }
+  usePrePhraseSnapshot: true
+  action: { name: clearAndSetSelection }
+initialState:
+  documentContents: aaa bbb
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+  marks: {}
+finalState:
+  documentContents: aaabbb
+  selections:
+    - anchor: { line: 0, character: 3 }
+      active: { line: 0, character: 3 }
+fullTargets:
+  [{ type: primitive, mark: { type: cursor }, modifiers: [{ type: trailing }] }]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/implicitExpansion/clearTrailing2.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/implicitExpansion/clearTrailing2.yml
new file mode 100644
index 0000000000..d1564ea48f
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/implicitExpansion/clearTrailing2.yml
@@ -0,0 +1,23 @@
+languageId: plaintext
+command:
+  spokenForm: clear trailing
+  version: 2
+  targets:
+    - type: primitive
+      modifiers:
+        - { type: trailing }
+  usePrePhraseSnapshot: true
+  action: { name: clearAndSetSelection }
+initialState:
+  documentContents: aaa bbb
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 1 }
+  marks: {}
+finalState:
+  documentContents: aaabbb
+  selections:
+    - anchor: { line: 0, character: 3 }
+      active: { line: 0, character: 3 }
+fullTargets:
+  [{ type: primitive, mark: { type: cursor }, modifiers: [{ type: trailing }] }]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/implicitExpansion/clearTrailingAir.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/implicitExpansion/clearTrailingAir.yml
new file mode 100644
index 0000000000..6bcdde711d
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/implicitExpansion/clearTrailingAir.yml
@@ -0,0 +1,33 @@
+languageId: plaintext
+command:
+  spokenForm: clear trailing air
+  version: 2
+  targets:
+    - type: primitive
+      mark: { type: decoratedSymbol, symbolColor: default, character: a }
+      modifiers:
+        - { type: trailing }
+  usePrePhraseSnapshot: true
+  action: { name: clearAndSetSelection }
+initialState:
+  documentContents: aaa bbb
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+  marks:
+    default.a:
+      start: { line: 0, character: 0 }
+      end: { line: 0, character: 3 }
+finalState:
+  documentContents: aaabbb
+  selections:
+    - anchor: { line: 0, character: 3 }
+      active: { line: 0, character: 3 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: decoratedSymbol, symbolColor: default, character: a },
+      modifiers: [{ type: trailing }],
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/implicitExpansion/clearTrailingLine.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/implicitExpansion/clearTrailingLine.yml
new file mode 100644
index 0000000000..68dadede8d
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/implicitExpansion/clearTrailingLine.yml
@@ -0,0 +1,37 @@
+languageId: plaintext
+command:
+  spokenForm: clear trailing line
+  version: 2
+  targets:
+    - type: primitive
+      modifiers:
+        - { type: trailing }
+        - type: containingScope
+          scopeType: { type: line }
+  usePrePhraseSnapshot: true
+  action: { name: clearAndSetSelection }
+initialState:
+  documentContents: |-
+    a b
+    c d
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+  marks: {}
+finalState:
+  documentContents: a bc d
+  selections:
+    - anchor: { line: 0, character: 3 }
+      active: { line: 0, character: 3 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      modifiers:
+        [
+          { type: trailing },
+          { type: containingScope, scopeType: { type: line } },
+        ],
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/implicitExpansion/clearTrailingThat.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/implicitExpansion/clearTrailingThat.yml
new file mode 100644
index 0000000000..e0a8ec489c
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/implicitExpansion/clearTrailingThat.yml
@@ -0,0 +1,33 @@
+languageId: plaintext
+command:
+  spokenForm: clear trailing that
+  version: 2
+  targets:
+    - type: primitive
+      modifiers:
+        - { type: trailing }
+      mark: { type: that }
+  usePrePhraseSnapshot: true
+  action: { name: clearAndSetSelection }
+initialState:
+  documentContents: |
+    helloWorld now
+  selections:
+    - anchor: { line: 1, character: 0 }
+      active: { line: 1, character: 0 }
+  marks: {}
+  thatMark:
+    - type: UntypedTarget
+      contentRange:
+        start: { line: 0, character: 10 }
+        end: { line: 0, character: 10 }
+      isReversed: false
+      hasExplicitRange: false
+finalState:
+  documentContents: |
+    helloWorldnow
+  selections:
+    - anchor: { line: 0, character: 10 }
+      active: { line: 0, character: 10 }
+fullTargets:
+  [{ type: primitive, mark: { type: that }, modifiers: [{ type: trailing }] }]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/implicitExpansion/cloneAir.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/implicitExpansion/cloneAir.yml
new file mode 100644
index 0000000000..20f9f94774
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/implicitExpansion/cloneAir.yml
@@ -0,0 +1,33 @@
+languageId: plaintext
+command:
+  spokenForm: clone air
+  version: 2
+  targets:
+    - type: primitive
+      mark: { type: decoratedSymbol, symbolColor: default, character: a }
+  usePrePhraseSnapshot: true
+  action: { name: insertCopyAfter }
+initialState:
+  documentContents: aaa bbb
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+  marks:
+    default.a:
+      start: { line: 0, character: 0 }
+      end: { line: 0, character: 3 }
+finalState:
+  documentContents: |-
+    aaa bbb
+    aaa bbb
+  selections:
+    - anchor: { line: 1, character: 0 }
+      active: { line: 1, character: 0 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: decoratedSymbol, symbolColor: default, character: a },
+      modifiers: [],
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/implicitExpansion/cloneFunk.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/implicitExpansion/cloneFunk.yml
new file mode 100644
index 0000000000..627664827d
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/implicitExpansion/cloneFunk.yml
@@ -0,0 +1,41 @@
+languageId: typescript
+command:
+  spokenForm: clone funk
+  version: 2
+  targets:
+    - type: primitive
+      modifiers:
+        - type: containingScope
+          scopeType: { type: namedFunction }
+  usePrePhraseSnapshot: true
+  action: { name: insertCopyAfter }
+initialState:
+  documentContents: |-
+    function myFunk() {
+      // aaa
+    }
+  selections:
+    - anchor: { line: 1, character: 5 }
+      active: { line: 1, character: 5 }
+  marks: {}
+finalState:
+  documentContents: |-
+    function myFunk() {
+      // aaa
+    }
+
+    function myFunk() {
+      // aaa
+    }
+  selections:
+    - anchor: { line: 5, character: 5 }
+      active: { line: 5, character: 5 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      modifiers:
+        [{ type: containingScope, scopeType: { type: namedFunction } }],
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/implicitExpansion/cloneNearPastWhale.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/implicitExpansion/cloneNearPastWhale.yml
new file mode 100644
index 0000000000..9412ab525b
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/implicitExpansion/cloneNearPastWhale.yml
@@ -0,0 +1,62 @@
+languageId: plaintext
+command:
+  spokenForm: clone near past whale
+  version: 2
+  targets:
+    - type: range
+      anchor:
+        type: primitive
+        mark: { type: decoratedSymbol, symbolColor: default, character: "n" }
+      active:
+        type: primitive
+        mark: { type: decoratedSymbol, symbolColor: default, character: w }
+      excludeAnchor: false
+      excludeActive: false
+  usePrePhraseSnapshot: true
+  action: { name: insertCopyAfter }
+initialState:
+  documentContents: |+
+    hello now
+    whatever
+
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+  marks:
+    default.n:
+      start: { line: 0, character: 6 }
+      end: { line: 0, character: 9 }
+    default.w:
+      start: { line: 1, character: 0 }
+      end: { line: 1, character: 8 }
+finalState:
+  documentContents: |+
+    hello now
+    whatever
+    hello now
+    whatever
+
+  selections:
+    - anchor: { line: 2, character: 0 }
+      active: { line: 2, character: 0 }
+fullTargets:
+  [
+    {
+      type: range,
+      excludeAnchor: false,
+      excludeActive: false,
+      rangeType: continuous,
+      anchor:
+        {
+          type: primitive,
+          mark: { type: decoratedSymbol, symbolColor: default, character: "n" },
+          modifiers: [],
+        },
+      active:
+        {
+          type: primitive,
+          mark: { type: decoratedSymbol, symbolColor: default, character: w },
+          modifiers: [],
+        },
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/implicitExpansion/clonePastWhale.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/implicitExpansion/clonePastWhale.yml
new file mode 100644
index 0000000000..4a08998bc5
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/implicitExpansion/clonePastWhale.yml
@@ -0,0 +1,50 @@
+languageId: plaintext
+command:
+  spokenForm: clone past whale
+  version: 2
+  targets:
+    - type: range
+      anchor: { type: primitive }
+      active:
+        type: primitive
+        mark: { type: decoratedSymbol, symbolColor: default, character: w }
+      excludeAnchor: false
+      excludeActive: false
+  usePrePhraseSnapshot: true
+  action: { name: insertCopyAfter }
+initialState:
+  documentContents: |-
+    hello
+    world
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+  marks:
+    default.w:
+      start: { line: 1, character: 0 }
+      end: { line: 1, character: 5 }
+finalState:
+  documentContents: |-
+    hello
+    world
+    hello
+    world
+  selections:
+    - anchor: { line: 2, character: 0 }
+      active: { line: 2, character: 0 }
+fullTargets:
+  [
+    {
+      type: range,
+      excludeAnchor: false,
+      excludeActive: false,
+      rangeType: continuous,
+      anchor: { type: primitive, mark: { type: cursor }, modifiers: [] },
+      active:
+        {
+          type: primitive,
+          mark: { type: decoratedSymbol, symbolColor: default, character: w },
+          modifiers: [],
+        },
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/implicitExpansion/cloneThat.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/implicitExpansion/cloneThat.yml
new file mode 100644
index 0000000000..0399f0105a
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/implicitExpansion/cloneThat.yml
@@ -0,0 +1,31 @@
+languageId: plaintext
+command:
+  spokenForm: clone that
+  version: 2
+  targets:
+    - type: primitive
+      mark: { type: that }
+  usePrePhraseSnapshot: true
+  action: { name: insertCopyAfter }
+initialState:
+  documentContents: |
+    hello world
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+  marks: {}
+  thatMark:
+    - type: UntypedTarget
+      contentRange:
+        start: { line: 0, character: 6 }
+        end: { line: 0, character: 6 }
+      isReversed: false
+      hasExplicitRange: false
+finalState:
+  documentContents: |
+    hello world
+    hello world
+  selections:
+    - anchor: { line: 1, character: 0 }
+      active: { line: 1, character: 0 }
+fullTargets: [{ type: primitive, mark: { type: that }, modifiers: [] }]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/implicitExpansion/cloneThat2.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/implicitExpansion/cloneThat2.yml
new file mode 100644
index 0000000000..7f04a88523
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/implicitExpansion/cloneThat2.yml
@@ -0,0 +1,33 @@
+languageId: plaintext
+command:
+  spokenForm: clone that
+  version: 2
+  targets:
+    - type: primitive
+      mark: { type: that }
+  usePrePhraseSnapshot: true
+  action: { name: insertCopyAfter }
+initialState:
+  documentContents: |+
+    hello world
+
+  selections:
+    - anchor: { line: 2, character: 0 }
+      active: { line: 2, character: 0 }
+  marks: {}
+  thatMark:
+    - type: UntypedTarget
+      contentRange:
+        start: { line: 0, character: 6 }
+        end: { line: 0, character: 11 }
+      isReversed: false
+      hasExplicitRange: true
+finalState:
+  documentContents: |+
+    hello world
+    hello world
+
+  selections:
+    - anchor: { line: 3, character: 0 }
+      active: { line: 3, character: 0 }
+fullTargets: [{ type: primitive, mark: { type: that }, modifiers: [] }]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/implicitExpansion/cloneThis.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/implicitExpansion/cloneThis.yml
new file mode 100644
index 0000000000..ed81841a2b
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/implicitExpansion/cloneThis.yml
@@ -0,0 +1,23 @@
+languageId: plaintext
+command:
+  spokenForm: clone this
+  version: 2
+  targets:
+    - type: primitive
+      mark: { type: cursor }
+  usePrePhraseSnapshot: true
+  action: { name: insertCopyAfter }
+initialState:
+  documentContents: aaa bbb
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+  marks: {}
+finalState:
+  documentContents: |-
+    aaa bbb
+    aaa bbb
+  selections:
+    - anchor: { line: 1, character: 0 }
+      active: { line: 1, character: 0 }
+fullTargets: [{ type: primitive, mark: { type: cursor }, modifiers: [] }]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/implicitExpansion/cloneThis2.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/implicitExpansion/cloneThis2.yml
new file mode 100644
index 0000000000..121f2da2a5
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/implicitExpansion/cloneThis2.yml
@@ -0,0 +1,23 @@
+languageId: plaintext
+command:
+  spokenForm: clone this
+  version: 2
+  targets:
+    - type: primitive
+      mark: { type: cursor }
+  usePrePhraseSnapshot: true
+  action: { name: insertCopyAfter }
+initialState:
+  documentContents: aaa bbb
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 3 }
+  marks: {}
+finalState:
+  documentContents: |-
+    aaa bbb
+    aaa bbb
+  selections:
+    - anchor: { line: 1, character: 0 }
+      active: { line: 1, character: 3 }
+fullTargets: [{ type: primitive, mark: { type: cursor }, modifiers: [] }]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/implicitExpansion/funkWrapPastInk.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/implicitExpansion/funkWrapPastInk.yml
new file mode 100644
index 0000000000..81cb67ea78
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/implicitExpansion/funkWrapPastInk.yml
@@ -0,0 +1,52 @@
+languageId: typescript
+command:
+  spokenForm: funk wrap past ink
+  version: 2
+  targets:
+    - type: range
+      anchor: { type: primitive }
+      active:
+        type: primitive
+        mark: { type: decoratedSymbol, symbolColor: default, character: i }
+      excludeAnchor: false
+      excludeActive: false
+  usePrePhraseSnapshot: true
+  action:
+    name: wrapWithSnippet
+    args: [functionDeclaration.body]
+initialState:
+  documentContents: |-
+    const whatever = "hello";
+    const testing = "hello";
+  selections:
+    - anchor: { line: 0, character: 6 }
+      active: { line: 0, character: 6 }
+  marks:
+    default.i:
+      start: { line: 1, character: 6 }
+      end: { line: 1, character: 13 }
+finalState:
+  documentContents: |-
+    function () {
+        const whatever = "hello";
+        const testing = "hello";
+    }
+  selections:
+    - anchor: { line: 0, character: 9 }
+      active: { line: 0, character: 9 }
+fullTargets:
+  [
+    {
+      type: range,
+      excludeAnchor: false,
+      excludeActive: false,
+      rangeType: continuous,
+      anchor: { type: primitive, mark: { type: cursor }, modifiers: [] },
+      active:
+        {
+          type: primitive,
+          mark: { type: decoratedSymbol, symbolColor: default, character: i },
+          modifiers: [],
+        },
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/implicitExpansion/funkWrapThat.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/implicitExpansion/funkWrapThat.yml
new file mode 100644
index 0000000000..42df9e3602
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/implicitExpansion/funkWrapThat.yml
@@ -0,0 +1,34 @@
+languageId: typescript
+command:
+  spokenForm: funk wrap that
+  version: 2
+  targets:
+    - type: primitive
+      mark: { type: that }
+  usePrePhraseSnapshot: true
+  action:
+    name: wrapWithSnippet
+    args: [functionDeclaration.body]
+initialState:
+  documentContents: |
+    const whatever = "hello";
+  selections:
+    - anchor: { line: 1, character: 0 }
+      active: { line: 1, character: 0 }
+  marks: {}
+  thatMark:
+    - type: UntypedTarget
+      contentRange:
+        start: { line: 0, character: 23 }
+        end: { line: 0, character: 23 }
+      isReversed: false
+      hasExplicitRange: false
+finalState:
+  documentContents: |
+    function () {
+        const whatever = "hello";
+    }
+  selections:
+    - anchor: { line: 0, character: 9 }
+      active: { line: 0, character: 9 }
+fullTargets: [{ type: primitive, mark: { type: that }, modifiers: [] }]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/implicitExpansion/funkWrapThat2.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/implicitExpansion/funkWrapThat2.yml
new file mode 100644
index 0000000000..a219425cc5
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/implicitExpansion/funkWrapThat2.yml
@@ -0,0 +1,34 @@
+languageId: typescript
+command:
+  spokenForm: funk wrap that
+  version: 2
+  targets:
+    - type: primitive
+      mark: { type: that }
+  usePrePhraseSnapshot: true
+  action:
+    name: wrapWithSnippet
+    args: [functionDeclaration.body]
+initialState:
+  documentContents: |
+    const whatever = "hello";
+  selections:
+    - anchor: { line: 1, character: 0 }
+      active: { line: 1, character: 0 }
+  marks: {}
+  thatMark:
+    - type: UntypedTarget
+      contentRange:
+        start: { line: 0, character: 6 }
+        end: { line: 0, character: 14 }
+      isReversed: false
+      hasExplicitRange: true
+finalState:
+  documentContents: |
+    function () {
+        const whatever = "hello";
+    }
+  selections:
+    - anchor: { line: 0, character: 9 }
+      active: { line: 0, character: 9 }
+fullTargets: [{ type: primitive, mark: { type: that }, modifiers: [] }]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/implicitExpansion/funkWrapThis.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/implicitExpansion/funkWrapThis.yml
new file mode 100644
index 0000000000..658d97251e
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/implicitExpansion/funkWrapThis.yml
@@ -0,0 +1,26 @@
+languageId: typescript
+command:
+  spokenForm: funk wrap this
+  version: 2
+  targets:
+    - type: primitive
+      mark: { type: cursor }
+  usePrePhraseSnapshot: true
+  action:
+    name: wrapWithSnippet
+    args: [functionDeclaration.body]
+initialState:
+  documentContents: const whatever = "hello";
+  selections:
+    - anchor: { line: 0, character: 24 }
+      active: { line: 0, character: 24 }
+  marks: {}
+finalState:
+  documentContents: |-
+    function () {
+        const whatever = "hello";
+    }
+  selections:
+    - anchor: { line: 0, character: 9 }
+      active: { line: 0, character: 9 }
+fullTargets: [{ type: primitive, mark: { type: cursor }, modifiers: [] }]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/implicitExpansion/funkWrapThis2.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/implicitExpansion/funkWrapThis2.yml
new file mode 100644
index 0000000000..1a586cb7a1
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/implicitExpansion/funkWrapThis2.yml
@@ -0,0 +1,26 @@
+languageId: typescript
+command:
+  spokenForm: funk wrap this
+  version: 2
+  targets:
+    - type: primitive
+      mark: { type: cursor }
+  usePrePhraseSnapshot: true
+  action:
+    name: wrapWithSnippet
+    args: [functionDeclaration.body]
+initialState:
+  documentContents: const whatever = "hello";
+  selections:
+    - anchor: { line: 0, character: 18 }
+      active: { line: 0, character: 23 }
+  marks: {}
+finalState:
+  documentContents: |-
+    function () {
+        const whatever = "hello";
+    }
+  selections:
+    - anchor: { line: 0, character: 9 }
+      active: { line: 0, character: 9 }
+fullTargets: [{ type: primitive, mark: { type: cursor }, modifiers: [] }]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/implicitExpansion/funkWrapToken.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/implicitExpansion/funkWrapToken.yml
new file mode 100644
index 0000000000..7325c488dc
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/implicitExpansion/funkWrapToken.yml
@@ -0,0 +1,35 @@
+languageId: typescript
+command:
+  spokenForm: funk wrap token
+  version: 2
+  targets:
+    - type: primitive
+      modifiers:
+        - type: containingScope
+          scopeType: { type: token }
+  usePrePhraseSnapshot: true
+  action:
+    name: wrapWithSnippet
+    args: [functionDeclaration.body]
+initialState:
+  documentContents: const whatever = "hello";
+  selections:
+    - anchor: { line: 0, character: 18 }
+      active: { line: 0, character: 18 }
+  marks: {}
+finalState:
+  documentContents: |-
+    const whatever = "function () {
+        hello
+    }";
+  selections:
+    - anchor: { line: 0, character: 27 }
+      active: { line: 0, character: 27 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      modifiers: [{ type: containingScope, scopeType: { type: token } }],
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/implicitExpansion/funkWrapWhale.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/implicitExpansion/funkWrapWhale.yml
new file mode 100644
index 0000000000..97a6e7d1bc
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/implicitExpansion/funkWrapWhale.yml
@@ -0,0 +1,37 @@
+languageId: typescript
+command:
+  spokenForm: funk wrap whale
+  version: 2
+  targets:
+    - type: primitive
+      mark: { type: decoratedSymbol, symbolColor: default, character: w }
+  usePrePhraseSnapshot: true
+  action:
+    name: wrapWithSnippet
+    args: [functionDeclaration.body]
+initialState:
+  documentContents: |
+    const whatever = "hello";
+  selections:
+    - anchor: { line: 1, character: 0 }
+      active: { line: 1, character: 0 }
+  marks:
+    default.w:
+      start: { line: 0, character: 6 }
+      end: { line: 0, character: 14 }
+finalState:
+  documentContents: |
+    function () {
+        const whatever = "hello";
+    }
+  selections:
+    - anchor: { line: 0, character: 9 }
+      active: { line: 0, character: 9 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: decoratedSymbol, symbolColor: default, character: w },
+      modifiers: [],
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/implicitExpansion/funkWrapWhalePastBat.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/implicitExpansion/funkWrapWhalePastBat.yml
new file mode 100644
index 0000000000..601df0a752
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/implicitExpansion/funkWrapWhalePastBat.yml
@@ -0,0 +1,62 @@
+languageId: typescript
+command:
+  spokenForm: funk wrap whale past bat
+  version: 2
+  targets:
+    - type: range
+      anchor:
+        type: primitive
+        mark: { type: decoratedSymbol, symbolColor: default, character: w }
+      active:
+        type: primitive
+        mark: { type: decoratedSymbol, symbolColor: default, character: b }
+      excludeAnchor: false
+      excludeActive: false
+  usePrePhraseSnapshot: true
+  action:
+    name: wrapWithSnippet
+    args: [functionDeclaration.body]
+initialState:
+  documentContents: |
+    const whatever = "hello";
+    const bar = "hello";
+  selections:
+    - anchor: { line: 2, character: 0 }
+      active: { line: 2, character: 0 }
+  marks:
+    default.w:
+      start: { line: 0, character: 6 }
+      end: { line: 0, character: 14 }
+    default.b:
+      start: { line: 1, character: 6 }
+      end: { line: 1, character: 9 }
+finalState:
+  documentContents: |
+    function () {
+        const whatever = "hello";
+        const bar = "hello";
+    }
+  selections:
+    - anchor: { line: 0, character: 9 }
+      active: { line: 0, character: 9 }
+fullTargets:
+  [
+    {
+      type: range,
+      excludeAnchor: false,
+      excludeActive: false,
+      rangeType: continuous,
+      anchor:
+        {
+          type: primitive,
+          mark: { type: decoratedSymbol, symbolColor: default, character: w },
+          modifiers: [],
+        },
+      active:
+        {
+          type: primitive,
+          mark: { type: decoratedSymbol, symbolColor: default, character: b },
+          modifiers: [],
+        },
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/implicitExpansion/pourAir.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/implicitExpansion/pourAir.yml
new file mode 100644
index 0000000000..639ff4333c
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/implicitExpansion/pourAir.yml
@@ -0,0 +1,32 @@
+languageId: plaintext
+command:
+  spokenForm: pour air
+  version: 2
+  targets:
+    - type: primitive
+      mark: { type: decoratedSymbol, symbolColor: default, character: a }
+  usePrePhraseSnapshot: true
+  action: { name: editNewLineAfter }
+initialState:
+  documentContents: aaa bbb
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+  marks:
+    default.a:
+      start: { line: 0, character: 0 }
+      end: { line: 0, character: 3 }
+finalState:
+  documentContents: |
+    aaa bbb
+  selections:
+    - anchor: { line: 1, character: 0 }
+      active: { line: 1, character: 0 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: decoratedSymbol, symbolColor: default, character: a },
+      modifiers: [],
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/implicitExpansion/pourFunk.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/implicitExpansion/pourFunk.yml
new file mode 100644
index 0000000000..4ddb665247
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/implicitExpansion/pourFunk.yml
@@ -0,0 +1,38 @@
+languageId: typescript
+command:
+  spokenForm: pour funk
+  version: 2
+  targets:
+    - type: primitive
+      modifiers:
+        - type: containingScope
+          scopeType: { type: namedFunction }
+  usePrePhraseSnapshot: true
+  action: { name: editNewLineAfter }
+initialState:
+  documentContents: |-
+    function myFunk() {
+      // aaa
+    }
+  selections:
+    - anchor: { line: 1, character: 5 }
+      active: { line: 1, character: 5 }
+  marks: {}
+finalState:
+  documentContents: |+
+    function myFunk() {
+      // aaa
+    }
+
+  selections:
+    - anchor: { line: 4, character: 0 }
+      active: { line: 4, character: 0 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      modifiers:
+        [{ type: containingScope, scopeType: { type: namedFunction } }],
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/implicitExpansion/pourNearPastWhale.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/implicitExpansion/pourNearPastWhale.yml
new file mode 100644
index 0000000000..ed06e47c5e
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/implicitExpansion/pourNearPastWhale.yml
@@ -0,0 +1,59 @@
+languageId: plaintext
+command:
+  spokenForm: pour near past whale
+  version: 2
+  targets:
+    - type: range
+      anchor:
+        type: primitive
+        mark: { type: decoratedSymbol, symbolColor: default, character: "n" }
+      active:
+        type: primitive
+        mark: { type: decoratedSymbol, symbolColor: default, character: w }
+      excludeAnchor: false
+      excludeActive: false
+  usePrePhraseSnapshot: true
+  action: { name: editNewLineAfter }
+initialState:
+  documentContents: |
+    hello now
+    whatever
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+  marks:
+    default.n:
+      start: { line: 0, character: 6 }
+      end: { line: 0, character: 9 }
+    default.w:
+      start: { line: 1, character: 0 }
+      end: { line: 1, character: 8 }
+finalState:
+  documentContents: |+
+    hello now
+    whatever
+
+  selections:
+    - anchor: { line: 2, character: 0 }
+      active: { line: 2, character: 0 }
+fullTargets:
+  [
+    {
+      type: range,
+      excludeAnchor: false,
+      excludeActive: false,
+      rangeType: continuous,
+      anchor:
+        {
+          type: primitive,
+          mark: { type: decoratedSymbol, symbolColor: default, character: "n" },
+          modifiers: [],
+        },
+      active:
+        {
+          type: primitive,
+          mark: { type: decoratedSymbol, symbolColor: default, character: w },
+          modifiers: [],
+        },
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/implicitExpansion/pourPastWhale.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/implicitExpansion/pourPastWhale.yml
new file mode 100644
index 0000000000..baff14b714
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/implicitExpansion/pourPastWhale.yml
@@ -0,0 +1,48 @@
+languageId: plaintext
+command:
+  spokenForm: pour past whale
+  version: 2
+  targets:
+    - type: range
+      anchor: { type: primitive }
+      active:
+        type: primitive
+        mark: { type: decoratedSymbol, symbolColor: default, character: w }
+      excludeAnchor: false
+      excludeActive: false
+  usePrePhraseSnapshot: true
+  action: { name: editNewLineAfter }
+initialState:
+  documentContents: |-
+    hello
+    world
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+  marks:
+    default.w:
+      start: { line: 1, character: 0 }
+      end: { line: 1, character: 5 }
+finalState:
+  documentContents: |
+    hello
+    world
+  selections:
+    - anchor: { line: 2, character: 0 }
+      active: { line: 2, character: 0 }
+fullTargets:
+  [
+    {
+      type: range,
+      excludeAnchor: false,
+      excludeActive: false,
+      rangeType: continuous,
+      anchor: { type: primitive, mark: { type: cursor }, modifiers: [] },
+      active:
+        {
+          type: primitive,
+          mark: { type: decoratedSymbol, symbolColor: default, character: w },
+          modifiers: [],
+        },
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/implicitExpansion/pourThat.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/implicitExpansion/pourThat.yml
new file mode 100644
index 0000000000..9162f67ac3
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/implicitExpansion/pourThat.yml
@@ -0,0 +1,33 @@
+languageId: plaintext
+command:
+  spokenForm: pour that
+  version: 2
+  targets:
+    - type: primitive
+      mark: { type: that }
+  usePrePhraseSnapshot: true
+  action: { name: editNewLineAfter }
+initialState:
+  documentContents: |+
+    hello world
+
+  selections:
+    - anchor: { line: 2, character: 0 }
+      active: { line: 2, character: 0 }
+  marks: {}
+  thatMark:
+    - type: UntypedTarget
+      contentRange:
+        start: { line: 0, character: 6 }
+        end: { line: 0, character: 6 }
+      isReversed: false
+      hasExplicitRange: false
+finalState:
+  documentContents: |+
+    hello world
+
+
+  selections:
+    - anchor: { line: 1, character: 0 }
+      active: { line: 1, character: 0 }
+fullTargets: [{ type: primitive, mark: { type: that }, modifiers: [] }]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/implicitExpansion/pourThat2.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/implicitExpansion/pourThat2.yml
new file mode 100644
index 0000000000..1005a630e5
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/implicitExpansion/pourThat2.yml
@@ -0,0 +1,33 @@
+languageId: plaintext
+command:
+  spokenForm: pour that
+  version: 2
+  targets:
+    - type: primitive
+      mark: { type: that }
+  usePrePhraseSnapshot: true
+  action: { name: editNewLineAfter }
+initialState:
+  documentContents: |+
+    hello world
+
+  selections:
+    - anchor: { line: 2, character: 0 }
+      active: { line: 2, character: 0 }
+  marks: {}
+  thatMark:
+    - type: UntypedTarget
+      contentRange:
+        start: { line: 0, character: 6 }
+        end: { line: 0, character: 11 }
+      isReversed: false
+      hasExplicitRange: true
+finalState:
+  documentContents: |+
+    hello world
+
+
+  selections:
+    - anchor: { line: 1, character: 0 }
+      active: { line: 1, character: 0 }
+fullTargets: [{ type: primitive, mark: { type: that }, modifiers: [] }]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/implicitExpansion/pourThis.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/implicitExpansion/pourThis.yml
new file mode 100644
index 0000000000..9a25816e31
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/implicitExpansion/pourThis.yml
@@ -0,0 +1,22 @@
+languageId: plaintext
+command:
+  spokenForm: pour this
+  version: 2
+  targets:
+    - type: primitive
+      mark: { type: cursor }
+  usePrePhraseSnapshot: true
+  action: { name: editNewLineAfter }
+initialState:
+  documentContents: aaa bbb
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+  marks: {}
+finalState:
+  documentContents: |
+    aaa bbb
+  selections:
+    - anchor: { line: 1, character: 0 }
+      active: { line: 1, character: 0 }
+fullTargets: [{ type: primitive, mark: { type: cursor }, modifiers: [] }]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/implicitExpansion/pourThis2.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/implicitExpansion/pourThis2.yml
new file mode 100644
index 0000000000..3293627c39
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/implicitExpansion/pourThis2.yml
@@ -0,0 +1,22 @@
+languageId: plaintext
+command:
+  spokenForm: pour this
+  version: 2
+  targets:
+    - type: primitive
+      mark: { type: cursor }
+  usePrePhraseSnapshot: true
+  action: { name: editNewLineAfter }
+initialState:
+  documentContents: aaa bbb
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 3 }
+  marks: {}
+finalState:
+  documentContents: |
+    aaa bbb
+  selections:
+    - anchor: { line: 1, character: 0 }
+      active: { line: 1, character: 0 }
+fullTargets: [{ type: primitive, mark: { type: cursor }, modifiers: [] }]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/implicitExpansion/snipFunkAfterThat.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/implicitExpansion/snipFunkAfterThat.yml
new file mode 100644
index 0000000000..e03f3d2e37
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/implicitExpansion/snipFunkAfterThat.yml
@@ -0,0 +1,50 @@
+languageId: typescript
+command:
+  spokenForm: snip funk after that
+  version: 2
+  targets:
+    - type: primitive
+      mark: { type: that }
+      modifiers:
+        - { type: position, position: after }
+  usePrePhraseSnapshot: true
+  action:
+    name: insertSnippet
+    args: [functionDeclaration]
+initialState:
+  documentContents: |
+    function myFunction() {
+        const whatever = "hello";
+    }
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+  marks: {}
+  thatMark:
+    - type: UntypedTarget
+      contentRange:
+        start: { line: 1, character: 27 }
+        end: { line: 1, character: 27 }
+      isReversed: false
+      hasExplicitRange: false
+finalState:
+  documentContents: |
+    function myFunction() {
+        const whatever = "hello";
+    }
+
+    function () {
+
+    }
+  selections:
+    - anchor: { line: 4, character: 9 }
+      active: { line: 4, character: 9 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: that },
+      modifiers: [],
+      positionModifier: { type: position, position: after },
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/implicitExpansion/snipFunkAfterThat2.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/implicitExpansion/snipFunkAfterThat2.yml
new file mode 100644
index 0000000000..787ce72813
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/implicitExpansion/snipFunkAfterThat2.yml
@@ -0,0 +1,50 @@
+languageId: typescript
+command:
+  spokenForm: snip funk after that
+  version: 2
+  targets:
+    - type: primitive
+      mark: { type: that }
+      modifiers:
+        - { type: position, position: after }
+  usePrePhraseSnapshot: true
+  action:
+    name: insertSnippet
+    args: [functionDeclaration]
+initialState:
+  documentContents: |-
+    function whatever() {
+        const hello = "world";
+    }
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+  marks: {}
+  thatMark:
+    - type: UntypedTarget
+      contentRange:
+        start: { line: 1, character: 10 }
+        end: { line: 1, character: 15 }
+      isReversed: false
+      hasExplicitRange: true
+finalState:
+  documentContents: |-
+    function whatever() {
+        const hello = "world";
+    }
+
+    function () {
+
+    }
+  selections:
+    - anchor: { line: 4, character: 9 }
+      active: { line: 4, character: 9 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: that },
+      modifiers: [],
+      positionModifier: { type: position, position: after },
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/implicitExpansion/snipFunkAfterThis.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/implicitExpansion/snipFunkAfterThis.yml
new file mode 100644
index 0000000000..c5d53cec8c
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/implicitExpansion/snipFunkAfterThis.yml
@@ -0,0 +1,47 @@
+languageId: typescript
+command:
+  spokenForm: snip funk after this
+  version: 2
+  targets:
+    - type: primitive
+      mark: { type: cursor }
+      modifiers:
+        - { type: position, position: after }
+  usePrePhraseSnapshot: true
+  action:
+    name: insertSnippet
+    args: [functionDeclaration]
+initialState:
+  documentContents: |+
+    function myFunction() {
+        const whatever = "hello";
+    }
+
+
+  selections:
+    - anchor: { line: 1, character: 10 }
+      active: { line: 1, character: 10 }
+  marks: {}
+finalState:
+  documentContents: |+
+    function myFunction() {
+        const whatever = "hello";
+    }
+
+    function () {
+
+    }
+
+
+  selections:
+    - anchor: { line: 4, character: 9 }
+      active: { line: 4, character: 9 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      modifiers: [],
+      positionModifier: { type: position, position: after },
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/implicitExpansion/snipFunkAfterThis2.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/implicitExpansion/snipFunkAfterThis2.yml
new file mode 100644
index 0000000000..bf53a4e0ba
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/implicitExpansion/snipFunkAfterThis2.yml
@@ -0,0 +1,47 @@
+languageId: typescript
+command:
+  spokenForm: snip funk after this
+  version: 2
+  targets:
+    - type: primitive
+      mark: { type: cursor }
+      modifiers:
+        - { type: position, position: after }
+  usePrePhraseSnapshot: true
+  action:
+    name: insertSnippet
+    args: [functionDeclaration]
+initialState:
+  documentContents: |+
+    function myFunction() {
+        const whatever = "hello";
+    }
+
+
+  selections:
+    - anchor: { line: 1, character: 10 }
+      active: { line: 1, character: 18 }
+  marks: {}
+finalState:
+  documentContents: |+
+    function myFunction() {
+        const whatever = "hello";
+    }
+
+    function () {
+
+    }
+
+
+  selections:
+    - anchor: { line: 4, character: 9 }
+      active: { line: 4, character: 9 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      modifiers: [],
+      positionModifier: { type: position, position: after },
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/implicitExpansion/snipFunkAfterToken.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/implicitExpansion/snipFunkAfterToken.yml
new file mode 100644
index 0000000000..be7ae69ebb
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/implicitExpansion/snipFunkAfterToken.yml
@@ -0,0 +1,44 @@
+languageId: typescript
+command:
+  spokenForm: snip funk after token
+  version: 2
+  targets:
+    - type: primitive
+      modifiers:
+        - { type: position, position: after }
+        - type: containingScope
+          scopeType: { type: token }
+  usePrePhraseSnapshot: true
+  action:
+    name: insertSnippet
+    args: [functionDeclaration]
+initialState:
+  documentContents: |+
+    function myFunction() {
+        const whatever = "hello";
+    }
+
+  selections:
+    - anchor: { line: 1, character: 10 }
+      active: { line: 1, character: 18 }
+  marks: {}
+finalState:
+  documentContents: |+
+    function myFunction() {
+        const whatever function () {
+
+        } = "hello";
+    }
+
+  selections:
+    - anchor: { line: 1, character: 28 }
+      active: { line: 1, character: 28 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      modifiers: [{ type: containingScope, scopeType: { type: token } }],
+      positionModifier: { type: position, position: after },
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/implicitExpansion/snipFunkAfterWhale.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/implicitExpansion/snipFunkAfterWhale.yml
new file mode 100644
index 0000000000..9ec3ea4031
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/implicitExpansion/snipFunkAfterWhale.yml
@@ -0,0 +1,48 @@
+languageId: typescript
+command:
+  spokenForm: snip funk after whale
+  version: 2
+  targets:
+    - type: primitive
+      mark: { type: decoratedSymbol, symbolColor: default, character: w }
+      modifiers:
+        - { type: position, position: after }
+  usePrePhraseSnapshot: true
+  action:
+    name: insertSnippet
+    args: [functionDeclaration]
+initialState:
+  documentContents: |+
+    function myFunction() {
+        const whatever = "hello";
+    }
+
+  selections:
+    - anchor: { line: 4, character: 0 }
+      active: { line: 4, character: 0 }
+  marks:
+    default.w:
+      start: { line: 1, character: 10 }
+      end: { line: 1, character: 18 }
+finalState:
+  documentContents: |+
+    function myFunction() {
+        const whatever = "hello";
+    }
+
+    function () {
+
+    }
+
+  selections:
+    - anchor: { line: 4, character: 9 }
+      active: { line: 4, character: 9 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: decoratedSymbol, symbolColor: default, character: w },
+      modifiers: [],
+      positionModifier: { type: position, position: after },
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/implicitExpansion/snipFunkToAirPastWhale.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/implicitExpansion/snipFunkToAirPastWhale.yml
new file mode 100644
index 0000000000..9367e147c4
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/implicitExpansion/snipFunkToAirPastWhale.yml
@@ -0,0 +1,68 @@
+languageId: typescript
+command:
+  spokenForm: snip funk to air past whale
+  version: 2
+  targets:
+    - type: range
+      anchor:
+        type: primitive
+        mark: { type: decoratedSymbol, symbolColor: default, character: a }
+      active:
+        type: primitive
+        mark: { type: decoratedSymbol, symbolColor: default, character: w }
+      excludeAnchor: false
+      excludeActive: false
+  usePrePhraseSnapshot: true
+  action:
+    name: insertSnippet
+    args: [functionDeclaration]
+initialState:
+  documentContents: |+
+    function myFunction() {
+        const whatever = "hello";
+    }
+
+    function testing() {
+        const whatever = "hello";
+    }
+
+  selections:
+    - anchor: { line: 8, character: 0 }
+      active: { line: 8, character: 0 }
+  marks:
+    default.a:
+      start: { line: 1, character: 10 }
+      end: { line: 1, character: 18 }
+    default.w:
+      start: { line: 5, character: 10 }
+      end: { line: 5, character: 18 }
+finalState:
+  documentContents: |+
+    function () {
+
+    }
+
+  selections:
+    - anchor: { line: 0, character: 9 }
+      active: { line: 0, character: 9 }
+fullTargets:
+  [
+    {
+      type: range,
+      excludeAnchor: false,
+      excludeActive: false,
+      rangeType: continuous,
+      anchor:
+        {
+          type: primitive,
+          mark: { type: decoratedSymbol, symbolColor: default, character: a },
+          modifiers: [],
+        },
+      active:
+        {
+          type: primitive,
+          mark: { type: decoratedSymbol, symbolColor: default, character: w },
+          modifiers: [],
+        },
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/implicitExpansion/snipFunkToThisPastEach.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/implicitExpansion/snipFunkToThisPastEach.yml
new file mode 100644
index 0000000000..01148d6d3c
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/implicitExpansion/snipFunkToThisPastEach.yml
@@ -0,0 +1,58 @@
+languageId: typescript
+command:
+  spokenForm: snip funk to this past each
+  version: 2
+  targets:
+    - type: range
+      anchor:
+        type: primitive
+        mark: { type: cursor }
+      active:
+        type: primitive
+        mark: { type: decoratedSymbol, symbolColor: default, character: e }
+      excludeAnchor: false
+      excludeActive: false
+  usePrePhraseSnapshot: true
+  action:
+    name: insertSnippet
+    args: [functionDeclaration]
+initialState:
+  documentContents: |-
+    function whatever() {
+        const hello = "world";
+    }
+
+    function testing() {
+        const hello = "world";
+    }
+  selections:
+    - anchor: { line: 1, character: 10 }
+      active: { line: 1, character: 10 }
+  marks:
+    default.e:
+      start: { line: 5, character: 10 }
+      end: { line: 5, character: 15 }
+finalState:
+  documentContents: |-
+    function () {
+
+    }
+  selections:
+    - anchor: { line: 0, character: 9 }
+      active: { line: 0, character: 9 }
+fullTargets:
+  [
+    {
+      type: range,
+      excludeAnchor: false,
+      excludeActive: false,
+      rangeType: continuous,
+      anchor: { type: primitive, mark: { type: cursor }, modifiers: [] },
+      active:
+        {
+          type: primitive,
+          mark: { type: decoratedSymbol, symbolColor: default, character: e },
+          modifiers: [],
+        },
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/implicitExpansion/squareSwitchAir.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/implicitExpansion/squareSwitchAir.yml
new file mode 100644
index 0000000000..41d9989973
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/implicitExpansion/squareSwitchAir.yml
@@ -0,0 +1,33 @@
+languageId: plaintext
+command:
+  spokenForm: square switch air
+  version: 2
+  targets:
+    - type: primitive
+      mark: { type: decoratedSymbol, symbolColor: default, character: a }
+  usePrePhraseSnapshot: true
+  action:
+    name: rewrapWithPairedDelimiter
+    args: ["[", "]"]
+initialState:
+  documentContents: (aaa bbb)
+  selections:
+    - anchor: { line: 0, character: 1 }
+      active: { line: 0, character: 1 }
+  marks:
+    default.a:
+      start: { line: 0, character: 1 }
+      end: { line: 0, character: 4 }
+finalState:
+  documentContents: "[aaa bbb]"
+  selections:
+    - anchor: { line: 0, character: 1 }
+      active: { line: 0, character: 1 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: decoratedSymbol, symbolColor: default, character: a },
+      modifiers: [],
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/implicitExpansion/squareSwitchFunk.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/implicitExpansion/squareSwitchFunk.yml
new file mode 100644
index 0000000000..c694b74207
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/implicitExpansion/squareSwitchFunk.yml
@@ -0,0 +1,34 @@
+languageId: typescript
+command:
+  spokenForm: square switch funk
+  version: 2
+  targets:
+    - type: primitive
+      modifiers:
+        - type: containingScope
+          scopeType: { type: namedFunction }
+  usePrePhraseSnapshot: true
+  action:
+    name: rewrapWithPairedDelimiter
+    args: ["[", "]"]
+initialState:
+  documentContents: |-
+    {
+      function myFunk() {
+        // aaa
+      }
+    }
+  selections:
+    - anchor: { line: 2, character: 7 }
+      active: { line: 2, character: 7 }
+  marks: {}
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      modifiers:
+        [{ type: containingScope, scopeType: { type: namedFunction } }],
+    },
+  ]
+thrownError: { name: NoContainingScopeError }
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/implicitExpansion/squareSwitchLookPastTrap.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/implicitExpansion/squareSwitchLookPastTrap.yml
new file mode 100644
index 0000000000..4186cd3948
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/implicitExpansion/squareSwitchLookPastTrap.yml
@@ -0,0 +1,58 @@
+languageId: plaintext
+command:
+  spokenForm: square switch look past trap
+  version: 2
+  targets:
+    - type: range
+      anchor:
+        type: primitive
+        mark: { type: decoratedSymbol, symbolColor: default, character: l }
+      active:
+        type: primitive
+        mark: { type: decoratedSymbol, symbolColor: default, character: t }
+      excludeAnchor: false
+      excludeActive: false
+  usePrePhraseSnapshot: true
+  action:
+    name: rewrapWithPairedDelimiter
+    args: ["[", "]"]
+initialState:
+  documentContents: |
+    (hello there now)
+  selections:
+    - anchor: { line: 1, character: 0 }
+      active: { line: 1, character: 0 }
+  marks:
+    default.l:
+      start: { line: 0, character: 1 }
+      end: { line: 0, character: 6 }
+    default.t:
+      start: { line: 0, character: 7 }
+      end: { line: 0, character: 12 }
+finalState:
+  documentContents: |
+    [hello there now]
+  selections:
+    - anchor: { line: 1, character: 0 }
+      active: { line: 1, character: 0 }
+fullTargets:
+  [
+    {
+      type: range,
+      excludeAnchor: false,
+      excludeActive: false,
+      rangeType: continuous,
+      anchor:
+        {
+          type: primitive,
+          mark: { type: decoratedSymbol, symbolColor: default, character: l },
+          modifiers: [],
+        },
+      active:
+        {
+          type: primitive,
+          mark: { type: decoratedSymbol, symbolColor: default, character: t },
+          modifiers: [],
+        },
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/implicitExpansion/squareSwitchPastWhale.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/implicitExpansion/squareSwitchPastWhale.yml
new file mode 100644
index 0000000000..751a49d4ce
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/implicitExpansion/squareSwitchPastWhale.yml
@@ -0,0 +1,46 @@
+languageId: plaintext
+command:
+  spokenForm: square switch past whale
+  version: 2
+  targets:
+    - type: range
+      anchor: { type: primitive }
+      active:
+        type: primitive
+        mark: { type: decoratedSymbol, symbolColor: default, character: w }
+      excludeAnchor: false
+      excludeActive: false
+  usePrePhraseSnapshot: true
+  action:
+    name: rewrapWithPairedDelimiter
+    args: ["[", "]"]
+initialState:
+  documentContents: (hello world there)
+  selections:
+    - anchor: { line: 0, character: 3 }
+      active: { line: 0, character: 3 }
+  marks:
+    default.w:
+      start: { line: 0, character: 7 }
+      end: { line: 0, character: 12 }
+finalState:
+  documentContents: "[hello world there]"
+  selections:
+    - anchor: { line: 0, character: 3 }
+      active: { line: 0, character: 3 }
+fullTargets:
+  [
+    {
+      type: range,
+      excludeAnchor: false,
+      excludeActive: false,
+      rangeType: continuous,
+      anchor: { type: primitive, mark: { type: cursor }, modifiers: [] },
+      active:
+        {
+          type: primitive,
+          mark: { type: decoratedSymbol, symbolColor: default, character: w },
+          modifiers: [],
+        },
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/implicitExpansion/squareSwitchThat.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/implicitExpansion/squareSwitchThat.yml
new file mode 100644
index 0000000000..b0014aefd0
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/implicitExpansion/squareSwitchThat.yml
@@ -0,0 +1,32 @@
+languageId: plaintext
+command:
+  spokenForm: square switch that
+  version: 2
+  targets:
+    - type: primitive
+      mark: { type: that }
+  usePrePhraseSnapshot: true
+  action:
+    name: rewrapWithPairedDelimiter
+    args: ["[", "]"]
+initialState:
+  documentContents: |
+    (hello )
+  selections:
+    - anchor: { line: 1, character: 0 }
+      active: { line: 1, character: 0 }
+  marks: {}
+  thatMark:
+    - type: UntypedTarget
+      contentRange:
+        start: { line: 0, character: 7 }
+        end: { line: 0, character: 7 }
+      isReversed: false
+      hasExplicitRange: false
+finalState:
+  documentContents: |
+    [hello ]
+  selections:
+    - anchor: { line: 1, character: 0 }
+      active: { line: 1, character: 0 }
+fullTargets: [{ type: primitive, mark: { type: that }, modifiers: [] }]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/implicitExpansion/squareSwitchThat2.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/implicitExpansion/squareSwitchThat2.yml
new file mode 100644
index 0000000000..4421eb6d38
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/implicitExpansion/squareSwitchThat2.yml
@@ -0,0 +1,32 @@
+languageId: plaintext
+command:
+  spokenForm: square switch that
+  version: 2
+  targets:
+    - type: primitive
+      mark: { type: that }
+  usePrePhraseSnapshot: true
+  action:
+    name: rewrapWithPairedDelimiter
+    args: ["[", "]"]
+initialState:
+  documentContents: |
+    (hello world)
+  selections:
+    - anchor: { line: 1, character: 0 }
+      active: { line: 1, character: 0 }
+  marks: {}
+  thatMark:
+    - type: UntypedTarget
+      contentRange:
+        start: { line: 0, character: 7 }
+        end: { line: 0, character: 12 }
+      isReversed: false
+      hasExplicitRange: true
+finalState:
+  documentContents: |
+    [hello world]
+  selections:
+    - anchor: { line: 1, character: 0 }
+      active: { line: 1, character: 0 }
+fullTargets: [{ type: primitive, mark: { type: that }, modifiers: [] }]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/implicitExpansion/squareSwitchThis.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/implicitExpansion/squareSwitchThis.yml
new file mode 100644
index 0000000000..ad6d4c6018
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/implicitExpansion/squareSwitchThis.yml
@@ -0,0 +1,23 @@
+languageId: plaintext
+command:
+  spokenForm: square switch this
+  version: 2
+  targets:
+    - type: primitive
+      mark: { type: cursor }
+  usePrePhraseSnapshot: true
+  action:
+    name: rewrapWithPairedDelimiter
+    args: ["[", "]"]
+initialState:
+  documentContents: (aaa bbb)
+  selections:
+    - anchor: { line: 0, character: 1 }
+      active: { line: 0, character: 1 }
+  marks: {}
+finalState:
+  documentContents: "[aaa bbb]"
+  selections:
+    - anchor: { line: 0, character: 1 }
+      active: { line: 0, character: 1 }
+fullTargets: [{ type: primitive, mark: { type: cursor }, modifiers: [] }]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/implicitExpansion/squareSwitchThis2.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/implicitExpansion/squareSwitchThis2.yml
new file mode 100644
index 0000000000..3bc5f5678a
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/implicitExpansion/squareSwitchThis2.yml
@@ -0,0 +1,23 @@
+languageId: plaintext
+command:
+  spokenForm: square switch this
+  version: 2
+  targets:
+    - type: primitive
+      mark: { type: cursor }
+  usePrePhraseSnapshot: true
+  action:
+    name: rewrapWithPairedDelimiter
+    args: ["[", "]"]
+initialState:
+  documentContents: (aaa bbb)
+  selections:
+    - anchor: { line: 0, character: 1 }
+      active: { line: 0, character: 4 }
+  marks: {}
+finalState:
+  documentContents: "[aaa bbb]"
+  selections:
+    - anchor: { line: 0, character: 1 }
+      active: { line: 0, character: 4 }
+fullTargets: [{ type: primitive, mark: { type: cursor }, modifiers: [] }]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/implicitExpansion/takeEveryBlock.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/implicitExpansion/takeEveryBlock.yml
new file mode 100644
index 0000000000..48c0b49111
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/implicitExpansion/takeEveryBlock.yml
@@ -0,0 +1,48 @@
+languageId: plaintext
+command:
+  spokenForm: take every block
+  version: 2
+  targets:
+    - type: primitive
+      modifiers:
+        - type: everyScope
+          scopeType: { type: paragraph }
+  usePrePhraseSnapshot: true
+  action: { name: setSelection }
+initialState:
+  documentContents: |-
+    first block-test
+    for testing
+
+    second block-test
+    for testing
+
+    third block-test
+    for testing
+  selections:
+    - anchor: { line: 0, character: 6 }
+      active: { line: 3, character: 6 }
+  marks: {}
+finalState:
+  documentContents: |-
+    first block-test
+    for testing
+
+    second block-test
+    for testing
+
+    third block-test
+    for testing
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 1, character: 11 }
+    - anchor: { line: 3, character: 0 }
+      active: { line: 4, character: 11 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      modifiers: [{ type: everyScope, scopeType: { type: paragraph } }],
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/implicitExpansion/takeEveryBlock2.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/implicitExpansion/takeEveryBlock2.yml
new file mode 100644
index 0000000000..bb1c923a2f
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/implicitExpansion/takeEveryBlock2.yml
@@ -0,0 +1,50 @@
+languageId: plaintext
+command:
+  spokenForm: take every block
+  version: 2
+  targets:
+    - type: primitive
+      modifiers:
+        - type: everyScope
+          scopeType: { type: paragraph }
+  usePrePhraseSnapshot: true
+  action: { name: setSelection }
+initialState:
+  documentContents: |-
+    first block-test
+    for testing
+
+    second block-test
+    for testing
+
+    third block-test
+    for testing
+  selections:
+    - anchor: { line: 3, character: 6 }
+      active: { line: 3, character: 6 }
+  marks: {}
+finalState:
+  documentContents: |-
+    first block-test
+    for testing
+
+    second block-test
+    for testing
+
+    third block-test
+    for testing
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 1, character: 11 }
+    - anchor: { line: 3, character: 0 }
+      active: { line: 4, character: 11 }
+    - anchor: { line: 6, character: 0 }
+      active: { line: 7, character: 11 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      modifiers: [{ type: everyScope, scopeType: { type: paragraph } }],
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/implicitExpansion/takeEveryBlockFunkWhale.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/implicitExpansion/takeEveryBlockFunkWhale.yml
new file mode 100644
index 0000000000..f069c493f5
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/implicitExpansion/takeEveryBlockFunkWhale.yml
@@ -0,0 +1,60 @@
+languageId: typescript
+command:
+  spokenForm: take every block funk whale
+  version: 2
+  targets:
+    - type: primitive
+      modifiers:
+        - type: everyScope
+          scopeType: { type: paragraph }
+        - type: containingScope
+          scopeType: { type: namedFunction }
+      mark: { type: decoratedSymbol, symbolColor: default, character: w }
+  usePrePhraseSnapshot: true
+  action: { name: setSelection }
+initialState:
+  documentContents: |-
+    function whatever() {
+        const testing = "hello";
+
+        const again = "hello";
+    }
+
+    function another() {
+        const testing = "hello";
+    }
+  selections:
+    - anchor: { line: 6, character: 16 }
+      active: { line: 6, character: 16 }
+  marks:
+    default.w:
+      start: { line: 0, character: 9 }
+      end: { line: 0, character: 17 }
+finalState:
+  documentContents: |-
+    function whatever() {
+        const testing = "hello";
+
+        const again = "hello";
+    }
+
+    function another() {
+        const testing = "hello";
+    }
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 1, character: 28 }
+    - anchor: { line: 3, character: 4 }
+      active: { line: 4, character: 1 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: decoratedSymbol, symbolColor: default, character: w },
+      modifiers:
+        [
+          { type: everyScope, scopeType: { type: paragraph } },
+          { type: containingScope, scopeType: { type: namedFunction } },
+        ],
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/implicitExpansion/takeEveryPaint.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/implicitExpansion/takeEveryPaint.yml
new file mode 100644
index 0000000000..2c9e00df79
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/implicitExpansion/takeEveryPaint.yml
@@ -0,0 +1,54 @@
+languageId: plaintext
+command:
+  spokenForm: take every paint
+  version: 2
+  targets:
+    - type: primitive
+      modifiers:
+        - type: everyScope
+          scopeType: { type: nonWhitespaceSequence }
+  usePrePhraseSnapshot: true
+  action: { name: setSelection }
+initialState:
+  documentContents: |-
+    first test-block
+    for testing
+
+    second test-block
+    for testing
+  selections:
+    - anchor: { line: 0, character: 6 }
+      active: { line: 3, character: 9 }
+  marks: {}
+finalState:
+  documentContents: |-
+    first test-block
+    for testing
+
+    second test-block
+    for testing
+  selections:
+    - anchor: { line: 0, character: 6 }
+      active: { line: 0, character: 16 }
+    - anchor: { line: 1, character: 0 }
+      active: { line: 1, character: 3 }
+    - anchor: { line: 1, character: 4 }
+      active: { line: 1, character: 11 }
+    - anchor: { line: 3, character: 0 }
+      active: { line: 3, character: 6 }
+    - anchor: { line: 3, character: 7 }
+      active: { line: 3, character: 17 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      modifiers:
+        [
+          {
+            type: everyScope,
+            scopeType: { type: boundedNonWhitespaceSequence },
+          },
+        ],
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/implicitExpansion/takeEveryPaintBlockRisk.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/implicitExpansion/takeEveryPaintBlockRisk.yml
new file mode 100644
index 0000000000..f5f483507a
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/implicitExpansion/takeEveryPaintBlockRisk.yml
@@ -0,0 +1,59 @@
+languageId: plaintext
+command:
+  spokenForm: take every paint block risk
+  version: 2
+  targets:
+    - type: primitive
+      modifiers:
+        - type: everyScope
+          scopeType: { type: nonWhitespaceSequence }
+        - type: containingScope
+          scopeType: { type: paragraph }
+      mark: { type: decoratedSymbol, symbolColor: default, character: r }
+  usePrePhraseSnapshot: true
+  action: { name: setSelection }
+initialState:
+  documentContents: |-
+    first test-block
+    for testing
+
+    second test-block
+    for testing
+  selections:
+    - anchor: { line: 4, character: 0 }
+      active: { line: 4, character: 0 }
+  marks:
+    default.r:
+      start: { line: 0, character: 0 }
+      end: { line: 0, character: 5 }
+finalState:
+  documentContents: |-
+    first test-block
+    for testing
+
+    second test-block
+    for testing
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 5 }
+    - anchor: { line: 0, character: 6 }
+      active: { line: 0, character: 16 }
+    - anchor: { line: 1, character: 0 }
+      active: { line: 1, character: 3 }
+    - anchor: { line: 1, character: 4 }
+      active: { line: 1, character: 11 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: decoratedSymbol, symbolColor: default, character: r },
+      modifiers:
+        [
+          {
+            type: everyScope,
+            scopeType: { type: boundedNonWhitespaceSequence },
+          },
+          { type: containingScope, scopeType: { type: paragraph } },
+        ],
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/implicitExpansion/takeEveryPaintEach.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/implicitExpansion/takeEveryPaintEach.yml
new file mode 100644
index 0000000000..7d20dd8f23
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/implicitExpansion/takeEveryPaintEach.yml
@@ -0,0 +1,46 @@
+languageId: plaintext
+command:
+  spokenForm: take every paint each
+  version: 2
+  targets:
+    - type: primitive
+      modifiers:
+        - type: everyScope
+          scopeType: { type: nonWhitespaceSequence }
+      mark: { type: decoratedSymbol, symbolColor: default, character: e }
+  usePrePhraseSnapshot: true
+  action: { name: setSelection }
+initialState:
+  documentContents: |-
+    first test-block
+    for testing
+  selections:
+    - anchor: { line: 1, character: 11 }
+      active: { line: 1, character: 11 }
+  marks:
+    default.e:
+      start: { line: 0, character: 6 }
+      end: { line: 0, character: 10 }
+finalState:
+  documentContents: |-
+    first test-block
+    for testing
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 5 }
+    - anchor: { line: 0, character: 6 }
+      active: { line: 0, character: 16 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: decoratedSymbol, symbolColor: default, character: e },
+      modifiers:
+        [
+          {
+            type: everyScope,
+            scopeType: { type: boundedNonWhitespaceSequence },
+          },
+        ],
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/implicitExpansion/takeEverySmallPaint.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/implicitExpansion/takeEverySmallPaint.yml
new file mode 100644
index 0000000000..087122cc72
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/implicitExpansion/takeEverySmallPaint.yml
@@ -0,0 +1,54 @@
+languageId: plaintext
+command:
+  spokenForm: take every paint
+  version: 2
+  targets:
+    - type: primitive
+      modifiers:
+        - type: everyScope
+          scopeType: { type: boundedNonWhitespaceSequence }
+  usePrePhraseSnapshot: true
+  action: { name: setSelection }
+initialState:
+  documentContents: |-
+    first test-block
+    for testing
+
+    second test-block
+    for testing
+  selections:
+    - anchor: { line: 0, character: 6 }
+      active: { line: 3, character: 9 }
+  marks: {}
+finalState:
+  documentContents: |-
+    first test-block
+    for testing
+
+    second test-block
+    for testing
+  selections:
+    - anchor: { line: 0, character: 6 }
+      active: { line: 0, character: 16 }
+    - anchor: { line: 1, character: 0 }
+      active: { line: 1, character: 3 }
+    - anchor: { line: 1, character: 4 }
+      active: { line: 1, character: 11 }
+    - anchor: { line: 3, character: 0 }
+      active: { line: 3, character: 6 }
+    - anchor: { line: 3, character: 7 }
+      active: { line: 3, character: 17 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      modifiers:
+        [
+          {
+            type: everyScope,
+            scopeType: { type: boundedNonWhitespaceSequence },
+          },
+        ],
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/implicitExpansion/takeEverySmallPaint2.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/implicitExpansion/takeEverySmallPaint2.yml
new file mode 100644
index 0000000000..ab18b2f8e1
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/implicitExpansion/takeEverySmallPaint2.yml
@@ -0,0 +1,38 @@
+languageId: plaintext
+command:
+  spokenForm: take every paint
+  version: 2
+  targets:
+    - type: primitive
+      modifiers:
+        - type: everyScope
+          scopeType: { type: boundedNonWhitespaceSequence }
+  usePrePhraseSnapshot: true
+  action: { name: setSelection }
+initialState:
+  documentContents: (hello world-whatever testing) testing now
+  selections:
+    - anchor: { line: 0, character: 3 }
+      active: { line: 0, character: 10 }
+  marks: {}
+finalState:
+  documentContents: (hello world-whatever testing) testing now
+  selections:
+    - anchor: { line: 0, character: 1 }
+      active: { line: 0, character: 6 }
+    - anchor: { line: 0, character: 7 }
+      active: { line: 0, character: 21 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      modifiers:
+        [
+          {
+            type: everyScope,
+            scopeType: { type: boundedNonWhitespaceSequence },
+          },
+        ],
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/implicitExpansion/takeEverySmallPaintBlockRisk.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/implicitExpansion/takeEverySmallPaintBlockRisk.yml
new file mode 100644
index 0000000000..72a167e09f
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/implicitExpansion/takeEverySmallPaintBlockRisk.yml
@@ -0,0 +1,59 @@
+languageId: plaintext
+command:
+  spokenForm: take every paint block risk
+  version: 2
+  targets:
+    - type: primitive
+      modifiers:
+        - type: everyScope
+          scopeType: { type: boundedNonWhitespaceSequence }
+        - type: containingScope
+          scopeType: { type: paragraph }
+      mark: { type: decoratedSymbol, symbolColor: default, character: r }
+  usePrePhraseSnapshot: true
+  action: { name: setSelection }
+initialState:
+  documentContents: |-
+    first test-block
+    for testing
+
+    second test-block
+    for testing
+  selections:
+    - anchor: { line: 4, character: 0 }
+      active: { line: 4, character: 0 }
+  marks:
+    default.r:
+      start: { line: 0, character: 0 }
+      end: { line: 0, character: 5 }
+finalState:
+  documentContents: |-
+    first test-block
+    for testing
+
+    second test-block
+    for testing
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 5 }
+    - anchor: { line: 0, character: 6 }
+      active: { line: 0, character: 16 }
+    - anchor: { line: 1, character: 0 }
+      active: { line: 1, character: 3 }
+    - anchor: { line: 1, character: 4 }
+      active: { line: 1, character: 11 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: decoratedSymbol, symbolColor: default, character: r },
+      modifiers:
+        [
+          {
+            type: everyScope,
+            scopeType: { type: boundedNonWhitespaceSequence },
+          },
+          { type: containingScope, scopeType: { type: paragraph } },
+        ],
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/implicitExpansion/takeEverySmallPaintEach.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/implicitExpansion/takeEverySmallPaintEach.yml
new file mode 100644
index 0000000000..3250f0a313
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/implicitExpansion/takeEverySmallPaintEach.yml
@@ -0,0 +1,46 @@
+languageId: plaintext
+command:
+  spokenForm: take every paint each
+  version: 2
+  targets:
+    - type: primitive
+      modifiers:
+        - type: everyScope
+          scopeType: { type: boundedNonWhitespaceSequence }
+      mark: { type: decoratedSymbol, symbolColor: default, character: e }
+  usePrePhraseSnapshot: true
+  action: { name: setSelection }
+initialState:
+  documentContents: |-
+    first test-block
+    for testing
+  selections:
+    - anchor: { line: 1, character: 11 }
+      active: { line: 1, character: 11 }
+  marks:
+    default.e:
+      start: { line: 0, character: 6 }
+      end: { line: 0, character: 10 }
+finalState:
+  documentContents: |-
+    first test-block
+    for testing
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 5 }
+    - anchor: { line: 0, character: 6 }
+      active: { line: 0, character: 16 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: decoratedSymbol, symbolColor: default, character: e },
+      modifiers:
+        [
+          {
+            type: everyScope,
+            scopeType: { type: boundedNonWhitespaceSequence },
+          },
+        ],
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/implicitExpansion/takeEverySmallPaintToken.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/implicitExpansion/takeEverySmallPaintToken.yml
new file mode 100644
index 0000000000..577608cb69
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/implicitExpansion/takeEverySmallPaintToken.yml
@@ -0,0 +1,41 @@
+languageId: plaintext
+command:
+  spokenForm: take every paint token
+  version: 2
+  targets:
+    - type: primitive
+      modifiers:
+        - type: everyScope
+          scopeType: { type: boundedNonWhitespaceSequence }
+        - type: containingScope
+          scopeType: { type: token }
+  usePrePhraseSnapshot: true
+  action: { name: setSelection }
+initialState:
+  documentContents: (hello world-whatever testing) testing now
+  selections:
+    - anchor: { line: 0, character: 3 }
+      active: { line: 0, character: 10 }
+  marks: {}
+finalState:
+  documentContents: (hello world-whatever testing) testing now
+  selections:
+    - anchor: { line: 0, character: 1 }
+      active: { line: 0, character: 6 }
+    - anchor: { line: 0, character: 7 }
+      active: { line: 0, character: 21 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      modifiers:
+        [
+          {
+            type: everyScope,
+            scopeType: { type: boundedNonWhitespaceSequence },
+          },
+          { type: containingScope, scopeType: { type: token } },
+        ],
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/implicitExpansion/takeEverySmallPaintWhale.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/implicitExpansion/takeEverySmallPaintWhale.yml
new file mode 100644
index 0000000000..1c8bda47bb
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/implicitExpansion/takeEverySmallPaintWhale.yml
@@ -0,0 +1,42 @@
+languageId: plaintext
+command:
+  spokenForm: take every paint whale
+  version: 2
+  targets:
+    - type: primitive
+      modifiers:
+        - type: everyScope
+          scopeType: { type: boundedNonWhitespaceSequence }
+      mark: { type: decoratedSymbol, symbolColor: default, character: w }
+  usePrePhraseSnapshot: true
+  action: { name: setSelection }
+initialState:
+  documentContents: (hello world-whatever) testing now
+  selections:
+    - anchor: { line: 0, character: 34 }
+      active: { line: 0, character: 34 }
+  marks:
+    default.w:
+      start: { line: 0, character: 7 }
+      end: { line: 0, character: 12 }
+finalState:
+  documentContents: (hello world-whatever) testing now
+  selections:
+    - anchor: { line: 0, character: 1 }
+      active: { line: 0, character: 6 }
+    - anchor: { line: 0, character: 7 }
+      active: { line: 0, character: 21 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: decoratedSymbol, symbolColor: default, character: w },
+      modifiers:
+        [
+          {
+            type: everyScope,
+            scopeType: { type: boundedNonWhitespaceSequence },
+          },
+        ],
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/implicitExpansion/takeEveryToken.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/implicitExpansion/takeEveryToken.yml
new file mode 100644
index 0000000000..eb0fe9513b
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/implicitExpansion/takeEveryToken.yml
@@ -0,0 +1,52 @@
+languageId: plaintext
+command:
+  spokenForm: take every token
+  version: 2
+  targets:
+    - type: primitive
+      modifiers:
+        - type: everyScope
+          scopeType: { type: token }
+  usePrePhraseSnapshot: true
+  action: { name: setSelection }
+initialState:
+  documentContents: |-
+    first test-block
+    for testing
+
+    second test-block
+    for testing
+  selections:
+    - anchor: { line: 0, character: 6 }
+      active: { line: 3, character: 9 }
+  marks: {}
+finalState:
+  documentContents: |-
+    first test-block
+    for testing
+
+    second test-block
+    for testing
+  selections:
+    - anchor: { line: 0, character: 6 }
+      active: { line: 0, character: 10 }
+    - anchor: { line: 0, character: 10 }
+      active: { line: 0, character: 11 }
+    - anchor: { line: 0, character: 11 }
+      active: { line: 0, character: 16 }
+    - anchor: { line: 1, character: 0 }
+      active: { line: 1, character: 3 }
+    - anchor: { line: 1, character: 4 }
+      active: { line: 1, character: 11 }
+    - anchor: { line: 3, character: 0 }
+      active: { line: 3, character: 6 }
+    - anchor: { line: 3, character: 7 }
+      active: { line: 3, character: 11 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      modifiers: [{ type: everyScope, scopeType: { type: token } }],
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/implicitExpansion/takeEveryTokenBlockRisk.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/implicitExpansion/takeEveryTokenBlockRisk.yml
new file mode 100644
index 0000000000..2754f49cd8
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/implicitExpansion/takeEveryTokenBlockRisk.yml
@@ -0,0 +1,60 @@
+languageId: plaintext
+command:
+  spokenForm: take every token block risk
+  version: 2
+  targets:
+    - type: primitive
+      modifiers:
+        - type: everyScope
+          scopeType: { type: token }
+        - type: containingScope
+          scopeType: { type: paragraph }
+      mark: { type: decoratedSymbol, symbolColor: default, character: r }
+  usePrePhraseSnapshot: true
+  action: { name: setSelection }
+initialState:
+  documentContents: |-
+    first test-block
+    for testing
+
+    second test-block
+    for testing
+  selections:
+    - anchor: { line: 4, character: 0 }
+      active: { line: 4, character: 0 }
+  marks:
+    default.r:
+      start: { line: 0, character: 0 }
+      end: { line: 0, character: 5 }
+finalState:
+  documentContents: |-
+    first test-block
+    for testing
+
+    second test-block
+    for testing
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 5 }
+    - anchor: { line: 0, character: 6 }
+      active: { line: 0, character: 10 }
+    - anchor: { line: 0, character: 10 }
+      active: { line: 0, character: 11 }
+    - anchor: { line: 0, character: 11 }
+      active: { line: 0, character: 16 }
+    - anchor: { line: 1, character: 0 }
+      active: { line: 1, character: 3 }
+    - anchor: { line: 1, character: 4 }
+      active: { line: 1, character: 11 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: decoratedSymbol, symbolColor: default, character: r },
+      modifiers:
+        [
+          { type: everyScope, scopeType: { type: token } },
+          { type: containingScope, scopeType: { type: paragraph } },
+        ],
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/implicitExpansion/takeEveryTokenEach.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/implicitExpansion/takeEveryTokenEach.yml
new file mode 100644
index 0000000000..3c3c71cdd4
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/implicitExpansion/takeEveryTokenEach.yml
@@ -0,0 +1,44 @@
+languageId: plaintext
+command:
+  spokenForm: take every token each
+  version: 2
+  targets:
+    - type: primitive
+      modifiers:
+        - type: everyScope
+          scopeType: { type: token }
+      mark: { type: decoratedSymbol, symbolColor: default, character: e }
+  usePrePhraseSnapshot: true
+  action: { name: setSelection }
+initialState:
+  documentContents: |-
+    first test-block
+    for testing
+  selections:
+    - anchor: { line: 1, character: 11 }
+      active: { line: 1, character: 11 }
+  marks:
+    default.e:
+      start: { line: 0, character: 6 }
+      end: { line: 0, character: 10 }
+finalState:
+  documentContents: |-
+    first test-block
+    for testing
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 5 }
+    - anchor: { line: 0, character: 6 }
+      active: { line: 0, character: 10 }
+    - anchor: { line: 0, character: 10 }
+      active: { line: 0, character: 11 }
+    - anchor: { line: 0, character: 11 }
+      active: { line: 0, character: 16 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: decoratedSymbol, symbolColor: default, character: e },
+      modifiers: [{ type: everyScope, scopeType: { type: token } }],
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/inference/bringBattBeforeFunk.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/inference/bringBattBeforeFunk.yml
new file mode 100644
index 0000000000..d420eaca7f
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/inference/bringBattBeforeFunk.yml
@@ -0,0 +1,59 @@
+languageId: typescript
+command:
+  spokenForm: bring batt before funk
+  version: 3
+  targets:
+    - type: primitive
+      mark: { type: decoratedSymbol, symbolColor: default, character: b }
+    - type: primitive
+      modifiers:
+        - { type: position, position: before }
+        - type: containingScope
+          scopeType: { type: namedFunction }
+  usePrePhraseSnapshot: true
+  action: { name: replaceWithTarget }
+initialState:
+  documentContents: |-
+    function foo() {
+        return "";
+    }
+
+    function bar() {
+        return "";
+    }
+  selections:
+    - anchor: { line: 1, character: 12 }
+      active: { line: 1, character: 12 }
+  marks:
+    default.b:
+      start: { line: 4, character: 9 }
+      end: { line: 4, character: 12 }
+finalState:
+  documentContents: |-
+    bar
+
+    function foo() {
+        return "";
+    }
+
+    function bar() {
+        return "";
+    }
+  selections:
+    - anchor: { line: 3, character: 12 }
+      active: { line: 3, character: 12 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: decoratedSymbol, symbolColor: default, character: b },
+      modifiers: [],
+    },
+    {
+      type: primitive,
+      mark: { type: cursor },
+      modifiers:
+        [{ type: containingScope, scopeType: { type: namedFunction } }],
+      positionModifier: { type: position, position: before },
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/inference/bringBattBeforeItsFunk.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/inference/bringBattBeforeItsFunk.yml
new file mode 100644
index 0000000000..ccea6b574e
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/inference/bringBattBeforeItsFunk.yml
@@ -0,0 +1,60 @@
+languageId: typescript
+command:
+  spokenForm: bring batt before its funk
+  version: 3
+  targets:
+    - type: primitive
+      mark: { type: decoratedSymbol, symbolColor: default, character: b }
+    - type: primitive
+      modifiers:
+        - { type: position, position: before }
+        - { type: inferPreviousMark }
+        - type: containingScope
+          scopeType: { type: namedFunction }
+  usePrePhraseSnapshot: true
+  action: { name: replaceWithTarget }
+initialState:
+  documentContents: |-
+    function foo() {
+        return "";
+    }
+
+    function bar() {
+        return "";
+    }
+  selections:
+    - anchor: { line: 1, character: 12 }
+      active: { line: 1, character: 12 }
+  marks:
+    default.b:
+      start: { line: 4, character: 9 }
+      end: { line: 4, character: 12 }
+finalState:
+  documentContents: |-
+    function foo() {
+        return "";
+    }
+
+    bar
+
+    function bar() {
+        return "";
+    }
+  selections:
+    - anchor: { line: 1, character: 12 }
+      active: { line: 1, character: 12 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: decoratedSymbol, symbolColor: default, character: b },
+      modifiers: [],
+    },
+    {
+      type: primitive,
+      mark: { type: decoratedSymbol, symbolColor: default, character: b },
+      modifiers:
+        [{ type: containingScope, scopeType: { type: namedFunction } }],
+      positionModifier: { type: position, position: before },
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/inference/bringHarpAfterLineTrapAndBlockSpun.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/inference/bringHarpAfterLineTrapAndBlockSpun.yml
new file mode 100644
index 0000000000..8616042a4c
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/inference/bringHarpAfterLineTrapAndBlockSpun.yml
@@ -0,0 +1,85 @@
+languageId: plaintext
+command:
+  spokenForm: bring harp after line trap and block spun
+  version: 2
+  targets:
+    - type: primitive
+      mark: { type: decoratedSymbol, symbolColor: default, character: h }
+    - type: list
+      elements:
+        - type: primitive
+          mark: { type: decoratedSymbol, symbolColor: default, character: t }
+          modifiers:
+            - { type: position, position: after }
+            - type: containingScope
+              scopeType: { type: line }
+        - type: primitive
+          mark: { type: decoratedSymbol, symbolColor: default, character: s }
+          modifiers:
+            - type: containingScope
+              scopeType: { type: paragraph }
+  usePrePhraseSnapshot: true
+  action: { name: replaceWithTarget }
+initialState:
+  documentContents: |-
+    hello
+    there
+
+    testing
+  selections:
+    - anchor: { line: 3, character: 7 }
+      active: { line: 3, character: 7 }
+  marks:
+    default.h:
+      start: { line: 0, character: 0 }
+      end: { line: 0, character: 5 }
+    default.t:
+      start: { line: 1, character: 0 }
+      end: { line: 1, character: 5 }
+    default.s:
+      start: { line: 3, character: 0 }
+      end: { line: 3, character: 7 }
+finalState:
+  documentContents: |-
+    hello
+    there
+    hello
+
+    testing
+
+    hello
+  selections:
+    - anchor: { line: 4, character: 7 }
+      active: { line: 4, character: 7 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: decoratedSymbol, symbolColor: default, character: h },
+      modifiers: [],
+    },
+    {
+      type: list,
+      elements:
+        [
+          {
+            type: primitive,
+            mark: { type: decoratedSymbol, symbolColor: default, character: t },
+            modifiers:
+              [
+                { type: position, position: after },
+                { type: containingScope, scopeType: { type: line } },
+              ],
+          },
+          {
+            type: primitive,
+            mark: { type: decoratedSymbol, symbolColor: default, character: s },
+            modifiers:
+              [
+                { type: position, position: after },
+                { type: containingScope, scopeType: { type: paragraph } },
+              ],
+          },
+        ],
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/inference/bringLineBattPastEndOfItsFunkToThis.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/inference/bringLineBattPastEndOfItsFunkToThis.yml
new file mode 100644
index 0000000000..95014d175c
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/inference/bringLineBattPastEndOfItsFunkToThis.yml
@@ -0,0 +1,81 @@
+languageId: typescript
+command:
+  spokenForm: bring line batt past end of its funk to this
+  version: 3
+  targets:
+    - type: range
+      anchor:
+        type: primitive
+        modifiers:
+          - type: containingScope
+            scopeType: { type: line }
+        mark: { type: decoratedSymbol, symbolColor: default, character: b }
+      active:
+        type: primitive
+        modifiers:
+          - { type: position, position: end }
+          - { type: inferPreviousMark }
+          - type: containingScope
+            scopeType: { type: namedFunction }
+      excludeAnchor: false
+      excludeActive: false
+    - type: primitive
+      mark: { type: cursor }
+  usePrePhraseSnapshot: true
+  action: { name: replaceWithTarget }
+initialState:
+  documentContents: |-
+    function foo() {
+        const bar = "hello";
+
+        const baz = "hi";
+    }
+
+    const bongo = "bazman";
+  selections:
+    - anchor: { line: 6, character: 0 }
+      active: { line: 6, character: 0 }
+  marks:
+    default.b:
+      start: { line: 1, character: 10 }
+      end: { line: 1, character: 13 }
+finalState:
+  documentContents: |-
+    function foo() {
+        const bar = "hello";
+
+        const baz = "hi";
+    }
+
+    const bar = "hello";
+
+        const baz = "hi";
+    }
+  selections:
+    - anchor: { line: 6, character: 0 }
+      active: { line: 6, character: 0 }
+fullTargets:
+  [
+    {
+      type: range,
+      excludeAnchor: false,
+      excludeActive: false,
+      rangeType: continuous,
+      anchor:
+        {
+          type: primitive,
+          mark: { type: decoratedSymbol, symbolColor: default, character: b },
+          modifiers:
+            [&ref_0 { type: containingScope, scopeType: { type: line } }],
+        },
+      active:
+        {
+          type: primitive,
+          mark: { type: decoratedSymbol, symbolColor: default, character: b },
+          modifiers:
+            [{ type: containingScope, scopeType: { type: namedFunction } }],
+          positionModifier: { type: position, position: end },
+        },
+    },
+    { type: primitive, mark: { type: cursor }, modifiers: [*ref_0] },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/inference/bringLineLookToJustAir.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/inference/bringLineLookToJustAir.yml
new file mode 100644
index 0000000000..28f8f27818
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/inference/bringLineLookToJustAir.yml
@@ -0,0 +1,54 @@
+languageId: plaintext
+command:
+  version: 1
+  spokenForm: bring line look to just air
+  action: replaceWithTarget
+  targets:
+    - type: primitive
+      selectionType: line
+      mark: { type: decoratedSymbol, symbolColor: default, character: l }
+    - type: primitive
+      modifier: { type: toRawSelection }
+      mark: { type: decoratedSymbol, symbolColor: default, character: a }
+initialState:
+  documentContents: |
+    hello there
+    whatever now
+  selections:
+    - anchor: { line: 2, character: 0 }
+      active: { line: 2, character: 0 }
+  marks:
+    default.l:
+      start: { line: 0, character: 0 }
+      end: { line: 0, character: 5 }
+    default.a:
+      start: { line: 1, character: 0 }
+      end: { line: 1, character: 8 }
+finalState:
+  documentContents: |
+    hello there
+    hello there now
+  selections:
+    - anchor: { line: 2, character: 0 }
+      active: { line: 2, character: 0 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: decoratedSymbol, symbolColor: default, character: l },
+      selectionType: line,
+      position: contents,
+      insideOutsideType: null,
+      modifier: { type: identity },
+      isImplicit: false,
+    },
+    {
+      type: primitive,
+      mark: { type: decoratedSymbol, symbolColor: default, character: a },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: null,
+      modifier: { type: toRawSelection },
+      isImplicit: false,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/inference/bringMapAirToLineHarp.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/inference/bringMapAirToLineHarp.yml
new file mode 100644
index 0000000000..83b20118a7
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/inference/bringMapAirToLineHarp.yml
@@ -0,0 +1,54 @@
+languageId: typescript
+command:
+  version: 1
+  spokenForm: bring map air to line harp
+  action: replaceWithTarget
+  targets:
+    - type: primitive
+      modifier:
+        { type: containingScope, scopeType: map, includeSiblings: false }
+      mark: { type: decoratedSymbol, symbolColor: default, character: a }
+    - type: primitive
+      selectionType: line
+      mark: { type: decoratedSymbol, symbolColor: default, character: h }
+initialState:
+  documentContents: |2-
+        hello world
+        value = {a:2}
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+  marks:
+    default.a:
+      start: { line: 1, character: 13 }
+      end: { line: 1, character: 14 }
+    default.h:
+      start: { line: 0, character: 4 }
+      end: { line: 0, character: 9 }
+finalState:
+  documentContents: |2-
+        {a:2}
+        value = {a:2}
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: decoratedSymbol, symbolColor: default, character: a },
+      selectionType: token,
+      position: contents,
+      modifier:
+        { type: containingScope, scopeType: map, includeSiblings: false },
+      insideOutsideType: null,
+    },
+    {
+      type: primitive,
+      mark: { type: decoratedSymbol, symbolColor: default, character: h },
+      selectionType: line,
+      position: contents,
+      modifier: { type: identity },
+      insideOutsideType: null,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/inference/bringMapAirToTokenHarp.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/inference/bringMapAirToTokenHarp.yml
new file mode 100644
index 0000000000..ee08f435f5
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/inference/bringMapAirToTokenHarp.yml
@@ -0,0 +1,54 @@
+languageId: typescript
+command:
+  version: 1
+  spokenForm: bring map air to token harp
+  action: replaceWithTarget
+  targets:
+    - type: primitive
+      modifier:
+        { type: containingScope, scopeType: map, includeSiblings: false }
+      mark: { type: decoratedSymbol, symbolColor: default, character: a }
+    - type: primitive
+      selectionType: token
+      mark: { type: decoratedSymbol, symbolColor: default, character: h }
+initialState:
+  documentContents: |2-
+        hello
+        value = {a:2}
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+  marks:
+    default.a:
+      start: { line: 1, character: 13 }
+      end: { line: 1, character: 14 }
+    default.h:
+      start: { line: 0, character: 4 }
+      end: { line: 0, character: 9 }
+finalState:
+  documentContents: |2-
+        {a:2}
+        value = {a:2}
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: decoratedSymbol, symbolColor: default, character: a },
+      selectionType: token,
+      position: contents,
+      modifier:
+        { type: containingScope, scopeType: map, includeSiblings: false },
+      insideOutsideType: null,
+    },
+    {
+      type: primitive,
+      mark: { type: decoratedSymbol, symbolColor: default, character: h },
+      selectionType: token,
+      position: contents,
+      modifier: { type: identity },
+      insideOutsideType: null,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/inference/bringOddToLine.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/inference/bringOddToLine.yml
new file mode 100644
index 0000000000..0776be4b18
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/inference/bringOddToLine.yml
@@ -0,0 +1,48 @@
+languageId: typescript
+command:
+  version: 1
+  spokenForm: bring odd to line
+  action: replaceWithTarget
+  targets:
+    - type: primitive
+      mark: { type: decoratedSymbol, symbolColor: default, character: o }
+    - { type: primitive, selectionType: line }
+initialState:
+  documentContents: |-
+    const foo = "hello";
+
+    const bar = "hello";
+  selections:
+    - anchor: { line: 2, character: 18 }
+      active: { line: 2, character: 18 }
+  marks:
+    default.o:
+      start: { line: 0, character: 0 }
+      end: { line: 0, character: 5 }
+finalState:
+  documentContents: |-
+    const foo = "hello";
+
+    const
+  selections:
+    - anchor: { line: 2, character: 5 }
+      active: { line: 2, character: 5 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: decoratedSymbol, symbolColor: default, character: o },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: null,
+      modifier: { type: identity },
+    },
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: line,
+      position: contents,
+      insideOutsideType: null,
+      modifier: { type: identity },
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/inference/bringOddToState.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/inference/bringOddToState.yml
new file mode 100644
index 0000000000..a398c031c5
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/inference/bringOddToState.yml
@@ -0,0 +1,51 @@
+languageId: typescript
+command:
+  version: 1
+  spokenForm: bring odd to state
+  action: replaceWithTarget
+  targets:
+    - type: primitive
+      mark: { type: decoratedSymbol, symbolColor: default, character: o }
+    - type: primitive
+      modifier:
+        { type: containingScope, scopeType: statement, includeSiblings: false }
+initialState:
+  documentContents: |-
+    const foo = "hello";
+
+    const bar = "hello";
+  selections:
+    - anchor: { line: 2, character: 18 }
+      active: { line: 2, character: 18 }
+  marks:
+    default.o:
+      start: { line: 0, character: 0 }
+      end: { line: 0, character: 5 }
+finalState:
+  documentContents: |-
+    const foo = "hello";
+
+    const
+  selections:
+    - anchor: { line: 2, character: 5 }
+      active: { line: 2, character: 5 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: decoratedSymbol, symbolColor: default, character: o },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: null,
+      modifier: { type: identity },
+    },
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: null,
+      modifier:
+        { type: containingScope, scopeType: statement, includeSiblings: false },
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/inference/bringOddToToken.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/inference/bringOddToToken.yml
new file mode 100644
index 0000000000..b0a5d4a0b5
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/inference/bringOddToToken.yml
@@ -0,0 +1,48 @@
+languageId: typescript
+command:
+  version: 1
+  spokenForm: bring odd to token
+  action: replaceWithTarget
+  targets:
+    - type: primitive
+      mark: { type: decoratedSymbol, symbolColor: default, character: o }
+    - { type: primitive, selectionType: token }
+initialState:
+  documentContents: |-
+    const foo = "hello";
+
+    const bar = "hello";
+  selections:
+    - anchor: { line: 2, character: 18 }
+      active: { line: 2, character: 18 }
+  marks:
+    default.o:
+      start: { line: 0, character: 0 }
+      end: { line: 0, character: 5 }
+finalState:
+  documentContents: |-
+    const foo = "hello";
+
+    const bar = "const";
+  selections:
+    - anchor: { line: 2, character: 18 }
+      active: { line: 2, character: 18 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: decoratedSymbol, symbolColor: default, character: o },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: null,
+      modifier: { type: identity },
+    },
+    {
+      type: primitive,
+      mark: { type: cursorToken },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: null,
+      modifier: { type: identity },
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/inference/bringRowOneBeforeBatt.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/inference/bringRowOneBeforeBatt.yml
new file mode 100644
index 0000000000..a496dab4b7
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/inference/bringRowOneBeforeBatt.yml
@@ -0,0 +1,50 @@
+languageId: plaintext
+command:
+  version: 4
+  spokenForm: bring row one before batt
+  action: { name: replaceWithTarget }
+  targets:
+    - type: primitive
+      mark: { type: lineNumber, lineNumberType: modulo100, lineNumber: 0 }
+    - type: primitive
+      mark: { type: decoratedSymbol, symbolColor: default, character: b }
+      modifiers:
+        - { type: position, position: before }
+  usePrePhraseSnapshot: true
+initialState:
+  documentContents: |-
+    aaa
+    ccc
+
+    b
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+  marks:
+    default.b:
+      start: { line: 3, character: 0 }
+      end: { line: 3, character: 1 }
+finalState:
+  documentContents: |-
+    aaa
+    ccc
+
+    aaa
+    b
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: lineNumber, lineNumberType: modulo100, lineNumber: 0 },
+      modifiers: [{ type: containingScope, scopeType: { type: line } }],
+    },
+    {
+      type: primitive,
+      mark: { type: decoratedSymbol, symbolColor: default, character: b },
+      modifiers: [{ type: containingScope, scopeType: { type: line } }],
+      positionModifier: { type: position, position: before },
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/inference/bringRowOnePastTwoBeforeBatt.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/inference/bringRowOnePastTwoBeforeBatt.yml
new file mode 100644
index 0000000000..fc26d2bf70
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/inference/bringRowOnePastTwoBeforeBatt.yml
@@ -0,0 +1,65 @@
+languageId: plaintext
+command:
+  version: 4
+  spokenForm: bring row one past two before batt
+  action: { name: replaceWithTarget }
+  targets:
+    - type: primitive
+      mark:
+        type: range
+        anchor: { type: lineNumber, lineNumberType: modulo100, lineNumber: 0 }
+        active: { type: lineNumber, lineNumberType: modulo100, lineNumber: 1 }
+        excludeAnchor: false
+        excludeActive: false
+    - type: primitive
+      mark: { type: decoratedSymbol, symbolColor: default, character: b }
+      modifiers:
+        - { type: position, position: before }
+  usePrePhraseSnapshot: true
+initialState:
+  documentContents: |-
+    aaa
+    ccc
+
+    b
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+  marks:
+    default.b:
+      start: { line: 3, character: 0 }
+      end: { line: 3, character: 1 }
+finalState:
+  documentContents: |-
+    aaa
+    ccc
+
+    aaa
+    ccc
+    b
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark:
+        {
+          type: range,
+          anchor:
+            { type: lineNumber, lineNumberType: modulo100, lineNumber: 0 },
+          active:
+            { type: lineNumber, lineNumberType: modulo100, lineNumber: 1 },
+          excludeAnchor: false,
+          excludeActive: false,
+        },
+      modifiers: [{ type: containingScope, scopeType: { type: line } }],
+    },
+    {
+      type: primitive,
+      mark: { type: decoratedSymbol, symbolColor: default, character: b },
+      modifiers: [{ type: containingScope, scopeType: { type: line } }],
+      positionModifier: { type: position, position: before },
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/inference/bringTokenHarpToMapAir.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/inference/bringTokenHarpToMapAir.yml
new file mode 100644
index 0000000000..c26513c455
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/inference/bringTokenHarpToMapAir.yml
@@ -0,0 +1,54 @@
+languageId: typescript
+command:
+  version: 1
+  spokenForm: bring token harp to map air
+  action: replaceWithTarget
+  targets:
+    - type: primitive
+      selectionType: token
+      mark: { type: decoratedSymbol, symbolColor: default, character: h }
+    - type: primitive
+      modifier:
+        { type: containingScope, scopeType: map, includeSiblings: false }
+      mark: { type: decoratedSymbol, symbolColor: default, character: a }
+initialState:
+  documentContents: |2-
+        hello
+        value = {a:2}
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+  marks:
+    default.h:
+      start: { line: 0, character: 4 }
+      end: { line: 0, character: 9 }
+    default.a:
+      start: { line: 1, character: 13 }
+      end: { line: 1, character: 14 }
+finalState:
+  documentContents: |2-
+        hello
+        value = hello
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: decoratedSymbol, symbolColor: default, character: h },
+      selectionType: token,
+      position: contents,
+      modifier: { type: identity },
+      insideOutsideType: null,
+    },
+    {
+      type: primitive,
+      mark: { type: decoratedSymbol, symbolColor: default, character: a },
+      selectionType: token,
+      position: contents,
+      modifier:
+        { type: containingScope, scopeType: map, includeSiblings: false },
+      insideOutsideType: null,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/inference/clearAirPastEndOfItsLine.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/inference/clearAirPastEndOfItsLine.yml
new file mode 100644
index 0000000000..8fb3774efa
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/inference/clearAirPastEndOfItsLine.yml
@@ -0,0 +1,62 @@
+languageId: plaintext
+command:
+  spokenForm: clear air past end of its line
+  version: 3
+  targets:
+    - type: range
+      anchor:
+        type: primitive
+        mark: { type: decoratedSymbol, symbolColor: default, character: a }
+      active:
+        type: primitive
+        modifiers:
+          - { type: position, position: end }
+          - { type: inferPreviousMark }
+          - type: containingScope
+            scopeType: { type: line }
+      excludeAnchor: false
+      excludeActive: false
+  usePrePhraseSnapshot: true
+  action: { name: clearAndSetSelection }
+initialState:
+  documentContents: |-
+    const value = "Hello world";
+
+    const value = "Hello world";
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+  marks:
+    default.a:
+      start: { line: 2, character: 6 }
+      end: { line: 2, character: 11 }
+finalState:
+  documentContents: |-
+    const value = "Hello world";
+
+    const
+  selections:
+    - anchor: { line: 2, character: 6 }
+      active: { line: 2, character: 6 }
+fullTargets:
+  [
+    {
+      type: range,
+      excludeAnchor: false,
+      excludeActive: false,
+      rangeType: continuous,
+      anchor:
+        {
+          type: primitive,
+          mark: { type: decoratedSymbol, symbolColor: default, character: a },
+          modifiers: [],
+        },
+      active:
+        {
+          type: primitive,
+          mark: { type: decoratedSymbol, symbolColor: default, character: a },
+          modifiers: [{ type: containingScope, scopeType: { type: line } }],
+          positionModifier: { type: position, position: end },
+        },
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/inference/clearEachPastStartOfItsLine.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/inference/clearEachPastStartOfItsLine.yml
new file mode 100644
index 0000000000..6a37b62b22
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/inference/clearEachPastStartOfItsLine.yml
@@ -0,0 +1,62 @@
+languageId: plaintext
+command:
+  spokenForm: clear each past start of its line
+  version: 3
+  targets:
+    - type: range
+      anchor:
+        type: primitive
+        mark: { type: decoratedSymbol, symbolColor: default, character: e }
+      active:
+        type: primitive
+        modifiers:
+          - { type: position, position: start }
+          - { type: inferPreviousMark }
+          - type: containingScope
+            scopeType: { type: line }
+      excludeAnchor: false
+      excludeActive: false
+  usePrePhraseSnapshot: true
+  action: { name: clearAndSetSelection }
+initialState:
+  documentContents: |-
+    const value = "Hello world";
+
+    const value = "Hello world";
+  selections:
+    - anchor: { line: 2, character: 0 }
+      active: { line: 2, character: 0 }
+  marks:
+    default.e:
+      start: { line: 0, character: 15 }
+      end: { line: 0, character: 20 }
+finalState:
+  documentContents: |2-
+     world";
+
+    const value = "Hello world";
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+fullTargets:
+  [
+    {
+      type: range,
+      excludeAnchor: false,
+      excludeActive: false,
+      rangeType: continuous,
+      anchor:
+        {
+          type: primitive,
+          mark: { type: decoratedSymbol, symbolColor: default, character: e },
+          modifiers: [],
+        },
+      active:
+        {
+          type: primitive,
+          mark: { type: decoratedSymbol, symbolColor: default, character: e },
+          modifiers: [{ type: containingScope, scopeType: { type: line } }],
+          positionModifier: { type: position, position: start },
+        },
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/inference/clearNearPastEndOfItsState.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/inference/clearNearPastEndOfItsState.yml
new file mode 100644
index 0000000000..3ca9554943
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/inference/clearNearPastEndOfItsState.yml
@@ -0,0 +1,63 @@
+languageId: typescript
+command:
+  spokenForm: clear near past end of its state
+  version: 3
+  targets:
+    - type: range
+      anchor:
+        type: primitive
+        mark: { type: decoratedSymbol, symbolColor: default, character: "n" }
+      active:
+        type: primitive
+        modifiers:
+          - { type: position, position: end }
+          - { type: inferPreviousMark }
+          - type: containingScope
+            scopeType: { type: statement }
+      excludeAnchor: false
+      excludeActive: false
+  usePrePhraseSnapshot: true
+  action: { name: clearAndSetSelection }
+initialState:
+  documentContents: |-
+    const foo = "hello";
+
+    const bar = "hello";
+  selections:
+    - anchor: { line: 2, character: 0 }
+      active: { line: 2, character: 0 }
+  marks:
+    default.n:
+      start: { line: 0, character: 0 }
+      end: { line: 0, character: 5 }
+finalState:
+  documentContents: |-
+
+
+    const bar = "hello";
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+fullTargets:
+  [
+    {
+      type: range,
+      excludeAnchor: false,
+      excludeActive: false,
+      rangeType: continuous,
+      anchor:
+        {
+          type: primitive,
+          mark: { type: decoratedSymbol, symbolColor: default, character: "n" },
+          modifiers: [],
+        },
+      active:
+        {
+          type: primitive,
+          mark: { type: decoratedSymbol, symbolColor: default, character: "n" },
+          modifiers:
+            [{ type: containingScope, scopeType: { type: statement } }],
+          positionModifier: { type: position, position: end },
+        },
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/inference/clearSecondCarLookPastEndOfItsToken.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/inference/clearSecondCarLookPastEndOfItsToken.yml
new file mode 100644
index 0000000000..6b8ac02cc8
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/inference/clearSecondCarLookPastEndOfItsToken.yml
@@ -0,0 +1,69 @@
+languageId: plaintext
+command:
+  spokenForm: clear second car look past end of its token
+  version: 3
+  targets:
+    - type: range
+      anchor:
+        type: primitive
+        modifiers:
+          - type: ordinalScope
+            scopeType: { type: character }
+            start: 1
+            length: 1
+        mark: { type: decoratedSymbol, symbolColor: default, character: l }
+      active:
+        type: primitive
+        modifiers:
+          - { type: position, position: end }
+          - { type: inferPreviousMark }
+          - type: containingScope
+            scopeType: { type: token }
+      excludeAnchor: false
+      excludeActive: false
+  usePrePhraseSnapshot: true
+  action: { name: clearAndSetSelection }
+initialState:
+  documentContents: "    hello there"
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+  marks:
+    default.l:
+      start: { line: 0, character: 4 }
+      end: { line: 0, character: 9 }
+finalState:
+  documentContents: "    h there"
+  selections:
+    - anchor: { line: 0, character: 5 }
+      active: { line: 0, character: 5 }
+fullTargets:
+  [
+    {
+      type: range,
+      excludeAnchor: false,
+      excludeActive: false,
+      rangeType: continuous,
+      anchor:
+        {
+          type: primitive,
+          mark: { type: decoratedSymbol, symbolColor: default, character: l },
+          modifiers:
+            [
+              {
+                type: ordinalScope,
+                scopeType: { type: character },
+                start: 1,
+                length: 1,
+              },
+            ],
+        },
+      active:
+        {
+          type: primitive,
+          mark: { type: decoratedSymbol, symbolColor: default, character: l },
+          modifiers: [{ type: containingScope, scopeType: { type: token } }],
+          positionModifier: { type: position, position: end },
+        },
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/inference/clearThis.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/inference/clearThis.yml
new file mode 100644
index 0000000000..bd1806f685
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/inference/clearThis.yml
@@ -0,0 +1,21 @@
+languageId: plaintext
+command:
+  spokenForm: clear this
+  version: 3
+  targets:
+    - type: primitive
+      mark: { type: cursor }
+  usePrePhraseSnapshot: true
+  action: { name: clearAndSetSelection }
+initialState:
+  documentContents: aaa
+  selections:
+    - anchor: { line: 0, character: 1 }
+      active: { line: 0, character: 1 }
+  marks: {}
+finalState:
+  documentContents: ""
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+fullTargets: [{ type: primitive, mark: { type: cursor }, modifiers: [] }]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/inference/ifWrapTokenFine.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/inference/ifWrapTokenFine.yml
new file mode 100644
index 0000000000..c25d7a2abb
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/inference/ifWrapTokenFine.yml
@@ -0,0 +1,39 @@
+languageId: typescript
+command:
+  version: 1
+  spokenForm: if wrap token fine
+  action: wrapWithSnippet
+  targets:
+    - type: primitive
+      selectionType: token
+      mark: { type: decoratedSymbol, symbolColor: default, character: f }
+  extraArgs: [ifStatement.consequence]
+initialState:
+  documentContents: |
+    const foo = "hello";
+  selections:
+    - anchor: { line: 1, character: 0 }
+      active: { line: 1, character: 0 }
+  marks:
+    default.f:
+      start: { line: 0, character: 6 }
+      end: { line: 0, character: 9 }
+finalState:
+  documentContents: |
+    const if () {
+        foo
+    } = "hello";
+  selections:
+    - anchor: { line: 0, character: 10 }
+      active: { line: 0, character: 10 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: decoratedSymbol, symbolColor: default, character: f },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: null,
+      modifier: { type: identity },
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/inference/takeAfterVestPastAir.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/inference/takeAfterVestPastAir.yml
new file mode 100644
index 0000000000..ae1e858a4e
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/inference/takeAfterVestPastAir.yml
@@ -0,0 +1,67 @@
+languageId: typescript
+command:
+  version: 1
+  spokenForm: take after vest past air
+  action: setSelection
+  targets:
+    - type: range
+      start:
+        type: primitive
+        position: after
+        mark: { type: decoratedSymbol, symbolColor: default, character: v }
+      end:
+        type: primitive
+        mark: { type: decoratedSymbol, symbolColor: default, character: a }
+      excludeStart: false
+      excludeEnd: false
+initialState:
+  documentContents: |
+
+    const value = "Hello world";
+
+    const value = "Hello world";
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+  marks:
+    default.v:
+      start: { line: 1, character: 6 }
+      end: { line: 1, character: 11 }
+    default.a:
+      start: { line: 3, character: 6 }
+      end: { line: 3, character: 11 }
+finalState:
+  documentContents: |
+
+    const value = "Hello world";
+
+    const value = "Hello world";
+  selections:
+    - anchor: { line: 1, character: 11 }
+      active: { line: 3, character: 11 }
+fullTargets:
+  [
+    {
+      type: range,
+      excludeStart: false,
+      excludeEnd: false,
+      start:
+        {
+          type: primitive,
+          mark: { type: decoratedSymbol, symbolColor: default, character: v },
+          selectionType: token,
+          position: after,
+          modifier: { type: identity },
+          insideOutsideType: inside,
+        },
+      end:
+        {
+          type: primitive,
+          mark: { type: decoratedSymbol, symbolColor: default, character: a },
+          selectionType: token,
+          position: contents,
+          modifier: { type: identity },
+          insideOutsideType: inside,
+        },
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/inference/takeAfterVestPastBeforeAir.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/inference/takeAfterVestPastBeforeAir.yml
new file mode 100644
index 0000000000..e288d1fc97
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/inference/takeAfterVestPastBeforeAir.yml
@@ -0,0 +1,68 @@
+languageId: typescript
+command:
+  version: 1
+  spokenForm: take after vest past before air
+  action: setSelection
+  targets:
+    - type: range
+      start:
+        type: primitive
+        position: after
+        mark: { type: decoratedSymbol, symbolColor: default, character: v }
+      end:
+        type: primitive
+        position: before
+        mark: { type: decoratedSymbol, symbolColor: default, character: a }
+      excludeStart: false
+      excludeEnd: false
+initialState:
+  documentContents: |
+
+    const value = "Hello world";
+
+    const value = "Hello world";
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+  marks:
+    default.v:
+      start: { line: 1, character: 6 }
+      end: { line: 1, character: 11 }
+    default.a:
+      start: { line: 3, character: 6 }
+      end: { line: 3, character: 11 }
+finalState:
+  documentContents: |
+
+    const value = "Hello world";
+
+    const value = "Hello world";
+  selections:
+    - anchor: { line: 1, character: 11 }
+      active: { line: 3, character: 6 }
+fullTargets:
+  [
+    {
+      type: range,
+      excludeStart: false,
+      excludeEnd: false,
+      start:
+        {
+          type: primitive,
+          mark: { type: decoratedSymbol, symbolColor: default, character: v },
+          selectionType: token,
+          position: after,
+          modifier: { type: identity },
+          insideOutsideType: inside,
+        },
+      end:
+        {
+          type: primitive,
+          mark: { type: decoratedSymbol, symbolColor: default, character: a },
+          selectionType: token,
+          position: before,
+          modifier: { type: identity },
+          insideOutsideType: inside,
+        },
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/inference/takeFirstWord.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/inference/takeFirstWord.yml
new file mode 100644
index 0000000000..b24a276b32
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/inference/takeFirstWord.yml
@@ -0,0 +1,37 @@
+languageId: typescript
+command:
+  version: 1
+  spokenForm: take first word
+  action: setSelection
+  targets:
+    - type: primitive
+      selectionType: token
+      modifier: { type: subpiece, pieceType: word, anchor: 0, active: 0 }
+initialState:
+  documentContents: |+
+
+    const value = "HelloWorld";
+
+  selections:
+    - anchor: { line: 1, character: 18 }
+      active: { line: 1, character: 18 }
+  marks: {}
+finalState:
+  documentContents: |+
+
+    const value = "HelloWorld";
+
+  selections:
+    - anchor: { line: 1, character: 15 }
+      active: { line: 1, character: 20 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursorToken },
+      selectionType: token,
+      position: contents,
+      modifier: { type: subpiece, pieceType: word, anchor: 0, active: 0 },
+      insideOutsideType: inside,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/inference/takeHarpAndStringEach.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/inference/takeHarpAndStringEach.yml
new file mode 100644
index 0000000000..31033edf73
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/inference/takeHarpAndStringEach.yml
@@ -0,0 +1,65 @@
+languageId: typescript
+command:
+  version: 1
+  spokenForm: take harp and string each
+  action: setSelection
+  targets:
+    - type: list
+      elements:
+        - type: primitive
+          mark: { type: decoratedSymbol, symbolColor: default, character: h }
+        - type: primitive
+          modifier: { type: containingScope, scopeType: string }
+          mark: { type: decoratedSymbol, symbolColor: default, character: e }
+initialState:
+  documentContents: |
+
+    const value = "Hello world";
+
+    const value = "Hello world";
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+  marks:
+    default.h:
+      start: { line: 1, character: 15 }
+      end: { line: 1, character: 20 }
+    default.e:
+      start: { line: 3, character: 15 }
+      end: { line: 3, character: 20 }
+finalState:
+  documentContents: |
+
+    const value = "Hello world";
+
+    const value = "Hello world";
+  selections:
+    - anchor: { line: 1, character: 15 }
+      active: { line: 1, character: 20 }
+    - anchor: { line: 3, character: 14 }
+      active: { line: 3, character: 27 }
+fullTargets:
+  [
+    {
+      type: list,
+      elements:
+        [
+          {
+            type: primitive,
+            mark: { type: decoratedSymbol, symbolColor: default, character: h },
+            selectionType: token,
+            position: contents,
+            modifier: { type: identity },
+            insideOutsideType: inside,
+          },
+          {
+            type: primitive,
+            mark: { type: decoratedSymbol, symbolColor: default, character: e },
+            selectionType: token,
+            position: contents,
+            modifier: { type: containingScope, scopeType: string },
+            insideOutsideType: inside,
+          },
+        ],
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/inference/takeHarpPastStringEach.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/inference/takeHarpPastStringEach.yml
new file mode 100644
index 0000000000..e0fc5c7179
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/inference/takeHarpPastStringEach.yml
@@ -0,0 +1,67 @@
+languageId: typescript
+command:
+  version: 1
+  spokenForm: take harp past string each
+  action: setSelection
+  targets:
+    - type: range
+      start:
+        type: primitive
+        mark: { type: decoratedSymbol, symbolColor: default, character: h }
+      end:
+        type: primitive
+        modifier: { type: containingScope, scopeType: string }
+        mark: { type: decoratedSymbol, symbolColor: default, character: e }
+      excludeStart: false
+      excludeEnd: false
+initialState:
+  documentContents: |
+
+    const value = "Hello world";
+
+    const value = "Hello world";
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+  marks:
+    default.h:
+      start: { line: 1, character: 15 }
+      end: { line: 1, character: 20 }
+    default.e:
+      start: { line: 3, character: 15 }
+      end: { line: 3, character: 20 }
+finalState:
+  documentContents: |
+
+    const value = "Hello world";
+
+    const value = "Hello world";
+  selections:
+    - anchor: { line: 1, character: 15 }
+      active: { line: 3, character: 27 }
+fullTargets:
+  [
+    {
+      type: range,
+      excludeStart: false,
+      excludeEnd: false,
+      start:
+        {
+          type: primitive,
+          mark: { type: decoratedSymbol, symbolColor: default, character: h },
+          selectionType: token,
+          position: contents,
+          modifier: { type: identity },
+          insideOutsideType: inside,
+        },
+      end:
+        {
+          type: primitive,
+          mark: { type: decoratedSymbol, symbolColor: default, character: e },
+          selectionType: token,
+          position: contents,
+          modifier: { type: containingScope, scopeType: string },
+          insideOutsideType: inside,
+        },
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/inference/takeLastChar.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/inference/takeLastChar.yml
new file mode 100644
index 0000000000..e162375352
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/inference/takeLastChar.yml
@@ -0,0 +1,38 @@
+languageId: typescript
+command:
+  version: 1
+  spokenForm: take last char
+  action: setSelection
+  targets:
+    - type: primitive
+      selectionType: token
+      modifier: { type: subpiece, pieceType: character, anchor: -1, active: -1 }
+initialState:
+  documentContents: |+
+
+    const value = "HelloWorld";
+
+  selections:
+    - anchor: { line: 1, character: 16 }
+      active: { line: 1, character: 16 }
+  marks: {}
+finalState:
+  documentContents: |+
+
+    const value = "HelloWorld";
+
+  selections:
+    - anchor: { line: 1, character: 24 }
+      active: { line: 1, character: 25 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursorToken },
+      selectionType: token,
+      position: contents,
+      modifier:
+        { type: subpiece, pieceType: character, anchor: -1, active: -1 },
+      insideOutsideType: inside,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/inference/takeLinePastAir.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/inference/takeLinePastAir.yml
new file mode 100644
index 0000000000..07fc003188
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/inference/takeLinePastAir.yml
@@ -0,0 +1,61 @@
+languageId: typescript
+command:
+  version: 1
+  spokenForm: take line past air
+  action: setSelection
+  targets:
+    - type: range
+      start: { type: primitive, selectionType: line }
+      end:
+        type: primitive
+        mark: { type: decoratedSymbol, symbolColor: default, character: a }
+      excludeStart: false
+      excludeEnd: false
+initialState:
+  documentContents: |
+
+    const value = "Hello world";
+
+    const value = "Hello world";
+  selections:
+    - anchor: { line: 1, character: 6 }
+      active: { line: 1, character: 6 }
+  marks:
+    default.a:
+      start: { line: 3, character: 6 }
+      end: { line: 3, character: 11 }
+finalState:
+  documentContents: |
+
+    const value = "Hello world";
+
+    const value = "Hello world";
+  selections:
+    - anchor: { line: 1, character: 0 }
+      active: { line: 3, character: 28 }
+fullTargets:
+  [
+    {
+      type: range,
+      excludeStart: false,
+      excludeEnd: false,
+      start:
+        {
+          type: primitive,
+          mark: { type: cursor },
+          selectionType: line,
+          position: contents,
+          modifier: { type: identity },
+          insideOutsideType: inside,
+        },
+      end:
+        {
+          type: primitive,
+          mark: { type: decoratedSymbol, symbolColor: default, character: a },
+          selectionType: line,
+          position: contents,
+          modifier: { type: identity },
+          insideOutsideType: inside,
+        },
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/inference/takeLineVestAndAir.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/inference/takeLineVestAndAir.yml
new file mode 100644
index 0000000000..c07a90d581
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/inference/takeLineVestAndAir.yml
@@ -0,0 +1,65 @@
+languageId: typescript
+command:
+  version: 1
+  spokenForm: take line vest and air
+  action: setSelection
+  targets:
+    - type: list
+      elements:
+        - type: primitive
+          selectionType: line
+          mark: { type: decoratedSymbol, symbolColor: default, character: v }
+        - type: primitive
+          mark: { type: decoratedSymbol, symbolColor: default, character: a }
+initialState:
+  documentContents: |
+
+    const value = "Hello world";
+
+    const value = "Hello world";
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+  marks:
+    default.v:
+      start: { line: 1, character: 6 }
+      end: { line: 1, character: 11 }
+    default.a:
+      start: { line: 3, character: 6 }
+      end: { line: 3, character: 11 }
+finalState:
+  documentContents: |
+
+    const value = "Hello world";
+
+    const value = "Hello world";
+  selections:
+    - anchor: { line: 1, character: 0 }
+      active: { line: 1, character: 28 }
+    - anchor: { line: 3, character: 0 }
+      active: { line: 3, character: 28 }
+fullTargets:
+  [
+    {
+      type: list,
+      elements:
+        [
+          {
+            type: primitive,
+            mark: { type: decoratedSymbol, symbolColor: default, character: v },
+            selectionType: line,
+            position: contents,
+            modifier: { type: identity },
+            insideOutsideType: inside,
+          },
+          {
+            type: primitive,
+            mark: { type: decoratedSymbol, symbolColor: default, character: a },
+            selectionType: line,
+            position: contents,
+            modifier: { type: identity },
+            insideOutsideType: inside,
+          },
+        ],
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/inference/takeLineVestPastAir.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/inference/takeLineVestPastAir.yml
new file mode 100644
index 0000000000..2d6e10dccd
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/inference/takeLineVestPastAir.yml
@@ -0,0 +1,67 @@
+languageId: typescript
+command:
+  version: 1
+  spokenForm: take line vest past air
+  action: setSelection
+  targets:
+    - type: range
+      start:
+        type: primitive
+        selectionType: line
+        mark: { type: decoratedSymbol, symbolColor: default, character: v }
+      end:
+        type: primitive
+        mark: { type: decoratedSymbol, symbolColor: default, character: a }
+      excludeStart: false
+      excludeEnd: false
+initialState:
+  documentContents: |
+
+    const value = "Hello world";
+
+    const value = "Hello world";
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+  marks:
+    default.v:
+      start: { line: 1, character: 6 }
+      end: { line: 1, character: 11 }
+    default.a:
+      start: { line: 3, character: 6 }
+      end: { line: 3, character: 11 }
+finalState:
+  documentContents: |
+
+    const value = "Hello world";
+
+    const value = "Hello world";
+  selections:
+    - anchor: { line: 1, character: 0 }
+      active: { line: 3, character: 28 }
+fullTargets:
+  [
+    {
+      type: range,
+      excludeStart: false,
+      excludeEnd: false,
+      start:
+        {
+          type: primitive,
+          mark: { type: decoratedSymbol, symbolColor: default, character: v },
+          selectionType: line,
+          position: contents,
+          modifier: { type: identity },
+          insideOutsideType: inside,
+        },
+      end:
+        {
+          type: primitive,
+          mark: { type: decoratedSymbol, symbolColor: default, character: a },
+          selectionType: line,
+          position: contents,
+          modifier: { type: identity },
+          insideOutsideType: inside,
+        },
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/inference/takeOddPastLine.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/inference/takeOddPastLine.yml
new file mode 100644
index 0000000000..9543566541
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/inference/takeOddPastLine.yml
@@ -0,0 +1,59 @@
+languageId: typescript
+command:
+  version: 1
+  spokenForm: take odd past line
+  action: setSelection
+  targets:
+    - type: range
+      start:
+        type: primitive
+        mark: { type: decoratedSymbol, symbolColor: default, character: o }
+      end: { type: primitive, selectionType: line }
+      excludeStart: false
+      excludeEnd: false
+initialState:
+  documentContents: |-
+    const foo = "hello";
+
+    const bar = "hello";
+  selections:
+    - anchor: { line: 2, character: 18 }
+      active: { line: 2, character: 18 }
+  marks:
+    default.o:
+      start: { line: 0, character: 0 }
+      end: { line: 0, character: 5 }
+finalState:
+  documentContents: |-
+    const foo = "hello";
+
+    const bar = "hello";
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 2, character: 20 }
+fullTargets:
+  [
+    {
+      type: range,
+      excludeAnchor: false,
+      excludeActive: false,
+      anchor:
+        {
+          type: primitive,
+          mark: { type: decoratedSymbol, symbolColor: default, character: o },
+          selectionType: token,
+          position: contents,
+          insideOutsideType: inside,
+          modifier: { type: identity },
+        },
+      active:
+        {
+          type: primitive,
+          mark: { type: cursor },
+          selectionType: line,
+          position: contents,
+          insideOutsideType: inside,
+          modifier: { type: identity },
+        },
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/inference/takeOddPastState.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/inference/takeOddPastState.yml
new file mode 100644
index 0000000000..7a338909e3
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/inference/takeOddPastState.yml
@@ -0,0 +1,71 @@
+languageId: typescript
+command:
+  version: 1
+  spokenForm: take odd past state
+  action: setSelection
+  targets:
+    - type: range
+      start:
+        type: primitive
+        mark: { type: decoratedSymbol, symbolColor: default, character: o }
+      end:
+        type: primitive
+        modifier:
+          {
+            type: containingScope,
+            scopeType: statement,
+            includeSiblings: false,
+          }
+      excludeStart: false
+      excludeEnd: false
+initialState:
+  documentContents: |-
+    const foo = "hello";
+
+    const bar = "hello";
+  selections:
+    - anchor: { line: 2, character: 18 }
+      active: { line: 2, character: 18 }
+  marks:
+    default.o:
+      start: { line: 0, character: 0 }
+      end: { line: 0, character: 5 }
+finalState:
+  documentContents: |-
+    const foo = "hello";
+
+    const bar = "hello";
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 2, character: 20 }
+fullTargets:
+  [
+    {
+      type: range,
+      excludeAnchor: false,
+      excludeActive: false,
+      anchor:
+        {
+          type: primitive,
+          mark: { type: decoratedSymbol, symbolColor: default, character: o },
+          selectionType: token,
+          position: contents,
+          insideOutsideType: inside,
+          modifier: { type: identity },
+        },
+      active:
+        {
+          type: primitive,
+          mark: { type: cursor },
+          selectionType: token,
+          position: contents,
+          insideOutsideType: inside,
+          modifier:
+            {
+              type: containingScope,
+              scopeType: statement,
+              includeSiblings: false,
+            },
+        },
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/inference/takeOddPastToken.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/inference/takeOddPastToken.yml
new file mode 100644
index 0000000000..787ce856f6
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/inference/takeOddPastToken.yml
@@ -0,0 +1,59 @@
+languageId: typescript
+command:
+  version: 1
+  spokenForm: take odd past token
+  action: setSelection
+  targets:
+    - type: range
+      start:
+        type: primitive
+        mark: { type: decoratedSymbol, symbolColor: default, character: o }
+      end: { type: primitive, selectionType: token }
+      excludeStart: false
+      excludeEnd: false
+initialState:
+  documentContents: |-
+    const foo = "hello";
+
+    const bar = "hello";
+  selections:
+    - anchor: { line: 2, character: 18 }
+      active: { line: 2, character: 18 }
+  marks:
+    default.o:
+      start: { line: 0, character: 0 }
+      end: { line: 0, character: 5 }
+finalState:
+  documentContents: |-
+    const foo = "hello";
+
+    const bar = "hello";
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 2, character: 18 }
+fullTargets:
+  [
+    {
+      type: range,
+      excludeAnchor: false,
+      excludeActive: false,
+      anchor:
+        {
+          type: primitive,
+          mark: { type: decoratedSymbol, symbolColor: default, character: o },
+          selectionType: token,
+          position: contents,
+          insideOutsideType: inside,
+          modifier: { type: identity },
+        },
+      active:
+        {
+          type: primitive,
+          mark: { type: cursorToken },
+          selectionType: token,
+          position: contents,
+          insideOutsideType: inside,
+          modifier: { type: identity },
+        },
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/inference/takePastLineAir.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/inference/takePastLineAir.yml
new file mode 100644
index 0000000000..6aa407620d
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/inference/takePastLineAir.yml
@@ -0,0 +1,62 @@
+languageId: typescript
+command:
+  version: 1
+  spokenForm: take past line air
+  action: setSelection
+  targets:
+    - type: range
+      start: { type: primitive }
+      end:
+        type: primitive
+        selectionType: line
+        mark: { type: decoratedSymbol, symbolColor: default, character: a }
+      excludeStart: false
+      excludeEnd: false
+initialState:
+  documentContents: |
+
+    const value = "Hello world";
+
+    const value = "Hello world";
+  selections:
+    - anchor: { line: 1, character: 6 }
+      active: { line: 1, character: 6 }
+  marks:
+    default.a:
+      start: { line: 3, character: 6 }
+      end: { line: 3, character: 11 }
+finalState:
+  documentContents: |
+
+    const value = "Hello world";
+
+    const value = "Hello world";
+  selections:
+    - anchor: { line: 1, character: 6 }
+      active: { line: 3, character: 28 }
+fullTargets:
+  [
+    {
+      type: range,
+      excludeStart: false,
+      excludeEnd: false,
+      start:
+        {
+          type: primitive,
+          mark: { type: cursor },
+          selectionType: token,
+          position: contents,
+          modifier: { type: identity },
+          insideOutsideType: inside,
+        },
+      end:
+        {
+          type: primitive,
+          mark: { type: decoratedSymbol, symbolColor: default, character: a },
+          selectionType: line,
+          position: contents,
+          modifier: { type: identity },
+          insideOutsideType: inside,
+        },
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/inference/takeStringHarpAndEach.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/inference/takeStringHarpAndEach.yml
new file mode 100644
index 0000000000..fc6883c768
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/inference/takeStringHarpAndEach.yml
@@ -0,0 +1,65 @@
+languageId: typescript
+command:
+  version: 1
+  spokenForm: take string harp and each
+  action: setSelection
+  targets:
+    - type: list
+      elements:
+        - type: primitive
+          modifier: { type: containingScope, scopeType: string }
+          mark: { type: decoratedSymbol, symbolColor: default, character: h }
+        - type: primitive
+          mark: { type: decoratedSymbol, symbolColor: default, character: e }
+initialState:
+  documentContents: |
+
+    const value = "Hello world";
+
+    const value = "Hello world";
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+  marks:
+    default.h:
+      start: { line: 1, character: 15 }
+      end: { line: 1, character: 20 }
+    default.e:
+      start: { line: 3, character: 15 }
+      end: { line: 3, character: 20 }
+finalState:
+  documentContents: |
+
+    const value = "Hello world";
+
+    const value = "Hello world";
+  selections:
+    - anchor: { line: 1, character: 14 }
+      active: { line: 1, character: 27 }
+    - anchor: { line: 3, character: 14 }
+      active: { line: 3, character: 27 }
+fullTargets:
+  [
+    {
+      type: list,
+      elements:
+        [
+          {
+            type: primitive,
+            mark: { type: decoratedSymbol, symbolColor: default, character: h },
+            selectionType: token,
+            position: contents,
+            modifier: { type: containingScope, scopeType: string },
+            insideOutsideType: inside,
+          },
+          {
+            type: primitive,
+            mark: { type: decoratedSymbol, symbolColor: default, character: e },
+            selectionType: token,
+            position: contents,
+            modifier: { type: containingScope, scopeType: string },
+            insideOutsideType: inside,
+          },
+        ],
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/inference/takeStringHarpPastEach.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/inference/takeStringHarpPastEach.yml
new file mode 100644
index 0000000000..782f1986ff
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/inference/takeStringHarpPastEach.yml
@@ -0,0 +1,67 @@
+languageId: typescript
+command:
+  version: 1
+  spokenForm: take string harp past each
+  action: setSelection
+  targets:
+    - type: range
+      start:
+        type: primitive
+        modifier: { type: containingScope, scopeType: string }
+        mark: { type: decoratedSymbol, symbolColor: default, character: h }
+      end:
+        type: primitive
+        mark: { type: decoratedSymbol, symbolColor: default, character: e }
+      excludeStart: false
+      excludeEnd: false
+initialState:
+  documentContents: |
+
+    const value = "Hello world";
+
+    const value = "Hello world";
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+  marks:
+    default.h:
+      start: { line: 1, character: 15 }
+      end: { line: 1, character: 20 }
+    default.e:
+      start: { line: 3, character: 15 }
+      end: { line: 3, character: 20 }
+finalState:
+  documentContents: |
+
+    const value = "Hello world";
+
+    const value = "Hello world";
+  selections:
+    - anchor: { line: 1, character: 14 }
+      active: { line: 3, character: 27 }
+fullTargets:
+  [
+    {
+      type: range,
+      excludeStart: false,
+      excludeEnd: false,
+      start:
+        {
+          type: primitive,
+          mark: { type: decoratedSymbol, symbolColor: default, character: h },
+          selectionType: token,
+          position: contents,
+          modifier: { type: containingScope, scopeType: string },
+          insideOutsideType: inside,
+        },
+      end:
+        {
+          type: primitive,
+          mark: { type: decoratedSymbol, symbolColor: default, character: e },
+          selectionType: token,
+          position: contents,
+          modifier: { type: containingScope, scopeType: string },
+          insideOutsideType: inside,
+        },
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/inference/takeVestAndLineAir.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/inference/takeVestAndLineAir.yml
new file mode 100644
index 0000000000..9972691d58
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/inference/takeVestAndLineAir.yml
@@ -0,0 +1,65 @@
+languageId: typescript
+command:
+  version: 1
+  spokenForm: take vest and line air
+  action: setSelection
+  targets:
+    - type: list
+      elements:
+        - type: primitive
+          mark: { type: decoratedSymbol, symbolColor: default, character: v }
+        - type: primitive
+          selectionType: line
+          mark: { type: decoratedSymbol, symbolColor: default, character: a }
+initialState:
+  documentContents: |
+
+    const value = "Hello world";
+
+    const value = "Hello world";
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+  marks:
+    default.v:
+      start: { line: 1, character: 6 }
+      end: { line: 1, character: 11 }
+    default.a:
+      start: { line: 3, character: 6 }
+      end: { line: 3, character: 11 }
+finalState:
+  documentContents: |
+
+    const value = "Hello world";
+
+    const value = "Hello world";
+  selections:
+    - anchor: { line: 1, character: 6 }
+      active: { line: 1, character: 11 }
+    - anchor: { line: 3, character: 0 }
+      active: { line: 3, character: 28 }
+fullTargets:
+  [
+    {
+      type: list,
+      elements:
+        [
+          {
+            type: primitive,
+            mark: { type: decoratedSymbol, symbolColor: default, character: v },
+            selectionType: token,
+            position: contents,
+            modifier: { type: identity },
+            insideOutsideType: inside,
+          },
+          {
+            type: primitive,
+            mark: { type: decoratedSymbol, symbolColor: default, character: a },
+            selectionType: line,
+            position: contents,
+            modifier: { type: identity },
+            insideOutsideType: inside,
+          },
+        ],
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/inference/takeVestPastAfterAir.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/inference/takeVestPastAfterAir.yml
new file mode 100644
index 0000000000..380eb801f3
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/inference/takeVestPastAfterAir.yml
@@ -0,0 +1,67 @@
+languageId: typescript
+command:
+  version: 1
+  spokenForm: take vest past after air
+  action: setSelection
+  targets:
+    - type: range
+      start:
+        type: primitive
+        mark: { type: decoratedSymbol, symbolColor: default, character: v }
+      end:
+        type: primitive
+        position: after
+        mark: { type: decoratedSymbol, symbolColor: default, character: a }
+      excludeStart: false
+      excludeEnd: false
+initialState:
+  documentContents: |
+
+    const value = "Hello world";
+
+    const value = "Hello world";
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+  marks:
+    default.v:
+      start: { line: 1, character: 6 }
+      end: { line: 1, character: 11 }
+    default.a:
+      start: { line: 3, character: 6 }
+      end: { line: 3, character: 11 }
+finalState:
+  documentContents: |
+
+    const value = "Hello world";
+
+    const value = "Hello world";
+  selections:
+    - anchor: { line: 1, character: 6 }
+      active: { line: 3, character: 11 }
+fullTargets:
+  [
+    {
+      type: range,
+      excludeStart: false,
+      excludeEnd: false,
+      start:
+        {
+          type: primitive,
+          mark: { type: decoratedSymbol, symbolColor: default, character: v },
+          selectionType: token,
+          position: contents,
+          modifier: { type: identity },
+          insideOutsideType: inside,
+        },
+      end:
+        {
+          type: primitive,
+          mark: { type: decoratedSymbol, symbolColor: default, character: a },
+          selectionType: token,
+          position: after,
+          modifier: { type: identity },
+          insideOutsideType: inside,
+        },
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/inference/takeVestPastBeforeAir.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/inference/takeVestPastBeforeAir.yml
new file mode 100644
index 0000000000..378a84c96f
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/inference/takeVestPastBeforeAir.yml
@@ -0,0 +1,67 @@
+languageId: typescript
+command:
+  version: 1
+  spokenForm: take vest past before air
+  action: setSelection
+  targets:
+    - type: range
+      start:
+        type: primitive
+        mark: { type: decoratedSymbol, symbolColor: default, character: v }
+      end:
+        type: primitive
+        position: before
+        mark: { type: decoratedSymbol, symbolColor: default, character: a }
+      excludeStart: false
+      excludeEnd: false
+initialState:
+  documentContents: |
+
+    const value = "Hello world";
+
+    const value = "Hello world";
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+  marks:
+    default.v:
+      start: { line: 1, character: 6 }
+      end: { line: 1, character: 11 }
+    default.a:
+      start: { line: 3, character: 6 }
+      end: { line: 3, character: 11 }
+finalState:
+  documentContents: |
+
+    const value = "Hello world";
+
+    const value = "Hello world";
+  selections:
+    - anchor: { line: 1, character: 6 }
+      active: { line: 3, character: 6 }
+fullTargets:
+  [
+    {
+      type: range,
+      excludeStart: false,
+      excludeEnd: false,
+      start:
+        {
+          type: primitive,
+          mark: { type: decoratedSymbol, symbolColor: default, character: v },
+          selectionType: token,
+          position: contents,
+          modifier: { type: identity },
+          insideOutsideType: inside,
+        },
+      end:
+        {
+          type: primitive,
+          mark: { type: decoratedSymbol, symbolColor: default, character: a },
+          selectionType: token,
+          position: before,
+          modifier: { type: identity },
+          insideOutsideType: inside,
+        },
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/inference/takeVestPastLineAir.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/inference/takeVestPastLineAir.yml
new file mode 100644
index 0000000000..f480326917
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/inference/takeVestPastLineAir.yml
@@ -0,0 +1,67 @@
+languageId: typescript
+command:
+  version: 1
+  spokenForm: take vest past line air
+  action: setSelection
+  targets:
+    - type: range
+      start:
+        type: primitive
+        mark: { type: decoratedSymbol, symbolColor: default, character: v }
+      end:
+        type: primitive
+        selectionType: line
+        mark: { type: decoratedSymbol, symbolColor: default, character: a }
+      excludeStart: false
+      excludeEnd: false
+initialState:
+  documentContents: |
+
+    const value = "Hello world";
+
+    const value = "Hello world";
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+  marks:
+    default.v:
+      start: { line: 1, character: 6 }
+      end: { line: 1, character: 11 }
+    default.a:
+      start: { line: 3, character: 6 }
+      end: { line: 3, character: 11 }
+finalState:
+  documentContents: |
+
+    const value = "Hello world";
+
+    const value = "Hello world";
+  selections:
+    - anchor: { line: 1, character: 6 }
+      active: { line: 3, character: 28 }
+fullTargets:
+  [
+    {
+      type: range,
+      excludeStart: false,
+      excludeEnd: false,
+      start:
+        {
+          type: primitive,
+          mark: { type: decoratedSymbol, symbolColor: default, character: v },
+          selectionType: token,
+          position: contents,
+          modifier: { type: identity },
+          insideOutsideType: inside,
+        },
+      end:
+        {
+          type: primitive,
+          mark: { type: decoratedSymbol, symbolColor: default, character: a },
+          selectionType: line,
+          position: contents,
+          modifier: { type: identity },
+          insideOutsideType: inside,
+        },
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/itemTextual/chuckEveryItem.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/itemTextual/chuckEveryItem.yml
new file mode 100644
index 0000000000..cbe18ba2cc
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/itemTextual/chuckEveryItem.yml
@@ -0,0 +1,37 @@
+languageId: plaintext
+command:
+  spokenForm: chuck every item
+  version: 2
+  targets:
+    - type: primitive
+      modifiers:
+        - type: everyScope
+          scopeType: { type: collectionItem }
+  usePrePhraseSnapshot: true
+  action: { name: remove }
+initialState:
+  documentContents: |-
+    {
+        "hello": "there",
+        "testing": "whatever",
+    }
+  selections:
+    - anchor: { line: 0, character: 1 }
+      active: { line: 0, character: 1 }
+  marks: {}
+finalState:
+  documentContents: |-
+    {
+
+    }
+  selections:
+    - anchor: { line: 0, character: 1 }
+      active: { line: 0, character: 1 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      modifiers: [{ type: everyScope, scopeType: { type: collectionItem } }],
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/itemTextual/chuckItem.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/itemTextual/chuckItem.yml
new file mode 100644
index 0000000000..70900c1e4d
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/itemTextual/chuckItem.yml
@@ -0,0 +1,37 @@
+languageId: plaintext
+command:
+  spokenForm: chuck item
+  version: 2
+  targets:
+    - type: primitive
+      modifiers:
+        - type: containingScope
+          scopeType: { type: collectionItem }
+  usePrePhraseSnapshot: true
+  action: { name: remove }
+initialState:
+  documentContents: |-
+    [
+        aaa,
+    ]
+  selections:
+    - anchor: { line: 1, character: 4 }
+      active: { line: 1, character: 4 }
+  marks: {}
+finalState:
+  documentContents: |-
+    [
+
+    ]
+  selections:
+    - anchor: { line: 1, character: 4 }
+      active: { line: 1, character: 4 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      modifiers:
+        [{ type: containingScope, scopeType: { type: collectionItem } }],
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/itemTextual/chuckItem2.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/itemTextual/chuckItem2.yml
new file mode 100644
index 0000000000..8f64828867
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/itemTextual/chuckItem2.yml
@@ -0,0 +1,37 @@
+languageId: plaintext
+command:
+  spokenForm: chuck item
+  version: 2
+  targets:
+    - type: primitive
+      modifiers:
+        - type: containingScope
+          scopeType: { type: collectionItem }
+  usePrePhraseSnapshot: true
+  action: { name: remove }
+initialState:
+  documentContents: |-
+    [
+        aaa
+    ]
+  selections:
+    - anchor: { line: 1, character: 4 }
+      active: { line: 1, character: 4 }
+  marks: {}
+finalState:
+  documentContents: |-
+    [
+
+    ]
+  selections:
+    - anchor: { line: 1, character: 0 }
+      active: { line: 1, character: 0 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      modifiers:
+        [{ type: containingScope, scopeType: { type: collectionItem } }],
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/itemTextual/chuckItem3.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/itemTextual/chuckItem3.yml
new file mode 100644
index 0000000000..6eca1755f3
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/itemTextual/chuckItem3.yml
@@ -0,0 +1,38 @@
+languageId: plaintext
+command:
+  spokenForm: chuck item
+  version: 2
+  targets:
+    - type: primitive
+      modifiers:
+        - type: containingScope
+          scopeType: { type: collectionItem }
+  usePrePhraseSnapshot: true
+  action: { name: remove }
+initialState:
+  documentContents: |-
+    [
+        foo,
+        bar,
+    ]
+  selections:
+    - anchor: { line: 2, character: 4 }
+      active: { line: 2, character: 4 }
+  marks: {}
+finalState:
+  documentContents: |-
+    [
+        foo,
+    ]
+  selections:
+    - anchor: { line: 1, character: 7 }
+      active: { line: 1, character: 7 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      modifiers:
+        [{ type: containingScope, scopeType: { type: collectionItem } }],
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/itemTextual/chuckItem4.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/itemTextual/chuckItem4.yml
new file mode 100644
index 0000000000..caee32298e
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/itemTextual/chuckItem4.yml
@@ -0,0 +1,39 @@
+languageId: plaintext
+command:
+  spokenForm: chuck item
+  version: 2
+  targets:
+    - type: primitive
+      modifiers:
+        - type: containingScope
+          scopeType: { type: collectionItem }
+  usePrePhraseSnapshot: true
+  action: { name: remove }
+initialState:
+  documentContents: |-
+    [
+        foo,
+        bar,
+        baz,
+    ]
+  selections:
+    - anchor: { line: 2, character: 8 }
+      active: { line: 2, character: 7 }
+  marks: {}
+finalState:
+  documentContents: |-
+    [
+        foo,
+    ]
+  selections:
+    - anchor: { line: 1, character: 7 }
+      active: { line: 1, character: 7 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      modifiers:
+        [{ type: containingScope, scopeType: { type: collectionItem } }],
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/itemTextual/clearEveryItem.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/itemTextual/clearEveryItem.yml
new file mode 100644
index 0000000000..7cc8c06128
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/itemTextual/clearEveryItem.yml
@@ -0,0 +1,44 @@
+languageId: plaintext
+command:
+  spokenForm: clear every item
+  version: 2
+  targets:
+    - type: primitive
+      modifiers:
+        - type: everyScope
+          scopeType: { type: collectionItem }
+  usePrePhraseSnapshot: true
+  action: { name: clearAndSetSelection }
+initialState:
+  documentContents: |-
+    [
+        111,
+        "a\"b\"c",
+        222,
+    ]
+  selections:
+    - anchor: { line: 1, character: 4 }
+      active: { line: 1, character: 4 }
+  marks: {}
+finalState:
+  documentContents: |-
+    [
+        ,
+        ,
+        ,
+    ]
+  selections:
+    - anchor: { line: 1, character: 4 }
+      active: { line: 1, character: 4 }
+    - anchor: { line: 2, character: 4 }
+      active: { line: 2, character: 4 }
+    - anchor: { line: 3, character: 4 }
+      active: { line: 3, character: 4 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      modifiers: [{ type: everyScope, scopeType: { type: collectionItem } }],
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/itemTextual/clearEveryItem2.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/itemTextual/clearEveryItem2.yml
new file mode 100644
index 0000000000..b1373a92f0
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/itemTextual/clearEveryItem2.yml
@@ -0,0 +1,34 @@
+languageId: plaintext
+command:
+  spokenForm: clear every item
+  version: 2
+  targets:
+    - type: primitive
+      modifiers:
+        - type: everyScope
+          scopeType: { type: collectionItem }
+  usePrePhraseSnapshot: true
+  action: { name: clearAndSetSelection }
+initialState:
+  documentContents: aaa, bbb, ccc
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+  marks: {}
+finalState:
+  documentContents: ", , "
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+    - anchor: { line: 0, character: 2 }
+      active: { line: 0, character: 2 }
+    - anchor: { line: 0, character: 4 }
+      active: { line: 0, character: 4 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      modifiers: [{ type: everyScope, scopeType: { type: collectionItem } }],
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/itemTextual/clearEveryItem3.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/itemTextual/clearEveryItem3.yml
new file mode 100644
index 0000000000..a2a305379e
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/itemTextual/clearEveryItem3.yml
@@ -0,0 +1,32 @@
+languageId: plaintext
+command:
+  spokenForm: clear every item
+  version: 2
+  targets:
+    - type: primitive
+      modifiers:
+        - type: everyScope
+          scopeType: { type: collectionItem }
+  usePrePhraseSnapshot: true
+  action: { name: clearAndSetSelection }
+initialState:
+  documentContents: aaa, """bbb"""
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+  marks: {}
+finalState:
+  documentContents: ", "
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+    - anchor: { line: 0, character: 2 }
+      active: { line: 0, character: 2 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      modifiers: [{ type: everyScope, scopeType: { type: collectionItem } }],
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/itemTextual/clearEveryItem4.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/itemTextual/clearEveryItem4.yml
new file mode 100644
index 0000000000..d6e8d75665
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/itemTextual/clearEveryItem4.yml
@@ -0,0 +1,36 @@
+languageId: plaintext
+command:
+  spokenForm: clear every item
+  version: 2
+  targets:
+    - type: primitive
+      modifiers:
+        - type: everyScope
+          scopeType: { type: collectionItem }
+  usePrePhraseSnapshot: true
+  action: { name: clearAndSetSelection }
+initialState:
+  documentContents: a, "b\",b\"b", 'c\',c\'c', `d\`,d\`d`
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+  marks: {}
+finalState:
+  documentContents: ", , , "
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+    - anchor: { line: 0, character: 2 }
+      active: { line: 0, character: 2 }
+    - anchor: { line: 0, character: 4 }
+      active: { line: 0, character: 4 }
+    - anchor: { line: 0, character: 6 }
+      active: { line: 0, character: 6 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      modifiers: [{ type: everyScope, scopeType: { type: collectionItem } }],
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/itemTextual/clearEveryItem5.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/itemTextual/clearEveryItem5.yml
new file mode 100644
index 0000000000..db81109cd2
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/itemTextual/clearEveryItem5.yml
@@ -0,0 +1,46 @@
+languageId: plaintext
+command:
+  spokenForm: clear every item
+  version: 2
+  targets:
+    - type: primitive
+      modifiers:
+        - type: everyScope
+          scopeType: { type: collectionItem }
+  usePrePhraseSnapshot: true
+  action: { name: clearAndSetSelection }
+initialState:
+  documentContents: |-
+    [
+        a,
+        [
+            b
+        ],
+        c
+    ]
+  selections:
+    - anchor: { line: 1, character: 4 }
+      active: { line: 1, character: 4 }
+  marks: {}
+finalState:
+  documentContents: |-
+    [
+        ,
+        ,
+
+    ]
+  selections:
+    - anchor: { line: 1, character: 4 }
+      active: { line: 1, character: 4 }
+    - anchor: { line: 2, character: 4 }
+      active: { line: 2, character: 4 }
+    - anchor: { line: 3, character: 4 }
+      active: { line: 3, character: 4 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      modifiers: [{ type: everyScope, scopeType: { type: collectionItem } }],
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/itemTextual/clearEveryItem6.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/itemTextual/clearEveryItem6.yml
new file mode 100644
index 0000000000..ef2277cd11
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/itemTextual/clearEveryItem6.yml
@@ -0,0 +1,36 @@
+languageId: plaintext
+command:
+  spokenForm: clear every item
+  version: 2
+  targets:
+    - type: primitive
+      modifiers:
+        - type: everyScope
+          scopeType: { type: collectionItem }
+  usePrePhraseSnapshot: true
+  action: { name: clearAndSetSelection }
+initialState:
+  documentContents: |-
+    a, b,
+    c, d
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+  marks: {}
+finalState:
+  documentContents: |-
+    , ,
+    c, d
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+    - anchor: { line: 0, character: 2 }
+      active: { line: 0, character: 2 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      modifiers: [{ type: everyScope, scopeType: { type: collectionItem } }],
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/itemTextual/clearEveryItem7.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/itemTextual/clearEveryItem7.yml
new file mode 100644
index 0000000000..5810e1d421
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/itemTextual/clearEveryItem7.yml
@@ -0,0 +1,36 @@
+languageId: typescript
+command:
+  spokenForm: clear every item
+  version: 2
+  targets:
+    - type: primitive
+      modifiers:
+        - type: everyScope
+          scopeType: { type: collectionItem }
+  usePrePhraseSnapshot: true
+  action: { name: clearAndSetSelection }
+initialState:
+  documentContents: seq('(', ",", $._import_list, ')')
+  selections:
+    - anchor: { line: 0, character: 6 }
+      active: { line: 0, character: 6 }
+  marks: {}
+finalState:
+  documentContents: seq(, , , )
+  selections:
+    - anchor: { line: 0, character: 4 }
+      active: { line: 0, character: 4 }
+    - anchor: { line: 0, character: 6 }
+      active: { line: 0, character: 6 }
+    - anchor: { line: 0, character: 8 }
+      active: { line: 0, character: 8 }
+    - anchor: { line: 0, character: 10 }
+      active: { line: 0, character: 10 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      modifiers: [{ type: everyScope, scopeType: { type: collectionItem } }],
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/itemTextual/clearEveryItemBlock.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/itemTextual/clearEveryItemBlock.yml
new file mode 100644
index 0000000000..7f8d578351
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/itemTextual/clearEveryItemBlock.yml
@@ -0,0 +1,46 @@
+languageId: plaintext
+command:
+  spokenForm: clear every item block
+  version: 2
+  targets:
+    - type: primitive
+      modifiers:
+        - type: everyScope
+          scopeType: { type: collectionItem }
+        - type: containingScope
+          scopeType: { type: paragraph }
+  usePrePhraseSnapshot: true
+  action: { name: clearAndSetSelection }
+initialState:
+  documentContents: |-
+    a, b,
+    c, d
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+  marks: {}
+finalState:
+  documentContents: |-
+    , ,
+    ,
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+    - anchor: { line: 0, character: 2 }
+      active: { line: 0, character: 2 }
+    - anchor: { line: 1, character: 0 }
+      active: { line: 1, character: 0 }
+    - anchor: { line: 1, character: 2 }
+      active: { line: 1, character: 2 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      modifiers:
+        [
+          { type: everyScope, scopeType: { type: collectionItem } },
+          { type: containingScope, scopeType: { type: paragraph } },
+        ],
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/itemTextual/clearEveryItemToken.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/itemTextual/clearEveryItemToken.yml
new file mode 100644
index 0000000000..d6d3a7982e
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/itemTextual/clearEveryItemToken.yml
@@ -0,0 +1,36 @@
+languageId: plaintext
+command:
+  spokenForm: clear every item token
+  version: 2
+  targets:
+    - type: primitive
+      modifiers:
+        - type: everyScope
+          scopeType: { type: collectionItem }
+        - type: containingScope
+          scopeType: { type: token }
+  usePrePhraseSnapshot: true
+  action: { name: clearAndSetSelection }
+initialState:
+  documentContents: aaa bbb, ccc
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+  marks: {}
+finalState:
+  documentContents: ", ccc"
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      modifiers:
+        [
+          { type: everyScope, scopeType: { type: collectionItem } },
+          { type: containingScope, scopeType: { type: token } },
+        ],
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/itemTextual/clearItem.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/itemTextual/clearItem.yml
new file mode 100644
index 0000000000..ef8c9e1b06
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/itemTextual/clearItem.yml
@@ -0,0 +1,41 @@
+languageId: plaintext
+command:
+  spokenForm: clear item
+  version: 2
+  targets:
+    - type: primitive
+      modifiers:
+        - type: containingScope
+          scopeType: { type: collectionItem }
+  usePrePhraseSnapshot: true
+  action: { name: clearAndSetSelection }
+initialState:
+  documentContents: |-
+    [
+        111,
+        "a\"b\"c",
+        222,
+    ]
+  selections:
+    - anchor: { line: 2, character: 5 }
+      active: { line: 2, character: 5 }
+  marks: {}
+finalState:
+  documentContents: |-
+    [
+        111,
+        ,
+        222,
+    ]
+  selections:
+    - anchor: { line: 2, character: 4 }
+      active: { line: 2, character: 4 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      modifiers:
+        [{ type: containingScope, scopeType: { type: collectionItem } }],
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/itemTextual/clearItem10.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/itemTextual/clearItem10.yml
new file mode 100644
index 0000000000..2f56b27b59
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/itemTextual/clearItem10.yml
@@ -0,0 +1,31 @@
+languageId: typescript
+command:
+  spokenForm: clear item
+  version: 2
+  targets:
+    - type: primitive
+      modifiers:
+        - type: containingScope
+          scopeType: { type: collectionItem }
+  usePrePhraseSnapshot: false
+  action: { name: clearAndSetSelection }
+initialState:
+  documentContents: foo(hello, world)
+  selections:
+    - anchor: { line: 0, character: 10 }
+      active: { line: 0, character: 10 }
+  marks: {}
+finalState:
+  documentContents: foo(hello, )
+  selections:
+    - anchor: { line: 0, character: 11 }
+      active: { line: 0, character: 11 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      modifiers:
+        [{ type: containingScope, scopeType: { type: collectionItem } }],
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/itemTextual/clearItem11.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/itemTextual/clearItem11.yml
new file mode 100644
index 0000000000..8dcf7004da
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/itemTextual/clearItem11.yml
@@ -0,0 +1,31 @@
+languageId: typescript
+command:
+  spokenForm: clear item
+  version: 2
+  targets:
+    - type: primitive
+      modifiers:
+        - type: containingScope
+          scopeType: { type: collectionItem }
+  usePrePhraseSnapshot: false
+  action: { name: clearAndSetSelection }
+initialState:
+  documentContents: foo(hello, world)
+  selections:
+    - anchor: { line: 0, character: 7 }
+      active: { line: 0, character: 13 }
+  marks: {}
+finalState:
+  documentContents: foo()
+  selections:
+    - anchor: { line: 0, character: 4 }
+      active: { line: 0, character: 4 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      modifiers:
+        [{ type: containingScope, scopeType: { type: collectionItem } }],
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/itemTextual/clearItem2.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/itemTextual/clearItem2.yml
new file mode 100644
index 0000000000..854159902e
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/itemTextual/clearItem2.yml
@@ -0,0 +1,41 @@
+languageId: plaintext
+command:
+  spokenForm: clear item
+  version: 2
+  targets:
+    - type: primitive
+      modifiers:
+        - type: containingScope
+          scopeType: { type: collectionItem }
+  usePrePhraseSnapshot: true
+  action: { name: clearAndSetSelection }
+initialState:
+  documentContents: |-
+    [
+        111,
+        "a\"b\"c",
+        222,
+    ]
+  selections:
+    - anchor: { line: 2, character: 9 }
+      active: { line: 2, character: 9 }
+  marks: {}
+finalState:
+  documentContents: |-
+    [
+        111,
+        ,
+        222,
+    ]
+  selections:
+    - anchor: { line: 2, character: 4 }
+      active: { line: 2, character: 4 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      modifiers:
+        [{ type: containingScope, scopeType: { type: collectionItem } }],
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/itemTextual/clearItem3.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/itemTextual/clearItem3.yml
new file mode 100644
index 0000000000..d8fbf4930b
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/itemTextual/clearItem3.yml
@@ -0,0 +1,41 @@
+languageId: plaintext
+command:
+  spokenForm: clear item
+  version: 2
+  targets:
+    - type: primitive
+      modifiers:
+        - type: containingScope
+          scopeType: { type: collectionItem }
+  usePrePhraseSnapshot: true
+  action: { name: clearAndSetSelection }
+initialState:
+  documentContents: |-
+    [
+        111,
+        "a\"b\"c",
+        222,
+    ]
+  selections:
+    - anchor: { line: 2, character: 12 }
+      active: { line: 2, character: 12 }
+  marks: {}
+finalState:
+  documentContents: |-
+    [
+        111,
+        ,
+        222,
+    ]
+  selections:
+    - anchor: { line: 2, character: 4 }
+      active: { line: 2, character: 4 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      modifiers:
+        [{ type: containingScope, scopeType: { type: collectionItem } }],
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/itemTextual/clearItem4.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/itemTextual/clearItem4.yml
new file mode 100644
index 0000000000..abb50bea45
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/itemTextual/clearItem4.yml
@@ -0,0 +1,31 @@
+languageId: plaintext
+command:
+  spokenForm: clear item
+  version: 2
+  targets:
+    - type: primitive
+      modifiers:
+        - type: containingScope
+          scopeType: { type: collectionItem }
+  usePrePhraseSnapshot: true
+  action: { name: clearAndSetSelection }
+initialState:
+  documentContents: (aaa)
+  selections:
+    - anchor: { line: 0, character: 2 }
+      active: { line: 0, character: 2 }
+  marks: {}
+finalState:
+  documentContents: ()
+  selections:
+    - anchor: { line: 0, character: 1 }
+      active: { line: 0, character: 1 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      modifiers:
+        [{ type: containingScope, scopeType: { type: collectionItem } }],
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/itemTextual/clearItem5.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/itemTextual/clearItem5.yml
new file mode 100644
index 0000000000..8d54f8fe12
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/itemTextual/clearItem5.yml
@@ -0,0 +1,31 @@
+languageId: plaintext
+command:
+  spokenForm: clear item
+  version: 2
+  targets:
+    - type: primitive
+      modifiers:
+        - type: containingScope
+          scopeType: { type: collectionItem }
+  usePrePhraseSnapshot: true
+  action: { name: clearAndSetSelection }
+initialState:
+  documentContents: aaa aaa, bbb bbb
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+  marks: {}
+finalState:
+  documentContents: ", bbb bbb"
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      modifiers:
+        [{ type: containingScope, scopeType: { type: collectionItem } }],
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/itemTextual/clearItem6.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/itemTextual/clearItem6.yml
new file mode 100644
index 0000000000..83ceca43b5
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/itemTextual/clearItem6.yml
@@ -0,0 +1,31 @@
+languageId: plaintext
+command:
+  spokenForm: clear item
+  version: 2
+  targets:
+    - type: primitive
+      modifiers:
+        - type: containingScope
+          scopeType: { type: collectionItem }
+  usePrePhraseSnapshot: true
+  action: { name: clearAndSetSelection }
+initialState:
+  documentContents: aaa aaa
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+  marks: {}
+finalState:
+  documentContents: ""
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      modifiers:
+        [{ type: containingScope, scopeType: { type: collectionItem } }],
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/itemTextual/clearItem7.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/itemTextual/clearItem7.yml
new file mode 100644
index 0000000000..3db3182005
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/itemTextual/clearItem7.yml
@@ -0,0 +1,31 @@
+languageId: plaintext
+command:
+  spokenForm: clear item
+  version: 2
+  targets:
+    - type: primitive
+      modifiers:
+        - type: containingScope
+          scopeType: { type: collectionItem }
+  usePrePhraseSnapshot: true
+  action: { name: clearAndSetSelection }
+initialState:
+  documentContents: a, "foo(bar)baz", b
+  selections:
+    - anchor: { line: 0, character: 8 }
+      active: { line: 0, character: 8 }
+  marks: {}
+finalState:
+  documentContents: a, "foo()baz", b
+  selections:
+    - anchor: { line: 0, character: 8 }
+      active: { line: 0, character: 8 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      modifiers:
+        [{ type: containingScope, scopeType: { type: collectionItem } }],
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/itemTextual/clearItem8.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/itemTextual/clearItem8.yml
new file mode 100644
index 0000000000..afd78a7dc7
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/itemTextual/clearItem8.yml
@@ -0,0 +1,31 @@
+languageId: plaintext
+command:
+  spokenForm: clear item
+  version: 2
+  targets:
+    - type: primitive
+      modifiers:
+        - type: containingScope
+          scopeType: { type: collectionItem }
+  usePrePhraseSnapshot: true
+  action: { name: clearAndSetSelection }
+initialState:
+  documentContents: a, "foo(bar)baz", b
+  selections:
+    - anchor: { line: 0, character: 4 }
+      active: { line: 0, character: 4 }
+  marks: {}
+finalState:
+  documentContents: a, , b
+  selections:
+    - anchor: { line: 0, character: 3 }
+      active: { line: 0, character: 3 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      modifiers:
+        [{ type: containingScope, scopeType: { type: collectionItem } }],
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/itemTextual/clearItem9.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/itemTextual/clearItem9.yml
new file mode 100644
index 0000000000..3a32203093
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/itemTextual/clearItem9.yml
@@ -0,0 +1,31 @@
+languageId: typescript
+command:
+  spokenForm: clear item
+  version: 2
+  targets:
+    - type: primitive
+      modifiers:
+        - type: containingScope
+          scopeType: { type: collectionItem }
+  usePrePhraseSnapshot: true
+  action: { name: clearAndSetSelection }
+initialState:
+  documentContents: foo(hello, world)
+  selections:
+    - anchor: { line: 0, character: 9 }
+      active: { line: 0, character: 9 }
+  marks: {}
+finalState:
+  documentContents: foo(, world)
+  selections:
+    - anchor: { line: 0, character: 4 }
+      active: { line: 0, character: 4 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      modifiers:
+        [{ type: containingScope, scopeType: { type: collectionItem } }],
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/itemTextual/clearItemDrip.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/itemTextual/clearItemDrip.yml
new file mode 100644
index 0000000000..fcb750e986
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/itemTextual/clearItemDrip.yml
@@ -0,0 +1,35 @@
+languageId: typescript
+command:
+  spokenForm: clear item drip
+  version: 2
+  targets:
+    - type: primitive
+      modifiers:
+        - type: containingScope
+          scopeType: { type: collectionItem }
+      mark: { type: decoratedSymbol, symbolColor: default, character: "," }
+  usePrePhraseSnapshot: true
+  action: { name: clearAndSetSelection }
+initialState:
+  documentContents: foo(hello, world)
+  selections:
+    - anchor: { line: 0, character: 13 }
+      active: { line: 0, character: 13 }
+  marks:
+    default.,:
+      start: { line: 0, character: 9 }
+      end: { line: 0, character: 10 }
+finalState:
+  documentContents: foo()
+  selections:
+    - anchor: { line: 0, character: 4 }
+      active: { line: 0, character: 4 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: decoratedSymbol, symbolColor: default, character: "," },
+      modifiers:
+        [{ type: containingScope, scopeType: { type: collectionItem } }],
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/itemTextual/drinkItem.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/itemTextual/drinkItem.yml
new file mode 100644
index 0000000000..6b73e5f216
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/itemTextual/drinkItem.yml
@@ -0,0 +1,42 @@
+languageId: plaintext
+command:
+  spokenForm: drink item
+  version: 2
+  targets:
+    - type: primitive
+      modifiers:
+        - type: containingScope
+          scopeType: { type: collectionItem }
+  usePrePhraseSnapshot: true
+  action: { name: editNewLineBefore }
+initialState:
+  documentContents: |-
+    [
+        aaa,
+        bbb,
+        ccc
+    ]
+  selections:
+    - anchor: { line: 3, character: 7 }
+      active: { line: 3, character: 7 }
+  marks: {}
+finalState:
+  documentContents: |-
+    [
+        aaa,
+        bbb,
+        ,
+        ccc
+    ]
+  selections:
+    - anchor: { line: 3, character: 4 }
+      active: { line: 3, character: 4 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      modifiers:
+        [{ type: containingScope, scopeType: { type: collectionItem } }],
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/itemTextual/drinkItem2.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/itemTextual/drinkItem2.yml
new file mode 100644
index 0000000000..3f8dabd1d0
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/itemTextual/drinkItem2.yml
@@ -0,0 +1,42 @@
+languageId: plaintext
+command:
+  spokenForm: drink item
+  version: 2
+  targets:
+    - type: primitive
+      modifiers:
+        - type: containingScope
+          scopeType: { type: collectionItem }
+  usePrePhraseSnapshot: true
+  action: { name: editNewLineBefore }
+initialState:
+  documentContents: |-
+    [
+        aaa,
+        bbb,
+        ccc,
+    ]
+  selections:
+    - anchor: { line: 3, character: 7 }
+      active: { line: 3, character: 7 }
+  marks: {}
+finalState:
+  documentContents: |-
+    [
+        aaa,
+        bbb,
+        ,
+        ccc,
+    ]
+  selections:
+    - anchor: { line: 3, character: 4 }
+      active: { line: 3, character: 4 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      modifiers:
+        [{ type: containingScope, scopeType: { type: collectionItem } }],
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/itemTextual/takeEveryItem.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/itemTextual/takeEveryItem.yml
new file mode 100644
index 0000000000..64a68e3df3
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/itemTextual/takeEveryItem.yml
@@ -0,0 +1,62 @@
+languageId: plaintext
+command:
+  spokenForm: take every item
+  version: 2
+  targets:
+    - type: primitive
+      modifiers:
+        - type: everyScope
+          scopeType: { type: collectionItem }
+  usePrePhraseSnapshot: true
+  action: { name: setSelection }
+initialState:
+  documentContents: |-
+    [
+        a b, (c, d),
+        e f, {g, h},
+        i j, [k, l],
+        m n, <o, p>,
+    ]
+  selections:
+    - anchor: { line: 1, character: 10 }
+      active: { line: 1, character: 10 }
+    - anchor: { line: 2, character: 10 }
+      active: { line: 2, character: 10 }
+    - anchor: { line: 3, character: 10 }
+      active: { line: 3, character: 10 }
+    - anchor: { line: 4, character: 10 }
+      active: { line: 4, character: 10 }
+  marks: {}
+finalState:
+  documentContents: |-
+    [
+        a b, (c, d),
+        e f, {g, h},
+        i j, [k, l],
+        m n, <o, p>,
+    ]
+  selections:
+    - anchor: { line: 1, character: 10 }
+      active: { line: 1, character: 11 }
+    - anchor: { line: 1, character: 13 }
+      active: { line: 1, character: 14 }
+    - anchor: { line: 2, character: 10 }
+      active: { line: 2, character: 11 }
+    - anchor: { line: 2, character: 13 }
+      active: { line: 2, character: 14 }
+    - anchor: { line: 3, character: 10 }
+      active: { line: 3, character: 11 }
+    - anchor: { line: 3, character: 13 }
+      active: { line: 3, character: 14 }
+    - anchor: { line: 4, character: 10 }
+      active: { line: 4, character: 11 }
+    - anchor: { line: 4, character: 13 }
+      active: { line: 4, character: 14 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      modifiers: [{ type: everyScope, scopeType: { type: collectionItem } }],
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/itemTextual/takeEveryItemAir.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/itemTextual/takeEveryItemAir.yml
new file mode 100644
index 0000000000..789abd8206
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/itemTextual/takeEveryItemAir.yml
@@ -0,0 +1,72 @@
+languageId: plaintext
+command:
+  spokenForm: take every item air
+  version: 2
+  targets:
+    - type: primitive
+      mark: { type: decoratedSymbol, symbolColor: default, character: a }
+      modifiers:
+        - type: everyScope
+          scopeType: { type: collectionItem }
+  usePrePhraseSnapshot: true
+  action: { name: setSelection }
+initialState:
+  documentContents: |-
+    [
+        a b, (c, d),
+        e f, {g, h},
+        i j, [k, l],
+        m n, <o, p>,
+        q r, "s, t",
+        u v, "foo(bar)baz",
+    ]
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+  marks:
+    default.a:
+      start: { line: 1, character: 4 }
+      end: { line: 1, character: 5 }
+finalState:
+  documentContents: |-
+    [
+        a b, (c, d),
+        e f, {g, h},
+        i j, [k, l],
+        m n, <o, p>,
+        q r, "s, t",
+        u v, "foo(bar)baz",
+    ]
+  selections:
+    - anchor: { line: 1, character: 4 }
+      active: { line: 1, character: 7 }
+    - anchor: { line: 1, character: 9 }
+      active: { line: 1, character: 15 }
+    - anchor: { line: 2, character: 4 }
+      active: { line: 2, character: 7 }
+    - anchor: { line: 2, character: 9 }
+      active: { line: 2, character: 15 }
+    - anchor: { line: 3, character: 4 }
+      active: { line: 3, character: 7 }
+    - anchor: { line: 3, character: 9 }
+      active: { line: 3, character: 15 }
+    - anchor: { line: 4, character: 4 }
+      active: { line: 4, character: 7 }
+    - anchor: { line: 4, character: 9 }
+      active: { line: 4, character: 15 }
+    - anchor: { line: 5, character: 4 }
+      active: { line: 5, character: 7 }
+    - anchor: { line: 5, character: 9 }
+      active: { line: 5, character: 15 }
+    - anchor: { line: 6, character: 4 }
+      active: { line: 6, character: 7 }
+    - anchor: { line: 6, character: 9 }
+      active: { line: 6, character: 22 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: decoratedSymbol, symbolColor: default, character: a },
+      modifiers: [{ type: everyScope, scopeType: { type: collectionItem } }],
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/itemTextual/takeItemAir.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/itemTextual/takeItemAir.yml
new file mode 100644
index 0000000000..884476ec3e
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/itemTextual/takeItemAir.yml
@@ -0,0 +1,51 @@
+languageId: plaintext
+command:
+  spokenForm: take item air
+  version: 2
+  targets:
+    - type: primitive
+      mark: { type: decoratedSymbol, symbolColor: default, character: a }
+      modifiers:
+        - type: containingScope
+          scopeType: { type: collectionItem }
+  usePrePhraseSnapshot: true
+  action: { name: setSelection }
+initialState:
+  documentContents: |-
+    [
+        a b, (c, d),
+        e f, {g, h},
+        i j, [k, l],
+        m n, <o, p>,
+        q r, "s, t",
+        u v, "foo(bar)baz",
+    ]
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+  marks:
+    default.a:
+      start: { line: 1, character: 4 }
+      end: { line: 1, character: 5 }
+finalState:
+  documentContents: |-
+    [
+        a b, (c, d),
+        e f, {g, h},
+        i j, [k, l],
+        m n, <o, p>,
+        q r, "s, t",
+        u v, "foo(bar)baz",
+    ]
+  selections:
+    - anchor: { line: 1, character: 4 }
+      active: { line: 1, character: 7 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: decoratedSymbol, symbolColor: default, character: a },
+      modifiers:
+        [{ type: containingScope, scopeType: { type: collectionItem } }],
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/itemTextual/takeItemBlueRisk.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/itemTextual/takeItemBlueRisk.yml
new file mode 100644
index 0000000000..d693281d85
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/itemTextual/takeItemBlueRisk.yml
@@ -0,0 +1,51 @@
+languageId: plaintext
+command:
+  spokenForm: take item blue risk
+  version: 2
+  targets:
+    - type: primitive
+      mark: { type: decoratedSymbol, symbolColor: blue, character: r }
+      modifiers:
+        - type: containingScope
+          scopeType: { type: collectionItem }
+  usePrePhraseSnapshot: true
+  action: { name: setSelection }
+initialState:
+  documentContents: |-
+    [
+        a b, (c, d),
+        e f, {g, h},
+        i j, [k, l],
+        m n, <o, p>,
+        q r, "s, t",
+        u v, "foo(bar)baz",
+    ]
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+  marks:
+    blue.r:
+      start: { line: 6, character: 14 }
+      end: { line: 6, character: 17 }
+finalState:
+  documentContents: |-
+    [
+        a b, (c, d),
+        e f, {g, h},
+        i j, [k, l],
+        m n, <o, p>,
+        q r, "s, t",
+        u v, "foo(bar)baz",
+    ]
+  selections:
+    - anchor: { line: 6, character: 14 }
+      active: { line: 6, character: 17 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: decoratedSymbol, symbolColor: blue, character: r },
+      modifiers:
+        [{ type: containingScope, scopeType: { type: collectionItem } }],
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/c/clearFunk.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/c/clearFunk.yml
new file mode 100644
index 0000000000..178e1ba7c8
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/c/clearFunk.yml
@@ -0,0 +1,33 @@
+languageId: c
+command:
+  version: 1
+  spokenForm: clear funk
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier: { type: containingScope, scopeType: namedFunction }
+initialState:
+  documentContents: |-
+    int f(int a, int b) {
+
+    }
+  selections:
+    - anchor: { line: 1, character: 4 }
+      active: { line: 1, character: 4 }
+  marks: {}
+finalState:
+  documentContents: ""
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      modifier: { type: containingScope, scopeType: namedFunction },
+      insideOutsideType: inside,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/clojure/changeCallee.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/clojure/changeCallee.yml
new file mode 100644
index 0000000000..cfbb04a5c5
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/clojure/changeCallee.yml
@@ -0,0 +1,41 @@
+languageId: clojure
+command:
+  version: 1
+  spokenForm: change callee
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier:
+        {
+          type: containingScope,
+          scopeType: functionCallee,
+          includeSiblings: false,
+        }
+initialState:
+  documentContents: (foo bar)
+  selections:
+    - anchor: { line: 0, character: 6 }
+      active: { line: 0, character: 6 }
+  marks: {}
+finalState:
+  documentContents: ( bar)
+  selections:
+    - anchor: { line: 0, character: 1 }
+      active: { line: 0, character: 1 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        {
+          type: containingScope,
+          scopeType: functionCallee,
+          includeSiblings: false,
+        },
+      isImplicit: false,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/clojure/changeCallee2.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/clojure/changeCallee2.yml
new file mode 100644
index 0000000000..84331940fd
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/clojure/changeCallee2.yml
@@ -0,0 +1,41 @@
+languageId: clojure
+command:
+  version: 1
+  spokenForm: change callee
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier:
+        {
+          type: containingScope,
+          scopeType: functionCallee,
+          includeSiblings: false,
+        }
+initialState:
+  documentContents: (defn messenger ([]     (messenger "Hello world!")))
+  selections:
+    - anchor: { line: 0, character: 43 }
+      active: { line: 0, character: 43 }
+  marks: {}
+finalState:
+  documentContents: (defn messenger ([]     ( "Hello world!")))
+  selections:
+    - anchor: { line: 0, character: 25 }
+      active: { line: 0, character: 25 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        {
+          type: containingScope,
+          scopeType: functionCallee,
+          includeSiblings: false,
+        },
+      isImplicit: false,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/clojure/changeCallee3.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/clojure/changeCallee3.yml
new file mode 100644
index 0000000000..9030b4d96d
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/clojure/changeCallee3.yml
@@ -0,0 +1,41 @@
+languageId: clojure
+command:
+  version: 1
+  spokenForm: change callee
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier:
+        {
+          type: containingScope,
+          scopeType: functionCallee,
+          includeSiblings: false,
+        }
+initialState:
+  documentContents: (  (fn [message] (println message))  "Hello world!" )
+  selections:
+    - anchor: { line: 0, character: 45 }
+      active: { line: 0, character: 45 }
+  marks: {}
+finalState:
+  documentContents: (    "Hello world!" )
+  selections:
+    - anchor: { line: 0, character: 3 }
+      active: { line: 0, character: 3 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        {
+          type: containingScope,
+          scopeType: functionCallee,
+          includeSiblings: false,
+        },
+      isImplicit: false,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/clojure/changeCallee4.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/clojure/changeCallee4.yml
new file mode 100644
index 0000000000..45eb3bd98d
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/clojure/changeCallee4.yml
@@ -0,0 +1,41 @@
+languageId: clojure
+command:
+  version: 1
+  spokenForm: change callee
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier:
+        {
+          type: containingScope,
+          scopeType: functionCallee,
+          includeSiblings: false,
+        }
+initialState:
+  documentContents: (apply f '(1 2 3 4))
+  selections:
+    - anchor: { line: 0, character: 15 }
+      active: { line: 0, character: 16 }
+  marks: {}
+finalState:
+  documentContents: ( f '(1 2 3 4))
+  selections:
+    - anchor: { line: 0, character: 1 }
+      active: { line: 0, character: 1 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        {
+          type: containingScope,
+          scopeType: functionCallee,
+          includeSiblings: false,
+        },
+      isImplicit: false,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/clojure/chuckItemFine.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/clojure/chuckItemFine.yml
new file mode 100644
index 0000000000..66c41b7a6b
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/clojure/chuckItemFine.yml
@@ -0,0 +1,59 @@
+languageId: clojure
+command:
+  version: 1
+  spokenForm: chuck item fine
+  action: remove
+  targets:
+    - type: primitive
+      modifier:
+        {
+          type: containingScope,
+          scopeType: collectionItem,
+          includeSiblings: false,
+        }
+      mark: { type: decoratedSymbol, symbolColor: default, character: f }
+initialState:
+  documentContents: |-
+    {
+        :foo "bar",
+        ;; hello
+        :baz "whatever",
+    }
+  selections:
+    - anchor: { line: 4, character: 1 }
+      active: { line: 4, character: 1 }
+  marks:
+    default.f:
+      start: { line: 1, character: 5 }
+      end: { line: 1, character: 8 }
+finalState:
+  documentContents: |-
+    {
+        ;; hello
+        :baz "whatever",
+    }
+  selections:
+    - anchor: { line: 3, character: 1 }
+      active: { line: 3, character: 1 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark:
+        {
+          type: decoratedSymbol,
+          symbolColor: default,
+          character: f,
+          usePrePhraseSnapshot: true,
+        },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: outside,
+      modifier:
+        {
+          type: containingScope,
+          scopeType: collectionItem,
+          includeSiblings: false,
+        },
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/clojure/chuckItemFine2.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/clojure/chuckItemFine2.yml
new file mode 100644
index 0000000000..a29a5b8c79
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/clojure/chuckItemFine2.yml
@@ -0,0 +1,57 @@
+languageId: clojure
+command:
+  version: 1
+  spokenForm: chuck item fine
+  action: remove
+  targets:
+    - type: primitive
+      modifier:
+        {
+          type: containingScope,
+          scopeType: collectionItem,
+          includeSiblings: false,
+        }
+      mark: { type: decoratedSymbol, symbolColor: default, character: f }
+initialState:
+  documentContents: |-
+    {
+        :foo "bar",
+        :baz "whatever",
+    }
+  selections:
+    - anchor: { line: 3, character: 1 }
+      active: { line: 3, character: 1 }
+  marks:
+    default.f:
+      start: { line: 1, character: 5 }
+      end: { line: 1, character: 8 }
+finalState:
+  documentContents: |-
+    {
+        :baz "whatever",
+    }
+  selections:
+    - anchor: { line: 2, character: 1 }
+      active: { line: 2, character: 1 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark:
+        {
+          type: decoratedSymbol,
+          symbolColor: default,
+          character: f,
+          usePrePhraseSnapshot: true,
+        },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: outside,
+      modifier:
+        {
+          type: containingScope,
+          scopeType: collectionItem,
+          includeSiblings: false,
+        },
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/clojure/chuckItemZip.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/clojure/chuckItemZip.yml
new file mode 100644
index 0000000000..b06031225b
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/clojure/chuckItemZip.yml
@@ -0,0 +1,60 @@
+languageId: clojure
+command:
+  version: 1
+  spokenForm: chuck item zip
+  action: remove
+  targets:
+    - type: primitive
+      modifier:
+        {
+          type: containingScope,
+          scopeType: collectionItem,
+          includeSiblings: false,
+        }
+      mark: { type: decoratedSymbol, symbolColor: default, character: z }
+initialState:
+  documentContents: |-
+    {
+        :foo "bar",
+        ;; hello
+        :baz "whatever",
+    }
+  selections:
+    - anchor: { line: 4, character: 1 }
+      active: { line: 4, character: 1 }
+  marks:
+    default.z:
+      start: { line: 3, character: 5 }
+      end: { line: 3, character: 8 }
+finalState:
+  documentContents: |-
+    {
+        :foo "bar",
+        ;; hello
+    ,
+    }
+  selections:
+    - anchor: { line: 4, character: 1 }
+      active: { line: 4, character: 1 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark:
+        {
+          type: decoratedSymbol,
+          symbolColor: default,
+          character: z,
+          usePrePhraseSnapshot: true,
+        },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: outside,
+      modifier:
+        {
+          type: containingScope,
+          scopeType: collectionItem,
+          includeSiblings: false,
+        },
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/clojure/chuckItemZip2.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/clojure/chuckItemZip2.yml
new file mode 100644
index 0000000000..cc80114268
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/clojure/chuckItemZip2.yml
@@ -0,0 +1,57 @@
+languageId: clojure
+command:
+  version: 1
+  spokenForm: chuck item zip
+  action: remove
+  targets:
+    - type: primitive
+      modifier:
+        {
+          type: containingScope,
+          scopeType: collectionItem,
+          includeSiblings: false,
+        }
+      mark: { type: decoratedSymbol, symbolColor: default, character: z }
+initialState:
+  documentContents: |-
+    {
+        :foo "bar",
+        :baz "whatever",
+    }
+  selections:
+    - anchor: { line: 3, character: 1 }
+      active: { line: 3, character: 1 }
+  marks:
+    default.z:
+      start: { line: 2, character: 5 }
+      end: { line: 2, character: 8 }
+finalState:
+  documentContents: |-
+    {
+        :foo "bar",
+    }
+  selections:
+    - anchor: { line: 2, character: 1 }
+      active: { line: 2, character: 1 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark:
+        {
+          type: decoratedSymbol,
+          symbolColor: default,
+          character: z,
+          usePrePhraseSnapshot: true,
+        },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: outside,
+      modifier:
+        {
+          type: containingScope,
+          scopeType: collectionItem,
+          includeSiblings: false,
+        },
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/clojure/clearArgue.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/clojure/clearArgue.yml
new file mode 100644
index 0000000000..4c4d1a0d02
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/clojure/clearArgue.yml
@@ -0,0 +1,40 @@
+languageId: clojure
+command:
+  version: 1
+  spokenForm: clear argue
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier:
+        {
+          type: containingScope,
+          scopeType: argumentOrParameter,
+          includeSiblings: false,
+        }
+initialState:
+  documentContents: (foo :bar)
+  selections:
+    - anchor: { line: 0, character: 6 }
+      active: { line: 0, character: 6 }
+  marks: {}
+finalState:
+  documentContents: (foo )
+  selections:
+    - anchor: { line: 0, character: 5 }
+      active: { line: 0, character: 5 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        {
+          type: containingScope,
+          scopeType: argumentOrParameter,
+          includeSiblings: false,
+        },
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/clojure/clearArgue2.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/clojure/clearArgue2.yml
new file mode 100644
index 0000000000..9e00d1f545
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/clojure/clearArgue2.yml
@@ -0,0 +1,40 @@
+languageId: clojure
+command:
+  version: 1
+  spokenForm: clear argue
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier:
+        {
+          type: containingScope,
+          scopeType: argumentOrParameter,
+          includeSiblings: false,
+        }
+initialState:
+  documentContents: (hello (foo :bar))
+  selections:
+    - anchor: { line: 0, character: 10 }
+      active: { line: 0, character: 10 }
+  marks: {}
+finalState:
+  documentContents: (hello )
+  selections:
+    - anchor: { line: 0, character: 7 }
+      active: { line: 0, character: 7 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        {
+          type: containingScope,
+          scopeType: argumentOrParameter,
+          includeSiblings: false,
+        },
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/clojure/clearArgue3.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/clojure/clearArgue3.yml
new file mode 100644
index 0000000000..6e2fc54b9e
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/clojure/clearArgue3.yml
@@ -0,0 +1,40 @@
+languageId: clojure
+command:
+  version: 1
+  spokenForm: clear argue
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier:
+        {
+          type: containingScope,
+          scopeType: argumentOrParameter,
+          includeSiblings: false,
+        }
+initialState:
+  documentContents: (foo '(hello there))
+  selections:
+    - anchor: { line: 0, character: 17 }
+      active: { line: 0, character: 17 }
+  marks: {}
+finalState:
+  documentContents: (foo )
+  selections:
+    - anchor: { line: 0, character: 5 }
+      active: { line: 0, character: 5 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        {
+          type: containingScope,
+          scopeType: argumentOrParameter,
+          includeSiblings: false,
+        },
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/clojure/clearCall.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/clojure/clearCall.yml
new file mode 100644
index 0000000000..7acddcb868
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/clojure/clearCall.yml
@@ -0,0 +1,40 @@
+languageId: clojure
+command:
+  version: 1
+  spokenForm: clear call
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier:
+        {
+          type: containingScope,
+          scopeType: functionCall,
+          includeSiblings: false,
+        }
+initialState:
+  documentContents: (hello)
+  selections:
+    - anchor: { line: 0, character: 2 }
+      active: { line: 0, character: 2 }
+  marks: {}
+finalState:
+  documentContents: ""
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        {
+          type: containingScope,
+          scopeType: functionCall,
+          includeSiblings: false,
+        },
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/clojure/clearCall2.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/clojure/clearCall2.yml
new file mode 100644
index 0000000000..e6da07cdc4
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/clojure/clearCall2.yml
@@ -0,0 +1,40 @@
+languageId: clojure
+command:
+  version: 1
+  spokenForm: clear call
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier:
+        {
+          type: containingScope,
+          scopeType: functionCall,
+          includeSiblings: false,
+        }
+initialState:
+  documentContents: (foo '(bar))
+  selections:
+    - anchor: { line: 0, character: 9 }
+      active: { line: 0, character: 9 }
+  marks: {}
+finalState:
+  documentContents: ""
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        {
+          type: containingScope,
+          scopeType: functionCall,
+          includeSiblings: false,
+        },
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/clojure/clearComment.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/clojure/clearComment.yml
new file mode 100644
index 0000000000..11b38c9207
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/clojure/clearComment.yml
@@ -0,0 +1,32 @@
+languageId: clojure
+command:
+  version: 1
+  spokenForm: clear comment
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier:
+        { type: containingScope, scopeType: comment, includeSiblings: false }
+initialState:
+  documentContents: ;; hello
+  selections:
+    - anchor: { line: 0, character: 6 }
+      active: { line: 0, character: 6 }
+  marks: {}
+finalState:
+  documentContents: ""
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        { type: containingScope, scopeType: comment, includeSiblings: false },
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/clojure/clearCondition.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/clojure/clearCondition.yml
new file mode 100644
index 0000000000..572864e8d8
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/clojure/clearCondition.yml
@@ -0,0 +1,32 @@
+languageId: clojure
+command:
+  version: 1
+  spokenForm: clear condition
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier:
+        { type: containingScope, scopeType: condition, includeSiblings: false }
+initialState:
+  documentContents: (if true "hello")
+  selections:
+    - anchor: { line: 0, character: 14 }
+      active: { line: 0, character: 14 }
+  marks: {}
+finalState:
+  documentContents: (if  "hello")
+  selections:
+    - anchor: { line: 0, character: 4 }
+      active: { line: 0, character: 4 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        { type: containingScope, scopeType: condition, includeSiblings: false },
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/clojure/clearEveryItem.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/clojure/clearEveryItem.yml
new file mode 100644
index 0000000000..d6cc7a1a24
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/clojure/clearEveryItem.yml
@@ -0,0 +1,54 @@
+languageId: clojure
+command:
+  version: 1
+  spokenForm: clear every item
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier:
+        {
+          type: containingScope,
+          scopeType: collectionItem,
+          includeSiblings: true,
+        }
+initialState:
+  documentContents: |-
+
+    {
+        :foo "bar",
+        ;; hello
+        :baz "whatever",
+    }
+  selections:
+    - anchor: { line: 4, character: 13 }
+      active: { line: 4, character: 13 }
+  marks: {}
+finalState:
+  documentContents: |-
+
+    {
+        ,
+        ;; hello
+        ,
+    }
+  selections:
+    - anchor: { line: 2, character: 4 }
+      active: { line: 2, character: 4 }
+    - anchor: { line: 4, character: 4 }
+      active: { line: 4, character: 4 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        {
+          type: containingScope,
+          scopeType: collectionItem,
+          includeSiblings: true,
+        },
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/clojure/clearEveryKey.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/clojure/clearEveryKey.yml
new file mode 100644
index 0000000000..bd359bad80
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/clojure/clearEveryKey.yml
@@ -0,0 +1,54 @@
+languageId: clojure
+command:
+  version: 1
+  spokenForm: clear every key
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier:
+        {
+          type: containingScope,
+          scopeType: collectionKey,
+          includeSiblings: true,
+        }
+initialState:
+  documentContents: |-
+
+    {
+        :foo "bar",
+        ;; hello
+        :baz "whatever",
+    }
+  selections:
+    - anchor: { line: 4, character: 13 }
+      active: { line: 4, character: 13 }
+  marks: {}
+finalState:
+  documentContents: |-
+
+    {
+         "bar",
+        ;; hello
+         "whatever",
+    }
+  selections:
+    - anchor: { line: 2, character: 4 }
+      active: { line: 2, character: 4 }
+    - anchor: { line: 4, character: 4 }
+      active: { line: 4, character: 4 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        {
+          type: containingScope,
+          scopeType: collectionKey,
+          includeSiblings: true,
+        },
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/clojure/clearEveryValue.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/clojure/clearEveryValue.yml
new file mode 100644
index 0000000000..4707526279
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/clojure/clearEveryValue.yml
@@ -0,0 +1,46 @@
+languageId: clojure
+command:
+  version: 1
+  spokenForm: clear every value
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier:
+        { type: containingScope, scopeType: value, includeSiblings: true }
+initialState:
+  documentContents: |-
+
+    {
+        :foo "bar",
+        ;; hello
+        :baz "whatever",
+    }
+  selections:
+    - anchor: { line: 4, character: 13 }
+      active: { line: 4, character: 13 }
+  marks: {}
+finalState:
+  documentContents: |-
+
+    {
+        :foo ,
+        ;; hello
+        :baz ,
+    }
+  selections:
+    - anchor: { line: 2, character: 9 }
+      active: { line: 2, character: 9 }
+    - anchor: { line: 4, character: 9 }
+      active: { line: 4, character: 9 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        { type: containingScope, scopeType: value, includeSiblings: true },
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/clojure/clearFunk.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/clojure/clearFunk.yml
new file mode 100644
index 0000000000..7731a4af6e
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/clojure/clearFunk.yml
@@ -0,0 +1,43 @@
+languageId: clojure
+command:
+  version: 1
+  spokenForm: clear funk
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier:
+        {
+          type: containingScope,
+          scopeType: namedFunction,
+          includeSiblings: false,
+        }
+initialState:
+  documentContents: |-
+    (defn say-hello
+      [name]
+      (println (str "Hello, " name)))
+  selections:
+    - anchor: { line: 2, character: 4 }
+      active: { line: 2, character: 4 }
+  marks: {}
+finalState:
+  documentContents: ""
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        {
+          type: containingScope,
+          scopeType: namedFunction,
+          includeSiblings: false,
+        },
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/clojure/clearFunk2.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/clojure/clearFunk2.yml
new file mode 100644
index 0000000000..693e437e4d
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/clojure/clearFunk2.yml
@@ -0,0 +1,40 @@
+languageId: clojure
+command:
+  version: 1
+  spokenForm: clear funk
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier:
+        {
+          type: containingScope,
+          scopeType: namedFunction,
+          includeSiblings: false,
+        }
+initialState:
+  documentContents: (defmacro foo [bar] "baz" (bongo))
+  selections:
+    - anchor: { line: 0, character: 30 }
+      active: { line: 0, character: 30 }
+  marks: {}
+finalState:
+  documentContents: ""
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        {
+          type: containingScope,
+          scopeType: namedFunction,
+          includeSiblings: false,
+        },
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/clojure/clearIfState.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/clojure/clearIfState.yml
new file mode 100644
index 0000000000..390761595e
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/clojure/clearIfState.yml
@@ -0,0 +1,40 @@
+languageId: clojure
+command:
+  version: 1
+  spokenForm: clear if state
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier:
+        {
+          type: containingScope,
+          scopeType: ifStatement,
+          includeSiblings: false,
+        }
+initialState:
+  documentContents: (if true "hello")
+  selections:
+    - anchor: { line: 0, character: 14 }
+      active: { line: 0, character: 14 }
+  marks: {}
+finalState:
+  documentContents: ""
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        {
+          type: containingScope,
+          scopeType: ifStatement,
+          includeSiblings: false,
+        },
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/clojure/clearItem.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/clojure/clearItem.yml
new file mode 100644
index 0000000000..9f5c84e310
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/clojure/clearItem.yml
@@ -0,0 +1,50 @@
+languageId: clojure
+command:
+  version: 1
+  spokenForm: clear item
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier:
+        {
+          type: containingScope,
+          scopeType: collectionItem,
+          includeSiblings: false,
+        }
+initialState:
+  documentContents: |-
+    {
+        :bongo {
+            :foo "bar",
+            ;; hello
+            :baz "whatever",
+        }
+    }
+  selections:
+    - anchor: { line: 3, character: 13 }
+      active: { line: 3, character: 13 }
+  marks: {}
+finalState:
+  documentContents: |-
+    {
+
+    }
+  selections:
+    - anchor: { line: 1, character: 4 }
+      active: { line: 1, character: 4 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        {
+          type: containingScope,
+          scopeType: collectionItem,
+          includeSiblings: false,
+        },
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/clojure/clearItem2.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/clojure/clearItem2.yml
new file mode 100644
index 0000000000..14be8a9684
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/clojure/clearItem2.yml
@@ -0,0 +1,40 @@
+languageId: clojure
+command:
+  version: 1
+  spokenForm: clear item
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier:
+        {
+          type: containingScope,
+          scopeType: collectionItem,
+          includeSiblings: false,
+        }
+initialState:
+  documentContents: (foo :bar)
+  selections:
+    - anchor: { line: 0, character: 6 }
+      active: { line: 0, character: 6 }
+  marks: {}
+finalState:
+  documentContents: (foo )
+  selections:
+    - anchor: { line: 0, character: 5 }
+      active: { line: 0, character: 5 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        {
+          type: containingScope,
+          scopeType: collectionItem,
+          includeSiblings: false,
+        },
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/clojure/clearItem3.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/clojure/clearItem3.yml
new file mode 100644
index 0000000000..609757e57d
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/clojure/clearItem3.yml
@@ -0,0 +1,40 @@
+languageId: clojure
+command:
+  version: 1
+  spokenForm: clear item
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier:
+        {
+          type: containingScope,
+          scopeType: collectionItem,
+          includeSiblings: false,
+        }
+initialState:
+  documentContents: (foo)
+  selections:
+    - anchor: { line: 0, character: 3 }
+      active: { line: 0, character: 3 }
+  marks: {}
+finalState:
+  documentContents: ()
+  selections:
+    - anchor: { line: 0, character: 1 }
+      active: { line: 0, character: 1 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        {
+          type: containingScope,
+          scopeType: collectionItem,
+          includeSiblings: false,
+        },
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/clojure/clearItem4.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/clojure/clearItem4.yml
new file mode 100644
index 0000000000..3ddf612d18
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/clojure/clearItem4.yml
@@ -0,0 +1,40 @@
+languageId: clojure
+command:
+  version: 1
+  spokenForm: clear item
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier:
+        {
+          type: containingScope,
+          scopeType: collectionItem,
+          includeSiblings: false,
+        }
+initialState:
+  documentContents: (foo (hello there))
+  selections:
+    - anchor: { line: 0, character: 5 }
+      active: { line: 0, character: 5 }
+  marks: {}
+finalState:
+  documentContents: (foo )
+  selections:
+    - anchor: { line: 0, character: 5 }
+      active: { line: 0, character: 5 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        {
+          type: containingScope,
+          scopeType: collectionItem,
+          includeSiblings: false,
+        },
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/clojure/clearItem5.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/clojure/clearItem5.yml
new file mode 100644
index 0000000000..66ed871d45
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/clojure/clearItem5.yml
@@ -0,0 +1,40 @@
+languageId: clojure
+command:
+  version: 1
+  spokenForm: clear item
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier:
+        {
+          type: containingScope,
+          scopeType: collectionItem,
+          includeSiblings: false,
+        }
+initialState:
+  documentContents: "'(foo bar)"
+  selections:
+    - anchor: { line: 0, character: 3 }
+      active: { line: 0, character: 3 }
+  marks: {}
+finalState:
+  documentContents: "'( bar)"
+  selections:
+    - anchor: { line: 0, character: 2 }
+      active: { line: 0, character: 2 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        {
+          type: containingScope,
+          scopeType: collectionItem,
+          includeSiblings: false,
+        },
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/clojure/clearItem6.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/clojure/clearItem6.yml
new file mode 100644
index 0000000000..f3c1e162d3
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/clojure/clearItem6.yml
@@ -0,0 +1,40 @@
+languageId: clojure
+command:
+  version: 1
+  spokenForm: clear item
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier:
+        {
+          type: containingScope,
+          scopeType: collectionItem,
+          includeSiblings: false,
+        }
+initialState:
+  documentContents: "[foo :bar]"
+  selections:
+    - anchor: { line: 0, character: 7 }
+      active: { line: 0, character: 7 }
+  marks: {}
+finalState:
+  documentContents: "[foo ]"
+  selections:
+    - anchor: { line: 0, character: 5 }
+      active: { line: 0, character: 5 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        {
+          type: containingScope,
+          scopeType: collectionItem,
+          includeSiblings: false,
+        },
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/clojure/clearItemBat.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/clojure/clearItemBat.yml
new file mode 100644
index 0000000000..b221667d89
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/clojure/clearItemBat.yml
@@ -0,0 +1,58 @@
+languageId: clojure
+command:
+  version: 1
+  spokenForm: clear item bat
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier:
+        {
+          type: containingScope,
+          scopeType: collectionItem,
+          includeSiblings: false,
+        }
+      mark: { type: decoratedSymbol, symbolColor: default, character: b }
+initialState:
+  documentContents: |-
+    {
+        :baz
+        ;; hello
+        "whatever",
+    }
+  selections:
+    - anchor: { line: 4, character: 1 }
+      active: { line: 4, character: 1 }
+  marks:
+    default.b:
+      start: { line: 1, character: 5 }
+      end: { line: 1, character: 8 }
+finalState:
+  documentContents: |-
+    {
+        ,
+    }
+  selections:
+    - anchor: { line: 1, character: 4 }
+      active: { line: 1, character: 4 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark:
+        {
+          type: decoratedSymbol,
+          symbolColor: default,
+          character: b,
+          usePrePhraseSnapshot: true,
+        },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        {
+          type: containingScope,
+          scopeType: collectionItem,
+          includeSiblings: false,
+        },
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/clojure/clearItemBatClearItemBat.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/clojure/clearItemBatClearItemBat.yml
new file mode 100644
index 0000000000..7db9a28a4b
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/clojure/clearItemBatClearItemBat.yml
@@ -0,0 +1,50 @@
+languageId: clojure
+command:
+  version: 1
+  spokenForm: clear item bat clear item bat
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier:
+        {
+          type: containingScope,
+          scopeType: collectionItem,
+          includeSiblings: false,
+        }
+      mark: { type: decoratedSymbol, symbolColor: default, character: b }
+initialState:
+  documentContents: '{:foo "bar"}'
+  selections:
+    - anchor: { line: 0, character: 12 }
+      active: { line: 0, character: 12 }
+  marks:
+    default.b:
+      start: { line: 0, character: 7 }
+      end: { line: 0, character: 10 }
+finalState:
+  documentContents: "{}"
+  selections:
+    - anchor: { line: 0, character: 1 }
+      active: { line: 0, character: 1 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark:
+        {
+          type: decoratedSymbol,
+          symbolColor: default,
+          character: b,
+          usePrePhraseSnapshot: true,
+        },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        {
+          type: containingScope,
+          scopeType: collectionItem,
+          includeSiblings: false,
+        },
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/clojure/clearItemFine.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/clojure/clearItemFine.yml
new file mode 100644
index 0000000000..c3aff5c875
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/clojure/clearItemFine.yml
@@ -0,0 +1,50 @@
+languageId: clojure
+command:
+  version: 1
+  spokenForm: clear item fine
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier:
+        {
+          type: containingScope,
+          scopeType: collectionItem,
+          includeSiblings: false,
+        }
+      mark: { type: decoratedSymbol, symbolColor: default, character: f }
+initialState:
+  documentContents: '{:foo "bar" :baz "whatever"}'
+  selections:
+    - anchor: { line: 0, character: 28 }
+      active: { line: 0, character: 28 }
+  marks:
+    default.f:
+      start: { line: 0, character: 2 }
+      end: { line: 0, character: 5 }
+finalState:
+  documentContents: '{ :baz "whatever"}'
+  selections:
+    - anchor: { line: 0, character: 1 }
+      active: { line: 0, character: 1 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark:
+        {
+          type: decoratedSymbol,
+          symbolColor: default,
+          character: f,
+          usePrePhraseSnapshot: true,
+        },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        {
+          type: containingScope,
+          scopeType: collectionItem,
+          includeSiblings: false,
+        },
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/clojure/clearItemWhale.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/clojure/clearItemWhale.yml
new file mode 100644
index 0000000000..e113968a41
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/clojure/clearItemWhale.yml
@@ -0,0 +1,50 @@
+languageId: clojure
+command:
+  version: 1
+  spokenForm: clear item whale
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier:
+        {
+          type: containingScope,
+          scopeType: collectionItem,
+          includeSiblings: false,
+        }
+      mark: { type: decoratedSymbol, symbolColor: default, character: w }
+initialState:
+  documentContents: '{:foo "bar", :baz "whatever"}'
+  selections:
+    - anchor: { line: 0, character: 29 }
+      active: { line: 0, character: 29 }
+  marks:
+    default.w:
+      start: { line: 0, character: 19 }
+      end: { line: 0, character: 27 }
+finalState:
+  documentContents: '{:foo "bar", }'
+  selections:
+    - anchor: { line: 0, character: 13 }
+      active: { line: 0, character: 13 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark:
+        {
+          type: decoratedSymbol,
+          symbolColor: default,
+          character: w,
+          usePrePhraseSnapshot: true,
+        },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        {
+          type: containingScope,
+          scopeType: collectionItem,
+          includeSiblings: false,
+        },
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/clojure/clearItemZip.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/clojure/clearItemZip.yml
new file mode 100644
index 0000000000..428bf64328
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/clojure/clearItemZip.yml
@@ -0,0 +1,50 @@
+languageId: clojure
+command:
+  version: 1
+  spokenForm: clear item zip
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier:
+        {
+          type: containingScope,
+          scopeType: collectionItem,
+          includeSiblings: false,
+        }
+      mark: { type: decoratedSymbol, symbolColor: default, character: z }
+initialState:
+  documentContents: '{:foo "bar", :baz "whatever"}'
+  selections:
+    - anchor: { line: 0, character: 29 }
+      active: { line: 0, character: 29 }
+  marks:
+    default.z:
+      start: { line: 0, character: 14 }
+      end: { line: 0, character: 17 }
+finalState:
+  documentContents: '{:foo "bar", }'
+  selections:
+    - anchor: { line: 0, character: 13 }
+      active: { line: 0, character: 13 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark:
+        {
+          type: decoratedSymbol,
+          symbolColor: default,
+          character: z,
+          usePrePhraseSnapshot: true,
+        },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        {
+          type: containingScope,
+          scopeType: collectionItem,
+          includeSiblings: false,
+        },
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/clojure/clearKey.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/clojure/clearKey.yml
new file mode 100644
index 0000000000..33ae144e4d
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/clojure/clearKey.yml
@@ -0,0 +1,40 @@
+languageId: clojure
+command:
+  version: 1
+  spokenForm: clear key
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier:
+        {
+          type: containingScope,
+          scopeType: collectionKey,
+          includeSiblings: false,
+        }
+initialState:
+  documentContents: '{:baz {:foo "bar"}}'
+  selections:
+    - anchor: { line: 0, character: 6 }
+      active: { line: 0, character: 6 }
+  marks: {}
+finalState:
+  documentContents: '{ {:foo "bar"}}'
+  selections:
+    - anchor: { line: 0, character: 1 }
+      active: { line: 0, character: 1 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        {
+          type: containingScope,
+          scopeType: collectionKey,
+          includeSiblings: false,
+        },
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/clojure/clearKeyWhale.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/clojure/clearKeyWhale.yml
new file mode 100644
index 0000000000..eb39759867
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/clojure/clearKeyWhale.yml
@@ -0,0 +1,50 @@
+languageId: clojure
+command:
+  version: 1
+  spokenForm: clear key whale
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier:
+        {
+          type: containingScope,
+          scopeType: collectionKey,
+          includeSiblings: false,
+        }
+      mark: { type: decoratedSymbol, symbolColor: default, character: w }
+initialState:
+  documentContents: '{:foo "bar", :baz "whatever"}'
+  selections:
+    - anchor: { line: 0, character: 29 }
+      active: { line: 0, character: 29 }
+  marks:
+    default.w:
+      start: { line: 0, character: 19 }
+      end: { line: 0, character: 27 }
+finalState:
+  documentContents: '{:foo "bar",  "whatever"}'
+  selections:
+    - anchor: { line: 0, character: 13 }
+      active: { line: 0, character: 13 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark:
+        {
+          type: decoratedSymbol,
+          symbolColor: default,
+          character: w,
+          usePrePhraseSnapshot: true,
+        },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        {
+          type: containingScope,
+          scopeType: collectionKey,
+          includeSiblings: false,
+        },
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/clojure/clearKeyWhale2.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/clojure/clearKeyWhale2.yml
new file mode 100644
index 0000000000..da247f092a
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/clojure/clearKeyWhale2.yml
@@ -0,0 +1,60 @@
+languageId: clojure
+command:
+  version: 1
+  spokenForm: clear key whale
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier:
+        {
+          type: containingScope,
+          scopeType: collectionKey,
+          includeSiblings: false,
+        }
+      mark: { type: decoratedSymbol, symbolColor: default, character: w }
+initialState:
+  documentContents: |-
+    {
+        :baz
+        ;; hello
+        "whatever",
+    }
+  selections:
+    - anchor: { line: 4, character: 1 }
+      active: { line: 4, character: 1 }
+  marks:
+    default.w:
+      start: { line: 3, character: 5 }
+      end: { line: 3, character: 13 }
+finalState:
+  documentContents: |-
+    {
+
+        ;; hello
+        "whatever",
+    }
+  selections:
+    - anchor: { line: 1, character: 4 }
+      active: { line: 1, character: 4 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark:
+        {
+          type: decoratedSymbol,
+          symbolColor: default,
+          character: w,
+          usePrePhraseSnapshot: true,
+        },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        {
+          type: containingScope,
+          scopeType: collectionKey,
+          includeSiblings: false,
+        },
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/clojure/clearKeyZip.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/clojure/clearKeyZip.yml
new file mode 100644
index 0000000000..374fa4fc40
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/clojure/clearKeyZip.yml
@@ -0,0 +1,50 @@
+languageId: clojure
+command:
+  version: 1
+  spokenForm: clear key zip
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier:
+        {
+          type: containingScope,
+          scopeType: collectionKey,
+          includeSiblings: false,
+        }
+      mark: { type: decoratedSymbol, symbolColor: default, character: z }
+initialState:
+  documentContents: '{:foo "bar", :baz "whatever"}'
+  selections:
+    - anchor: { line: 0, character: 29 }
+      active: { line: 0, character: 29 }
+  marks:
+    default.z:
+      start: { line: 0, character: 14 }
+      end: { line: 0, character: 17 }
+finalState:
+  documentContents: '{:foo "bar",  "whatever"}'
+  selections:
+    - anchor: { line: 0, character: 13 }
+      active: { line: 0, character: 13 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark:
+        {
+          type: decoratedSymbol,
+          symbolColor: default,
+          character: z,
+          usePrePhraseSnapshot: true,
+        },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        {
+          type: containingScope,
+          scopeType: collectionKey,
+          includeSiblings: false,
+        },
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/clojure/clearKeyZip2.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/clojure/clearKeyZip2.yml
new file mode 100644
index 0000000000..93ccda4a54
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/clojure/clearKeyZip2.yml
@@ -0,0 +1,60 @@
+languageId: clojure
+command:
+  version: 1
+  spokenForm: clear key zip
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier:
+        {
+          type: containingScope,
+          scopeType: collectionKey,
+          includeSiblings: false,
+        }
+      mark: { type: decoratedSymbol, symbolColor: default, character: z }
+initialState:
+  documentContents: |-
+    {
+        :foo "bar",
+        ;; hello
+        :baz "whatever",
+    }
+  selections:
+    - anchor: { line: 4, character: 1 }
+      active: { line: 4, character: 1 }
+  marks:
+    default.z:
+      start: { line: 3, character: 5 }
+      end: { line: 3, character: 8 }
+finalState:
+  documentContents: |-
+    {
+        :foo "bar",
+        ;; hello
+         "whatever",
+    }
+  selections:
+    - anchor: { line: 3, character: 4 }
+      active: { line: 3, character: 4 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark:
+        {
+          type: decoratedSymbol,
+          symbolColor: default,
+          character: z,
+          usePrePhraseSnapshot: true,
+        },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        {
+          type: containingScope,
+          scopeType: collectionKey,
+          includeSiblings: false,
+        },
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/clojure/clearLambda.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/clojure/clearLambda.yml
new file mode 100644
index 0000000000..387b80e215
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/clojure/clearLambda.yml
@@ -0,0 +1,40 @@
+languageId: clojure
+command:
+  version: 1
+  spokenForm: clear lambda
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier:
+        {
+          type: containingScope,
+          scopeType: anonymousFunction,
+          includeSiblings: false,
+        }
+initialState:
+  documentContents: (fn [] (println "Hello world"))
+  selections:
+    - anchor: { line: 0, character: 12 }
+      active: { line: 0, character: 12 }
+  marks: {}
+finalState:
+  documentContents: ""
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        {
+          type: containingScope,
+          scopeType: anonymousFunction,
+          includeSiblings: false,
+        },
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/clojure/clearLambda2.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/clojure/clearLambda2.yml
new file mode 100644
index 0000000000..8915364d16
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/clojure/clearLambda2.yml
@@ -0,0 +1,40 @@
+languageId: clojure
+command:
+  version: 1
+  spokenForm: clear lambda
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier:
+        {
+          type: containingScope,
+          scopeType: anonymousFunction,
+          includeSiblings: false,
+        }
+initialState:
+  documentContents: "#(+ 1 1)"
+  selections:
+    - anchor: { line: 0, character: 6 }
+      active: { line: 0, character: 6 }
+  marks: {}
+finalState:
+  documentContents: ""
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        {
+          type: containingScope,
+          scopeType: anonymousFunction,
+          includeSiblings: false,
+        },
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/clojure/clearList.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/clojure/clearList.yml
new file mode 100644
index 0000000000..a89fe06d2d
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/clojure/clearList.yml
@@ -0,0 +1,32 @@
+languageId: clojure
+command:
+  version: 1
+  spokenForm: clear list
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier:
+        { type: containingScope, scopeType: list, includeSiblings: false }
+initialState:
+  documentContents: "'(hello)"
+  selections:
+    - anchor: { line: 0, character: 3 }
+      active: { line: 0, character: 3 }
+  marks: {}
+finalState:
+  documentContents: ""
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        { type: containingScope, scopeType: list, includeSiblings: false },
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/clojure/clearList2.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/clojure/clearList2.yml
new file mode 100644
index 0000000000..63469edaa8
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/clojure/clearList2.yml
@@ -0,0 +1,32 @@
+languageId: clojure
+command:
+  version: 1
+  spokenForm: clear list
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier:
+        { type: containingScope, scopeType: list, includeSiblings: false }
+initialState:
+  documentContents: "[hello]"
+  selections:
+    - anchor: { line: 0, character: 5 }
+      active: { line: 0, character: 5 }
+  marks: {}
+finalState:
+  documentContents: ""
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        { type: containingScope, scopeType: list, includeSiblings: false },
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/clojure/clearMap.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/clojure/clearMap.yml
new file mode 100644
index 0000000000..13f6c0c99f
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/clojure/clearMap.yml
@@ -0,0 +1,32 @@
+languageId: clojure
+command:
+  version: 1
+  spokenForm: clear map
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier:
+        { type: containingScope, scopeType: map, includeSiblings: false }
+initialState:
+  documentContents: '{:foo "bar"}'
+  selections:
+    - anchor: { line: 0, character: 9 }
+      active: { line: 0, character: 9 }
+  marks: {}
+finalState:
+  documentContents: ""
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        { type: containingScope, scopeType: map, includeSiblings: false },
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/clojure/clearName.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/clojure/clearName.yml
new file mode 100644
index 0000000000..a030ba8633
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/clojure/clearName.yml
@@ -0,0 +1,38 @@
+languageId: clojure
+command:
+  version: 1
+  spokenForm: clear name
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier:
+        { type: containingScope, scopeType: name, includeSiblings: false }
+initialState:
+  documentContents: |-
+    (defn say-hello
+      [name]
+      (println (str "Hello, " name)))
+  selections:
+    - anchor: { line: 2, character: 4 }
+      active: { line: 2, character: 4 }
+  marks: {}
+finalState:
+  documentContents: |-
+    (defn
+      [name]
+      (println (str "Hello, " name)))
+  selections:
+    - anchor: { line: 0, character: 6 }
+      active: { line: 0, character: 6 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        { type: containingScope, scopeType: name, includeSiblings: false },
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/clojure/clearName2.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/clojure/clearName2.yml
new file mode 100644
index 0000000000..3199eef29f
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/clojure/clearName2.yml
@@ -0,0 +1,32 @@
+languageId: clojure
+command:
+  version: 1
+  spokenForm: clear name
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier:
+        { type: containingScope, scopeType: name, includeSiblings: false }
+initialState:
+  documentContents: (defmacro foo [bar] "baz" (bongo))
+  selections:
+    - anchor: { line: 0, character: 30 }
+      active: { line: 0, character: 30 }
+  marks: {}
+finalState:
+  documentContents: (defmacro  [bar] "baz" (bongo))
+  selections:
+    - anchor: { line: 0, character: 10 }
+      active: { line: 0, character: 10 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        { type: containingScope, scopeType: name, includeSiblings: false },
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/clojure/clearValueBat.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/clojure/clearValueBat.yml
new file mode 100644
index 0000000000..8f184327e1
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/clojure/clearValueBat.yml
@@ -0,0 +1,52 @@
+languageId: clojure
+command:
+  version: 1
+  spokenForm: clear value bat
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier:
+        { type: containingScope, scopeType: value, includeSiblings: false }
+      mark: { type: decoratedSymbol, symbolColor: default, character: b }
+initialState:
+  documentContents: |-
+    {
+        :baz
+        ;; hello
+        "whatever",
+    }
+  selections:
+    - anchor: { line: 4, character: 1 }
+      active: { line: 4, character: 1 }
+  marks:
+    default.b:
+      start: { line: 1, character: 5 }
+      end: { line: 1, character: 8 }
+finalState:
+  documentContents: |-
+    {
+        :baz
+        ;; hello
+        ,
+    }
+  selections:
+    - anchor: { line: 3, character: 4 }
+      active: { line: 3, character: 4 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark:
+        {
+          type: decoratedSymbol,
+          symbolColor: default,
+          character: b,
+          usePrePhraseSnapshot: true,
+        },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        { type: containingScope, scopeType: value, includeSiblings: false },
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/clojure/clearValueZip.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/clojure/clearValueZip.yml
new file mode 100644
index 0000000000..0391075908
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/clojure/clearValueZip.yml
@@ -0,0 +1,52 @@
+languageId: clojure
+command:
+  version: 1
+  spokenForm: clear value zip
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier:
+        { type: containingScope, scopeType: value, includeSiblings: false }
+      mark: { type: decoratedSymbol, symbolColor: default, character: z }
+initialState:
+  documentContents: |-
+    {
+        :foo "bar",
+        ;; hello
+        :baz "whatever",
+    }
+  selections:
+    - anchor: { line: 4, character: 1 }
+      active: { line: 4, character: 1 }
+  marks:
+    default.z:
+      start: { line: 3, character: 5 }
+      end: { line: 3, character: 8 }
+finalState:
+  documentContents: |-
+    {
+        :foo "bar",
+        ;; hello
+        :baz ,
+    }
+  selections:
+    - anchor: { line: 3, character: 9 }
+      active: { line: 3, character: 9 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark:
+        {
+          type: decoratedSymbol,
+          symbolColor: default,
+          character: z,
+          usePrePhraseSnapshot: true,
+        },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        { type: containingScope, scopeType: value, includeSiblings: false },
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/clojure/takeValue.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/clojure/takeValue.yml
new file mode 100644
index 0000000000..dcebbb12d8
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/clojure/takeValue.yml
@@ -0,0 +1,32 @@
+languageId: clojure
+command:
+  version: 1
+  spokenForm: take value
+  action: setSelection
+  targets:
+    - type: primitive
+      modifier:
+        { type: containingScope, scopeType: value, includeSiblings: false }
+initialState:
+  documentContents: '{:bar {:foo "bar"}}'
+  selections:
+    - anchor: { line: 0, character: 6 }
+      active: { line: 0, character: 6 }
+  marks: {}
+finalState:
+  documentContents: '{:bar {:foo "bar"}}'
+  selections:
+    - anchor: { line: 0, character: 6 }
+      active: { line: 0, character: 18 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        { type: containingScope, scopeType: value, includeSiblings: false },
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/clojure/takeValueBat.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/clojure/takeValueBat.yml
new file mode 100644
index 0000000000..b31ff19fd3
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/clojure/takeValueBat.yml
@@ -0,0 +1,42 @@
+languageId: clojure
+command:
+  version: 1
+  spokenForm: take value bat
+  action: setSelection
+  targets:
+    - type: primitive
+      modifier:
+        { type: containingScope, scopeType: value, includeSiblings: false }
+      mark: { type: decoratedSymbol, symbolColor: default, character: b }
+initialState:
+  documentContents: '{:foo "bar", :baz "whatever"}'
+  selections:
+    - anchor: { line: 0, character: 29 }
+      active: { line: 0, character: 29 }
+  marks:
+    default.b:
+      start: { line: 0, character: 7 }
+      end: { line: 0, character: 10 }
+finalState:
+  documentContents: '{:foo "bar", :baz "whatever"}'
+  selections:
+    - anchor: { line: 0, character: 6 }
+      active: { line: 0, character: 11 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark:
+        {
+          type: decoratedSymbol,
+          symbolColor: default,
+          character: b,
+          usePrePhraseSnapshot: true,
+        },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        { type: containingScope, scopeType: value, includeSiblings: false },
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/clojure/takeValueBat2.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/clojure/takeValueBat2.yml
new file mode 100644
index 0000000000..52198a2bf9
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/clojure/takeValueBat2.yml
@@ -0,0 +1,42 @@
+languageId: clojure
+command:
+  version: 1
+  spokenForm: take value bat
+  action: setSelection
+  targets:
+    - type: primitive
+      modifier:
+        { type: containingScope, scopeType: value, includeSiblings: false }
+      mark: { type: decoratedSymbol, symbolColor: default, character: b }
+initialState:
+  documentContents: '{:foo "bar"}'
+  selections:
+    - anchor: { line: 0, character: 12 }
+      active: { line: 0, character: 12 }
+  marks:
+    default.b:
+      start: { line: 0, character: 7 }
+      end: { line: 0, character: 10 }
+finalState:
+  documentContents: '{:foo "bar"}'
+  selections:
+    - anchor: { line: 0, character: 6 }
+      active: { line: 0, character: 11 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark:
+        {
+          type: decoratedSymbol,
+          symbolColor: default,
+          character: b,
+          usePrePhraseSnapshot: true,
+        },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        { type: containingScope, scopeType: value, includeSiblings: false },
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/clojure/takeValueFine.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/clojure/takeValueFine.yml
new file mode 100644
index 0000000000..d169da3e1f
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/clojure/takeValueFine.yml
@@ -0,0 +1,42 @@
+languageId: clojure
+command:
+  version: 1
+  spokenForm: take value fine
+  action: setSelection
+  targets:
+    - type: primitive
+      modifier:
+        { type: containingScope, scopeType: value, includeSiblings: false }
+      mark: { type: decoratedSymbol, symbolColor: default, character: f }
+initialState:
+  documentContents: '{:foo "bar", :baz "whatever"}'
+  selections:
+    - anchor: { line: 0, character: 29 }
+      active: { line: 0, character: 29 }
+  marks:
+    default.f:
+      start: { line: 0, character: 2 }
+      end: { line: 0, character: 5 }
+finalState:
+  documentContents: '{:foo "bar", :baz "whatever"}'
+  selections:
+    - anchor: { line: 0, character: 6 }
+      active: { line: 0, character: 11 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark:
+        {
+          type: decoratedSymbol,
+          symbolColor: default,
+          character: f,
+          usePrePhraseSnapshot: true,
+        },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        { type: containingScope, scopeType: value, includeSiblings: false },
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/clojure/takeValueFine2.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/clojure/takeValueFine2.yml
new file mode 100644
index 0000000000..6b30f8846a
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/clojure/takeValueFine2.yml
@@ -0,0 +1,42 @@
+languageId: clojure
+command:
+  version: 1
+  spokenForm: take value fine
+  action: setSelection
+  targets:
+    - type: primitive
+      modifier:
+        { type: containingScope, scopeType: value, includeSiblings: false }
+      mark: { type: decoratedSymbol, symbolColor: default, character: f }
+initialState:
+  documentContents: '{:foo "bar"}'
+  selections:
+    - anchor: { line: 0, character: 12 }
+      active: { line: 0, character: 12 }
+  marks:
+    default.f:
+      start: { line: 0, character: 2 }
+      end: { line: 0, character: 5 }
+finalState:
+  documentContents: '{:foo "bar"}'
+  selections:
+    - anchor: { line: 0, character: 6 }
+      active: { line: 0, character: 11 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark:
+        {
+          type: decoratedSymbol,
+          symbolColor: default,
+          character: f,
+          usePrePhraseSnapshot: true,
+        },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        { type: containingScope, scopeType: value, includeSiblings: false },
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/clojure/takeValueWhale.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/clojure/takeValueWhale.yml
new file mode 100644
index 0000000000..784d249e81
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/clojure/takeValueWhale.yml
@@ -0,0 +1,42 @@
+languageId: clojure
+command:
+  version: 1
+  spokenForm: take value whale
+  action: setSelection
+  targets:
+    - type: primitive
+      modifier:
+        { type: containingScope, scopeType: value, includeSiblings: false }
+      mark: { type: decoratedSymbol, symbolColor: default, character: w }
+initialState:
+  documentContents: '{:foo "bar", :baz "whatever"}'
+  selections:
+    - anchor: { line: 0, character: 29 }
+      active: { line: 0, character: 29 }
+  marks:
+    default.w:
+      start: { line: 0, character: 19 }
+      end: { line: 0, character: 27 }
+finalState:
+  documentContents: '{:foo "bar", :baz "whatever"}'
+  selections:
+    - anchor: { line: 0, character: 18 }
+      active: { line: 0, character: 28 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark:
+        {
+          type: decoratedSymbol,
+          symbolColor: default,
+          character: w,
+          usePrePhraseSnapshot: true,
+        },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        { type: containingScope, scopeType: value, includeSiblings: false },
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/clojure/takeValueZip.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/clojure/takeValueZip.yml
new file mode 100644
index 0000000000..08b206e294
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/clojure/takeValueZip.yml
@@ -0,0 +1,42 @@
+languageId: clojure
+command:
+  version: 1
+  spokenForm: take value zip
+  action: setSelection
+  targets:
+    - type: primitive
+      modifier:
+        { type: containingScope, scopeType: value, includeSiblings: false }
+      mark: { type: decoratedSymbol, symbolColor: default, character: z }
+initialState:
+  documentContents: '{:foo "bar", :baz "whatever"}'
+  selections:
+    - anchor: { line: 0, character: 29 }
+      active: { line: 0, character: 29 }
+  marks:
+    default.z:
+      start: { line: 0, character: 14 }
+      end: { line: 0, character: 17 }
+finalState:
+  documentContents: '{:foo "bar", :baz "whatever"}'
+  selections:
+    - anchor: { line: 0, character: 18 }
+      active: { line: 0, character: 28 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark:
+        {
+          type: decoratedSymbol,
+          symbolColor: default,
+          character: z,
+          usePrePhraseSnapshot: true,
+        },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        { type: containingScope, scopeType: value, includeSiblings: false },
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/clojure/takeValueZip2.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/clojure/takeValueZip2.yml
new file mode 100644
index 0000000000..c470c8525a
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/clojure/takeValueZip2.yml
@@ -0,0 +1,42 @@
+languageId: clojure
+command:
+  version: 1
+  spokenForm: take value zip
+  action: setSelection
+  targets:
+    - type: primitive
+      modifier:
+        { type: containingScope, scopeType: value, includeSiblings: false }
+      mark: { type: decoratedSymbol, symbolColor: default, character: z }
+initialState:
+  documentContents: '{:baz {:foo "bar"}}'
+  selections:
+    - anchor: { line: 0, character: 6 }
+      active: { line: 0, character: 6 }
+  marks:
+    default.z:
+      start: { line: 0, character: 2 }
+      end: { line: 0, character: 5 }
+finalState:
+  documentContents: '{:baz {:foo "bar"}}'
+  selections:
+    - anchor: { line: 0, character: 6 }
+      active: { line: 0, character: 18 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark:
+        {
+          type: decoratedSymbol,
+          symbolColor: default,
+          character: z,
+          usePrePhraseSnapshot: true,
+        },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        { type: containingScope, scopeType: value, includeSiblings: false },
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/cpp/changeCall.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/cpp/changeCall.yml
new file mode 100644
index 0000000000..ecb9f50e31
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/cpp/changeCall.yml
@@ -0,0 +1,41 @@
+languageId: cpp
+command:
+  version: 1
+  spokenForm: change call
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier:
+        {
+          type: containingScope,
+          scopeType: functionCall,
+          includeSiblings: false,
+        }
+initialState:
+  documentContents: Car carObj1("BMW", "X5", 1999);
+  selections:
+    - anchor: { line: 0, character: 19 }
+      active: { line: 0, character: 19 }
+  marks: {}
+finalState:
+  documentContents: Car ;
+  selections:
+    - anchor: { line: 0, character: 4 }
+      active: { line: 0, character: 4 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        {
+          type: containingScope,
+          scopeType: functionCall,
+          includeSiblings: false,
+        },
+      isImplicit: false,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/cpp/changeCallee.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/cpp/changeCallee.yml
new file mode 100644
index 0000000000..5f40d57e37
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/cpp/changeCallee.yml
@@ -0,0 +1,41 @@
+languageId: cpp
+command:
+  version: 1
+  spokenForm: change callee
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier:
+        {
+          type: containingScope,
+          scopeType: functionCallee,
+          includeSiblings: false,
+        }
+initialState:
+  documentContents: obj.method[0]();
+  selections:
+    - anchor: { line: 0, character: 14 }
+      active: { line: 0, character: 14 }
+  marks: {}
+finalState:
+  documentContents: ();
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        {
+          type: containingScope,
+          scopeType: functionCallee,
+          includeSiblings: false,
+        },
+      isImplicit: false,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/cpp/changeCallee2.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/cpp/changeCallee2.yml
new file mode 100644
index 0000000000..3cfd395cd9
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/cpp/changeCallee2.yml
@@ -0,0 +1,41 @@
+languageId: cpp
+command:
+  version: 1
+  spokenForm: change callee
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier:
+        {
+          type: containingScope,
+          scopeType: functionCallee,
+          includeSiblings: false,
+        }
+initialState:
+  documentContents: obj.method[0]().otherMethod();
+  selections:
+    - anchor: { line: 0, character: 28 }
+      active: { line: 0, character: 28 }
+  marks: {}
+finalState:
+  documentContents: ();
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        {
+          type: containingScope,
+          scopeType: functionCallee,
+          includeSiblings: false,
+        },
+      isImplicit: false,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/cpp/changeCallee3.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/cpp/changeCallee3.yml
new file mode 100644
index 0000000000..d77f9b3cb6
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/cpp/changeCallee3.yml
@@ -0,0 +1,41 @@
+languageId: cpp
+command:
+  version: 1
+  spokenForm: change callee
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier:
+        {
+          type: containingScope,
+          scopeType: functionCallee,
+          includeSiblings: false,
+        }
+initialState:
+  documentContents: Car carObj1("X5", 1999);
+  selections:
+    - anchor: { line: 0, character: 17 }
+      active: { line: 0, character: 17 }
+  marks: {}
+finalState:
+  documentContents: Car ("X5", 1999);
+  selections:
+    - anchor: { line: 0, character: 4 }
+      active: { line: 0, character: 4 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        {
+          type: containingScope,
+          scopeType: functionCallee,
+          includeSiblings: false,
+        },
+      isImplicit: false,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/cpp/changeCallee4.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/cpp/changeCallee4.yml
new file mode 100644
index 0000000000..4b277de54e
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/cpp/changeCallee4.yml
@@ -0,0 +1,41 @@
+languageId: cpp
+command:
+  version: 1
+  spokenForm: change callee
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier:
+        {
+          type: containingScope,
+          scopeType: functionCallee,
+          includeSiblings: false,
+        }
+initialState:
+  documentContents: method();
+  selections:
+    - anchor: { line: 0, character: 7 }
+      active: { line: 0, character: 7 }
+  marks: {}
+finalState:
+  documentContents: ();
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        {
+          type: containingScope,
+          scopeType: functionCallee,
+          includeSiblings: false,
+        },
+      isImplicit: false,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/cpp/chuckTypeAir.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/cpp/chuckTypeAir.yml
new file mode 100644
index 0000000000..33733e71b1
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/cpp/chuckTypeAir.yml
@@ -0,0 +1,36 @@
+languageId: cpp
+command:
+  version: 1
+  spokenForm: chuck type air
+  action: remove
+  targets:
+    - type: primitive
+      modifier:
+        { type: containingScope, scopeType: type, includeSiblings: false }
+      mark: { type: decoratedSymbol, symbolColor: default, character: a }
+initialState:
+  documentContents: string name = "hello";
+  selections:
+    - anchor: { line: 0, character: 22 }
+      active: { line: 0, character: 22 }
+  marks:
+    default.a:
+      start: { line: 0, character: 7 }
+      end: { line: 0, character: 11 }
+finalState:
+  documentContents: name = "hello";
+  selections:
+    - anchor: { line: 0, character: 15 }
+      active: { line: 0, character: 15 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: decoratedSymbol, symbolColor: default, character: a },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: outside,
+      modifier:
+        { type: containingScope, scopeType: type, includeSiblings: false },
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/cpp/chuckTypeSoon.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/cpp/chuckTypeSoon.yml
new file mode 100644
index 0000000000..2297c8bb78
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/cpp/chuckTypeSoon.yml
@@ -0,0 +1,42 @@
+languageId: cpp
+command:
+  version: 1
+  spokenForm: chuck type soon
+  action: remove
+  targets:
+    - type: primitive
+      modifier:
+        { type: containingScope, scopeType: type, includeSiblings: false }
+      mark: { type: decoratedSymbol, symbolColor: default, character: s }
+initialState:
+  documentContents: |-
+    void myFunk(string value) {
+
+    }
+  selections:
+    - anchor: { line: 1, character: 4 }
+      active: { line: 1, character: 4 }
+  marks:
+    default.s:
+      start: { line: 0, character: 12 }
+      end: { line: 0, character: 18 }
+finalState:
+  documentContents: |-
+    void myFunk(value) {
+
+    }
+  selections:
+    - anchor: { line: 1, character: 4 }
+      active: { line: 1, character: 4 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: decoratedSymbol, symbolColor: default, character: s },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: outside,
+      modifier:
+        { type: containingScope, scopeType: type, includeSiblings: false },
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/cpp/chuckValue.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/cpp/chuckValue.yml
new file mode 100644
index 0000000000..92c1f0e6bc
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/cpp/chuckValue.yml
@@ -0,0 +1,95 @@
+languageId: cpp
+command:
+  version: 1
+  spokenForm: chuck value
+  action: remove
+  targets:
+    - type: primitive
+      modifier:
+        { type: containingScope, scopeType: value, includeSiblings: false }
+initialState:
+  documentContents: |-
+    a = 1;
+    a += 1;
+    a -= 1;
+    a *= 1;
+    a /= 1;
+    a %= 1;
+    a &= 1;
+    a |= 1;
+    a ^= 1;
+    a <<= 1;
+    a >>= 1;
+  selections:
+    - anchor: { line: 0, character: 4 }
+      active: { line: 0, character: 5 }
+    - anchor: { line: 1, character: 5 }
+      active: { line: 1, character: 6 }
+    - anchor: { line: 2, character: 5 }
+      active: { line: 2, character: 6 }
+    - anchor: { line: 3, character: 5 }
+      active: { line: 3, character: 6 }
+    - anchor: { line: 4, character: 5 }
+      active: { line: 4, character: 6 }
+    - anchor: { line: 5, character: 5 }
+      active: { line: 5, character: 6 }
+    - anchor: { line: 6, character: 5 }
+      active: { line: 6, character: 6 }
+    - anchor: { line: 7, character: 5 }
+      active: { line: 7, character: 6 }
+    - anchor: { line: 8, character: 5 }
+      active: { line: 8, character: 6 }
+    - anchor: { line: 9, character: 6 }
+      active: { line: 9, character: 7 }
+    - anchor: { line: 10, character: 6 }
+      active: { line: 10, character: 7 }
+  marks: {}
+finalState:
+  documentContents: |-
+    a;
+    a;
+    a;
+    a;
+    a;
+    a;
+    a;
+    a;
+    a;
+    a;
+    a;
+  selections:
+    - anchor: { line: 0, character: 1 }
+      active: { line: 0, character: 1 }
+    - anchor: { line: 1, character: 1 }
+      active: { line: 1, character: 1 }
+    - anchor: { line: 2, character: 1 }
+      active: { line: 2, character: 1 }
+    - anchor: { line: 3, character: 1 }
+      active: { line: 3, character: 1 }
+    - anchor: { line: 4, character: 1 }
+      active: { line: 4, character: 1 }
+    - anchor: { line: 5, character: 1 }
+      active: { line: 5, character: 1 }
+    - anchor: { line: 6, character: 1 }
+      active: { line: 6, character: 1 }
+    - anchor: { line: 7, character: 1 }
+      active: { line: 7, character: 1 }
+    - anchor: { line: 8, character: 1 }
+      active: { line: 8, character: 1 }
+    - anchor: { line: 9, character: 1 }
+      active: { line: 9, character: 1 }
+    - anchor: { line: 10, character: 1 }
+      active: { line: 10, character: 1 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: outside,
+      modifier:
+        { type: containingScope, scopeType: value, includeSiblings: false },
+      isImplicit: false,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/cpp/clearName.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/cpp/clearName.yml
new file mode 100644
index 0000000000..6a42bac220
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/cpp/clearName.yml
@@ -0,0 +1,33 @@
+languageId: cpp
+command:
+  version: 1
+  spokenForm: clear name
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier:
+        { type: containingScope, scopeType: name, includeSiblings: false }
+initialState:
+  documentContents: a += "world"
+  selections:
+    - anchor: { line: 0, character: 6 }
+      active: { line: 0, character: 6 }
+  marks: {}
+finalState:
+  documentContents: ' += "world"'
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        { type: containingScope, scopeType: name, includeSiblings: false },
+      isImplicit: false,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/cpp/clearSubject.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/cpp/clearSubject.yml
new file mode 100644
index 0000000000..d7fff72c17
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/cpp/clearSubject.yml
@@ -0,0 +1,48 @@
+languageId: cpp
+command:
+  version: 3
+  spokenForm: clear subject
+  action: { name: clearAndSetSelection }
+  targets:
+    - type: primitive
+      modifiers:
+        - type: containingScope
+          scopeType: { type: switchStatementSubject }
+  usePrePhraseSnapshot: true
+initialState:
+  documentContents: |
+    int main() {
+      switch (i) {
+        default:
+          break;
+      }
+    }
+  selections:
+    - anchor: { line: 3, character: 4 }
+      active: { line: 3, character: 4 }
+  marks: {}
+finalState:
+  documentContents: |
+    int main() {
+      switch () {
+        default:
+          break;
+      }
+    }
+  selections:
+    - anchor: { line: 1, character: 10 }
+      active: { line: 1, character: 10 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      modifiers:
+        [
+          {
+            type: containingScope,
+            scopeType: { type: switchStatementSubject },
+          },
+        ],
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/cpp/clearSubject2.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/cpp/clearSubject2.yml
new file mode 100644
index 0000000000..a40f4391ca
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/cpp/clearSubject2.yml
@@ -0,0 +1,48 @@
+languageId: cpp
+command:
+  version: 3
+  spokenForm: clear subject
+  action: { name: clearAndSetSelection }
+  targets:
+    - type: primitive
+      modifiers:
+        - type: containingScope
+          scopeType: { type: switchStatementSubject }
+  usePrePhraseSnapshot: false
+initialState:
+  documentContents: |
+    int main() {
+      switch (int i = rand() % 100; i) {
+        default:
+        break;
+      }
+    }
+  selections:
+    - anchor: { line: 3, character: 4 }
+      active: { line: 3, character: 4 }
+  marks: {}
+finalState:
+  documentContents: |
+    int main() {
+      switch (int i = rand() % 100; ) {
+        default:
+        break;
+      }
+    }
+  selections:
+    - anchor: { line: 1, character: 32 }
+      active: { line: 1, character: 32 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      modifiers:
+        [
+          {
+            type: containingScope,
+            scopeType: { type: switchStatementSubject },
+          },
+        ],
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/cpp/clearValue.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/cpp/clearValue.yml
new file mode 100644
index 0000000000..54abb5c10f
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/cpp/clearValue.yml
@@ -0,0 +1,33 @@
+languageId: cpp
+command:
+  version: 1
+  spokenForm: clear value
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier:
+        { type: containingScope, scopeType: value, includeSiblings: false }
+initialState:
+  documentContents: a += "world"
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+  marks: {}
+finalState:
+  documentContents: "a += "
+  selections:
+    - anchor: { line: 0, character: 5 }
+      active: { line: 0, character: 5 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        { type: containingScope, scopeType: value, includeSiblings: false },
+      isImplicit: false,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/cpp/elseStateWrapThis.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/cpp/elseStateWrapThis.yml
new file mode 100644
index 0000000000..69069216dc
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/cpp/elseStateWrapThis.yml
@@ -0,0 +1,37 @@
+languageId: cpp
+command:
+  version: 1
+  spokenForm: else state wrap this
+  action: wrapWithSnippet
+  targets:
+    - type: primitive
+      mark: { type: cursor }
+  extraArgs: [ifElseStatement.alternative]
+initialState:
+  documentContents: int foo = 0;
+  selections:
+    - anchor: { line: 0, character: 6 }
+      active: { line: 0, character: 6 }
+  marks: {}
+finalState:
+  documentContents: |-
+    if () {
+
+    } else {
+        int foo = 0;
+    }
+  selections:
+    - anchor: { line: 0, character: 4 }
+      active: { line: 0, character: 4 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        { type: containingScope, scopeType: statement, includeSiblings: false },
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/cpp/ifElseWrapThis.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/cpp/ifElseWrapThis.yml
new file mode 100644
index 0000000000..90007e2fce
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/cpp/ifElseWrapThis.yml
@@ -0,0 +1,37 @@
+languageId: cpp
+command:
+  version: 1
+  spokenForm: if else wrap this
+  action: wrapWithSnippet
+  targets:
+    - type: primitive
+      mark: { type: cursor }
+  extraArgs: [ifElseStatement.consequence]
+initialState:
+  documentContents: int foo = 0;
+  selections:
+    - anchor: { line: 0, character: 6 }
+      active: { line: 0, character: 6 }
+  marks: {}
+finalState:
+  documentContents: |-
+    if () {
+        int foo = 0;
+    } else {
+
+    }
+  selections:
+    - anchor: { line: 0, character: 4 }
+      active: { line: 0, character: 4 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        { type: containingScope, scopeType: statement, includeSiblings: false },
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/cpp/ifStateWrapThis.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/cpp/ifStateWrapThis.yml
new file mode 100644
index 0000000000..278b5a54cc
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/cpp/ifStateWrapThis.yml
@@ -0,0 +1,35 @@
+languageId: cpp
+command:
+  version: 1
+  spokenForm: if state wrap this
+  action: wrapWithSnippet
+  targets:
+    - type: primitive
+      mark: { type: cursor }
+  extraArgs: [ifStatement.consequence]
+initialState:
+  documentContents: int foo = 0;
+  selections:
+    - anchor: { line: 0, character: 6 }
+      active: { line: 0, character: 6 }
+  marks: {}
+finalState:
+  documentContents: |-
+    if () {
+        int foo = 0;
+    }
+  selections:
+    - anchor: { line: 0, character: 4 }
+      active: { line: 0, character: 4 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        { type: containingScope, scopeType: statement, includeSiblings: false },
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/cpp/takeArg.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/cpp/takeArg.yml
new file mode 100644
index 0000000000..28f490de50
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/cpp/takeArg.yml
@@ -0,0 +1,36 @@
+languageId: cpp
+command:
+  version: 1
+  spokenForm: take arg
+  action: setSelection
+  targets:
+    - type: primitive
+      modifier: { type: containingScope, scopeType: argumentOrParameter }
+initialState:
+  documentContents: |-
+    int main() {
+        f(1 + 2, 3 + 4);
+    }
+  selections:
+    - anchor: { line: 1, character: 7 }
+      active: { line: 1, character: 7 }
+  marks: {}
+finalState:
+  documentContents: |-
+    int main() {
+        f(1 + 2, 3 + 4);
+    }
+  selections:
+    - anchor: { line: 1, character: 6 }
+      active: { line: 1, character: 11 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      modifier: { type: containingScope, scopeType: argumentOrParameter },
+      insideOutsideType: inside,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/cpp/takeArg2.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/cpp/takeArg2.yml
new file mode 100644
index 0000000000..63c59f5e3d
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/cpp/takeArg2.yml
@@ -0,0 +1,34 @@
+languageId: cpp
+command:
+  version: 1
+  spokenForm: take arg
+  action: setSelection
+  targets:
+    - type: primitive
+      modifier: { type: containingScope, scopeType: argumentOrParameter }
+initialState:
+  documentContents: |-
+    int f(int a, int b) {
+    }
+  selections:
+    - anchor: { line: 0, character: 16 }
+      active: { line: 0, character: 16 }
+  marks: {}
+finalState:
+  documentContents: |-
+    int f(int a, int b) {
+    }
+  selections:
+    - anchor: { line: 0, character: 13 }
+      active: { line: 0, character: 18 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      modifier: { type: containingScope, scopeType: argumentOrParameter },
+      insideOutsideType: inside,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/cpp/takeAttribute.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/cpp/takeAttribute.yml
new file mode 100644
index 0000000000..22b480c847
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/cpp/takeAttribute.yml
@@ -0,0 +1,36 @@
+languageId: cpp
+command:
+  version: 1
+  spokenForm: take attribute
+  action: setSelection
+  targets:
+    - type: primitive
+      modifier: { type: containingScope, scopeType: attribute }
+initialState:
+  documentContents: |
+    [[nodiscard]]
+    int f(int a = 1) {
+    }
+  selections:
+    - anchor: { line: 0, character: 9 }
+      active: { line: 0, character: 9 }
+  marks: {}
+finalState:
+  documentContents: |
+    [[nodiscard]]
+    int f(int a = 1) {
+    }
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 13 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      modifier: { type: containingScope, scopeType: attribute },
+      insideOutsideType: inside,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/cpp/takeCall.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/cpp/takeCall.yml
new file mode 100644
index 0000000000..e09bfd7941
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/cpp/takeCall.yml
@@ -0,0 +1,36 @@
+languageId: cpp
+command:
+  version: 1
+  spokenForm: take call
+  action: setSelection
+  targets:
+    - type: primitive
+      modifier: { type: containingScope, scopeType: functionCall }
+initialState:
+  documentContents: |-
+    int f(int a, int b) {
+        return f(a, b);
+    }
+  selections:
+    - anchor: { line: 1, character: 14 }
+      active: { line: 1, character: 14 }
+  marks: {}
+finalState:
+  documentContents: |-
+    int f(int a, int b) {
+        return f(a, b);
+    }
+  selections:
+    - anchor: { line: 1, character: 11 }
+      active: { line: 1, character: 18 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      modifier: { type: containingScope, scopeType: functionCall },
+      insideOutsideType: inside,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/cpp/takeClass.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/cpp/takeClass.yml
new file mode 100644
index 0000000000..f8e918a48d
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/cpp/takeClass.yml
@@ -0,0 +1,30 @@
+languageId: cpp
+command:
+  version: 1
+  spokenForm: take class
+  action: setSelection
+  targets:
+    - type: primitive
+      modifier: { type: containingScope, scopeType: class }
+initialState:
+  documentContents: class A { int a; };
+  selections:
+    - anchor: { line: 0, character: 14 }
+      active: { line: 0, character: 14 }
+  marks: {}
+finalState:
+  documentContents: class A { int a; };
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 18 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      modifier: { type: containingScope, scopeType: class },
+      insideOutsideType: inside,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/cpp/takeClass2.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/cpp/takeClass2.yml
new file mode 100644
index 0000000000..24d45b3def
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/cpp/takeClass2.yml
@@ -0,0 +1,30 @@
+languageId: cpp
+command:
+  version: 1
+  spokenForm: take class
+  action: setSelection
+  targets:
+    - type: primitive
+      modifier: { type: containingScope, scopeType: class }
+initialState:
+  documentContents: enum class A { B };
+  selections:
+    - anchor: { line: 0, character: 16 }
+      active: { line: 0, character: 16 }
+  marks: {}
+finalState:
+  documentContents: enum class A { B };
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 18 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      modifier: { type: containingScope, scopeType: class },
+      insideOutsideType: inside,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/cpp/takeClassName.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/cpp/takeClassName.yml
new file mode 100644
index 0000000000..c4c417db2a
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/cpp/takeClassName.yml
@@ -0,0 +1,30 @@
+languageId: cpp
+command:
+  version: 1
+  spokenForm: take class name
+  action: setSelection
+  targets:
+    - type: primitive
+      modifier: { type: containingScope, scopeType: className }
+initialState:
+  documentContents: class A { int a; };
+  selections:
+    - anchor: { line: 0, character: 15 }
+      active: { line: 0, character: 15 }
+  marks: {}
+finalState:
+  documentContents: class A { int a; };
+  selections:
+    - anchor: { line: 0, character: 6 }
+      active: { line: 0, character: 7 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      modifier: { type: containingScope, scopeType: className },
+      insideOutsideType: inside,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/cpp/takeClassName2.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/cpp/takeClassName2.yml
new file mode 100644
index 0000000000..a26b2667d2
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/cpp/takeClassName2.yml
@@ -0,0 +1,30 @@
+languageId: cpp
+command:
+  version: 1
+  spokenForm: take class name
+  action: setSelection
+  targets:
+    - type: primitive
+      modifier: { type: containingScope, scopeType: className }
+initialState:
+  documentContents: enum class A { B };
+  selections:
+    - anchor: { line: 0, character: 16 }
+      active: { line: 0, character: 16 }
+  marks: {}
+finalState:
+  documentContents: enum class A { B };
+  selections:
+    - anchor: { line: 0, character: 11 }
+      active: { line: 0, character: 12 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      modifier: { type: containingScope, scopeType: className },
+      insideOutsideType: inside,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/cpp/takeClassName3.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/cpp/takeClassName3.yml
new file mode 100644
index 0000000000..d234e48839
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/cpp/takeClassName3.yml
@@ -0,0 +1,30 @@
+languageId: cpp
+command:
+  version: 1
+  spokenForm: take class name
+  action: setSelection
+  targets:
+    - type: primitive
+      modifier: { type: containingScope, scopeType: className }
+initialState:
+  documentContents: void ClassName::method() {}
+  selections:
+    - anchor: { line: 0, character: 26 }
+      active: { line: 0, character: 26 }
+  marks: {}
+finalState:
+  documentContents: void ClassName::method() {}
+  selections:
+    - anchor: { line: 0, character: 5 }
+      active: { line: 0, character: 14 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      modifier: { type: containingScope, scopeType: className },
+      insideOutsideType: inside,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/cpp/takeComment.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/cpp/takeComment.yml
new file mode 100644
index 0000000000..a39cef9325
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/cpp/takeComment.yml
@@ -0,0 +1,30 @@
+languageId: cpp
+command:
+  version: 1
+  spokenForm: take comment
+  action: setSelection
+  targets:
+    - type: primitive
+      modifier: { type: containingScope, scopeType: comment }
+initialState:
+  documentContents: int a; // the comment
+  selections:
+    - anchor: { line: 0, character: 20 }
+      active: { line: 0, character: 20 }
+  marks: {}
+finalState:
+  documentContents: int a; // the comment
+  selections:
+    - anchor: { line: 0, character: 7 }
+      active: { line: 0, character: 21 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      modifier: { type: containingScope, scopeType: comment },
+      insideOutsideType: inside,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/cpp/takeEveryArg.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/cpp/takeEveryArg.yml
new file mode 100644
index 0000000000..8f5b03edca
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/cpp/takeEveryArg.yml
@@ -0,0 +1,48 @@
+languageId: cpp
+command:
+  version: 1
+  spokenForm: take every arg
+  action: setSelection
+  targets:
+    - type: primitive
+      modifier:
+        {
+          type: containingScope,
+          scopeType: argumentOrParameter,
+          includeSiblings: true,
+        }
+initialState:
+  documentContents: |-
+    int f(int a, int b) {
+        return f(a, b);
+    }
+  selections:
+    - anchor: { line: 1, character: 16 }
+      active: { line: 1, character: 16 }
+  marks: {}
+finalState:
+  documentContents: |-
+    int f(int a, int b) {
+        return f(a, b);
+    }
+  selections:
+    - anchor: { line: 1, character: 13 }
+      active: { line: 1, character: 14 }
+    - anchor: { line: 1, character: 16 }
+      active: { line: 1, character: 17 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      modifier:
+        {
+          type: containingScope,
+          scopeType: argumentOrParameter,
+          includeSiblings: true,
+        },
+      insideOutsideType: inside,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/cpp/takeEveryItem.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/cpp/takeEveryItem.yml
new file mode 100644
index 0000000000..7f257b5317
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/cpp/takeEveryItem.yml
@@ -0,0 +1,48 @@
+languageId: cpp
+command:
+  version: 1
+  spokenForm: take every item
+  action: setSelection
+  targets:
+    - type: primitive
+      modifier:
+        {
+          type: containingScope,
+          scopeType: collectionItem,
+          includeSiblings: true,
+        }
+initialState:
+  documentContents: |-
+    int f(int a, int b) {
+        std::vector<int> v { a, b };
+    }
+  selections:
+    - anchor: { line: 1, character: 29 }
+      active: { line: 1, character: 29 }
+  marks: {}
+finalState:
+  documentContents: |-
+    int f(int a, int b) {
+        std::vector<int> v { a, b };
+    }
+  selections:
+    - anchor: { line: 1, character: 25 }
+      active: { line: 1, character: 26 }
+    - anchor: { line: 1, character: 28 }
+      active: { line: 1, character: 29 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      modifier:
+        {
+          type: containingScope,
+          scopeType: collectionItem,
+          includeSiblings: true,
+        },
+      insideOutsideType: inside,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/cpp/takeFunk.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/cpp/takeFunk.yml
new file mode 100644
index 0000000000..110b8de559
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/cpp/takeFunk.yml
@@ -0,0 +1,36 @@
+languageId: cpp
+command:
+  version: 1
+  spokenForm: take funk
+  action: setSelection
+  targets:
+    - type: primitive
+      modifier: { type: containingScope, scopeType: namedFunction }
+initialState:
+  documentContents: |-
+    int f(int a, int b) {
+
+    }
+  selections:
+    - anchor: { line: 1, character: 4 }
+      active: { line: 1, character: 4 }
+  marks: {}
+finalState:
+  documentContents: |-
+    int f(int a, int b) {
+
+    }
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 2, character: 1 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      modifier: { type: containingScope, scopeType: namedFunction },
+      insideOutsideType: inside,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/cpp/takeFunk2.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/cpp/takeFunk2.yml
new file mode 100644
index 0000000000..5b9fb6d434
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/cpp/takeFunk2.yml
@@ -0,0 +1,30 @@
+languageId: cpp
+command:
+  version: 1
+  spokenForm: take funk
+  action: setSelection
+  targets:
+    - type: primitive
+      modifier: { type: containingScope, scopeType: namedFunction }
+initialState:
+  documentContents: int f(int a, int b);
+  selections:
+    - anchor: { line: 0, character: 7 }
+      active: { line: 0, character: 7 }
+  marks: {}
+finalState:
+  documentContents: int f(int a, int b);
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 20 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      modifier: { type: containingScope, scopeType: namedFunction },
+      insideOutsideType: inside,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/cpp/takeFunkName.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/cpp/takeFunkName.yml
new file mode 100644
index 0000000000..b6f44a5df9
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/cpp/takeFunkName.yml
@@ -0,0 +1,36 @@
+languageId: cpp
+command:
+  version: 1
+  spokenForm: take funk name
+  action: setSelection
+  targets:
+    - type: primitive
+      modifier: { type: containingScope, scopeType: functionName }
+initialState:
+  documentContents: |-
+    int f(int a, int b) {
+
+    }
+  selections:
+    - anchor: { line: 1, character: 4 }
+      active: { line: 1, character: 4 }
+  marks: {}
+finalState:
+  documentContents: |-
+    int f(int a, int b) {
+
+    }
+  selections:
+    - anchor: { line: 0, character: 4 }
+      active: { line: 0, character: 5 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      modifier: { type: containingScope, scopeType: functionName },
+      insideOutsideType: inside,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/cpp/takeFunkName2.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/cpp/takeFunkName2.yml
new file mode 100644
index 0000000000..b25e4f5289
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/cpp/takeFunkName2.yml
@@ -0,0 +1,36 @@
+languageId: cpp
+command:
+  version: 1
+  spokenForm: take funk name
+  action: setSelection
+  targets:
+    - type: primitive
+      modifier: { type: containingScope, scopeType: functionName }
+initialState:
+  documentContents: |-
+    int C::f(int a, int b) {
+
+    }
+  selections:
+    - anchor: { line: 1, character: 4 }
+      active: { line: 1, character: 4 }
+  marks: {}
+finalState:
+  documentContents: |-
+    int C::f(int a, int b) {
+
+    }
+  selections:
+    - anchor: { line: 0, character: 7 }
+      active: { line: 0, character: 8 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      modifier: { type: containingScope, scopeType: functionName },
+      insideOutsideType: inside,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/cpp/takeFunkName3.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/cpp/takeFunkName3.yml
new file mode 100644
index 0000000000..2032ff9a1e
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/cpp/takeFunkName3.yml
@@ -0,0 +1,30 @@
+languageId: cpp
+command:
+  version: 1
+  spokenForm: take funk name
+  action: setSelection
+  targets:
+    - type: primitive
+      modifier: { type: containingScope, scopeType: functionName }
+initialState:
+  documentContents: int f(int a, int b);
+  selections:
+    - anchor: { line: 0, character: 1 }
+      active: { line: 0, character: 1 }
+  marks: {}
+finalState:
+  documentContents: int f(int a, int b);
+  selections:
+    - anchor: { line: 0, character: 4 }
+      active: { line: 0, character: 5 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      modifier: { type: containingScope, scopeType: functionName },
+      insideOutsideType: inside,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/cpp/takeIf.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/cpp/takeIf.yml
new file mode 100644
index 0000000000..169b55430f
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/cpp/takeIf.yml
@@ -0,0 +1,40 @@
+languageId: cpp
+command:
+  version: 1
+  spokenForm: take if
+  action: setSelection
+  targets:
+    - type: primitive
+      modifier: { type: containingScope, scopeType: ifStatement }
+initialState:
+  documentContents: |-
+    void f() {
+        if (true) {
+
+        }
+    }
+  selections:
+    - anchor: { line: 2, character: 8 }
+      active: { line: 2, character: 8 }
+  marks: {}
+finalState:
+  documentContents: |-
+    void f() {
+        if (true) {
+
+        }
+    }
+  selections:
+    - anchor: { line: 1, character: 4 }
+      active: { line: 3, character: 5 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      modifier: { type: containingScope, scopeType: ifStatement },
+      insideOutsideType: inside,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/cpp/takeIf2.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/cpp/takeIf2.yml
new file mode 100644
index 0000000000..b6817130da
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/cpp/takeIf2.yml
@@ -0,0 +1,40 @@
+languageId: cpp
+command:
+  version: 1
+  spokenForm: take if
+  action: setSelection
+  targets:
+    - type: primitive
+      modifier: { type: containingScope, scopeType: ifStatement }
+initialState:
+  documentContents: |-
+    void f() {
+        if constexpr (true) {
+
+        }
+    }
+  selections:
+    - anchor: { line: 2, character: 8 }
+      active: { line: 2, character: 8 }
+  marks: {}
+finalState:
+  documentContents: |-
+    void f() {
+        if constexpr (true) {
+
+        }
+    }
+  selections:
+    - anchor: { line: 1, character: 4 }
+      active: { line: 3, character: 5 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      modifier: { type: containingScope, scopeType: ifStatement },
+      insideOutsideType: inside,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/cpp/takeItem.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/cpp/takeItem.yml
new file mode 100644
index 0000000000..e1e49aa68a
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/cpp/takeItem.yml
@@ -0,0 +1,42 @@
+languageId: cpp
+command:
+  version: 1
+  spokenForm: take item
+  action: setSelection
+  targets:
+    - type: primitive
+      modifier: { type: containingScope, scopeType: collectionItem }
+initialState:
+  documentContents: |-
+    void f() {
+        std::vector<int> v {
+            1 + 2,
+            3
+        };
+    }
+  selections:
+    - anchor: { line: 2, character: 10 }
+      active: { line: 2, character: 10 }
+  marks: {}
+finalState:
+  documentContents: |-
+    void f() {
+        std::vector<int> v {
+            1 + 2,
+            3
+        };
+    }
+  selections:
+    - anchor: { line: 2, character: 8 }
+      active: { line: 2, character: 13 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      modifier: { type: containingScope, scopeType: collectionItem },
+      insideOutsideType: inside,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/cpp/takeItem2.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/cpp/takeItem2.yml
new file mode 100644
index 0000000000..92b3967bb0
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/cpp/takeItem2.yml
@@ -0,0 +1,42 @@
+languageId: cpp
+command:
+  version: 1
+  spokenForm: take item
+  action: setSelection
+  targets:
+    - type: primitive
+      modifier: { type: containingScope, scopeType: collectionItem }
+initialState:
+  documentContents: |-
+    void f() {
+        int arr[] = {
+            1 + 2,
+            3
+        };
+    }
+  selections:
+    - anchor: { line: 2, character: 11 }
+      active: { line: 2, character: 11 }
+  marks: {}
+finalState:
+  documentContents: |-
+    void f() {
+        int arr[] = {
+            1 + 2,
+            3
+        };
+    }
+  selections:
+    - anchor: { line: 2, character: 8 }
+      active: { line: 2, character: 13 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      modifier: { type: containingScope, scopeType: collectionItem },
+      insideOutsideType: inside,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/cpp/takeLambda.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/cpp/takeLambda.yml
new file mode 100644
index 0000000000..157462c7bb
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/cpp/takeLambda.yml
@@ -0,0 +1,36 @@
+languageId: cpp
+command:
+  version: 1
+  spokenForm: take lambda
+  action: setSelection
+  targets:
+    - type: primitive
+      modifier: { type: containingScope, scopeType: anonymousFunction }
+initialState:
+  documentContents: |
+    void f() {
+        [](){}();
+    }
+  selections:
+    - anchor: { line: 1, character: 7 }
+      active: { line: 1, character: 7 }
+  marks: {}
+finalState:
+  documentContents: |
+    void f() {
+        [](){}();
+    }
+  selections:
+    - anchor: { line: 1, character: 4 }
+      active: { line: 1, character: 10 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      modifier: { type: containingScope, scopeType: anonymousFunction },
+      insideOutsideType: inside,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/cpp/takeList.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/cpp/takeList.yml
new file mode 100644
index 0000000000..00f9962268
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/cpp/takeList.yml
@@ -0,0 +1,42 @@
+languageId: cpp
+command:
+  version: 1
+  spokenForm: take list
+  action: setSelection
+  targets:
+    - type: primitive
+      modifier: { type: containingScope, scopeType: list }
+initialState:
+  documentContents: |-
+    void f() {
+        std::vector<int> v {
+            1 + 2,
+            3
+        };
+    }
+  selections:
+    - anchor: { line: 2, character: 11 }
+      active: { line: 2, character: 11 }
+  marks: {}
+finalState:
+  documentContents: |-
+    void f() {
+        std::vector<int> v {
+            1 + 2,
+            3
+        };
+    }
+  selections:
+    - anchor: { line: 1, character: 23 }
+      active: { line: 4, character: 5 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      modifier: { type: containingScope, scopeType: list },
+      insideOutsideType: inside,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/cpp/takeList2.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/cpp/takeList2.yml
new file mode 100644
index 0000000000..5500300628
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/cpp/takeList2.yml
@@ -0,0 +1,42 @@
+languageId: cpp
+command:
+  version: 1
+  spokenForm: take list
+  action: setSelection
+  targets:
+    - type: primitive
+      modifier: { type: containingScope, scopeType: list }
+initialState:
+  documentContents: |-
+    void f() {
+        int arr[] = {
+            1 + 2,
+            3
+        };
+    }
+  selections:
+    - anchor: { line: 2, character: 12 }
+      active: { line: 2, character: 12 }
+  marks: {}
+finalState:
+  documentContents: |-
+    void f() {
+        int arr[] = {
+            1 + 2,
+            3
+        };
+    }
+  selections:
+    - anchor: { line: 1, character: 16 }
+      active: { line: 4, character: 5 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      modifier: { type: containingScope, scopeType: list },
+      insideOutsideType: inside,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/cpp/takeName.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/cpp/takeName.yml
new file mode 100644
index 0000000000..024542146a
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/cpp/takeName.yml
@@ -0,0 +1,36 @@
+languageId: cpp
+command:
+  version: 1
+  spokenForm: take name
+  action: setSelection
+  targets:
+    - type: primitive
+      modifier: { type: containingScope, scopeType: name }
+initialState:
+  documentContents: |-
+    void f() {
+        int i = 1;
+    }
+  selections:
+    - anchor: { line: 1, character: 13 }
+      active: { line: 1, character: 13 }
+  marks: {}
+finalState:
+  documentContents: |-
+    void f() {
+        int i = 1;
+    }
+  selections:
+    - anchor: { line: 1, character: 8 }
+      active: { line: 1, character: 9 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      modifier: { type: containingScope, scopeType: name },
+      insideOutsideType: inside,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/cpp/takeName2.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/cpp/takeName2.yml
new file mode 100644
index 0000000000..28ce5b7d40
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/cpp/takeName2.yml
@@ -0,0 +1,36 @@
+languageId: cpp
+command:
+  version: 1
+  spokenForm: take name
+  action: setSelection
+  targets:
+    - type: primitive
+      modifier: { type: containingScope, scopeType: name }
+initialState:
+  documentContents: |-
+    void f(int i = 1) {
+
+    }
+  selections:
+    - anchor: { line: 0, character: 15 }
+      active: { line: 0, character: 15 }
+  marks: {}
+finalState:
+  documentContents: |-
+    void f(int i = 1) {
+
+    }
+  selections:
+    - anchor: { line: 0, character: 11 }
+      active: { line: 0, character: 12 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      modifier: { type: containingScope, scopeType: name },
+      insideOutsideType: inside,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/cpp/takeName3.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/cpp/takeName3.yml
new file mode 100644
index 0000000000..0a67e1b0f3
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/cpp/takeName3.yml
@@ -0,0 +1,36 @@
+languageId: cpp
+command:
+  version: 1
+  spokenForm: take name
+  action: setSelection
+  targets:
+    - type: primitive
+      modifier: { type: containingScope, scopeType: name }
+initialState:
+  documentContents: |-
+    void f(int i = 1) {
+
+    }
+  selections:
+    - anchor: { line: 1, character: 4 }
+      active: { line: 1, character: 4 }
+  marks: {}
+finalState:
+  documentContents: |-
+    void f(int i = 1) {
+
+    }
+  selections:
+    - anchor: { line: 0, character: 5 }
+      active: { line: 0, character: 6 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      modifier: { type: containingScope, scopeType: name },
+      insideOutsideType: inside,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/cpp/takeState.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/cpp/takeState.yml
new file mode 100644
index 0000000000..901a2028da
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/cpp/takeState.yml
@@ -0,0 +1,40 @@
+languageId: cpp
+command:
+  version: 1
+  spokenForm: take state
+  action: setSelection
+  targets:
+    - type: primitive
+      modifier: { type: containingScope, scopeType: statement }
+initialState:
+  documentContents: |-
+    void f() {
+        while (true) {
+            ;
+        }
+    }
+  selections:
+    - anchor: { line: 1, character: 7 }
+      active: { line: 1, character: 7 }
+  marks: {}
+finalState:
+  documentContents: |-
+    void f() {
+        while (true) {
+            ;
+        }
+    }
+  selections:
+    - anchor: { line: 1, character: 4 }
+      active: { line: 3, character: 5 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      modifier: { type: containingScope, scopeType: statement },
+      insideOutsideType: inside,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/cpp/takeState2.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/cpp/takeState2.yml
new file mode 100644
index 0000000000..d53ac9a6be
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/cpp/takeState2.yml
@@ -0,0 +1,36 @@
+languageId: cpp
+command:
+  version: 1
+  spokenForm: take state
+  action: setSelection
+  targets:
+    - type: primitive
+      modifier: { type: containingScope, scopeType: statement }
+initialState:
+  documentContents: |-
+    void f() {
+        a = 1;
+    }
+  selections:
+    - anchor: { line: 1, character: 7 }
+      active: { line: 1, character: 7 }
+  marks: {}
+finalState:
+  documentContents: |-
+    void f() {
+        a = 1;
+    }
+  selections:
+    - anchor: { line: 1, character: 4 }
+      active: { line: 1, character: 10 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      modifier: { type: containingScope, scopeType: statement },
+      insideOutsideType: inside,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/cpp/takeState3.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/cpp/takeState3.yml
new file mode 100644
index 0000000000..f484ec9e8c
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/cpp/takeState3.yml
@@ -0,0 +1,36 @@
+languageId: cpp
+command:
+  version: 1
+  spokenForm: take state
+  action: setSelection
+  targets:
+    - type: primitive
+      modifier: { type: containingScope, scopeType: statement }
+initialState:
+  documentContents: |-
+    void f() {
+        int a = 1;
+    }
+  selections:
+    - anchor: { line: 1, character: 10 }
+      active: { line: 1, character: 10 }
+  marks: {}
+finalState:
+  documentContents: |-
+    void f() {
+        int a = 1;
+    }
+  selections:
+    - anchor: { line: 1, character: 4 }
+      active: { line: 1, character: 14 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      modifier: { type: containingScope, scopeType: statement },
+      insideOutsideType: inside,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/cpp/takeString.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/cpp/takeString.yml
new file mode 100644
index 0000000000..b3f67bcdf8
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/cpp/takeString.yml
@@ -0,0 +1,32 @@
+languageId: cpp
+command:
+  version: 1
+  spokenForm: take string
+  action: setSelection
+  targets:
+    - type: primitive
+      modifier: { type: containingScope, scopeType: string }
+initialState:
+  documentContents: |
+    char* a = "hello world";
+  selections:
+    - anchor: { line: 0, character: 21 }
+      active: { line: 0, character: 21 }
+  marks: {}
+finalState:
+  documentContents: |
+    char* a = "hello world";
+  selections:
+    - anchor: { line: 0, character: 10 }
+      active: { line: 0, character: 23 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      modifier: { type: containingScope, scopeType: string },
+      insideOutsideType: inside,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/cpp/takeType.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/cpp/takeType.yml
new file mode 100644
index 0000000000..4011cd4c19
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/cpp/takeType.yml
@@ -0,0 +1,32 @@
+languageId: cpp
+command:
+  version: 1
+  spokenForm: take type
+  action: setSelection
+  targets:
+    - type: primitive
+      modifier: { type: containingScope, scopeType: type }
+initialState:
+  documentContents: |
+    int f(int a) {}
+  selections:
+    - anchor: { line: 0, character: 10 }
+      active: { line: 0, character: 10 }
+  marks: {}
+finalState:
+  documentContents: |
+    int f(int a) {}
+  selections:
+    - anchor: { line: 0, character: 6 }
+      active: { line: 0, character: 9 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      modifier: { type: containingScope, scopeType: type },
+      insideOutsideType: inside,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/cpp/takeType2.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/cpp/takeType2.yml
new file mode 100644
index 0000000000..99a36db11e
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/cpp/takeType2.yml
@@ -0,0 +1,32 @@
+languageId: cpp
+command:
+  version: 1
+  spokenForm: take type
+  action: setSelection
+  targets:
+    - type: primitive
+      modifier: { type: containingScope, scopeType: type }
+initialState:
+  documentContents: |
+    int f(int a) {}
+  selections:
+    - anchor: { line: 0, character: 14 }
+      active: { line: 0, character: 14 }
+  marks: {}
+finalState:
+  documentContents: |
+    int f(int a) {}
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 3 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      modifier: { type: containingScope, scopeType: type },
+      insideOutsideType: inside,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/cpp/takeType3.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/cpp/takeType3.yml
new file mode 100644
index 0000000000..11d9a8bbda
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/cpp/takeType3.yml
@@ -0,0 +1,36 @@
+languageId: cpp
+command:
+  version: 1
+  spokenForm: take type
+  action: setSelection
+  targets:
+    - type: primitive
+      modifier: { type: containingScope, scopeType: type }
+initialState:
+  documentContents: |
+    int f(int a) {
+        int j = a;
+    }
+  selections:
+    - anchor: { line: 1, character: 13 }
+      active: { line: 1, character: 13 }
+  marks: {}
+finalState:
+  documentContents: |
+    int f(int a) {
+        int j = a;
+    }
+  selections:
+    - anchor: { line: 1, character: 4 }
+      active: { line: 1, character: 7 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      modifier: { type: containingScope, scopeType: type },
+      insideOutsideType: inside,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/cpp/takeValue.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/cpp/takeValue.yml
new file mode 100644
index 0000000000..0b7db87470
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/cpp/takeValue.yml
@@ -0,0 +1,36 @@
+languageId: cpp
+command:
+  version: 1
+  spokenForm: take value
+  action: setSelection
+  targets:
+    - type: primitive
+      modifier: { type: containingScope, scopeType: value }
+initialState:
+  documentContents: |
+    int f(int a) {
+        int j = a;
+    }
+  selections:
+    - anchor: { line: 1, character: 5 }
+      active: { line: 1, character: 5 }
+  marks: {}
+finalState:
+  documentContents: |
+    int f(int a) {
+        int j = a;
+    }
+  selections:
+    - anchor: { line: 1, character: 12 }
+      active: { line: 1, character: 13 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      modifier: { type: containingScope, scopeType: value },
+      insideOutsideType: inside,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/cpp/takeValue2.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/cpp/takeValue2.yml
new file mode 100644
index 0000000000..fe2ebbfe4c
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/cpp/takeValue2.yml
@@ -0,0 +1,36 @@
+languageId: cpp
+command:
+  version: 1
+  spokenForm: take value
+  action: setSelection
+  targets:
+    - type: primitive
+      modifier: { type: containingScope, scopeType: value }
+initialState:
+  documentContents: |
+    int f(int a) {
+        a = 2;
+    }
+  selections:
+    - anchor: { line: 1, character: 5 }
+      active: { line: 1, character: 5 }
+  marks: {}
+finalState:
+  documentContents: |
+    int f(int a) {
+        a = 2;
+    }
+  selections:
+    - anchor: { line: 1, character: 8 }
+      active: { line: 1, character: 9 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      modifier: { type: containingScope, scopeType: value },
+      insideOutsideType: inside,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/cpp/takeValue3.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/cpp/takeValue3.yml
new file mode 100644
index 0000000000..4a9ab58517
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/cpp/takeValue3.yml
@@ -0,0 +1,34 @@
+languageId: cpp
+command:
+  version: 1
+  spokenForm: take value
+  action: setSelection
+  targets:
+    - type: primitive
+      modifier: { type: containingScope, scopeType: value }
+initialState:
+  documentContents: |
+    int f(int a = 1) {
+    }
+  selections:
+    - anchor: { line: 0, character: 11 }
+      active: { line: 0, character: 11 }
+  marks: {}
+finalState:
+  documentContents: |
+    int f(int a = 1) {
+    }
+  selections:
+    - anchor: { line: 0, character: 14 }
+      active: { line: 0, character: 15 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      modifier: { type: containingScope, scopeType: value },
+      insideOutsideType: inside,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/cpp/tryCatchWrapThis.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/cpp/tryCatchWrapThis.yml
new file mode 100644
index 0000000000..2414b3a867
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/cpp/tryCatchWrapThis.yml
@@ -0,0 +1,37 @@
+languageId: cpp
+command:
+  version: 1
+  spokenForm: try catch wrap this
+  action: wrapWithSnippet
+  targets:
+    - type: primitive
+      mark: { type: cursor }
+  extraArgs: [tryCatchStatement.body]
+initialState:
+  documentContents: int foo = 0;
+  selections:
+    - anchor: { line: 0, character: 6 }
+      active: { line: 0, character: 6 }
+  marks: {}
+finalState:
+  documentContents: |-
+    try {
+        int foo = 0;
+    } catch () {
+
+    }
+  selections:
+    - anchor: { line: 2, character: 9 }
+      active: { line: 2, character: 9 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        { type: containingScope, scopeType: statement, includeSiblings: false },
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/cpp/tryCatchWrapThis2.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/cpp/tryCatchWrapThis2.yml
new file mode 100644
index 0000000000..eb5bf8ecfc
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/cpp/tryCatchWrapThis2.yml
@@ -0,0 +1,54 @@
+languageId: cpp
+command:
+  version: 1
+  spokenForm: try catch wrap this
+  action: wrapWithSnippet
+  targets:
+    - type: primitive
+      mark: { type: cursor }
+  extraArgs: [tryCatchStatement.body]
+initialState:
+  documentContents: |-
+    if (true) {
+        int foo = 0;
+    }
+
+    int bar = 1;
+  selections:
+    - anchor: { line: 4, character: 0 }
+      active: { line: 4, character: 0 }
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+  marks: {}
+finalState:
+  documentContents: |-
+    try {
+        if (true) {
+            int foo = 0;
+        }
+    } catch () {
+
+    }
+
+    try {
+        int bar = 1;
+    } catch () {
+
+    }
+  selections:
+    - anchor: { line: 10, character: 9 }
+      active: { line: 10, character: 9 }
+    - anchor: { line: 4, character: 9 }
+      active: { line: 4, character: 9 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        { type: containingScope, scopeType: statement, includeSiblings: false },
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/csharp/changeCall.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/csharp/changeCall.yml
new file mode 100644
index 0000000000..3f96799d17
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/csharp/changeCall.yml
@@ -0,0 +1,41 @@
+languageId: csharp
+command:
+  version: 1
+  spokenForm: change call
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier:
+        {
+          type: containingScope,
+          scopeType: functionCall,
+          includeSiblings: false,
+        }
+initialState:
+  documentContents: Taxi t = new Taxi();
+  selections:
+    - anchor: { line: 0, character: 18 }
+      active: { line: 0, character: 18 }
+  marks: {}
+finalState:
+  documentContents: Taxi t = ;
+  selections:
+    - anchor: { line: 0, character: 9 }
+      active: { line: 0, character: 9 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        {
+          type: containingScope,
+          scopeType: functionCall,
+          includeSiblings: false,
+        },
+      isImplicit: false,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/csharp/changeCall2.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/csharp/changeCall2.yml
new file mode 100644
index 0000000000..573b5441ef
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/csharp/changeCall2.yml
@@ -0,0 +1,41 @@
+languageId: csharp
+command:
+  version: 1
+  spokenForm: change call
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier:
+        {
+          type: containingScope,
+          scopeType: functionCall,
+          includeSiblings: false,
+        }
+initialState:
+  documentContents: Taxi t = new c.Taxi(a, b);
+  selections:
+    - anchor: { line: 0, character: 23 }
+      active: { line: 0, character: 23 }
+  marks: {}
+finalState:
+  documentContents: Taxi t = ;
+  selections:
+    - anchor: { line: 0, character: 9 }
+      active: { line: 0, character: 9 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        {
+          type: containingScope,
+          scopeType: functionCall,
+          includeSiblings: false,
+        },
+      isImplicit: false,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/csharp/changeCall3.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/csharp/changeCall3.yml
new file mode 100644
index 0000000000..ca339c8e99
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/csharp/changeCall3.yml
@@ -0,0 +1,41 @@
+languageId: csharp
+command:
+  version: 1
+  spokenForm: change call
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier:
+        {
+          type: containingScope,
+          scopeType: functionCall,
+          includeSiblings: false,
+        }
+initialState:
+  documentContents: Taxi t = new c[0].Taxi(a, b);
+  selections:
+    - anchor: { line: 0, character: 25 }
+      active: { line: 0, character: 25 }
+  marks: {}
+finalState:
+  documentContents: Taxi t = ;
+  selections:
+    - anchor: { line: 0, character: 9 }
+      active: { line: 0, character: 9 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        {
+          type: containingScope,
+          scopeType: functionCall,
+          includeSiblings: false,
+        },
+      isImplicit: false,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/csharp/changeCallee.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/csharp/changeCallee.yml
new file mode 100644
index 0000000000..bd0c3b6bfc
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/csharp/changeCallee.yml
@@ -0,0 +1,41 @@
+languageId: csharp
+command:
+  version: 1
+  spokenForm: change callee
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier:
+        {
+          type: containingScope,
+          scopeType: functionCallee,
+          includeSiblings: false,
+        }
+initialState:
+  documentContents: TestMotorcycle moto = new TestMotorcycle();
+  selections:
+    - anchor: { line: 0, character: 41 }
+      active: { line: 0, character: 41 }
+  marks: {}
+finalState:
+  documentContents: TestMotorcycle moto = new ();
+  selections:
+    - anchor: { line: 0, character: 26 }
+      active: { line: 0, character: 26 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        {
+          type: containingScope,
+          scopeType: functionCallee,
+          includeSiblings: false,
+        },
+      isImplicit: false,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/csharp/changeCallee2.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/csharp/changeCallee2.yml
new file mode 100644
index 0000000000..707ea0035a
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/csharp/changeCallee2.yml
@@ -0,0 +1,41 @@
+languageId: csharp
+command:
+  version: 1
+  spokenForm: change callee
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier:
+        {
+          type: containingScope,
+          scopeType: functionCallee,
+          includeSiblings: false,
+        }
+initialState:
+  documentContents: TestMotorcycle moto = new TestMotorcycle[0]();
+  selections:
+    - anchor: { line: 0, character: 44 }
+      active: { line: 0, character: 44 }
+  marks: {}
+finalState:
+  documentContents: TestMotorcycle moto = ();
+  selections:
+    - anchor: { line: 0, character: 22 }
+      active: { line: 0, character: 22 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        {
+          type: containingScope,
+          scopeType: functionCallee,
+          includeSiblings: false,
+        },
+      isImplicit: false,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/csharp/changeCallee3.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/csharp/changeCallee3.yml
new file mode 100644
index 0000000000..a1ff4117db
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/csharp/changeCallee3.yml
@@ -0,0 +1,41 @@
+languageId: csharp
+command:
+  version: 1
+  spokenForm: change callee
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier:
+        {
+          type: containingScope,
+          scopeType: functionCallee,
+          includeSiblings: false,
+        }
+initialState:
+  documentContents: moto.StartEngine();
+  selections:
+    - anchor: { line: 0, character: 17 }
+      active: { line: 0, character: 17 }
+  marks: {}
+finalState:
+  documentContents: ();
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        {
+          type: containingScope,
+          scopeType: functionCallee,
+          includeSiblings: false,
+        },
+      isImplicit: false,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/csharp/changeCallee4.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/csharp/changeCallee4.yml
new file mode 100644
index 0000000000..692be07030
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/csharp/changeCallee4.yml
@@ -0,0 +1,41 @@
+languageId: csharp
+command:
+  version: 1
+  spokenForm: change callee
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier:
+        {
+          type: containingScope,
+          scopeType: functionCallee,
+          includeSiblings: false,
+        }
+initialState:
+  documentContents: moto.StartEngine[0](5, true);
+  selections:
+    - anchor: { line: 0, character: 24 }
+      active: { line: 0, character: 24 }
+  marks: {}
+finalState:
+  documentContents: (5, true);
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        {
+          type: containingScope,
+          scopeType: functionCallee,
+          includeSiblings: false,
+        },
+      isImplicit: false,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/csharp/changeCallee5.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/csharp/changeCallee5.yml
new file mode 100644
index 0000000000..c03fff473a
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/csharp/changeCallee5.yml
@@ -0,0 +1,41 @@
+languageId: csharp
+command:
+  version: 1
+  spokenForm: change callee
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier:
+        {
+          type: containingScope,
+          scopeType: functionCallee,
+          includeSiblings: false,
+        }
+initialState:
+  documentContents: startEngine[0](5, true)();
+  selections:
+    - anchor: { line: 0, character: 24 }
+      active: { line: 0, character: 24 }
+  marks: {}
+finalState:
+  documentContents: ();
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        {
+          type: containingScope,
+          scopeType: functionCallee,
+          includeSiblings: false,
+        },
+      isImplicit: false,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/csharp/changeCallee6.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/csharp/changeCallee6.yml
new file mode 100644
index 0000000000..24bc9fc31b
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/csharp/changeCallee6.yml
@@ -0,0 +1,41 @@
+languageId: csharp
+command:
+  version: 1
+  spokenForm: change callee
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier:
+        {
+          type: containingScope,
+          scopeType: functionCallee,
+          includeSiblings: false,
+        }
+initialState:
+  documentContents: startEngine[0](5, true).test();
+  selections:
+    - anchor: { line: 0, character: 29 }
+      active: { line: 0, character: 29 }
+  marks: {}
+finalState:
+  documentContents: ();
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        {
+          type: containingScope,
+          scopeType: functionCallee,
+          includeSiblings: false,
+        },
+      isImplicit: false,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/csharp/changeCondition.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/csharp/changeCondition.yml
new file mode 100644
index 0000000000..f0b50954f0
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/csharp/changeCondition.yml
@@ -0,0 +1,39 @@
+languageId: csharp
+command:
+  version: 1
+  spokenForm: change condition
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier:
+        { type: containingScope, scopeType: condition, includeSiblings: false }
+initialState:
+  documentContents: |-
+    if (columnname != a && columnname != b && columnname != c)
+    {
+    }
+  selections:
+    - anchor: { line: 0, character: 28 }
+      active: { line: 0, character: 28 }
+  marks: {}
+finalState:
+  documentContents: |-
+    if ()
+    {
+    }
+  selections:
+    - anchor: { line: 0, character: 4 }
+      active: { line: 0, character: 4 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        { type: containingScope, scopeType: condition, includeSiblings: false },
+      isImplicit: false,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/csharp/changeCondition2.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/csharp/changeCondition2.yml
new file mode 100644
index 0000000000..8ce63e8199
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/csharp/changeCondition2.yml
@@ -0,0 +1,33 @@
+languageId: csharp
+command:
+  version: 1
+  spokenForm: change condition
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier:
+        { type: containingScope, scopeType: condition, includeSiblings: false }
+initialState:
+  documentContents: for (int i = 0; i < 5; i++) {}
+  selections:
+    - anchor: { line: 0, character: 19 }
+      active: { line: 0, character: 19 }
+  marks: {}
+finalState:
+  documentContents: for (int i = 0; ; i++) {}
+  selections:
+    - anchor: { line: 0, character: 16 }
+      active: { line: 0, character: 16 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        { type: containingScope, scopeType: condition, includeSiblings: false },
+      isImplicit: false,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/csharp/changeCondition3.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/csharp/changeCondition3.yml
new file mode 100644
index 0000000000..68b23574a6
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/csharp/changeCondition3.yml
@@ -0,0 +1,33 @@
+languageId: csharp
+command:
+  version: 1
+  spokenForm: change condition
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier:
+        { type: containingScope, scopeType: condition, includeSiblings: false }
+initialState:
+  documentContents: while (a != true) {}
+  selections:
+    - anchor: { line: 0, character: 11 }
+      active: { line: 0, character: 11 }
+  marks: {}
+finalState:
+  documentContents: while () {}
+  selections:
+    - anchor: { line: 0, character: 7 }
+      active: { line: 0, character: 7 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        { type: containingScope, scopeType: condition, includeSiblings: false },
+      isImplicit: false,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/csharp/changeCondition4.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/csharp/changeCondition4.yml
new file mode 100644
index 0000000000..74e17a98f5
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/csharp/changeCondition4.yml
@@ -0,0 +1,33 @@
+languageId: csharp
+command:
+  version: 1
+  spokenForm: change condition
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier:
+        { type: containingScope, scopeType: condition, includeSiblings: false }
+initialState:
+  documentContents: if (false) {}
+  selections:
+    - anchor: { line: 0, character: 12 }
+      active: { line: 0, character: 12 }
+  marks: {}
+finalState:
+  documentContents: if () {}
+  selections:
+    - anchor: { line: 0, character: 4 }
+      active: { line: 0, character: 4 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        { type: containingScope, scopeType: condition, includeSiblings: false },
+      isImplicit: false,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/csharp/changeCondition5.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/csharp/changeCondition5.yml
new file mode 100644
index 0000000000..19136b3d81
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/csharp/changeCondition5.yml
@@ -0,0 +1,33 @@
+languageId: csharp
+command:
+  version: 1
+  spokenForm: change condition
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier:
+        { type: containingScope, scopeType: condition, includeSiblings: false }
+initialState:
+  documentContents: if (!true) {}
+  selections:
+    - anchor: { line: 0, character: 12 }
+      active: { line: 0, character: 12 }
+  marks: {}
+finalState:
+  documentContents: if () {}
+  selections:
+    - anchor: { line: 0, character: 4 }
+      active: { line: 0, character: 4 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        { type: containingScope, scopeType: condition, includeSiblings: false },
+      isImplicit: false,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/csharp/changeCondition6.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/csharp/changeCondition6.yml
new file mode 100644
index 0000000000..4b02e062c4
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/csharp/changeCondition6.yml
@@ -0,0 +1,33 @@
+languageId: csharp
+command:
+  version: 1
+  spokenForm: change condition
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier:
+        { type: containingScope, scopeType: condition, includeSiblings: false }
+initialState:
+  documentContents: if (foo(bar)) {    }
+  selections:
+    - anchor: { line: 0, character: 11 }
+      active: { line: 0, character: 11 }
+  marks: {}
+finalState:
+  documentContents: if () {    }
+  selections:
+    - anchor: { line: 0, character: 4 }
+      active: { line: 0, character: 4 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        { type: containingScope, scopeType: condition, includeSiblings: false },
+      isImplicit: false,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/csharp/changeCondition7.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/csharp/changeCondition7.yml
new file mode 100644
index 0000000000..1dceefde82
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/csharp/changeCondition7.yml
@@ -0,0 +1,33 @@
+languageId: csharp
+command:
+  version: 1
+  spokenForm: change condition
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier:
+        { type: containingScope, scopeType: condition, includeSiblings: false }
+initialState:
+  documentContents: while (true) {}
+  selections:
+    - anchor: { line: 0, character: 10 }
+      active: { line: 0, character: 10 }
+  marks: {}
+finalState:
+  documentContents: while () {}
+  selections:
+    - anchor: { line: 0, character: 7 }
+      active: { line: 0, character: 7 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        { type: containingScope, scopeType: condition, includeSiblings: false },
+      isImplicit: false,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/csharp/changeCondition8.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/csharp/changeCondition8.yml
new file mode 100644
index 0000000000..ffd60374b8
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/csharp/changeCondition8.yml
@@ -0,0 +1,33 @@
+languageId: csharp
+command:
+  version: 1
+  spokenForm: change condition
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier:
+        { type: containingScope, scopeType: condition, includeSiblings: false }
+initialState:
+  documentContents: for (int i = 0; i < 5; i++) { while(false == true) {} }
+  selections:
+    - anchor: { line: 0, character: 43 }
+      active: { line: 0, character: 43 }
+  marks: {}
+finalState:
+  documentContents: for (int i = 0; i < 5; i++) { while() {} }
+  selections:
+    - anchor: { line: 0, character: 36 }
+      active: { line: 0, character: 36 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        { type: containingScope, scopeType: condition, includeSiblings: false },
+      isImplicit: false,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/csharp/changeCondition9.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/csharp/changeCondition9.yml
new file mode 100644
index 0000000000..c8f76be806
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/csharp/changeCondition9.yml
@@ -0,0 +1,33 @@
+languageId: csharp
+command:
+  version: 1
+  spokenForm: change condition
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier:
+        { type: containingScope, scopeType: condition, includeSiblings: false }
+initialState:
+  documentContents: for (int i = 0; i < 5; i++) { for (int i = 0; i < 5; i++) {} }
+  selections:
+    - anchor: { line: 0, character: 59 }
+      active: { line: 0, character: 59 }
+  marks: {}
+finalState:
+  documentContents: for (int i = 0; i < 5; i++) { for (int i = 0; ; i++) {} }
+  selections:
+    - anchor: { line: 0, character: 46 }
+      active: { line: 0, character: 46 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        { type: containingScope, scopeType: condition, includeSiblings: false },
+      isImplicit: false,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/csharp/chuckTypeSoon.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/csharp/chuckTypeSoon.yml
new file mode 100644
index 0000000000..3cb1f8ad1d
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/csharp/chuckTypeSoon.yml
@@ -0,0 +1,36 @@
+languageId: csharp
+command:
+  version: 1
+  spokenForm: chuck type soon
+  action: remove
+  targets:
+    - type: primitive
+      modifier:
+        { type: containingScope, scopeType: type, includeSiblings: false }
+      mark: { type: decoratedSymbol, symbolColor: default, character: s }
+initialState:
+  documentContents: String name = "hello";
+  selections:
+    - anchor: { line: 0, character: 22 }
+      active: { line: 0, character: 22 }
+  marks:
+    default.s:
+      start: { line: 0, character: 0 }
+      end: { line: 0, character: 6 }
+finalState:
+  documentContents: name = "hello";
+  selections:
+    - anchor: { line: 0, character: 15 }
+      active: { line: 0, character: 15 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: decoratedSymbol, symbolColor: default, character: s },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: outside,
+      modifier:
+        { type: containingScope, scopeType: type, includeSiblings: false },
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/csharp/chuckTypeSoon2.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/csharp/chuckTypeSoon2.yml
new file mode 100644
index 0000000000..c90237a3fe
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/csharp/chuckTypeSoon2.yml
@@ -0,0 +1,42 @@
+languageId: csharp
+command:
+  version: 1
+  spokenForm: chuck type soon
+  action: remove
+  targets:
+    - type: primitive
+      modifier:
+        { type: containingScope, scopeType: type, includeSiblings: false }
+      mark: { type: decoratedSymbol, symbolColor: default, character: s }
+initialState:
+  documentContents: |-
+    void myFunk(String value) {
+
+    }
+  selections:
+    - anchor: { line: 1, character: 4 }
+      active: { line: 1, character: 4 }
+  marks:
+    default.s:
+      start: { line: 0, character: 12 }
+      end: { line: 0, character: 18 }
+finalState:
+  documentContents: |-
+    void myFunk(value) {
+
+    }
+  selections:
+    - anchor: { line: 1, character: 4 }
+      active: { line: 1, character: 4 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: decoratedSymbol, symbolColor: default, character: s },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: outside,
+      modifier:
+        { type: containingScope, scopeType: type, includeSiblings: false },
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/csharp/chuckValue.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/csharp/chuckValue.yml
new file mode 100644
index 0000000000..75de999099
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/csharp/chuckValue.yml
@@ -0,0 +1,95 @@
+languageId: csharp
+command:
+  version: 1
+  spokenForm: chuck value
+  action: remove
+  targets:
+    - type: primitive
+      modifier:
+        { type: containingScope, scopeType: value, includeSiblings: false }
+initialState:
+  documentContents: |-
+    a = 1;
+    a += 1;
+    a -= 1;
+    a *= 1;
+    a /= 1;
+    a %= 1;
+    a &= 1;
+    a |= 1;
+    a ^= 1;
+    a <<= 1;
+    a >>= 1;
+  selections:
+    - anchor: { line: 0, character: 4 }
+      active: { line: 0, character: 5 }
+    - anchor: { line: 1, character: 5 }
+      active: { line: 1, character: 6 }
+    - anchor: { line: 2, character: 5 }
+      active: { line: 2, character: 6 }
+    - anchor: { line: 3, character: 5 }
+      active: { line: 3, character: 6 }
+    - anchor: { line: 4, character: 5 }
+      active: { line: 4, character: 6 }
+    - anchor: { line: 5, character: 5 }
+      active: { line: 5, character: 6 }
+    - anchor: { line: 6, character: 5 }
+      active: { line: 6, character: 6 }
+    - anchor: { line: 7, character: 5 }
+      active: { line: 7, character: 6 }
+    - anchor: { line: 8, character: 5 }
+      active: { line: 8, character: 6 }
+    - anchor: { line: 9, character: 6 }
+      active: { line: 9, character: 7 }
+    - anchor: { line: 10, character: 6 }
+      active: { line: 10, character: 7 }
+  marks: {}
+finalState:
+  documentContents: |-
+    a;
+    a;
+    a;
+    a;
+    a;
+    a;
+    a;
+    a;
+    a;
+    a;
+    a;
+  selections:
+    - anchor: { line: 0, character: 1 }
+      active: { line: 0, character: 1 }
+    - anchor: { line: 1, character: 1 }
+      active: { line: 1, character: 1 }
+    - anchor: { line: 2, character: 1 }
+      active: { line: 2, character: 1 }
+    - anchor: { line: 3, character: 1 }
+      active: { line: 3, character: 1 }
+    - anchor: { line: 4, character: 1 }
+      active: { line: 4, character: 1 }
+    - anchor: { line: 5, character: 1 }
+      active: { line: 5, character: 1 }
+    - anchor: { line: 6, character: 1 }
+      active: { line: 6, character: 1 }
+    - anchor: { line: 7, character: 1 }
+      active: { line: 7, character: 1 }
+    - anchor: { line: 8, character: 1 }
+      active: { line: 8, character: 1 }
+    - anchor: { line: 9, character: 1 }
+      active: { line: 9, character: 1 }
+    - anchor: { line: 10, character: 1 }
+      active: { line: 10, character: 1 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: outside,
+      modifier:
+        { type: containingScope, scopeType: value, includeSiblings: false },
+      isImplicit: false,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/csharp/clearName.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/csharp/clearName.yml
new file mode 100644
index 0000000000..a7c5ba94fc
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/csharp/clearName.yml
@@ -0,0 +1,33 @@
+languageId: csharp
+command:
+  version: 1
+  spokenForm: clear name
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier:
+        { type: containingScope, scopeType: name, includeSiblings: false }
+initialState:
+  documentContents: a += "world";
+  selections:
+    - anchor: { line: 0, character: 6 }
+      active: { line: 0, character: 6 }
+  marks: {}
+finalState:
+  documentContents: ' += "world";'
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        { type: containingScope, scopeType: name, includeSiblings: false },
+      isImplicit: false,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/csharp/clearName2.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/csharp/clearName2.yml
new file mode 100644
index 0000000000..e0c72150b4
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/csharp/clearName2.yml
@@ -0,0 +1,33 @@
+languageId: csharp
+command:
+  version: 1
+  spokenForm: clear name
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier:
+        { type: containingScope, scopeType: name, includeSiblings: false }
+initialState:
+  documentContents: String a = "hello";
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+  marks: {}
+finalState:
+  documentContents: String  = "hello";
+  selections:
+    - anchor: { line: 0, character: 7 }
+      active: { line: 0, character: 7 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        { type: containingScope, scopeType: name, includeSiblings: false },
+      isImplicit: false,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/csharp/clearName3.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/csharp/clearName3.yml
new file mode 100644
index 0000000000..dbc7b62a3e
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/csharp/clearName3.yml
@@ -0,0 +1,33 @@
+languageId: csharp
+command:
+  version: 1
+  spokenForm: clear name
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier:
+        { type: containingScope, scopeType: name, includeSiblings: false }
+initialState:
+  documentContents: String a = "hello";
+  selections:
+    - anchor: { line: 0, character: 12 }
+      active: { line: 0, character: 12 }
+  marks: {}
+finalState:
+  documentContents: String  = "hello";
+  selections:
+    - anchor: { line: 0, character: 7 }
+      active: { line: 0, character: 7 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        { type: containingScope, scopeType: name, includeSiblings: false },
+      isImplicit: false,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/csharp/clearSubject.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/csharp/clearSubject.yml
new file mode 100644
index 0000000000..4562e4af0a
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/csharp/clearSubject.yml
@@ -0,0 +1,44 @@
+languageId: csharp
+command:
+  version: 3
+  spokenForm: clear subject
+  action: { name: clearAndSetSelection }
+  targets:
+    - type: primitive
+      modifiers:
+        - type: containingScope
+          scopeType: { type: switchStatementSubject }
+  usePrePhraseSnapshot: true
+initialState:
+  documentContents: |-
+    switch (aaa) {
+      default:
+        break;
+    }
+  selections:
+    - anchor: { line: 2, character: 4 }
+      active: { line: 2, character: 4 }
+  marks: {}
+finalState:
+  documentContents: |-
+    switch () {
+      default:
+        break;
+    }
+  selections:
+    - anchor: { line: 0, character: 8 }
+      active: { line: 0, character: 8 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      modifiers:
+        [
+          {
+            type: containingScope,
+            scopeType: { type: switchStatementSubject },
+          },
+        ],
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/csharp/clearSubject2.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/csharp/clearSubject2.yml
new file mode 100644
index 0000000000..68202bf9ef
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/csharp/clearSubject2.yml
@@ -0,0 +1,44 @@
+languageId: csharp
+command:
+  version: 3
+  spokenForm: clear subject
+  action: { name: clearAndSetSelection }
+  targets:
+    - type: primitive
+      modifiers:
+        - type: containingScope
+          scopeType: { type: switchStatementSubject }
+  usePrePhraseSnapshot: false
+initialState:
+  documentContents: |-
+    switch (aaa + 1) {
+      default:
+        break;
+    }
+  selections:
+    - anchor: { line: 2, character: 4 }
+      active: { line: 2, character: 4 }
+  marks: {}
+finalState:
+  documentContents: |-
+    switch () {
+      default:
+        break;
+    }
+  selections:
+    - anchor: { line: 0, character: 8 }
+      active: { line: 0, character: 8 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      modifiers:
+        [
+          {
+            type: containingScope,
+            scopeType: { type: switchStatementSubject },
+          },
+        ],
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/csharp/clearValue.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/csharp/clearValue.yml
new file mode 100644
index 0000000000..4e8f4b4160
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/csharp/clearValue.yml
@@ -0,0 +1,33 @@
+languageId: csharp
+command:
+  version: 1
+  spokenForm: clear value
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier:
+        { type: containingScope, scopeType: value, includeSiblings: false }
+initialState:
+  documentContents: a += "world";
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+  marks: {}
+finalState:
+  documentContents: a += ;
+  selections:
+    - anchor: { line: 0, character: 5 }
+      active: { line: 0, character: 5 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        { type: containingScope, scopeType: value, includeSiblings: false },
+      isImplicit: false,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/csharp/clearValue2.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/csharp/clearValue2.yml
new file mode 100644
index 0000000000..b30b9dfadc
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/csharp/clearValue2.yml
@@ -0,0 +1,33 @@
+languageId: csharp
+command:
+  version: 1
+  spokenForm: clear value
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier:
+        { type: containingScope, scopeType: value, includeSiblings: false }
+initialState:
+  documentContents: String a = "hello";
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+  marks: {}
+finalState:
+  documentContents: String a = ;
+  selections:
+    - anchor: { line: 0, character: 11 }
+      active: { line: 0, character: 11 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        { type: containingScope, scopeType: value, includeSiblings: false },
+      isImplicit: false,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/csharp/clearValue3.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/csharp/clearValue3.yml
new file mode 100644
index 0000000000..a841bd380d
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/csharp/clearValue3.yml
@@ -0,0 +1,33 @@
+languageId: csharp
+command:
+  version: 1
+  spokenForm: clear value
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier:
+        { type: containingScope, scopeType: value, includeSiblings: false }
+initialState:
+  documentContents: String a = "hello";
+  selections:
+    - anchor: { line: 0, character: 7 }
+      active: { line: 0, character: 7 }
+  marks: {}
+finalState:
+  documentContents: String a = ;
+  selections:
+    - anchor: { line: 0, character: 11 }
+      active: { line: 0, character: 11 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        { type: containingScope, scopeType: value, includeSiblings: false },
+      isImplicit: false,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/csharp/elseStateWrapThis.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/csharp/elseStateWrapThis.yml
new file mode 100644
index 0000000000..fab7501011
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/csharp/elseStateWrapThis.yml
@@ -0,0 +1,37 @@
+languageId: csharp
+command:
+  version: 1
+  spokenForm: else state wrap this
+  action: wrapWithSnippet
+  targets:
+    - type: primitive
+      mark: { type: cursor }
+  extraArgs: [ifElseStatement.alternative]
+initialState:
+  documentContents: int foo = 0;
+  selections:
+    - anchor: { line: 0, character: 6 }
+      active: { line: 0, character: 6 }
+  marks: {}
+finalState:
+  documentContents: |-
+    if () {
+
+    } else {
+        int foo = 0;
+    }
+  selections:
+    - anchor: { line: 0, character: 4 }
+      active: { line: 0, character: 4 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        { type: containingScope, scopeType: statement, includeSiblings: false },
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/csharp/ifElseWrapThis.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/csharp/ifElseWrapThis.yml
new file mode 100644
index 0000000000..fca555268f
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/csharp/ifElseWrapThis.yml
@@ -0,0 +1,37 @@
+languageId: csharp
+command:
+  version: 1
+  spokenForm: if else wrap this
+  action: wrapWithSnippet
+  targets:
+    - type: primitive
+      mark: { type: cursor }
+  extraArgs: [ifElseStatement.consequence]
+initialState:
+  documentContents: int foo = 0;
+  selections:
+    - anchor: { line: 0, character: 6 }
+      active: { line: 0, character: 6 }
+  marks: {}
+finalState:
+  documentContents: |-
+    if () {
+        int foo = 0;
+    } else {
+
+    }
+  selections:
+    - anchor: { line: 0, character: 4 }
+      active: { line: 0, character: 4 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        { type: containingScope, scopeType: statement, includeSiblings: false },
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/csharp/ifStateWrapThis.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/csharp/ifStateWrapThis.yml
new file mode 100644
index 0000000000..f720cfe290
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/csharp/ifStateWrapThis.yml
@@ -0,0 +1,35 @@
+languageId: csharp
+command:
+  version: 1
+  spokenForm: if state wrap this
+  action: wrapWithSnippet
+  targets:
+    - type: primitive
+      mark: { type: cursor }
+  extraArgs: [ifStatement.consequence]
+initialState:
+  documentContents: int foo = 0;
+  selections:
+    - anchor: { line: 0, character: 6 }
+      active: { line: 0, character: 6 }
+  marks: {}
+finalState:
+  documentContents: |-
+    if () {
+        int foo = 0;
+    }
+  selections:
+    - anchor: { line: 0, character: 4 }
+      active: { line: 0, character: 4 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        { type: containingScope, scopeType: statement, includeSiblings: false },
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/csharp/tryCatchWrapThis.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/csharp/tryCatchWrapThis.yml
new file mode 100644
index 0000000000..f98f6b902d
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/csharp/tryCatchWrapThis.yml
@@ -0,0 +1,37 @@
+languageId: csharp
+command:
+  version: 1
+  spokenForm: try catch wrap this
+  action: wrapWithSnippet
+  targets:
+    - type: primitive
+      mark: { type: cursor }
+  extraArgs: [tryCatchStatement.body]
+initialState:
+  documentContents: int foo = 0;
+  selections:
+    - anchor: { line: 0, character: 6 }
+      active: { line: 0, character: 6 }
+  marks: {}
+finalState:
+  documentContents: |-
+    try {
+        int foo = 0;
+    } catch () {
+
+    }
+  selections:
+    - anchor: { line: 2, character: 9 }
+      active: { line: 2, character: 9 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        { type: containingScope, scopeType: statement, includeSiblings: false },
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/csharp/tryCatchWrapThis2.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/csharp/tryCatchWrapThis2.yml
new file mode 100644
index 0000000000..4acc4e9f7b
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/csharp/tryCatchWrapThis2.yml
@@ -0,0 +1,54 @@
+languageId: csharp
+command:
+  version: 1
+  spokenForm: try catch wrap this
+  action: wrapWithSnippet
+  targets:
+    - type: primitive
+      mark: { type: cursor }
+  extraArgs: [tryCatchStatement.body]
+initialState:
+  documentContents: |-
+    if (true) {
+        int foo = 0;
+    }
+
+    int bar = 1;
+  selections:
+    - anchor: { line: 4, character: 0 }
+      active: { line: 4, character: 0 }
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+  marks: {}
+finalState:
+  documentContents: |-
+    try {
+        if (true) {
+            int foo = 0;
+        }
+    } catch () {
+
+    }
+
+    try {
+        int bar = 1;
+    } catch () {
+
+    }
+  selections:
+    - anchor: { line: 10, character: 9 }
+      active: { line: 10, character: 9 }
+    - anchor: { line: 4, character: 9 }
+      active: { line: 4, character: 9 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        { type: containingScope, scopeType: statement, includeSiblings: false },
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/css/changeArgue.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/css/changeArgue.yml
new file mode 100644
index 0000000000..241ef59b43
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/css/changeArgue.yml
@@ -0,0 +1,49 @@
+languageId: css
+command:
+  version: 1
+  spokenForm: change argue
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier:
+        {
+          type: containingScope,
+          scopeType: argumentOrParameter,
+          includeSiblings: false,
+        }
+initialState:
+  documentContents: |-
+
+    .double {
+      transform: translate(-50%, -50%);
+    }
+  selections:
+    - anchor: { line: 2, character: 25 }
+      active: { line: 2, character: 25 }
+  marks: {}
+finalState:
+  documentContents: |-
+
+    .double {
+      transform: translate(, -50%);
+    }
+  selections:
+    - anchor: { line: 2, character: 23 }
+      active: { line: 2, character: 23 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        {
+          type: containingScope,
+          scopeType: argumentOrParameter,
+          includeSiblings: false,
+        },
+      isImplicit: false,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/css/changeArgue2.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/css/changeArgue2.yml
new file mode 100644
index 0000000000..8a91c3a2ce
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/css/changeArgue2.yml
@@ -0,0 +1,47 @@
+languageId: css
+command:
+  version: 1
+  spokenForm: change argue
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier:
+        {
+          type: containingScope,
+          scopeType: argumentOrParameter,
+          includeSiblings: false,
+        }
+initialState:
+  documentContents: |-
+    div {
+      background: repeating-linear-gradient(red, orange 50px);
+    }
+  selections:
+    - anchor: { line: 1, character: 47 }
+      active: { line: 1, character: 47 }
+  marks: {}
+finalState:
+  documentContents: |-
+    div {
+      background: repeating-linear-gradient(red, );
+    }
+  selections:
+    - anchor: { line: 1, character: 45 }
+      active: { line: 1, character: 45 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        {
+          type: containingScope,
+          scopeType: argumentOrParameter,
+          includeSiblings: false,
+        },
+      isImplicit: false,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/css/changeArgue3.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/css/changeArgue3.yml
new file mode 100644
index 0000000000..726a092be4
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/css/changeArgue3.yml
@@ -0,0 +1,49 @@
+languageId: css
+command:
+  version: 1
+  spokenForm: change argue
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier:
+        {
+          type: containingScope,
+          scopeType: argumentOrParameter,
+          includeSiblings: false,
+        }
+initialState:
+  documentContents: |-
+    a {
+      clip-path: polygon(50% 0%, 60% 40%, 100% 50%, 60% 60%, 50% 100%, 40% 60%, 0% 50%, 40% 40%);
+    }
+
+  selections:
+    - anchor: { line: 1, character: 27 }
+      active: { line: 1, character: 27 }
+  marks: {}
+finalState:
+  documentContents: |-
+    a {
+      clip-path: polygon(, 60% 40%, 100% 50%, 60% 60%, 50% 100%, 40% 60%, 0% 50%, 40% 40%);
+    }
+
+  selections:
+    - anchor: { line: 1, character: 21 }
+      active: { line: 1, character: 21 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        {
+          type: containingScope,
+          scopeType: argumentOrParameter,
+          includeSiblings: false,
+        },
+      isImplicit: false,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/css/changeArgue4.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/css/changeArgue4.yml
new file mode 100644
index 0000000000..5881395e5b
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/css/changeArgue4.yml
@@ -0,0 +1,47 @@
+languageId: css
+command:
+  version: 1
+  spokenForm: change argue
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier:
+        {
+          type: containingScope,
+          scopeType: argumentOrParameter,
+          includeSiblings: false,
+        }
+initialState:
+  documentContents: |-
+    a {
+      clip-path: ellipse(115px 55px at 50% 40%);
+    }
+  selections:
+    - anchor: { line: 1, character: 39 }
+      active: { line: 1, character: 39 }
+  marks: {}
+finalState:
+  documentContents: |-
+    a {
+      clip-path: ellipse(115px 55px at );
+    }
+  selections:
+    - anchor: { line: 1, character: 35 }
+      active: { line: 1, character: 35 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        {
+          type: containingScope,
+          scopeType: argumentOrParameter,
+          includeSiblings: false,
+        },
+      isImplicit: false,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/css/changeArgue5.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/css/changeArgue5.yml
new file mode 100644
index 0000000000..a70e3ed0f8
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/css/changeArgue5.yml
@@ -0,0 +1,47 @@
+languageId: css
+command:
+  version: 1
+  spokenForm: change argue
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier:
+        {
+          type: containingScope,
+          scopeType: argumentOrParameter,
+          includeSiblings: false,
+        }
+initialState:
+  documentContents: |-
+    a {
+      clip-path: ellipse(115px 55px at 50% 40%);
+    }
+  selections:
+    - anchor: { line: 1, character: 25 }
+      active: { line: 1, character: 25 }
+  marks: {}
+finalState:
+  documentContents: |-
+    a {
+      clip-path: ellipse( at 50% 40%);
+    }
+  selections:
+    - anchor: { line: 1, character: 21 }
+      active: { line: 1, character: 21 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        {
+          type: containingScope,
+          scopeType: argumentOrParameter,
+          includeSiblings: false,
+        },
+      isImplicit: false,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/css/changeComment.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/css/changeComment.yml
new file mode 100644
index 0000000000..c19ac746e3
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/css/changeComment.yml
@@ -0,0 +1,36 @@
+languageId: css
+command:
+  version: 1
+  spokenForm: change comment
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier:
+        { type: containingScope, scopeType: comment, includeSiblings: false }
+initialState:
+  documentContents: |-
+    /*
+      hello
+    */
+  selections:
+    - anchor: { line: 1, character: 7 }
+      active: { line: 1, character: 7 }
+  marks: {}
+finalState:
+  documentContents: ""
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        { type: containingScope, scopeType: comment, includeSiblings: false },
+      isImplicit: false,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/css/changeEveryArgue.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/css/changeEveryArgue.yml
new file mode 100644
index 0000000000..82ad099be5
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/css/changeEveryArgue.yml
@@ -0,0 +1,51 @@
+languageId: css
+command:
+  version: 1
+  spokenForm: change every argue
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier:
+        {
+          type: containingScope,
+          scopeType: argumentOrParameter,
+          includeSiblings: true,
+        }
+initialState:
+  documentContents: |-
+
+    .double {
+      transform: translate(-50%, -50%);
+    }
+  selections:
+    - anchor: { line: 2, character: 25 }
+      active: { line: 2, character: 25 }
+  marks: {}
+finalState:
+  documentContents: |-
+
+    .double {
+      transform: translate(, );
+    }
+  selections:
+    - anchor: { line: 2, character: 23 }
+      active: { line: 2, character: 23 }
+    - anchor: { line: 2, character: 25 }
+      active: { line: 2, character: 25 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        {
+          type: containingScope,
+          scopeType: argumentOrParameter,
+          includeSiblings: true,
+        },
+      isImplicit: false,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/css/changeEveryArgue2.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/css/changeEveryArgue2.yml
new file mode 100644
index 0000000000..2c3834ea02
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/css/changeEveryArgue2.yml
@@ -0,0 +1,51 @@
+languageId: css
+command:
+  version: 1
+  spokenForm: change every argue
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier:
+        {
+          type: containingScope,
+          scopeType: argumentOrParameter,
+          includeSiblings: true,
+        }
+initialState:
+  documentContents: |-
+    div {
+      background: repeating-linear-gradient(red, orange 50px);
+      clip-path: polygon(50% 0%, 60% 40%, 100% 50%, 60% 60%, 50% 100%, 40% 60%, 0% 50%, 40% 40%);
+    }
+  selections:
+    - anchor: { line: 1, character: 50 }
+      active: { line: 1, character: 50 }
+  marks: {}
+finalState:
+  documentContents: |-
+    div {
+      background: repeating-linear-gradient(, );
+      clip-path: polygon(50% 0%, 60% 40%, 100% 50%, 60% 60%, 50% 100%, 40% 60%, 0% 50%, 40% 40%);
+    }
+  selections:
+    - anchor: { line: 1, character: 40 }
+      active: { line: 1, character: 40 }
+    - anchor: { line: 1, character: 42 }
+      active: { line: 1, character: 42 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        {
+          type: containingScope,
+          scopeType: argumentOrParameter,
+          includeSiblings: true,
+        },
+      isImplicit: false,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/css/changeEveryArgue3.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/css/changeEveryArgue3.yml
new file mode 100644
index 0000000000..ca582313f2
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/css/changeEveryArgue3.yml
@@ -0,0 +1,53 @@
+languageId: css
+command:
+  version: 1
+  spokenForm: change every argue
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier:
+        {
+          type: containingScope,
+          scopeType: argumentOrParameter,
+          includeSiblings: true,
+        }
+initialState:
+  documentContents: |-
+    a {
+      width: calc(100% - 80px);
+      clip-path: ellipse(115px 55px at 50% 40%);
+    }
+
+  selections:
+    - anchor: { line: 2, character: 25 }
+      active: { line: 2, character: 25 }
+  marks: {}
+finalState:
+  documentContents: |-
+    a {
+      width: calc(100% - 80px);
+      clip-path: ellipse( at );
+    }
+
+  selections:
+    - anchor: { line: 2, character: 21 }
+      active: { line: 2, character: 21 }
+    - anchor: { line: 2, character: 25 }
+      active: { line: 2, character: 25 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        {
+          type: containingScope,
+          scopeType: argumentOrParameter,
+          includeSiblings: true,
+        },
+      isImplicit: false,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/css/changeItem.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/css/changeItem.yml
new file mode 100644
index 0000000000..545ebf204e
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/css/changeItem.yml
@@ -0,0 +1,47 @@
+languageId: css
+command:
+  version: 1
+  spokenForm: change item
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier:
+        {
+          type: containingScope,
+          scopeType: collectionItem,
+          includeSiblings: false,
+        }
+initialState:
+  documentContents: |-
+    a {
+      width: calc(100% - 80px);
+    }
+  selections:
+    - anchor: { line: 1, character: 12 }
+      active: { line: 1, character: 12 }
+  marks: {}
+finalState:
+  documentContents: |-
+    a {
+
+    }
+  selections:
+    - anchor: { line: 1, character: 2 }
+      active: { line: 1, character: 2 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        {
+          type: containingScope,
+          scopeType: collectionItem,
+          includeSiblings: false,
+        },
+      isImplicit: false,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/css/changeKey.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/css/changeKey.yml
new file mode 100644
index 0000000000..c316cc7bfd
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/css/changeKey.yml
@@ -0,0 +1,47 @@
+languageId: css
+command:
+  version: 1
+  spokenForm: change key
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier:
+        {
+          type: containingScope,
+          scopeType: collectionKey,
+          includeSiblings: false,
+        }
+initialState:
+  documentContents: |
+    span[hello="Cleveland"][goodbye="Columbus"] {
+      color: blue;
+    }
+  selections:
+    - anchor: { line: 1, character: 4 }
+      active: { line: 1, character: 4 }
+  marks: {}
+finalState:
+  documentContents: |
+    span[hello="Cleveland"][goodbye="Columbus"] {
+      : blue;
+    }
+  selections:
+    - anchor: { line: 1, character: 2 }
+      active: { line: 1, character: 2 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        {
+          type: containingScope,
+          scopeType: collectionKey,
+          includeSiblings: false,
+        },
+      isImplicit: false,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/css/changeKey2.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/css/changeKey2.yml
new file mode 100644
index 0000000000..111e571933
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/css/changeKey2.yml
@@ -0,0 +1,47 @@
+languageId: css
+command:
+  version: 1
+  spokenForm: change key
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier:
+        {
+          type: containingScope,
+          scopeType: collectionKey,
+          includeSiblings: false,
+        }
+initialState:
+  documentContents: |-
+    span[hello="Cleveland"][goodbye="Columbus"] {
+      color: blue;
+    }
+  selections:
+    - anchor: { line: 1, character: 12 }
+      active: { line: 1, character: 12 }
+  marks: {}
+finalState:
+  documentContents: |-
+    span[hello="Cleveland"][goodbye="Columbus"] {
+      : blue;
+    }
+  selections:
+    - anchor: { line: 1, character: 2 }
+      active: { line: 1, character: 2 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        {
+          type: containingScope,
+          scopeType: collectionKey,
+          includeSiblings: false,
+        },
+      isImplicit: false,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/css/changeName.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/css/changeName.yml
new file mode 100644
index 0000000000..8786c8d664
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/css/changeName.yml
@@ -0,0 +1,41 @@
+languageId: css
+command:
+  version: 1
+  spokenForm: change name
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier:
+        { type: containingScope, scopeType: name, includeSiblings: false }
+initialState:
+  documentContents: |-
+    a {
+      height: 10px;
+      color: red;
+    }
+  selections:
+    - anchor: { line: 1, character: 12 }
+      active: { line: 1, character: 12 }
+  marks: {}
+finalState:
+  documentContents: |-
+    a {
+      : 10px;
+      color: red;
+    }
+  selections:
+    - anchor: { line: 1, character: 2 }
+      active: { line: 1, character: 2 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        { type: containingScope, scopeType: name, includeSiblings: false },
+      isImplicit: false,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/css/changeName2.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/css/changeName2.yml
new file mode 100644
index 0000000000..c19881cca1
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/css/changeName2.yml
@@ -0,0 +1,39 @@
+languageId: css
+command:
+  version: 1
+  spokenForm: change name
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier:
+        { type: containingScope, scopeType: name, includeSiblings: false }
+initialState:
+  documentContents: |-
+    a {
+      height: 10px;
+    }
+  selections:
+    - anchor: { line: 1, character: 4 }
+      active: { line: 1, character: 4 }
+  marks: {}
+finalState:
+  documentContents: |-
+    a {
+      : 10px;
+    }
+  selections:
+    - anchor: { line: 1, character: 2 }
+      active: { line: 1, character: 2 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        { type: containingScope, scopeType: name, includeSiblings: false },
+      isImplicit: false,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/css/changeName3.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/css/changeName3.yml
new file mode 100644
index 0000000000..ad86709d46
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/css/changeName3.yml
@@ -0,0 +1,39 @@
+languageId: css
+command:
+  version: 1
+  spokenForm: change name
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier:
+        { type: containingScope, scopeType: name, includeSiblings: false }
+initialState:
+  documentContents: |
+    a {
+      margin: 10px 10px 10px 10px;
+    }
+  selections:
+    - anchor: { line: 1, character: 14 }
+      active: { line: 1, character: 14 }
+  marks: {}
+finalState:
+  documentContents: |
+    a {
+      : 10px 10px 10px 10px;
+    }
+  selections:
+    - anchor: { line: 1, character: 2 }
+      active: { line: 1, character: 2 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        { type: containingScope, scopeType: name, includeSiblings: false },
+      isImplicit: false,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/css/changeName6.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/css/changeName6.yml
new file mode 100644
index 0000000000..112ea48a80
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/css/changeName6.yml
@@ -0,0 +1,39 @@
+languageId: css
+command:
+  version: 1
+  spokenForm: change name
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier:
+        { type: containingScope, scopeType: name, includeSiblings: false }
+initialState:
+  documentContents: |-
+    a[data-lang^="tel"] {
+      color: rgba(0, 255, 0, 0.5);
+    }
+  selections:
+    - anchor: { line: 0, character: 15 }
+      active: { line: 0, character: 15 }
+  marks: {}
+finalState:
+  documentContents: |-
+    a[^="tel"] {
+      color: rgba(0, 255, 0, 0.5);
+    }
+  selections:
+    - anchor: { line: 0, character: 2 }
+      active: { line: 0, character: 2 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        { type: containingScope, scopeType: name, includeSiblings: false },
+      isImplicit: false,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/css/changeRound.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/css/changeRound.yml
new file mode 100644
index 0000000000..d87feb8a65
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/css/changeRound.yml
@@ -0,0 +1,37 @@
+languageId: css
+command:
+  version: 1
+  spokenForm: change round
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier: { type: surroundingPair, delimiter: parentheses }
+initialState:
+  documentContents: |-
+    a {
+      font-family: "hello (world)";
+    }
+  selections:
+    - anchor: { line: 1, character: 25 }
+      active: { line: 1, character: 25 }
+  marks: {}
+finalState:
+  documentContents: |-
+    a {
+      font-family: "hello ";
+    }
+  selections:
+    - anchor: { line: 1, character: 22 }
+      active: { line: 1, character: 22 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier: { type: surroundingPair, delimiter: parentheses },
+      isImplicit: false,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/css/changeSelector.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/css/changeSelector.yml
new file mode 100644
index 0000000000..bcd32a4bfa
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/css/changeSelector.yml
@@ -0,0 +1,39 @@
+languageId: css
+command:
+  version: 1
+  spokenForm: change selector
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier:
+        { type: containingScope, scopeType: selector, includeSiblings: false }
+initialState:
+  documentContents: |
+    span[hello="Cleveland"][goodbye="Columbus"] {
+      color: blue;
+    }
+  selections:
+    - anchor: { line: 1, character: 4 }
+      active: { line: 1, character: 4 }
+  marks: {}
+finalState:
+  documentContents: |2
+     {
+      color: blue;
+    }
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        { type: containingScope, scopeType: selector, includeSiblings: false },
+      isImplicit: false,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/css/changeSelector2.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/css/changeSelector2.yml
new file mode 100644
index 0000000000..592f94f9af
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/css/changeSelector2.yml
@@ -0,0 +1,39 @@
+languageId: css
+command:
+  version: 1
+  spokenForm: change selector
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier:
+        { type: containingScope, scopeType: selector, includeSiblings: false }
+initialState:
+  documentContents: |-
+    a.b ~ c.d {
+
+    }
+  selections:
+    - anchor: { line: 1, character: 2 }
+      active: { line: 1, character: 2 }
+  marks: {}
+finalState:
+  documentContents: |2-
+     {
+
+    }
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        { type: containingScope, scopeType: selector, includeSiblings: false },
+      isImplicit: false,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/css/changeSelector3.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/css/changeSelector3.yml
new file mode 100644
index 0000000000..168713e6dc
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/css/changeSelector3.yml
@@ -0,0 +1,39 @@
+languageId: css
+command:
+  version: 1
+  spokenForm: change selector
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier:
+        { type: containingScope, scopeType: selector, includeSiblings: false }
+initialState:
+  documentContents: |
+    #header.callout {
+
+    }
+  selections:
+    - anchor: { line: 1, character: 2 }
+      active: { line: 1, character: 2 }
+  marks: {}
+finalState:
+  documentContents: |2
+     {
+
+    }
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        { type: containingScope, scopeType: selector, includeSiblings: false },
+      isImplicit: false,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/css/changeSelector4.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/css/changeSelector4.yml
new file mode 100644
index 0000000000..6538d029a8
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/css/changeSelector4.yml
@@ -0,0 +1,39 @@
+languageId: css
+command:
+  version: 1
+  spokenForm: change selector
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier:
+        { type: containingScope, scopeType: selector, includeSiblings: false }
+initialState:
+  documentContents: |-
+    #header .callout {
+
+    }
+  selections:
+    - anchor: { line: 1, character: 0 }
+      active: { line: 1, character: 0 }
+  marks: {}
+finalState:
+  documentContents: |2-
+     {
+
+    }
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        { type: containingScope, scopeType: selector, includeSiblings: false },
+      isImplicit: false,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/css/changeSelector5.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/css/changeSelector5.yml
new file mode 100644
index 0000000000..cc40a389c8
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/css/changeSelector5.yml
@@ -0,0 +1,39 @@
+languageId: css
+command:
+  version: 1
+  spokenForm: change selector
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier:
+        { type: containingScope, scopeType: selector, includeSiblings: false }
+initialState:
+  documentContents: |-
+    span[hello="Cleveland"][goodbye="Columbus"] {
+      color: blue;
+    }
+  selections:
+    - anchor: { line: 1, character: 12 }
+      active: { line: 1, character: 12 }
+  marks: {}
+finalState:
+  documentContents: |2-
+     {
+      color: blue;
+    }
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        { type: containingScope, scopeType: selector, includeSiblings: false },
+      isImplicit: false,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/css/changeState.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/css/changeState.yml
new file mode 100644
index 0000000000..6adf9e8fc9
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/css/changeState.yml
@@ -0,0 +1,35 @@
+languageId: css
+command:
+  version: 1
+  spokenForm: change state
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier:
+        { type: containingScope, scopeType: statement, includeSiblings: false }
+initialState:
+  documentContents: |
+    @import "subs.css";
+  selections:
+    - anchor: { line: 0, character: 11 }
+      active: { line: 0, character: 11 }
+  marks: {}
+finalState:
+  documentContents: |+
+
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        { type: containingScope, scopeType: statement, includeSiblings: false },
+      isImplicit: false,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/css/changeState5.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/css/changeState5.yml
new file mode 100644
index 0000000000..dd1335c19d
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/css/changeState5.yml
@@ -0,0 +1,36 @@
+languageId: css
+command:
+  version: 1
+  spokenForm: change state
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier:
+        { type: containingScope, scopeType: statement, includeSiblings: false }
+initialState:
+  documentContents: |-
+    a {
+      width: calc(100% - 80px);
+    }
+  selections:
+    - anchor: { line: 1, character: 12 }
+      active: { line: 1, character: 12 }
+  marks: {}
+finalState:
+  documentContents: ""
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        { type: containingScope, scopeType: statement, includeSiblings: false },
+      isImplicit: false,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/css/changeStateAir.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/css/changeStateAir.yml
new file mode 100644
index 0000000000..8ff8b9eb7f
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/css/changeStateAir.yml
@@ -0,0 +1,41 @@
+languageId: css
+command:
+  version: 1
+  spokenForm: change state air
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier:
+        { type: containingScope, scopeType: statement, includeSiblings: false }
+      mark: { type: decoratedSymbol, symbolColor: default, character: a }
+initialState:
+  documentContents: |-
+    a {
+      height: 10px;
+      color: red;
+    }
+  selections:
+    - anchor: { line: 0, character: 3 }
+      active: { line: 0, character: 3 }
+  marks:
+    default.a:
+      start: { line: 0, character: 0 }
+      end: { line: 0, character: 1 }
+finalState:
+  documentContents: ""
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: decoratedSymbol, symbolColor: default, character: a },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        { type: containingScope, scopeType: statement, includeSiblings: false },
+      isImplicit: false,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/css/changeStateHarp.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/css/changeStateHarp.yml
new file mode 100644
index 0000000000..348df0aedd
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/css/changeStateHarp.yml
@@ -0,0 +1,41 @@
+languageId: css
+command:
+  version: 1
+  spokenForm: change state harp
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier:
+        { type: containingScope, scopeType: statement, includeSiblings: false }
+      mark: { type: decoratedSymbol, symbolColor: default, character: h }
+initialState:
+  documentContents: |-
+    a .child-selector {
+      height: 10px;
+      color: red;
+    }
+  selections:
+    - anchor: { line: 2, character: 13 }
+      active: { line: 2, character: 13 }
+  marks:
+    default.h:
+      start: { line: 0, character: 3 }
+      end: { line: 0, character: 17 }
+finalState:
+  documentContents: ""
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: decoratedSymbol, symbolColor: default, character: h },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        { type: containingScope, scopeType: statement, includeSiblings: false },
+      isImplicit: false,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/css/changeValue.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/css/changeValue.yml
new file mode 100644
index 0000000000..5c331c6439
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/css/changeValue.yml
@@ -0,0 +1,35 @@
+languageId: css
+command:
+  version: 1
+  spokenForm: change value
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier:
+        { type: containingScope, scopeType: value, includeSiblings: false }
+initialState:
+  documentContents: |
+    @import "subs.css";
+  selections:
+    - anchor: { line: 0, character: 10 }
+      active: { line: 0, character: 10 }
+  marks: {}
+finalState:
+  documentContents: |
+    @import ;
+  selections:
+    - anchor: { line: 0, character: 8 }
+      active: { line: 0, character: 8 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        { type: containingScope, scopeType: value, includeSiblings: false },
+      isImplicit: false,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/css/changeValue2.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/css/changeValue2.yml
new file mode 100644
index 0000000000..a90f2106a6
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/css/changeValue2.yml
@@ -0,0 +1,41 @@
+languageId: css
+command:
+  version: 1
+  spokenForm: change value
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier:
+        { type: containingScope, scopeType: value, includeSiblings: false }
+initialState:
+  documentContents: |-
+    a {
+      height: 10px;
+      color: red;
+    }
+  selections:
+    - anchor: { line: 1, character: 12 }
+      active: { line: 1, character: 12 }
+  marks: {}
+finalState:
+  documentContents: |-
+    a {
+      height: ;
+      color: red;
+    }
+  selections:
+    - anchor: { line: 1, character: 10 }
+      active: { line: 1, character: 10 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        { type: containingScope, scopeType: value, includeSiblings: false },
+      isImplicit: false,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/css/changeValue4.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/css/changeValue4.yml
new file mode 100644
index 0000000000..de0819c3d5
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/css/changeValue4.yml
@@ -0,0 +1,39 @@
+languageId: css
+command:
+  version: 1
+  spokenForm: change value
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier:
+        { type: containingScope, scopeType: value, includeSiblings: false }
+initialState:
+  documentContents: |
+    a {
+      margin: 10px 10px 10px 10px;
+    }
+  selections:
+    - anchor: { line: 1, character: 4 }
+      active: { line: 1, character: 4 }
+  marks: {}
+finalState:
+  documentContents: |
+    a {
+      margin: ;
+    }
+  selections:
+    - anchor: { line: 1, character: 10 }
+      active: { line: 1, character: 10 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        { type: containingScope, scopeType: value, includeSiblings: false },
+      isImplicit: false,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/css/changeValue6.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/css/changeValue6.yml
new file mode 100644
index 0000000000..6f07baabbf
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/css/changeValue6.yml
@@ -0,0 +1,39 @@
+languageId: css
+command:
+  version: 1
+  spokenForm: change value
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier:
+        { type: containingScope, scopeType: value, includeSiblings: false }
+initialState:
+  documentContents: |
+    a {
+      background-image: url("/icons/mail.svg");
+    }
+  selections:
+    - anchor: { line: 1, character: 35 }
+      active: { line: 1, character: 35 }
+  marks: {}
+finalState:
+  documentContents: |
+    a {
+      background-image: ;
+    }
+  selections:
+    - anchor: { line: 1, character: 20 }
+      active: { line: 1, character: 20 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        { type: containingScope, scopeType: value, includeSiblings: false },
+      isImplicit: false,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/css/changeValue9.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/css/changeValue9.yml
new file mode 100644
index 0000000000..911c74cb5c
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/css/changeValue9.yml
@@ -0,0 +1,39 @@
+languageId: css
+command:
+  version: 1
+  spokenForm: change value
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier:
+        { type: containingScope, scopeType: value, includeSiblings: false }
+initialState:
+  documentContents: |-
+    a[data-lang^="tel"] {
+      color: rgba(0, 255, 0, 0.5);
+    }
+  selections:
+    - anchor: { line: 0, character: 16 }
+      active: { line: 0, character: 16 }
+  marks: {}
+finalState:
+  documentContents: |-
+    a[data-lang^=] {
+      color: rgba(0, 255, 0, 0.5);
+    }
+  selections:
+    - anchor: { line: 0, character: 13 }
+      active: { line: 0, character: 13 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        { type: containingScope, scopeType: value, includeSiblings: false },
+      isImplicit: false,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/css/chuckArgue.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/css/chuckArgue.yml
new file mode 100644
index 0000000000..4669a01705
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/css/chuckArgue.yml
@@ -0,0 +1,47 @@
+languageId: css
+command:
+  version: 1
+  spokenForm: chuck argue
+  action: remove
+  targets:
+    - type: primitive
+      modifier:
+        {
+          type: containingScope,
+          scopeType: argumentOrParameter,
+          includeSiblings: false,
+        }
+initialState:
+  documentContents: |-
+    div {
+      background: repeating-linear-gradient(red, orange 50px);
+    }
+  selections:
+    - anchor: { line: 1, character: 46 }
+      active: { line: 1, character: 46 }
+  marks: {}
+finalState:
+  documentContents: |-
+    div {
+      background: repeating-linear-gradient(red);
+    }
+  selections:
+    - anchor: { line: 1, character: 43 }
+      active: { line: 1, character: 43 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: outside,
+      modifier:
+        {
+          type: containingScope,
+          scopeType: argumentOrParameter,
+          includeSiblings: false,
+        },
+      isImplicit: false,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/css/chuckArgue2.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/css/chuckArgue2.yml
new file mode 100644
index 0000000000..d923c1434a
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/css/chuckArgue2.yml
@@ -0,0 +1,47 @@
+languageId: css
+command:
+  version: 1
+  spokenForm: chuck argue
+  action: remove
+  targets:
+    - type: primitive
+      modifier:
+        {
+          type: containingScope,
+          scopeType: argumentOrParameter,
+          includeSiblings: false,
+        }
+initialState:
+  documentContents: |-
+    div {
+      clip-path: polygon(50% 0%, 60% 40%, 100% 50%, 60% 60%, 50% 100%, 40% 60%, 0% 50%, 40% 40%);
+    }
+  selections:
+    - anchor: { line: 1, character: 22 }
+      active: { line: 1, character: 22 }
+  marks: {}
+finalState:
+  documentContents: |-
+    div {
+      clip-path: polygon(60% 40%, 100% 50%, 60% 60%, 50% 100%, 40% 60%, 0% 50%, 40% 40%);
+    }
+  selections:
+    - anchor: { line: 1, character: 21 }
+      active: { line: 1, character: 21 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: outside,
+      modifier:
+        {
+          type: containingScope,
+          scopeType: argumentOrParameter,
+          includeSiblings: false,
+        },
+      isImplicit: false,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/css/chuckArgue3.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/css/chuckArgue3.yml
new file mode 100644
index 0000000000..a39ccab9e6
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/css/chuckArgue3.yml
@@ -0,0 +1,47 @@
+languageId: css
+command:
+  version: 1
+  spokenForm: chuck argue
+  action: remove
+  targets:
+    - type: primitive
+      modifier:
+        {
+          type: containingScope,
+          scopeType: argumentOrParameter,
+          includeSiblings: false,
+        }
+initialState:
+  documentContents: |-
+    a {
+      width: calc(100% - 80px);
+    }
+  selections:
+    - anchor: { line: 1, character: 23 }
+      active: { line: 1, character: 23 }
+  marks: {}
+finalState:
+  documentContents: |-
+    a {
+      width: calc();
+    }
+  selections:
+    - anchor: { line: 1, character: 14 }
+      active: { line: 1, character: 14 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: outside,
+      modifier:
+        {
+          type: containingScope,
+          scopeType: argumentOrParameter,
+          includeSiblings: false,
+        },
+      isImplicit: false,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/css/chuckArgue4.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/css/chuckArgue4.yml
new file mode 100644
index 0000000000..a7a02b9dcb
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/css/chuckArgue4.yml
@@ -0,0 +1,47 @@
+languageId: css
+command:
+  version: 1
+  spokenForm: chuck argue
+  action: remove
+  targets:
+    - type: primitive
+      modifier:
+        {
+          type: containingScope,
+          scopeType: argumentOrParameter,
+          includeSiblings: false,
+        }
+initialState:
+  documentContents: |-
+    a {
+      clip-path: ellipse(115px 55px at 50% 40%);
+    }
+  selections:
+    - anchor: { line: 1, character: 24 }
+      active: { line: 1, character: 24 }
+  marks: {}
+finalState:
+  documentContents: |-
+    a {
+      clip-path: ellipse(50% 40%);
+    }
+  selections:
+    - anchor: { line: 1, character: 21 }
+      active: { line: 1, character: 21 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: outside,
+      modifier:
+        {
+          type: containingScope,
+          scopeType: argumentOrParameter,
+          includeSiblings: false,
+        },
+      isImplicit: false,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/css/chuckArgue5.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/css/chuckArgue5.yml
new file mode 100644
index 0000000000..e42be38ba4
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/css/chuckArgue5.yml
@@ -0,0 +1,47 @@
+languageId: css
+command:
+  version: 1
+  spokenForm: chuck argue
+  action: remove
+  targets:
+    - type: primitive
+      modifier:
+        {
+          type: containingScope,
+          scopeType: argumentOrParameter,
+          includeSiblings: false,
+        }
+initialState:
+  documentContents: |-
+    .micro {
+      width: sum(50px, 30px, 100px);
+    }
+  selections:
+    - anchor: { line: 1, character: 14 }
+      active: { line: 1, character: 14 }
+  marks: {}
+finalState:
+  documentContents: |-
+    .micro {
+      width: sum(30px, 100px);
+    }
+  selections:
+    - anchor: { line: 1, character: 13 }
+      active: { line: 1, character: 13 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: outside,
+      modifier:
+        {
+          type: containingScope,
+          scopeType: argumentOrParameter,
+          includeSiblings: false,
+        },
+      isImplicit: false,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/css/chuckArgue6.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/css/chuckArgue6.yml
new file mode 100644
index 0000000000..19141e2916
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/css/chuckArgue6.yml
@@ -0,0 +1,47 @@
+languageId: css
+command:
+  version: 1
+  spokenForm: chuck argue
+  action: remove
+  targets:
+    - type: primitive
+      modifier:
+        {
+          type: containingScope,
+          scopeType: argumentOrParameter,
+          includeSiblings: false,
+        }
+initialState:
+  documentContents: |-
+    .micro {
+      width: sum(50px, 30px, 100px);
+    }
+  selections:
+    - anchor: { line: 1, character: 27 }
+      active: { line: 1, character: 27 }
+  marks: {}
+finalState:
+  documentContents: |-
+    .micro {
+      width: sum(50px, 30px);
+    }
+  selections:
+    - anchor: { line: 1, character: 23 }
+      active: { line: 1, character: 23 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: outside,
+      modifier:
+        {
+          type: containingScope,
+          scopeType: argumentOrParameter,
+          includeSiblings: false,
+        },
+      isImplicit: false,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/css/chuckArgue7.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/css/chuckArgue7.yml
new file mode 100644
index 0000000000..401d5f4000
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/css/chuckArgue7.yml
@@ -0,0 +1,47 @@
+languageId: css
+command:
+  version: 1
+  spokenForm: chuck argue
+  action: remove
+  targets:
+    - type: primitive
+      modifier:
+        {
+          type: containingScope,
+          scopeType: argumentOrParameter,
+          includeSiblings: false,
+        }
+initialState:
+  documentContents: |-
+    div {
+      clip-path: polygon(50% 0%, 60% 40%, 100% 50%, 60% 60%, 50% 100%, 40% 60%, 0% 50%, 40% 40%);
+    }
+  selections:
+    - anchor: { line: 1, character: 85 }
+      active: { line: 1, character: 85 }
+  marks: {}
+finalState:
+  documentContents: |-
+    div {
+      clip-path: polygon(50% 0%, 60% 40%, 100% 50%, 60% 60%, 50% 100%, 40% 60%, 0% 50%);
+    }
+  selections:
+    - anchor: { line: 1, character: 82 }
+      active: { line: 1, character: 82 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: outside,
+      modifier:
+        {
+          type: containingScope,
+          scopeType: argumentOrParameter,
+          includeSiblings: false,
+        },
+      isImplicit: false,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/css/chuckArgue8.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/css/chuckArgue8.yml
new file mode 100644
index 0000000000..8f53ca8eb0
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/css/chuckArgue8.yml
@@ -0,0 +1,47 @@
+languageId: css
+command:
+  version: 1
+  spokenForm: chuck argue
+  action: remove
+  targets:
+    - type: primitive
+      modifier:
+        {
+          type: containingScope,
+          scopeType: argumentOrParameter,
+          includeSiblings: false,
+        }
+initialState:
+  documentContents: |-
+    a {
+      clip-path: ellipse(115px 55px at 50% 40%);
+    }
+  selections:
+    - anchor: { line: 1, character: 41 }
+      active: { line: 1, character: 41 }
+  marks: {}
+finalState:
+  documentContents: |-
+    a {
+      clip-path: ellipse(115px 55px);
+    }
+  selections:
+    - anchor: { line: 1, character: 31 }
+      active: { line: 1, character: 31 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: outside,
+      modifier:
+        {
+          type: containingScope,
+          scopeType: argumentOrParameter,
+          includeSiblings: false,
+        },
+      isImplicit: false,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/css/chuckEveryArgue2.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/css/chuckEveryArgue2.yml
new file mode 100644
index 0000000000..cba2f958e7
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/css/chuckEveryArgue2.yml
@@ -0,0 +1,47 @@
+languageId: css
+command:
+  version: 1
+  spokenForm: chuck every argue
+  action: remove
+  targets:
+    - type: primitive
+      modifier:
+        {
+          type: containingScope,
+          scopeType: argumentOrParameter,
+          includeSiblings: true,
+        }
+initialState:
+  documentContents: |-
+    a {
+      clip-path: ellipse(115px 55px at 50% 40%);
+    }
+  selections:
+    - anchor: { line: 1, character: 36 }
+      active: { line: 1, character: 36 }
+  marks: {}
+finalState:
+  documentContents: |-
+    a {
+      clip-path: ellipse();
+    }
+  selections:
+    - anchor: { line: 1, character: 21 }
+      active: { line: 1, character: 21 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: outside,
+      modifier:
+        {
+          type: containingScope,
+          scopeType: argumentOrParameter,
+          includeSiblings: true,
+        },
+      isImplicit: false,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/css/chuckState.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/css/chuckState.yml
new file mode 100644
index 0000000000..2c281e8dbd
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/css/chuckState.yml
@@ -0,0 +1,33 @@
+languageId: css
+command:
+  version: 1
+  spokenForm: chuck state
+  action: remove
+  targets:
+    - type: primitive
+      modifier:
+        { type: containingScope, scopeType: statement, includeSiblings: false }
+initialState:
+  documentContents: '@namespace prefix "XML-namespace-URL";'
+  selections:
+    - anchor: { line: 0, character: 15 }
+      active: { line: 0, character: 15 }
+  marks: {}
+finalState:
+  documentContents: ""
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: outside,
+      modifier:
+        { type: containingScope, scopeType: statement, includeSiblings: false },
+      isImplicit: false,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/css/chuckState2.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/css/chuckState2.yml
new file mode 100644
index 0000000000..50ecf992c9
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/css/chuckState2.yml
@@ -0,0 +1,39 @@
+languageId: css
+command:
+  version: 1
+  spokenForm: chuck state
+  action: remove
+  targets:
+    - type: primitive
+      modifier:
+        { type: containingScope, scopeType: statement, includeSiblings: false }
+initialState:
+  documentContents: |
+    @keyframes important1 {
+      from { margin-top: 50px; }
+      50%  { margin-top: 150px !important; } /* ignored */
+      to   { margin-top: 100px; }
+    }
+  selections:
+    - anchor: { line: 0, character: 2 }
+      active: { line: 0, character: 2 }
+  marks: {}
+finalState:
+  documentContents: |+
+
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: outside,
+      modifier:
+        { type: containingScope, scopeType: statement, includeSiblings: false },
+      isImplicit: false,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/css/chuckValue.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/css/chuckValue.yml
new file mode 100644
index 0000000000..dc867a0c2a
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/css/chuckValue.yml
@@ -0,0 +1,33 @@
+languageId: css
+command:
+  version: 1
+  spokenForm: chuck value
+  action: remove
+  targets:
+    - type: primitive
+      modifier:
+        { type: containingScope, scopeType: value, includeSiblings: false }
+initialState:
+  documentContents: '@namespace prefix "XML-namespace-URL";'
+  selections:
+    - anchor: { line: 0, character: 16 }
+      active: { line: 0, character: 16 }
+  marks: {}
+finalState:
+  documentContents: "@namespace;"
+  selections:
+    - anchor: { line: 0, character: 10 }
+      active: { line: 0, character: 10 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: outside,
+      modifier:
+        { type: containingScope, scopeType: value, includeSiblings: false },
+      isImplicit: false,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/css/chuckValue2.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/css/chuckValue2.yml
new file mode 100644
index 0000000000..520489457e
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/css/chuckValue2.yml
@@ -0,0 +1,33 @@
+languageId: css
+command:
+  version: 1
+  spokenForm: chuck value
+  action: remove
+  targets:
+    - type: primitive
+      modifier:
+        { type: containingScope, scopeType: value, includeSiblings: false }
+initialState:
+  documentContents: "@namespace url(http://www.w3.org/1999/xhtml);"
+  selections:
+    - anchor: { line: 0, character: 6 }
+      active: { line: 0, character: 6 }
+  marks: {}
+finalState:
+  documentContents: "@namespace;"
+  selections:
+    - anchor: { line: 0, character: 6 }
+      active: { line: 0, character: 6 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: outside,
+      modifier:
+        { type: containingScope, scopeType: value, includeSiblings: false },
+      isImplicit: false,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/css/chuckValue3.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/css/chuckValue3.yml
new file mode 100644
index 0000000000..5e2de0a5b7
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/css/chuckValue3.yml
@@ -0,0 +1,39 @@
+languageId: css
+command:
+  version: 1
+  spokenForm: chuck value
+  action: remove
+  targets:
+    - type: primitive
+      modifier:
+        { type: containingScope, scopeType: value, includeSiblings: false }
+initialState:
+  documentContents: |
+    a {
+      margin-top: 150px !important;
+    }
+  selections:
+    - anchor: { line: 1, character: 7 }
+      active: { line: 1, character: 7 }
+  marks: {}
+finalState:
+  documentContents: |
+    a {
+      margin-top:;
+    }
+  selections:
+    - anchor: { line: 1, character: 7 }
+      active: { line: 1, character: 7 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: outside,
+      modifier:
+        { type: containingScope, scopeType: value, includeSiblings: false },
+      isImplicit: false,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/css/clearUnit.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/css/clearUnit.yml
new file mode 100644
index 0000000000..bfcd6f1fa8
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/css/clearUnit.yml
@@ -0,0 +1,36 @@
+languageId: css
+command:
+  spokenForm: clear unit
+  version: 3
+  targets:
+    - type: primitive
+      modifiers:
+        - type: containingScope
+          scopeType: { type: unit }
+  usePrePhraseSnapshot: true
+  action: { name: clearAndSetSelection }
+initialState:
+  documentContents: |-
+    div {
+        padding: 25px 50px 75px 100px;
+    }
+  selections:
+    - anchor: { line: 1, character: 16 }
+      active: { line: 1, character: 16 }
+  marks: {}
+finalState:
+  documentContents: |-
+    div {
+        padding: 25 50px 75px 100px;
+    }
+  selections:
+    - anchor: { line: 1, character: 15 }
+      active: { line: 1, character: 15 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      modifiers: [{ type: containingScope, scopeType: { type: unit } }],
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/css/clearUnit2.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/css/clearUnit2.yml
new file mode 100644
index 0000000000..05ae85dde6
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/css/clearUnit2.yml
@@ -0,0 +1,36 @@
+languageId: css
+command:
+  spokenForm: clear unit
+  version: 3
+  targets:
+    - type: primitive
+      modifiers:
+        - type: containingScope
+          scopeType: { type: unit }
+  usePrePhraseSnapshot: false
+  action: { name: clearAndSetSelection }
+initialState:
+  documentContents: |-
+    div {
+        padding: 25px 50px 75px 100px;
+    }
+  selections:
+    - anchor: { line: 1, character: 31 }
+      active: { line: 1, character: 31 }
+  marks: {}
+finalState:
+  documentContents: |-
+    div {
+        padding: 25px 50px 75px 100;
+    }
+  selections:
+    - anchor: { line: 1, character: 31 }
+      active: { line: 1, character: 31 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      modifiers: [{ type: containingScope, scopeType: { type: unit } }],
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/css/clearUnit3.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/css/clearUnit3.yml
new file mode 100644
index 0000000000..39a618b2e8
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/css/clearUnit3.yml
@@ -0,0 +1,36 @@
+languageId: css
+command:
+  spokenForm: clear unit
+  version: 3
+  targets:
+    - type: primitive
+      modifiers:
+        - type: containingScope
+          scopeType: { type: unit }
+  usePrePhraseSnapshot: true
+  action: { name: clearAndSetSelection }
+initialState:
+  documentContents: |-
+    div {
+        padding-left: 25px 50px 75px 100px;
+    }
+  selections:
+    - anchor: { line: 1, character: 19 }
+      active: { line: 1, character: 19 }
+  marks: {}
+finalState:
+  documentContents: |-
+    div {
+        padding-left: 25 50px 75px 100px;
+    }
+  selections:
+    - anchor: { line: 1, character: 20 }
+      active: { line: 1, character: 20 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      modifiers: [{ type: containingScope, scopeType: { type: unit } }],
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/css/clearUnit4.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/css/clearUnit4.yml
new file mode 100644
index 0000000000..b38bccdc09
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/css/clearUnit4.yml
@@ -0,0 +1,36 @@
+languageId: css
+command:
+  spokenForm: clear unit
+  version: 3
+  targets:
+    - type: primitive
+      modifiers:
+        - type: containingScope
+          scopeType: { type: unit }
+  usePrePhraseSnapshot: false
+  action: { name: clearAndSetSelection }
+initialState:
+  documentContents: |-
+    div {
+        padding-left: 25px 50px 75px 100px;
+    }
+  selections:
+    - anchor: { line: 1, character: 34 }
+      active: { line: 1, character: 34 }
+  marks: {}
+finalState:
+  documentContents: |-
+    div {
+        padding-left: 25px 50px 75px 100;
+    }
+  selections:
+    - anchor: { line: 1, character: 36 }
+      active: { line: 1, character: 36 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      modifiers: [{ type: containingScope, scopeType: { type: unit } }],
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/css/clearUnit5.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/css/clearUnit5.yml
new file mode 100644
index 0000000000..6e3366a247
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/css/clearUnit5.yml
@@ -0,0 +1,44 @@
+languageId: css
+command:
+  spokenForm: clear unit
+  version: 3
+  targets:
+    - type: primitive
+      modifiers:
+        - type: containingScope
+          scopeType: { type: unit }
+  usePrePhraseSnapshot: true
+  action: { name: clearAndSetSelection }
+initialState:
+  documentContents: |-
+    div {
+        padding: 25px 50px 75px 100px;
+    }
+
+  selections:
+    - anchor: { line: 1, character: 4 }
+      active: { line: 1, character: 4 }
+  marks: {}
+finalState:
+  documentContents: |-
+    div {
+        padding: 25 50 75 100;
+    }
+
+  selections:
+    - anchor: { line: 1, character: 15 }
+      active: { line: 1, character: 15 }
+    - anchor: { line: 1, character: 18 }
+      active: { line: 1, character: 18 }
+    - anchor: { line: 1, character: 21 }
+      active: { line: 1, character: 21 }
+    - anchor: { line: 1, character: 25 }
+      active: { line: 1, character: 25 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      modifiers: [{ type: containingScope, scopeType: { type: unit } }],
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/go/changeCall.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/go/changeCall.yml
new file mode 100644
index 0000000000..84e2ae7d32
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/go/changeCall.yml
@@ -0,0 +1,41 @@
+languageId: go
+command:
+  version: 1
+  spokenForm: change call
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier:
+        {
+          type: containingScope,
+          scopeType: functionCall,
+          includeSiblings: false,
+        }
+initialState:
+  documentContents: 'b := Student{ Name: "Bob", }'
+  selections:
+    - anchor: { line: 0, character: 19 }
+      active: { line: 0, character: 19 }
+  marks: {}
+finalState:
+  documentContents: "b := "
+  selections:
+    - anchor: { line: 0, character: 5 }
+      active: { line: 0, character: 5 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        {
+          type: containingScope,
+          scopeType: functionCall,
+          includeSiblings: false,
+        },
+      isImplicit: false,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/go/changeCallee.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/go/changeCallee.yml
new file mode 100644
index 0000000000..35ef876fe7
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/go/changeCallee.yml
@@ -0,0 +1,41 @@
+languageId: go
+command:
+  version: 1
+  spokenForm: change callee
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier:
+        {
+          type: containingScope,
+          scopeType: functionCallee,
+          includeSiblings: false,
+        }
+initialState:
+  documentContents: test()
+  selections:
+    - anchor: { line: 0, character: 5 }
+      active: { line: 0, character: 5 }
+  marks: {}
+finalState:
+  documentContents: ()
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        {
+          type: containingScope,
+          scopeType: functionCallee,
+          includeSiblings: false,
+        },
+      isImplicit: false,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/go/changeCallee2.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/go/changeCallee2.yml
new file mode 100644
index 0000000000..07514d6f78
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/go/changeCallee2.yml
@@ -0,0 +1,41 @@
+languageId: go
+command:
+  version: 1
+  spokenForm: change callee
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier:
+        {
+          type: containingScope,
+          scopeType: functionCallee,
+          includeSiblings: false,
+        }
+initialState:
+  documentContents: test(anArgument)()
+  selections:
+    - anchor: { line: 0, character: 17 }
+      active: { line: 0, character: 17 }
+  marks: {}
+finalState:
+  documentContents: ()
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        {
+          type: containingScope,
+          scopeType: functionCallee,
+          includeSiblings: false,
+        },
+      isImplicit: false,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/go/changeCallee3.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/go/changeCallee3.yml
new file mode 100644
index 0000000000..4bfd6b1216
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/go/changeCallee3.yml
@@ -0,0 +1,41 @@
+languageId: go
+command:
+  version: 1
+  spokenForm: change callee
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier:
+        {
+          type: containingScope,
+          scopeType: functionCallee,
+          includeSiblings: false,
+        }
+initialState:
+  documentContents: object.test();
+  selections:
+    - anchor: { line: 0, character: 12 }
+      active: { line: 0, character: 12 }
+  marks: {}
+finalState:
+  documentContents: ();
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        {
+          type: containingScope,
+          scopeType: functionCallee,
+          includeSiblings: false,
+        },
+      isImplicit: false,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/go/changeCallee4.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/go/changeCallee4.yml
new file mode 100644
index 0000000000..4cf98b6753
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/go/changeCallee4.yml
@@ -0,0 +1,41 @@
+languageId: go
+command:
+  version: 1
+  spokenForm: change callee
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier:
+        {
+          type: containingScope,
+          scopeType: functionCallee,
+          includeSiblings: false,
+        }
+initialState:
+  documentContents: object.test[1]();
+  selections:
+    - anchor: { line: 0, character: 15 }
+      active: { line: 0, character: 15 }
+  marks: {}
+finalState:
+  documentContents: ();
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        {
+          type: containingScope,
+          scopeType: functionCallee,
+          includeSiblings: false,
+        },
+      isImplicit: false,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/go/changeCallee5.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/go/changeCallee5.yml
new file mode 100644
index 0000000000..546b08031e
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/go/changeCallee5.yml
@@ -0,0 +1,41 @@
+languageId: go
+command:
+  version: 1
+  spokenForm: change callee
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier:
+        {
+          type: containingScope,
+          scopeType: functionCallee,
+          includeSiblings: false,
+        }
+initialState:
+  documentContents: 'b := Student{ Name: "Bob" }'
+  selections:
+    - anchor: { line: 0, character: 22 }
+      active: { line: 0, character: 22 }
+  marks: {}
+finalState:
+  documentContents: 'b := { Name: "Bob" }'
+  selections:
+    - anchor: { line: 0, character: 5 }
+      active: { line: 0, character: 5 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        {
+          type: containingScope,
+          scopeType: functionCallee,
+          includeSiblings: false,
+        },
+      isImplicit: false,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/go/chuckArg.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/go/chuckArg.yml
new file mode 100644
index 0000000000..ef583d0a48
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/go/chuckArg.yml
@@ -0,0 +1,40 @@
+languageId: go
+command:
+  version: 1
+  spokenForm: chuck arg
+  action: remove
+  targets:
+    - type: primitive
+      modifier:
+        {
+          type: containingScope,
+          scopeType: argumentOrParameter,
+          includeSiblings: false,
+        }
+initialState:
+  documentContents: "func add(x, y int) int {\n\t return add(x, add(1, 2))\n}"
+  selections:
+    - anchor: { line: 1, character: 13 }
+      active: { line: 1, character: 13 }
+  marks: {}
+finalState:
+  documentContents: "func add(x, y int) int {\n\t return add(add(1, 2))\n}"
+  selections:
+    - anchor: { line: 1, character: 13 }
+      active: { line: 1, character: 13 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: outside,
+      modifier:
+        {
+          type: containingScope,
+          scopeType: argumentOrParameter,
+          includeSiblings: false,
+        },
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/go/chuckArg2.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/go/chuckArg2.yml
new file mode 100644
index 0000000000..ec1c3ae05d
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/go/chuckArg2.yml
@@ -0,0 +1,40 @@
+languageId: go
+command:
+  version: 1
+  spokenForm: chuck arg
+  action: remove
+  targets:
+    - type: primitive
+      modifier:
+        {
+          type: containingScope,
+          scopeType: argumentOrParameter,
+          includeSiblings: false,
+        }
+initialState:
+  documentContents: "func add(x, y int) int {\n\t return add(add(1, 2))\n}"
+  selections:
+    - anchor: { line: 1, character: 13 }
+      active: { line: 1, character: 13 }
+  marks: {}
+finalState:
+  documentContents: "func add(x, y int) int {\n\t return add()\n}"
+  selections:
+    - anchor: { line: 1, character: 13 }
+      active: { line: 1, character: 13 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: outside,
+      modifier:
+        {
+          type: containingScope,
+          scopeType: argumentOrParameter,
+          includeSiblings: false,
+        },
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/go/chuckValue.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/go/chuckValue.yml
new file mode 100644
index 0000000000..9fa4ffe6db
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/go/chuckValue.yml
@@ -0,0 +1,33 @@
+languageId: go
+command:
+  version: 1
+  spokenForm: chuck value
+  action: remove
+  targets:
+    - type: primitive
+      modifier:
+        { type: containingScope, scopeType: value, includeSiblings: false }
+initialState:
+  documentContents: " return true"
+  selections:
+    - anchor: { line: 0, character: 5 }
+      active: { line: 0, character: 5 }
+  marks: {}
+finalState:
+  documentContents: " return"
+  selections:
+    - anchor: { line: 0, character: 5 }
+      active: { line: 0, character: 5 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: outside,
+      modifier:
+        { type: containingScope, scopeType: value, includeSiblings: false },
+      isImplicit: false,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/go/clearCondition.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/go/clearCondition.yml
new file mode 100644
index 0000000000..1b299cfc41
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/go/clearCondition.yml
@@ -0,0 +1,33 @@
+languageId: go
+command:
+  version: 1
+  spokenForm: clear condition
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier:
+        { type: containingScope, scopeType: condition, includeSiblings: false }
+initialState:
+  documentContents: "if true {\n\treturn true\n}"
+  selections:
+    - anchor: { line: 1, character: 1 }
+      active: { line: 1, character: 1 }
+  marks: {}
+finalState:
+  documentContents: "if  {\n\treturn true\n}"
+  selections:
+    - anchor: { line: 0, character: 3 }
+      active: { line: 0, character: 3 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        { type: containingScope, scopeType: condition, includeSiblings: false },
+      isImplicit: false,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/go/clearIfState.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/go/clearIfState.yml
new file mode 100644
index 0000000000..f324197515
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/go/clearIfState.yml
@@ -0,0 +1,40 @@
+languageId: go
+command:
+  version: 1
+  spokenForm: clear if state
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier:
+        {
+          type: containingScope,
+          scopeType: ifStatement,
+          includeSiblings: false,
+        }
+initialState:
+  documentContents: "if true {\n\treturn true\n}"
+  selections:
+    - anchor: { line: 1, character: 12 }
+      active: { line: 1, character: 12 }
+  marks: {}
+finalState:
+  documentContents: ""
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        {
+          type: containingScope,
+          scopeType: ifStatement,
+          includeSiblings: false,
+        },
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/go/clearPair.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/go/clearPair.yml
new file mode 100644
index 0000000000..b37ec2dafe
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/go/clearPair.yml
@@ -0,0 +1,31 @@
+languageId: go
+command:
+  version: 1
+  spokenForm: clear pair
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier: { type: surroundingPair, delimiter: any }
+initialState:
+  documentContents: '"(hello)"'
+  selections:
+    - anchor: { line: 0, character: 6 }
+      active: { line: 0, character: 6 }
+  marks: {}
+finalState:
+  documentContents: '""'
+  selections:
+    - anchor: { line: 0, character: 1 }
+      active: { line: 0, character: 1 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier: { type: surroundingPair, delimiter: any },
+      isImplicit: false,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/go/clearState.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/go/clearState.yml
new file mode 100644
index 0000000000..0ee146aed2
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/go/clearState.yml
@@ -0,0 +1,32 @@
+languageId: go
+command:
+  version: 1
+  spokenForm: clear state
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier:
+        { type: containingScope, scopeType: statement, includeSiblings: false }
+initialState:
+  documentContents: "if true {\n\t\n}"
+  selections:
+    - anchor: { line: 1, character: 1 }
+      active: { line: 1, character: 1 }
+  marks: {}
+finalState:
+  documentContents: ""
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        { type: containingScope, scopeType: statement, includeSiblings: false },
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/go/takeArg.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/go/takeArg.yml
new file mode 100644
index 0000000000..b8ccfce07a
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/go/takeArg.yml
@@ -0,0 +1,40 @@
+languageId: go
+command:
+  version: 1
+  spokenForm: take arg
+  action: setSelection
+  targets:
+    - type: primitive
+      modifier:
+        {
+          type: containingScope,
+          scopeType: argumentOrParameter,
+          includeSiblings: false,
+        }
+initialState:
+  documentContents: "func add(x int, y int) int {\n\treturn x + y\n}"
+  selections:
+    - anchor: { line: 0, character: 11 }
+      active: { line: 0, character: 11 }
+  marks: {}
+finalState:
+  documentContents: "func add(x int, y int) int {\n\treturn x + y\n}"
+  selections:
+    - anchor: { line: 0, character: 9 }
+      active: { line: 0, character: 14 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        {
+          type: containingScope,
+          scopeType: argumentOrParameter,
+          includeSiblings: false,
+        },
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/go/takeArg2.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/go/takeArg2.yml
new file mode 100644
index 0000000000..3b1bd01859
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/go/takeArg2.yml
@@ -0,0 +1,40 @@
+languageId: go
+command:
+  version: 1
+  spokenForm: take arg
+  action: setSelection
+  targets:
+    - type: primitive
+      modifier:
+        {
+          type: containingScope,
+          scopeType: argumentOrParameter,
+          includeSiblings: false,
+        }
+initialState:
+  documentContents: "func add(x int, y int) int {\n\treturn x + y\n}"
+  selections:
+    - anchor: { line: 0, character: 19 }
+      active: { line: 0, character: 19 }
+  marks: {}
+finalState:
+  documentContents: "func add(x int, y int) int {\n\treturn x + y\n}"
+  selections:
+    - anchor: { line: 0, character: 16 }
+      active: { line: 0, character: 21 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        {
+          type: containingScope,
+          scopeType: argumentOrParameter,
+          includeSiblings: false,
+        },
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/go/takeArg3.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/go/takeArg3.yml
new file mode 100644
index 0000000000..21f081fa1b
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/go/takeArg3.yml
@@ -0,0 +1,40 @@
+languageId: go
+command:
+  version: 1
+  spokenForm: take arg
+  action: setSelection
+  targets:
+    - type: primitive
+      modifier:
+        {
+          type: containingScope,
+          scopeType: argumentOrParameter,
+          includeSiblings: false,
+        }
+initialState:
+  documentContents: "func add(x int, y int) int {\n\treturn add(x, y)\n}"
+  selections:
+    - anchor: { line: 1, character: 13 }
+      active: { line: 1, character: 13 }
+  marks: {}
+finalState:
+  documentContents: "func add(x int, y int) int {\n\treturn add(x, y)\n}"
+  selections:
+    - anchor: { line: 1, character: 12 }
+      active: { line: 1, character: 13 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        {
+          type: containingScope,
+          scopeType: argumentOrParameter,
+          includeSiblings: false,
+        },
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/go/takeCall.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/go/takeCall.yml
new file mode 100644
index 0000000000..29ce4e49a7
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/go/takeCall.yml
@@ -0,0 +1,40 @@
+languageId: go
+command:
+  version: 1
+  spokenForm: take call
+  action: setSelection
+  targets:
+    - type: primitive
+      modifier:
+        {
+          type: containingScope,
+          scopeType: functionCall,
+          includeSiblings: false,
+        }
+initialState:
+  documentContents: add(1, 2)
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+  marks: {}
+finalState:
+  documentContents: add(1, 2)
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 9 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        {
+          type: containingScope,
+          scopeType: functionCall,
+          includeSiblings: false,
+        },
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/go/takeComment.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/go/takeComment.yml
new file mode 100644
index 0000000000..a7312819aa
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/go/takeComment.yml
@@ -0,0 +1,32 @@
+languageId: go
+command:
+  version: 1
+  spokenForm: take comment
+  action: setSelection
+  targets:
+    - type: primitive
+      modifier:
+        { type: containingScope, scopeType: comment, includeSiblings: false }
+initialState:
+  documentContents: // Hello World
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+  marks: {}
+finalState:
+  documentContents: // Hello World
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 14 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        { type: containingScope, scopeType: comment, includeSiblings: false },
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/go/takeEveryItem.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/go/takeEveryItem.yml
new file mode 100644
index 0000000000..ef0831b7d1
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/go/takeEveryItem.yml
@@ -0,0 +1,42 @@
+languageId: go
+command:
+  version: 1
+  spokenForm: take every item
+  action: setSelection
+  targets:
+    - type: primitive
+      modifier:
+        {
+          type: containingScope,
+          scopeType: collectionItem,
+          includeSiblings: true,
+        }
+initialState:
+  documentContents: 'map[string]string{"air": "bat", "cap": "drum"}'
+  selections:
+    - anchor: { line: 0, character: 42 }
+      active: { line: 0, character: 42 }
+  marks: {}
+finalState:
+  documentContents: 'map[string]string{"air": "bat", "cap": "drum"}'
+  selections:
+    - anchor: { line: 0, character: 18 }
+      active: { line: 0, character: 30 }
+    - anchor: { line: 0, character: 32 }
+      active: { line: 0, character: 45 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        {
+          type: containingScope,
+          scopeType: collectionItem,
+          includeSiblings: true,
+        },
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/go/takeEveryKey.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/go/takeEveryKey.yml
new file mode 100644
index 0000000000..d916cce517
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/go/takeEveryKey.yml
@@ -0,0 +1,42 @@
+languageId: go
+command:
+  version: 1
+  spokenForm: take every key
+  action: setSelection
+  targets:
+    - type: primitive
+      modifier:
+        {
+          type: containingScope,
+          scopeType: collectionKey,
+          includeSiblings: true,
+        }
+initialState:
+  documentContents: 'map[string]string{"air": "bat", "cap": "drum"}'
+  selections:
+    - anchor: { line: 0, character: 42 }
+      active: { line: 0, character: 42 }
+  marks: {}
+finalState:
+  documentContents: 'map[string]string{"air": "bat", "cap": "drum"}'
+  selections:
+    - anchor: { line: 0, character: 18 }
+      active: { line: 0, character: 23 }
+    - anchor: { line: 0, character: 32 }
+      active: { line: 0, character: 37 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        {
+          type: containingScope,
+          scopeType: collectionKey,
+          includeSiblings: true,
+        },
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/go/takeFunk.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/go/takeFunk.yml
new file mode 100644
index 0000000000..e11441b995
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/go/takeFunk.yml
@@ -0,0 +1,40 @@
+languageId: go
+command:
+  version: 1
+  spokenForm: take funk
+  action: setSelection
+  targets:
+    - type: primitive
+      modifier:
+        {
+          type: containingScope,
+          scopeType: namedFunction,
+          includeSiblings: false,
+        }
+initialState:
+  documentContents: "func add(x int, y int) int {\n\treturn add(x, y)\n}"
+  selections:
+    - anchor: { line: 1, character: 11 }
+      active: { line: 1, character: 11 }
+  marks: {}
+finalState:
+  documentContents: "func add(x int, y int) int {\n\treturn add(x, y)\n}"
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 2, character: 1 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        {
+          type: containingScope,
+          scopeType: namedFunction,
+          includeSiblings: false,
+        },
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/go/takeFunkName.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/go/takeFunkName.yml
new file mode 100644
index 0000000000..d0065fd623
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/go/takeFunkName.yml
@@ -0,0 +1,40 @@
+languageId: go
+command:
+  version: 1
+  spokenForm: take funk name
+  action: setSelection
+  targets:
+    - type: primitive
+      modifier:
+        {
+          type: containingScope,
+          scopeType: functionName,
+          includeSiblings: false,
+        }
+initialState:
+  documentContents: "func add(x, y int, z int) int {\n\treturn x + y\n}"
+  selections:
+    - anchor: { line: 1, character: 9 }
+      active: { line: 1, character: 9 }
+  marks: {}
+finalState:
+  documentContents: "func add(x, y int, z int) int {\n\treturn x + y\n}"
+  selections:
+    - anchor: { line: 0, character: 5 }
+      active: { line: 0, character: 8 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        {
+          type: containingScope,
+          scopeType: functionName,
+          includeSiblings: false,
+        },
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/go/takeItem.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/go/takeItem.yml
new file mode 100644
index 0000000000..222aa60346
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/go/takeItem.yml
@@ -0,0 +1,40 @@
+languageId: go
+command:
+  version: 1
+  spokenForm: take item
+  action: setSelection
+  targets:
+    - type: primitive
+      modifier:
+        {
+          type: containingScope,
+          scopeType: collectionItem,
+          includeSiblings: false,
+        }
+initialState:
+  documentContents: x := []string{"a", "b"}
+  selections:
+    - anchor: { line: 0, character: 16 }
+      active: { line: 0, character: 16 }
+  marks: {}
+finalState:
+  documentContents: x := []string{"a", "b"}
+  selections:
+    - anchor: { line: 0, character: 14 }
+      active: { line: 0, character: 17 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        {
+          type: containingScope,
+          scopeType: collectionItem,
+          includeSiblings: false,
+        },
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/go/takeKey.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/go/takeKey.yml
new file mode 100644
index 0000000000..31c1c8f0a4
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/go/takeKey.yml
@@ -0,0 +1,40 @@
+languageId: go
+command:
+  version: 1
+  spokenForm: take key
+  action: setSelection
+  targets:
+    - type: primitive
+      modifier:
+        {
+          type: containingScope,
+          scopeType: collectionKey,
+          includeSiblings: false,
+        }
+initialState:
+  documentContents: ' x := map[string]string{"a": "b", "c": "d"}'
+  selections:
+    - anchor: { line: 0, character: 31 }
+      active: { line: 0, character: 31 }
+  marks: {}
+finalState:
+  documentContents: ' x := map[string]string{"a": "b", "c": "d"}'
+  selections:
+    - anchor: { line: 0, character: 24 }
+      active: { line: 0, character: 27 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        {
+          type: containingScope,
+          scopeType: collectionKey,
+          includeSiblings: false,
+        },
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/go/takeKey2.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/go/takeKey2.yml
new file mode 100644
index 0000000000..ea6e2f47f6
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/go/takeKey2.yml
@@ -0,0 +1,40 @@
+languageId: go
+command:
+  version: 1
+  spokenForm: take key
+  action: setSelection
+  targets:
+    - type: primitive
+      modifier:
+        {
+          type: containingScope,
+          scopeType: collectionKey,
+          includeSiblings: false,
+        }
+initialState:
+  documentContents: 'map[string]string{"air": "bat", "cap": "drum"}'
+  selections:
+    - anchor: { line: 0, character: 20 }
+      active: { line: 0, character: 20 }
+  marks: {}
+finalState:
+  documentContents: 'map[string]string{"air": "bat", "cap": "drum"}'
+  selections:
+    - anchor: { line: 0, character: 18 }
+      active: { line: 0, character: 23 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        {
+          type: containingScope,
+          scopeType: collectionKey,
+          includeSiblings: false,
+        },
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/go/takeList.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/go/takeList.yml
new file mode 100644
index 0000000000..ad92afbeaa
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/go/takeList.yml
@@ -0,0 +1,32 @@
+languageId: go
+command:
+  version: 1
+  spokenForm: take list
+  action: setSelection
+  targets:
+    - type: primitive
+      modifier:
+        { type: containingScope, scopeType: list, includeSiblings: false }
+initialState:
+  documentContents: x := []string{"a", "b"}
+  selections:
+    - anchor: { line: 0, character: 16 }
+      active: { line: 0, character: 16 }
+  marks: {}
+finalState:
+  documentContents: x := []string{"a", "b"}
+  selections:
+    - anchor: { line: 0, character: 5 }
+      active: { line: 0, character: 23 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        { type: containingScope, scopeType: list, includeSiblings: false },
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/go/takeMap.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/go/takeMap.yml
new file mode 100644
index 0000000000..0c3abb75a6
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/go/takeMap.yml
@@ -0,0 +1,32 @@
+languageId: go
+command:
+  version: 1
+  spokenForm: take map
+  action: setSelection
+  targets:
+    - type: primitive
+      modifier:
+        { type: containingScope, scopeType: map, includeSiblings: false }
+initialState:
+  documentContents: x := map[string]string{"a", "b"}
+  selections:
+    - anchor: { line: 0, character: 24 }
+      active: { line: 0, character: 24 }
+  marks: {}
+finalState:
+  documentContents: x := map[string]string{"a", "b"}
+  selections:
+    - anchor: { line: 0, character: 5 }
+      active: { line: 0, character: 32 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        { type: containingScope, scopeType: map, includeSiblings: false },
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/go/takeState.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/go/takeState.yml
new file mode 100644
index 0000000000..5fc53e375e
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/go/takeState.yml
@@ -0,0 +1,32 @@
+languageId: go
+command:
+  version: 1
+  spokenForm: take state
+  action: setSelection
+  targets:
+    - type: primitive
+      modifier:
+        { type: containingScope, scopeType: statement, includeSiblings: false }
+initialState:
+  documentContents: "type Hello struct {\n\tworld string\n}"
+  selections:
+    - anchor: { line: 1, character: 12 }
+      active: { line: 1, character: 12 }
+  marks: {}
+finalState:
+  documentContents: "type Hello struct {\n\tworld string\n}"
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 2, character: 1 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        { type: containingScope, scopeType: statement, includeSiblings: false },
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/go/takeString.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/go/takeString.yml
new file mode 100644
index 0000000000..de401f229c
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/go/takeString.yml
@@ -0,0 +1,32 @@
+languageId: go
+command:
+  version: 1
+  spokenForm: take string
+  action: setSelection
+  targets:
+    - type: primitive
+      modifier:
+        { type: containingScope, scopeType: string, includeSiblings: false }
+initialState:
+  documentContents: x := "hello world"
+  selections:
+    - anchor: { line: 0, character: 7 }
+      active: { line: 0, character: 7 }
+  marks: {}
+finalState:
+  documentContents: x := "hello world"
+  selections:
+    - anchor: { line: 0, character: 5 }
+      active: { line: 0, character: 18 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        { type: containingScope, scopeType: string, includeSiblings: false },
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/go/takeType.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/go/takeType.yml
new file mode 100644
index 0000000000..0c11b77233
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/go/takeType.yml
@@ -0,0 +1,32 @@
+languageId: go
+command:
+  version: 1
+  spokenForm: take type
+  action: setSelection
+  targets:
+    - type: primitive
+      modifier:
+        { type: containingScope, scopeType: type, includeSiblings: false }
+initialState:
+  documentContents: "func add(x int, y int) int {\n\treturn x + y\n}"
+  selections:
+    - anchor: { line: 1, character: 9 }
+      active: { line: 1, character: 9 }
+  marks: {}
+finalState:
+  documentContents: "func add(x int, y int) int {\n\treturn x + y\n}"
+  selections:
+    - anchor: { line: 0, character: 23 }
+      active: { line: 0, character: 26 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        { type: containingScope, scopeType: type, includeSiblings: false },
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/go/takeValue.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/go/takeValue.yml
new file mode 100644
index 0000000000..621b4a9498
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/go/takeValue.yml
@@ -0,0 +1,32 @@
+languageId: go
+command:
+  version: 1
+  spokenForm: take value
+  action: setSelection
+  targets:
+    - type: primitive
+      modifier:
+        { type: containingScope, scopeType: value, includeSiblings: false }
+initialState:
+  documentContents: ' x := map[string]string{"a": "b", "c": "d"}'
+  selections:
+    - anchor: { line: 0, character: 26 }
+      active: { line: 0, character: 26 }
+  marks: {}
+finalState:
+  documentContents: ' x := map[string]string{"a": "b", "c": "d"}'
+  selections:
+    - anchor: { line: 0, character: 29 }
+      active: { line: 0, character: 32 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        { type: containingScope, scopeType: value, includeSiblings: false },
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/go/takeValue2.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/go/takeValue2.yml
new file mode 100644
index 0000000000..4fce33a6f7
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/go/takeValue2.yml
@@ -0,0 +1,32 @@
+languageId: go
+command:
+  version: 1
+  spokenForm: take value
+  action: setSelection
+  targets:
+    - type: primitive
+      modifier:
+        { type: containingScope, scopeType: value, includeSiblings: false }
+initialState:
+  documentContents: 'map[string]string{"air": "bat", "cap": "drum"}'
+  selections:
+    - anchor: { line: 0, character: 27 }
+      active: { line: 0, character: 27 }
+  marks: {}
+finalState:
+  documentContents: 'map[string]string{"air": "bat", "cap": "drum"}'
+  selections:
+    - anchor: { line: 0, character: 25 }
+      active: { line: 0, character: 30 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        { type: containingScope, scopeType: value, includeSiblings: false },
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/html/chuckCoreElement.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/html/chuckCoreElement.yml
new file mode 100644
index 0000000000..2828776f62
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/html/chuckCoreElement.yml
@@ -0,0 +1,38 @@
+languageId: html
+command:
+  spokenForm: chuck core element
+  version: 2
+  targets:
+    - type: primitive
+      modifiers:
+        - { type: interiorOnly }
+        - type: containingScope
+          scopeType: { type: xmlElement }
+  usePrePhraseSnapshot: true
+  action: { name: remove }
+initialState:
+  documentContents: |-
+    <div>
+        aaa
+    </div>
+  selections:
+    - anchor: { line: 1, character: 4 }
+      active: { line: 1, character: 4 }
+  marks: {}
+finalState:
+  documentContents: <div></div>
+  selections:
+    - anchor: { line: 0, character: 5 }
+      active: { line: 0, character: 5 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      modifiers:
+        [
+          { type: interiorOnly },
+          { type: containingScope, scopeType: { type: xmlElement } },
+        ],
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/html/chuckValueInk.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/html/chuckValueInk.yml
new file mode 100644
index 0000000000..ec210253a8
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/html/chuckValueInk.yml
@@ -0,0 +1,42 @@
+languageId: html
+command:
+  version: 1
+  spokenForm: chuck value ink
+  action: remove
+  targets:
+    - type: primitive
+      modifier:
+        { type: containingScope, scopeType: value, includeSiblings: false }
+      mark: { type: decoratedSymbol, symbolColor: default, character: i }
+initialState:
+  documentContents: |-
+    <html id="value">
+
+    </html>
+  selections:
+    - anchor: { line: 1, character: 4 }
+      active: { line: 1, character: 4 }
+  marks:
+    default.i:
+      start: { line: 0, character: 6 }
+      end: { line: 0, character: 8 }
+finalState:
+  documentContents: |-
+    <html id>
+
+    </html>
+  selections:
+    - anchor: { line: 1, character: 4 }
+      active: { line: 1, character: 4 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: decoratedSymbol, symbolColor: default, character: i },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: outside,
+      modifier:
+        { type: containingScope, scopeType: value, includeSiblings: false },
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/html/clearAttributeVest.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/html/clearAttributeVest.yml
new file mode 100644
index 0000000000..6781784c1d
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/html/clearAttributeVest.yml
@@ -0,0 +1,42 @@
+languageId: html
+command:
+  version: 1
+  spokenForm: clear attribute vest
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier:
+        { type: containingScope, scopeType: attribute, includeSiblings: false }
+      mark: { type: decoratedSymbol, symbolColor: default, character: v }
+initialState:
+  documentContents: |-
+    <html id="value">
+
+    </html>
+  selections:
+    - anchor: { line: 1, character: 4 }
+      active: { line: 1, character: 4 }
+  marks:
+    default.v:
+      start: { line: 0, character: 10 }
+      end: { line: 0, character: 15 }
+finalState:
+  documentContents: |-
+    <html >
+
+    </html>
+  selections:
+    - anchor: { line: 0, character: 6 }
+      active: { line: 0, character: 6 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: decoratedSymbol, symbolColor: default, character: v },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        { type: containingScope, scopeType: attribute, includeSiblings: false },
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/html/clearComment.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/html/clearComment.yml
new file mode 100644
index 0000000000..abbf7c6396
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/html/clearComment.yml
@@ -0,0 +1,32 @@
+languageId: html
+command:
+  version: 1
+  spokenForm: clear comment
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier:
+        { type: containingScope, scopeType: comment, includeSiblings: false }
+initialState:
+  documentContents: <!-- Comment -->
+  selections:
+    - anchor: { line: 0, character: 8 }
+      active: { line: 0, character: 8 }
+  marks: {}
+finalState:
+  documentContents: ""
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        { type: containingScope, scopeType: comment, includeSiblings: false },
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/html/clearCoreElement.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/html/clearCoreElement.yml
new file mode 100644
index 0000000000..825170e0b9
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/html/clearCoreElement.yml
@@ -0,0 +1,42 @@
+languageId: html
+command:
+  spokenForm: clear core element
+  version: 2
+  targets:
+    - type: primitive
+      modifiers:
+        - { type: interiorOnly }
+        - type: containingScope
+          scopeType: { type: xmlElement }
+  usePrePhraseSnapshot: true
+  action: { name: clearAndSetSelection }
+initialState:
+  documentContents: |-
+    <div>
+        aaa
+        <span>bbb</span>
+    </div>
+  selections:
+    - anchor: { line: 1, character: 4 }
+      active: { line: 1, character: 4 }
+  marks: {}
+finalState:
+  documentContents: |-
+    <div>
+
+    </div>
+  selections:
+    - anchor: { line: 1, character: 4 }
+      active: { line: 1, character: 4 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      modifiers:
+        [
+          { type: interiorOnly },
+          { type: containingScope, scopeType: { type: xmlElement } },
+        ],
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/html/clearCoreElement2.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/html/clearCoreElement2.yml
new file mode 100644
index 0000000000..c0b27316cf
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/html/clearCoreElement2.yml
@@ -0,0 +1,41 @@
+languageId: html
+command:
+  spokenForm: clear core element
+  version: 2
+  targets:
+    - type: primitive
+      modifiers:
+        - { type: interiorOnly }
+        - type: containingScope
+          scopeType: { type: xmlElement }
+  usePrePhraseSnapshot: true
+  action: { name: clearAndSetSelection }
+initialState:
+  documentContents: |-
+    <div>
+        aaa
+    </div>
+  selections:
+    - anchor: { line: 1, character: 4 }
+      active: { line: 1, character: 4 }
+  marks: {}
+finalState:
+  documentContents: |-
+    <div>
+
+    </div>
+  selections:
+    - anchor: { line: 1, character: 4 }
+      active: { line: 1, character: 4 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      modifiers:
+        [
+          { type: interiorOnly },
+          { type: containingScope, scopeType: { type: xmlElement } },
+        ],
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/html/clearElement.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/html/clearElement.yml
new file mode 100644
index 0000000000..45d2aef57d
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/html/clearElement.yml
@@ -0,0 +1,39 @@
+languageId: html
+command:
+  version: 1
+  spokenForm: clear element
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier:
+        { type: containingScope, scopeType: xmlElement, includeSiblings: false }
+initialState:
+  documentContents: |-
+    <html>
+
+    </html>
+  selections:
+    - anchor: { line: 1, character: 4 }
+      active: { line: 1, character: 4 }
+  marks: {}
+finalState:
+  documentContents: ""
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        {
+          type: containingScope,
+          scopeType: xmlElement,
+          includeSiblings: false,
+        },
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/html/clearEndTag.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/html/clearEndTag.yml
new file mode 100644
index 0000000000..91a535d63e
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/html/clearEndTag.yml
@@ -0,0 +1,37 @@
+languageId: html
+command:
+  version: 1
+  spokenForm: clear end tag
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier:
+        { type: containingScope, scopeType: xmlEndTag, includeSiblings: false }
+initialState:
+  documentContents: |-
+    <html>
+
+    </html>
+  selections:
+    - anchor: { line: 1, character: 4 }
+      active: { line: 1, character: 4 }
+  marks: {}
+finalState:
+  documentContents: |
+    <html>
+
+  selections:
+    - anchor: { line: 2, character: 0 }
+      active: { line: 2, character: 0 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        { type: containingScope, scopeType: xmlEndTag, includeSiblings: false },
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/html/clearKey.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/html/clearKey.yml
new file mode 100644
index 0000000000..cbb09b2824
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/html/clearKey.yml
@@ -0,0 +1,46 @@
+languageId: html
+command:
+  version: 1
+  spokenForm: clear key
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier:
+        {
+          type: containingScope,
+          scopeType: collectionKey,
+          includeSiblings: false,
+        }
+initialState:
+  documentContents: |-
+    <html id="value">
+
+    </html>
+  selections:
+    - anchor: { line: 0, character: 9 }
+      active: { line: 0, character: 9 }
+  marks: {}
+finalState:
+  documentContents: |-
+    <html ="value">
+
+    </html>
+  selections:
+    - anchor: { line: 0, character: 6 }
+      active: { line: 0, character: 6 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        {
+          type: containingScope,
+          scopeType: collectionKey,
+          includeSiblings: false,
+        },
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/html/clearName.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/html/clearName.yml
new file mode 100644
index 0000000000..e60c00d5c3
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/html/clearName.yml
@@ -0,0 +1,38 @@
+languageId: html
+command:
+  version: 1
+  spokenForm: clear name
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier:
+        { type: containingScope, scopeType: name, includeSiblings: false }
+initialState:
+  documentContents: |-
+    <html id="value">
+
+    </html>
+  selections:
+    - anchor: { line: 0, character: 9 }
+      active: { line: 0, character: 9 }
+  marks: {}
+finalState:
+  documentContents: |-
+    < id="value">
+
+    </html>
+  selections:
+    - anchor: { line: 0, character: 1 }
+      active: { line: 0, character: 1 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        { type: containingScope, scopeType: name, includeSiblings: false },
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/html/clearStartTag.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/html/clearStartTag.yml
new file mode 100644
index 0000000000..266f1403e4
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/html/clearStartTag.yml
@@ -0,0 +1,46 @@
+languageId: html
+command:
+  version: 1
+  spokenForm: clear start tag
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier:
+        {
+          type: containingScope,
+          scopeType: xmlStartTag,
+          includeSiblings: false,
+        }
+initialState:
+  documentContents: |-
+    <html>
+
+    </html>
+  selections:
+    - anchor: { line: 1, character: 4 }
+      active: { line: 1, character: 4 }
+  marks: {}
+finalState:
+  documentContents: |2-
+
+
+    </html>
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        {
+          type: containingScope,
+          scopeType: xmlStartTag,
+          includeSiblings: false,
+        },
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/html/clearString.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/html/clearString.yml
new file mode 100644
index 0000000000..3369791dc1
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/html/clearString.yml
@@ -0,0 +1,36 @@
+languageId: html
+command:
+  version: 1
+  spokenForm: clear string
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier: { type: surroundingPair, delimiter: string }
+initialState:
+  documentContents: |-
+    <html id="value">
+
+        </html>
+  selections:
+    - anchor: { line: 0, character: 11 }
+      active: { line: 0, character: 11 }
+  marks: {}
+finalState:
+  documentContents: |-
+    <html id=>
+
+        </html>
+  selections:
+    - anchor: { line: 0, character: 9 }
+      active: { line: 0, character: 9 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier: { type: surroundingPair, delimiter: string },
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/html/clearTags.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/html/clearTags.yml
new file mode 100644
index 0000000000..c5f85c1b9b
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/html/clearTags.yml
@@ -0,0 +1,46 @@
+languageId: html
+command:
+  version: 1
+  spokenForm: clear tags
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier:
+        {
+          type: containingScope,
+          scopeType: xmlBothTags,
+          includeSiblings: false,
+        }
+initialState:
+  documentContents: |-
+    <html>
+
+    </html>
+  selections:
+    - anchor: { line: 1, character: 4 }
+      active: { line: 1, character: 4 }
+  marks: {}
+finalState:
+  documentContents: |2
+
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+    - anchor: { line: 2, character: 0 }
+      active: { line: 2, character: 0 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        {
+          type: containingScope,
+          scopeType: xmlBothTags,
+          includeSiblings: false,
+        },
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/java/changeCall.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/java/changeCall.yml
new file mode 100644
index 0000000000..daa42a28f7
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/java/changeCall.yml
@@ -0,0 +1,43 @@
+languageId: java
+command:
+  version: 1
+  spokenForm: change call
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier:
+        {
+          type: containingScope,
+          scopeType: functionCall,
+          includeSiblings: false,
+        }
+initialState:
+  documentContents: |
+    Box<Integer> integerBox = new Box<>();
+  selections:
+    - anchor: { line: 0, character: 36 }
+      active: { line: 0, character: 36 }
+  marks: {}
+finalState:
+  documentContents: |
+    Box<Integer> integerBox = ;
+  selections:
+    - anchor: { line: 0, character: 26 }
+      active: { line: 0, character: 26 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        {
+          type: containingScope,
+          scopeType: functionCall,
+          includeSiblings: false,
+        },
+      isImplicit: false,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/java/changeCall2.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/java/changeCall2.yml
new file mode 100644
index 0000000000..205e33a18f
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/java/changeCall2.yml
@@ -0,0 +1,63 @@
+languageId: java
+command:
+  version: 1
+  spokenForm: change call
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier:
+        {
+          type: containingScope,
+          scopeType: functionCall,
+          includeSiblings: false,
+        }
+initialState:
+  documentContents: |-
+    class Point {
+      int x, y;
+      Point(int x, int y) {
+        this.x = x;
+        this.y = y;
+      }
+
+      Point() {
+        this(0, 0);
+      }
+    }
+  selections:
+    - anchor: { line: 8, character: 12 }
+      active: { line: 8, character: 12 }
+  marks: {}
+finalState:
+  documentContents: |-
+    class Point {
+      int x, y;
+      Point(int x, int y) {
+        this.x = x;
+        this.y = y;
+      }
+
+      Point() {
+
+      }
+    }
+  selections:
+    - anchor: { line: 8, character: 4 }
+      active: { line: 8, character: 4 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        {
+          type: containingScope,
+          scopeType: functionCall,
+          includeSiblings: false,
+        },
+      isImplicit: false,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/java/changeCallee.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/java/changeCallee.yml
new file mode 100644
index 0000000000..7696b7f7fe
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/java/changeCallee.yml
@@ -0,0 +1,41 @@
+languageId: java
+command:
+  version: 1
+  spokenForm: change callee
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier:
+        {
+          type: containingScope,
+          scopeType: functionCallee,
+          includeSiblings: false,
+        }
+initialState:
+  documentContents: new test().bar();
+  selections:
+    - anchor: { line: 0, character: 9 }
+      active: { line: 0, character: 9 }
+  marks: {}
+finalState:
+  documentContents: new ().bar();
+  selections:
+    - anchor: { line: 0, character: 4 }
+      active: { line: 0, character: 4 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        {
+          type: containingScope,
+          scopeType: functionCallee,
+          includeSiblings: false,
+        },
+      isImplicit: false,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/java/changeCallee2.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/java/changeCallee2.yml
new file mode 100644
index 0000000000..a2d2bcd6ea
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/java/changeCallee2.yml
@@ -0,0 +1,41 @@
+languageId: java
+command:
+  version: 1
+  spokenForm: change callee
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier:
+        {
+          type: containingScope,
+          scopeType: functionCallee,
+          includeSiblings: false,
+        }
+initialState:
+  documentContents: new test().bar();
+  selections:
+    - anchor: { line: 0, character: 15 }
+      active: { line: 0, character: 15 }
+  marks: {}
+finalState:
+  documentContents: ();
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        {
+          type: containingScope,
+          scopeType: functionCallee,
+          includeSiblings: false,
+        },
+      isImplicit: false,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/java/changeCallee3.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/java/changeCallee3.yml
new file mode 100644
index 0000000000..07b742b791
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/java/changeCallee3.yml
@@ -0,0 +1,41 @@
+languageId: java
+command:
+  version: 1
+  spokenForm: change callee
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier:
+        {
+          type: containingScope,
+          scopeType: functionCallee,
+          includeSiblings: false,
+        }
+initialState:
+  documentContents: new test[0]();
+  selections:
+    - anchor: { line: 0, character: 12 }
+      active: { line: 0, character: 12 }
+  marks: {}
+finalState:
+  documentContents: new ();
+  selections:
+    - anchor: { line: 0, character: 4 }
+      active: { line: 0, character: 4 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        {
+          type: containingScope,
+          scopeType: functionCallee,
+          includeSiblings: false,
+        },
+      isImplicit: false,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/java/changeCallee5.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/java/changeCallee5.yml
new file mode 100644
index 0000000000..31fbb3a4d3
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/java/changeCallee5.yml
@@ -0,0 +1,51 @@
+languageId: java
+command:
+  version: 1
+  spokenForm: change callee
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier:
+        {
+          type: containingScope,
+          scopeType: functionCallee,
+          includeSiblings: false,
+        }
+initialState:
+  documentContents: |-
+    public class Test {
+        public Test()  {
+            super();
+        }
+    }
+  selections:
+    - anchor: { line: 2, character: 14 }
+      active: { line: 2, character: 14 }
+  marks: {}
+finalState:
+  documentContents: |-
+    public class Test {
+        public Test()  {
+            ();
+        }
+    }
+  selections:
+    - anchor: { line: 2, character: 8 }
+      active: { line: 2, character: 8 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        {
+          type: containingScope,
+          scopeType: functionCallee,
+          includeSiblings: false,
+        },
+      isImplicit: false,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/java/changeCallee6.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/java/changeCallee6.yml
new file mode 100644
index 0000000000..1ec249b5b8
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/java/changeCallee6.yml
@@ -0,0 +1,41 @@
+languageId: java
+command:
+  version: 1
+  spokenForm: change callee
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier:
+        {
+          type: containingScope,
+          scopeType: functionCallee,
+          includeSiblings: false,
+        }
+initialState:
+  documentContents: tests[0].run();
+  selections:
+    - anchor: { line: 0, character: 13 }
+      active: { line: 0, character: 13 }
+  marks: {}
+finalState:
+  documentContents: ();
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        {
+          type: containingScope,
+          scopeType: functionCallee,
+          includeSiblings: false,
+        },
+      isImplicit: false,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/java/changeCallee7.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/java/changeCallee7.yml
new file mode 100644
index 0000000000..31fbb3a4d3
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/java/changeCallee7.yml
@@ -0,0 +1,51 @@
+languageId: java
+command:
+  version: 1
+  spokenForm: change callee
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier:
+        {
+          type: containingScope,
+          scopeType: functionCallee,
+          includeSiblings: false,
+        }
+initialState:
+  documentContents: |-
+    public class Test {
+        public Test()  {
+            super();
+        }
+    }
+  selections:
+    - anchor: { line: 2, character: 14 }
+      active: { line: 2, character: 14 }
+  marks: {}
+finalState:
+  documentContents: |-
+    public class Test {
+        public Test()  {
+            ();
+        }
+    }
+  selections:
+    - anchor: { line: 2, character: 8 }
+      active: { line: 2, character: 8 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        {
+          type: containingScope,
+          scopeType: functionCallee,
+          includeSiblings: false,
+        },
+      isImplicit: false,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/java/changeCalleeSoap.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/java/changeCalleeSoap.yml
new file mode 100644
index 0000000000..a9eee05e3f
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/java/changeCalleeSoap.yml
@@ -0,0 +1,45 @@
+languageId: java
+command:
+  version: 1
+  spokenForm: change callee soap
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier:
+        {
+          type: containingScope,
+          scopeType: functionCallee,
+          includeSiblings: false,
+        }
+      mark: { type: decoratedSymbol, symbolColor: default, character: s }
+initialState:
+  documentContents: someFunction();
+  selections:
+    - anchor: { line: 0, character: 15 }
+      active: { line: 0, character: 15 }
+  marks:
+    default.s:
+      start: { line: 0, character: 0 }
+      end: { line: 0, character: 12 }
+finalState:
+  documentContents: ();
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: decoratedSymbol, symbolColor: default, character: s },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        {
+          type: containingScope,
+          scopeType: functionCallee,
+          includeSiblings: false,
+        },
+      isImplicit: false,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/java/chuckTypeNear.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/java/chuckTypeNear.yml
new file mode 100644
index 0000000000..babab1a046
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/java/chuckTypeNear.yml
@@ -0,0 +1,46 @@
+languageId: java
+command:
+  version: 1
+  spokenForm: chuck type near
+  action: remove
+  targets:
+    - type: primitive
+      modifier:
+        { type: containingScope, scopeType: type, includeSiblings: false }
+      mark: { type: decoratedSymbol, symbolColor: default, character: "n" }
+initialState:
+  documentContents: |-
+    public class Java {
+        private Java(String name) {
+            String value = "hello";
+        }
+    }
+  selections:
+    - anchor: { line: 3, character: 1 }
+      active: { line: 3, character: 1 }
+  marks:
+    default.n:
+      start: { line: 1, character: 24 }
+      end: { line: 1, character: 28 }
+finalState:
+  documentContents: |-
+    public class Java {
+        private Java(name) {
+            String value = "hello";
+        }
+    }
+  selections:
+    - anchor: { line: 3, character: 1 }
+      active: { line: 3, character: 1 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: decoratedSymbol, symbolColor: default, character: "n" },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: outside,
+      modifier:
+        { type: containingScope, scopeType: type, includeSiblings: false },
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/java/chuckTypeUrge.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/java/chuckTypeUrge.yml
new file mode 100644
index 0000000000..15b673b0a5
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/java/chuckTypeUrge.yml
@@ -0,0 +1,46 @@
+languageId: java
+command:
+  version: 1
+  spokenForm: chuck type urge
+  action: remove
+  targets:
+    - type: primitive
+      modifier:
+        { type: containingScope, scopeType: type, includeSiblings: false }
+      mark: { type: decoratedSymbol, symbolColor: default, character: u }
+initialState:
+  documentContents: |-
+    public class Java {
+        private Java(String name) {
+            String value = "hello";
+        }
+    }
+  selections:
+    - anchor: { line: 3, character: 1 }
+      active: { line: 3, character: 1 }
+  marks:
+    default.u:
+      start: { line: 2, character: 15 }
+      end: { line: 2, character: 20 }
+finalState:
+  documentContents: |-
+    public class Java {
+        private Java(String name) {
+            value = "hello";
+        }
+    }
+  selections:
+    - anchor: { line: 3, character: 1 }
+      active: { line: 3, character: 1 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: decoratedSymbol, symbolColor: default, character: u },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: outside,
+      modifier:
+        { type: containingScope, scopeType: type, includeSiblings: false },
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/java/chuckValue.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/java/chuckValue.yml
new file mode 100644
index 0000000000..2fa4f39139
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/java/chuckValue.yml
@@ -0,0 +1,103 @@
+languageId: java
+command:
+  version: 1
+  spokenForm: chuck value
+  action: remove
+  targets:
+    - type: primitive
+      modifier:
+        { type: containingScope, scopeType: value, includeSiblings: false }
+initialState:
+  documentContents: |
+    public class MyClass {
+        public static void main(String[] args) {
+            a = 1;
+            a += 1;
+            a -= 1;
+            a *= 1;
+            a /= 1;
+            a %= 1;
+            a &= 1;
+            a |= 1;
+            a ^= 1;
+            a <<= 1;
+            a >>= 1;
+        }
+    }
+  selections:
+    - anchor: { line: 11, character: 14 }
+      active: { line: 11, character: 15 }
+    - anchor: { line: 3, character: 13 }
+      active: { line: 3, character: 14 }
+    - anchor: { line: 4, character: 13 }
+      active: { line: 4, character: 14 }
+    - anchor: { line: 5, character: 13 }
+      active: { line: 5, character: 14 }
+    - anchor: { line: 6, character: 13 }
+      active: { line: 6, character: 14 }
+    - anchor: { line: 7, character: 13 }
+      active: { line: 7, character: 14 }
+    - anchor: { line: 8, character: 13 }
+      active: { line: 8, character: 14 }
+    - anchor: { line: 9, character: 13 }
+      active: { line: 9, character: 14 }
+    - anchor: { line: 10, character: 13 }
+      active: { line: 10, character: 14 }
+    - anchor: { line: 2, character: 12 }
+      active: { line: 2, character: 13 }
+    - anchor: { line: 12, character: 14 }
+      active: { line: 12, character: 15 }
+  marks: {}
+finalState:
+  documentContents: |
+    public class MyClass {
+        public static void main(String[] args) {
+            a;
+            a;
+            a;
+            a;
+            a;
+            a;
+            a;
+            a;
+            a;
+            a;
+            a;
+        }
+    }
+  selections:
+    - anchor: { line: 11, character: 9 }
+      active: { line: 11, character: 9 }
+    - anchor: { line: 3, character: 9 }
+      active: { line: 3, character: 9 }
+    - anchor: { line: 4, character: 9 }
+      active: { line: 4, character: 9 }
+    - anchor: { line: 5, character: 9 }
+      active: { line: 5, character: 9 }
+    - anchor: { line: 6, character: 9 }
+      active: { line: 6, character: 9 }
+    - anchor: { line: 7, character: 9 }
+      active: { line: 7, character: 9 }
+    - anchor: { line: 8, character: 9 }
+      active: { line: 8, character: 9 }
+    - anchor: { line: 9, character: 9 }
+      active: { line: 9, character: 9 }
+    - anchor: { line: 10, character: 9 }
+      active: { line: 10, character: 9 }
+    - anchor: { line: 2, character: 9 }
+      active: { line: 2, character: 9 }
+    - anchor: { line: 12, character: 9 }
+      active: { line: 12, character: 9 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: outside,
+      modifier:
+        { type: containingScope, scopeType: value, includeSiblings: false },
+      isImplicit: false,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/java/clearBranch.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/java/clearBranch.yml
new file mode 100644
index 0000000000..7d586866b4
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/java/clearBranch.yml
@@ -0,0 +1,49 @@
+languageId: java
+command:
+  spokenForm: clear branch
+  version: 3
+  targets:
+    - type: primitive
+      modifiers:
+        - type: containingScope
+          scopeType: { type: branch }
+  usePrePhraseSnapshot: true
+  action: { name: clearAndSetSelection }
+initialState:
+  documentContents: |-
+    class Aaa {
+      static void bbb() {
+        switch ("0") {
+          case ("0"):
+            break;
+          case ("1"):
+            break;
+        }
+      }
+    }
+  selections:
+    - anchor: { line: 4, character: 12 }
+      active: { line: 4, character: 12 }
+  marks: {}
+finalState:
+  documentContents: |-
+    class Aaa {
+      static void bbb() {
+        switch ("0") {
+
+          case ("1"):
+            break;
+        }
+      }
+    }
+  selections:
+    - anchor: { line: 3, character: 6 }
+      active: { line: 3, character: 6 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      modifiers: [{ type: containingScope, scopeType: { type: branch } }],
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/java/clearBranch2.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/java/clearBranch2.yml
new file mode 100644
index 0000000000..7110cc1b52
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/java/clearBranch2.yml
@@ -0,0 +1,48 @@
+languageId: java
+command:
+  spokenForm: clear branch
+  version: 3
+  targets:
+    - type: primitive
+      modifiers:
+        - type: containingScope
+          scopeType: { type: branch }
+  usePrePhraseSnapshot: true
+  action: { name: clearAndSetSelection }
+initialState:
+  documentContents: |-
+    class Aaa {
+      static void bbb() {
+        var s =
+          switch ("0") {
+            case "0" -> "zero";
+            case "1" -> "one";
+          };
+      }
+    }
+  selections:
+    - anchor: { line: 4, character: 23 }
+      active: { line: 4, character: 23 }
+  marks: {}
+finalState:
+  documentContents: |-
+    class Aaa {
+      static void bbb() {
+        var s =
+          switch ("0") {
+
+            case "1" -> "one";
+          };
+      }
+    }
+  selections:
+    - anchor: { line: 4, character: 8 }
+      active: { line: 4, character: 8 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      modifiers: [{ type: containingScope, scopeType: { type: branch } }],
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/java/clearComment.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/java/clearComment.yml
new file mode 100644
index 0000000000..c65138147b
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/java/clearComment.yml
@@ -0,0 +1,30 @@
+languageId: java
+command:
+  spokenForm: clear comment
+  version: 2
+  targets:
+    - type: primitive
+      modifiers:
+        - type: containingScope
+          scopeType: { type: comment }
+  usePrePhraseSnapshot: true
+  action: { name: clearAndSetSelection }
+initialState:
+  documentContents: /* Hello world */
+  selections:
+    - anchor: { line: 0, character: 9 }
+      active: { line: 0, character: 9 }
+  marks: {}
+finalState:
+  documentContents: ""
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      modifiers: [{ type: containingScope, scopeType: { type: comment } }],
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/java/clearName.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/java/clearName.yml
new file mode 100644
index 0000000000..9cef42f8b5
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/java/clearName.yml
@@ -0,0 +1,33 @@
+languageId: java
+command:
+  version: 1
+  spokenForm: clear name
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier:
+        { type: containingScope, scopeType: name, includeSiblings: false }
+initialState:
+  documentContents: a += "world"
+  selections:
+    - anchor: { line: 0, character: 6 }
+      active: { line: 0, character: 6 }
+  marks: {}
+finalState:
+  documentContents: ' += "world"'
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        { type: containingScope, scopeType: name, includeSiblings: false },
+      isImplicit: false,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/java/clearState.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/java/clearState.yml
new file mode 100644
index 0000000000..372840e52c
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/java/clearState.yml
@@ -0,0 +1,47 @@
+languageId: java
+command:
+  version: 1
+  spokenForm: clear state
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier:
+        { type: containingScope, scopeType: statement, includeSiblings: false }
+initialState:
+  documentContents: |
+    public class MyClass {
+        public static void main(String[] args) {
+            switch("foo") {
+                case "bar":
+
+                    break;
+            }
+        }
+    }
+  selections:
+    - anchor: { line: 4, character: 16 }
+      active: { line: 4, character: 16 }
+  marks: {}
+finalState:
+  documentContents: |
+    public class MyClass {
+        public static void main(String[] args) {
+
+        }
+    }
+  selections:
+    - anchor: { line: 2, character: 8 }
+      active: { line: 2, character: 8 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        { type: containingScope, scopeType: statement, includeSiblings: false },
+      isImplicit: false,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/java/clearState2.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/java/clearState2.yml
new file mode 100644
index 0000000000..88dedd6e27
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/java/clearState2.yml
@@ -0,0 +1,51 @@
+languageId: java
+command:
+  version: 1
+  spokenForm: clear state
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier:
+        { type: containingScope, scopeType: statement, includeSiblings: false }
+initialState:
+  documentContents: |
+    public class MyClass {
+        public static void main(String[] args) {
+            if() {
+
+            }
+            else if() {
+
+            }
+            else {
+
+            }
+        }
+    }
+  selections:
+    - anchor: { line: 3, character: 12 }
+      active: { line: 3, character: 12 }
+  marks: {}
+finalState:
+  documentContents: |
+    public class MyClass {
+        public static void main(String[] args) {
+
+        }
+    }
+  selections:
+    - anchor: { line: 2, character: 8 }
+      active: { line: 2, character: 8 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        { type: containingScope, scopeType: statement, includeSiblings: false },
+      isImplicit: false,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/java/clearState3.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/java/clearState3.yml
new file mode 100644
index 0000000000..af1fb11166
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/java/clearState3.yml
@@ -0,0 +1,37 @@
+languageId: java
+command:
+  spokenForm: clear state
+  version: 3
+  targets:
+    - type: primitive
+      modifiers:
+        - type: containingScope
+          scopeType: { type: statement }
+  usePrePhraseSnapshot: true
+  action: { name: clearAndSetSelection }
+initialState:
+  documentContents: |
+    public class MyClass {
+        @Inject
+        private Aaa aaa;
+    }
+  selections:
+    - anchor: { line: 2, character: 4 }
+      active: { line: 2, character: 4 }
+  marks: {}
+finalState:
+  documentContents: |
+    public class MyClass {
+
+    }
+  selections:
+    - anchor: { line: 1, character: 4 }
+      active: { line: 1, character: 4 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      modifiers: [{ type: containingScope, scopeType: { type: statement } }],
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/java/clearState4.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/java/clearState4.yml
new file mode 100644
index 0000000000..04c8b8c498
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/java/clearState4.yml
@@ -0,0 +1,36 @@
+languageId: java
+command:
+  spokenForm: clear state
+  version: 3
+  targets:
+    - type: primitive
+      modifiers:
+        - type: containingScope
+          scopeType: { type: statement }
+  usePrePhraseSnapshot: true
+  action: { name: clearAndSetSelection }
+initialState:
+  documentContents: |
+    public class MyClass {
+        private String value = "hello";
+    }
+  selections:
+    - anchor: { line: 1, character: 4 }
+      active: { line: 1, character: 4 }
+  marks: {}
+finalState:
+  documentContents: |
+    public class MyClass {
+
+    }
+  selections:
+    - anchor: { line: 1, character: 4 }
+      active: { line: 1, character: 4 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      modifiers: [{ type: containingScope, scopeType: { type: statement } }],
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/java/clearState5.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/java/clearState5.yml
new file mode 100644
index 0000000000..e65c7c5988
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/java/clearState5.yml
@@ -0,0 +1,37 @@
+languageId: java
+command:
+  spokenForm: clear state
+  version: 3
+  targets:
+    - type: primitive
+      modifiers:
+        - type: containingScope
+          scopeType: { type: statement }
+  usePrePhraseSnapshot: true
+  action: { name: clearAndSetSelection }
+initialState:
+  documentContents: |
+    public class MyClass {
+        public MyClass() {
+        }
+    }
+  selections:
+    - anchor: { line: 1, character: 4 }
+      active: { line: 1, character: 4 }
+  marks: {}
+finalState:
+  documentContents: |
+    public class MyClass {
+
+    }
+  selections:
+    - anchor: { line: 1, character: 4 }
+      active: { line: 1, character: 4 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      modifiers: [{ type: containingScope, scopeType: { type: statement } }],
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/java/clearState6.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/java/clearState6.yml
new file mode 100644
index 0000000000..85679f6013
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/java/clearState6.yml
@@ -0,0 +1,37 @@
+languageId: java
+command:
+  spokenForm: clear state
+  version: 3
+  targets:
+    - type: primitive
+      modifiers:
+        - type: containingScope
+          scopeType: { type: statement }
+  usePrePhraseSnapshot: true
+  action: { name: clearAndSetSelection }
+initialState:
+  documentContents: |
+    public class MyClass {
+        private void myFunction() {
+        }
+    }
+  selections:
+    - anchor: { line: 1, character: 4 }
+      active: { line: 1, character: 4 }
+  marks: {}
+finalState:
+  documentContents: |
+    public class MyClass {
+
+    }
+  selections:
+    - anchor: { line: 1, character: 4 }
+      active: { line: 1, character: 4 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      modifiers: [{ type: containingScope, scopeType: { type: statement } }],
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/java/clearState7.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/java/clearState7.yml
new file mode 100644
index 0000000000..bf2c9f6eed
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/java/clearState7.yml
@@ -0,0 +1,33 @@
+languageId: java
+command:
+  spokenForm: clear state
+  version: 3
+  targets:
+    - type: primitive
+      modifiers:
+        - type: containingScope
+          scopeType: { type: statement }
+  usePrePhraseSnapshot: true
+  action: { name: clearAndSetSelection }
+initialState:
+  documentContents: |
+    public class MyClass {
+    }
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+  marks: {}
+finalState:
+  documentContents: |+
+
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      modifiers: [{ type: containingScope, scopeType: { type: statement } }],
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/java/clearSubject.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/java/clearSubject.yml
new file mode 100644
index 0000000000..3373b240fa
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/java/clearSubject.yml
@@ -0,0 +1,54 @@
+languageId: java
+command:
+  spokenForm: clear subject
+  version: 3
+  targets:
+    - type: primitive
+      modifiers:
+        - type: containingScope
+          scopeType: { type: switchStatementSubject }
+  usePrePhraseSnapshot: true
+  action: { name: clearAndSetSelection }
+initialState:
+  documentContents: |
+    class Aaa {
+
+      static void bbb() {
+        switch ("0") {
+          case ("0"):
+            break;
+        }
+      }
+    }
+  selections:
+    - anchor: { line: 4, character: 17 }
+      active: { line: 4, character: 17 }
+  marks: {}
+finalState:
+  documentContents: |
+    class Aaa {
+
+      static void bbb() {
+        switch () {
+          case ("0"):
+            break;
+        }
+      }
+    }
+  selections:
+    - anchor: { line: 3, character: 12 }
+      active: { line: 3, character: 12 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      modifiers:
+        [
+          {
+            type: containingScope,
+            scopeType: { type: switchStatementSubject },
+          },
+        ],
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/java/clearSubject2.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/java/clearSubject2.yml
new file mode 100644
index 0000000000..85f14b5217
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/java/clearSubject2.yml
@@ -0,0 +1,54 @@
+languageId: java
+command:
+  spokenForm: clear subject
+  version: 3
+  targets:
+    - type: primitive
+      modifiers:
+        - type: containingScope
+          scopeType: { type: switchStatementSubject }
+  usePrePhraseSnapshot: true
+  action: { name: clearAndSetSelection }
+initialState:
+  documentContents: |
+    class Aaa {
+
+      static void bbb() {
+        var s =
+          switch ("0") {
+            case "0" -> "zero";
+          };
+      }
+    }
+  selections:
+    - anchor: { line: 5, character: 22 }
+      active: { line: 5, character: 22 }
+  marks: {}
+finalState:
+  documentContents: |
+    class Aaa {
+
+      static void bbb() {
+        var s =
+          switch () {
+            case "0" -> "zero";
+          };
+      }
+    }
+  selections:
+    - anchor: { line: 4, character: 14 }
+      active: { line: 4, character: 14 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      modifiers:
+        [
+          {
+            type: containingScope,
+            scopeType: { type: switchStatementSubject },
+          },
+        ],
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/java/clearValue.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/java/clearValue.yml
new file mode 100644
index 0000000000..92a615f35a
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/java/clearValue.yml
@@ -0,0 +1,33 @@
+languageId: java
+command:
+  version: 1
+  spokenForm: clear value
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier:
+        { type: containingScope, scopeType: value, includeSiblings: false }
+initialState:
+  documentContents: a += "world"
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+  marks: {}
+finalState:
+  documentContents: "a += "
+  selections:
+    - anchor: { line: 0, character: 5 }
+      active: { line: 0, character: 5 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        { type: containingScope, scopeType: value, includeSiblings: false },
+      isImplicit: false,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/java/clearValue2.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/java/clearValue2.yml
new file mode 100644
index 0000000000..651f7309a0
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/java/clearValue2.yml
@@ -0,0 +1,40 @@
+languageId: java
+command:
+  spokenForm: clear value
+  version: 2
+  targets:
+    - type: primitive
+      modifiers:
+        - type: containingScope
+          scopeType: { type: value }
+  usePrePhraseSnapshot: true
+  action: { name: clearAndSetSelection }
+initialState:
+  documentContents: |-
+    public class MyClass {
+        String myFunk() {
+            return "hello there";
+        }
+    }
+  selections:
+    - anchor: { line: 2, character: 21 }
+      active: { line: 2, character: 21 }
+  marks: {}
+finalState:
+  documentContents: |-
+    public class MyClass {
+        String myFunk() {
+            return ;
+        }
+    }
+  selections:
+    - anchor: { line: 2, character: 15 }
+      active: { line: 2, character: 15 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      modifiers: [{ type: containingScope, scopeType: { type: value } }],
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/java/clearValue3.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/java/clearValue3.yml
new file mode 100644
index 0000000000..6c805ec9bb
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/java/clearValue3.yml
@@ -0,0 +1,40 @@
+languageId: java
+command:
+  spokenForm: clear value
+  version: 2
+  targets:
+    - type: primitive
+      modifiers:
+        - type: containingScope
+          scopeType: { type: value }
+  usePrePhraseSnapshot: true
+  action: { name: clearAndSetSelection }
+initialState:
+  documentContents: |-
+    public class MyClass {
+        String myFunk() {
+            return "hello";
+        }
+    }
+  selections:
+    - anchor: { line: 2, character: 8 }
+      active: { line: 2, character: 8 }
+  marks: {}
+finalState:
+  documentContents: |-
+    public class MyClass {
+        String myFunk() {
+            return ;
+        }
+    }
+  selections:
+    - anchor: { line: 2, character: 15 }
+      active: { line: 2, character: 15 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      modifiers: [{ type: containingScope, scopeType: { type: value } }],
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/java/elseStateWrapThis.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/java/elseStateWrapThis.yml
new file mode 100644
index 0000000000..413cf2c509
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/java/elseStateWrapThis.yml
@@ -0,0 +1,37 @@
+languageId: java
+command:
+  version: 1
+  spokenForm: else state wrap this
+  action: wrapWithSnippet
+  targets:
+    - type: primitive
+      mark: { type: cursor }
+  extraArgs: [ifElseStatement.alternative]
+initialState:
+  documentContents: int foo = 0;
+  selections:
+    - anchor: { line: 0, character: 6 }
+      active: { line: 0, character: 6 }
+  marks: {}
+finalState:
+  documentContents: |-
+    if () {
+
+    } else {
+        int foo = 0;
+    }
+  selections:
+    - anchor: { line: 0, character: 4 }
+      active: { line: 0, character: 4 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        { type: containingScope, scopeType: statement, includeSiblings: false },
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/java/ifElseWrapThis.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/java/ifElseWrapThis.yml
new file mode 100644
index 0000000000..569e767512
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/java/ifElseWrapThis.yml
@@ -0,0 +1,37 @@
+languageId: java
+command:
+  version: 1
+  spokenForm: if else wrap this
+  action: wrapWithSnippet
+  targets:
+    - type: primitive
+      mark: { type: cursor }
+  extraArgs: [ifElseStatement.consequence]
+initialState:
+  documentContents: int foo = 0;
+  selections:
+    - anchor: { line: 0, character: 6 }
+      active: { line: 0, character: 6 }
+  marks: {}
+finalState:
+  documentContents: |-
+    if () {
+        int foo = 0;
+    } else {
+
+    }
+  selections:
+    - anchor: { line: 0, character: 4 }
+      active: { line: 0, character: 4 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        { type: containingScope, scopeType: statement, includeSiblings: false },
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/java/ifStateWrapThis.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/java/ifStateWrapThis.yml
new file mode 100644
index 0000000000..61376ec06b
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/java/ifStateWrapThis.yml
@@ -0,0 +1,35 @@
+languageId: java
+command:
+  version: 1
+  spokenForm: if state wrap this
+  action: wrapWithSnippet
+  targets:
+    - type: primitive
+      mark: { type: cursor }
+  extraArgs: [ifStatement.consequence]
+initialState:
+  documentContents: int foo = 0;
+  selections:
+    - anchor: { line: 0, character: 6 }
+      active: { line: 0, character: 6 }
+  marks: {}
+finalState:
+  documentContents: |-
+    if () {
+        int foo = 0;
+    }
+  selections:
+    - anchor: { line: 0, character: 4 }
+      active: { line: 0, character: 4 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        { type: containingScope, scopeType: statement, includeSiblings: false },
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/java/pourBranch.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/java/pourBranch.yml
new file mode 100644
index 0000000000..20f5ff9de5
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/java/pourBranch.yml
@@ -0,0 +1,49 @@
+languageId: java
+command:
+  spokenForm: pour branch
+  version: 3
+  targets:
+    - type: primitive
+      modifiers:
+        - type: containingScope
+          scopeType: { type: branch }
+  usePrePhraseSnapshot: true
+  action: { name: editNewLineAfter }
+initialState:
+  documentContents: |-
+    class Aaa {
+      static void bbb() {
+        var s =
+          switch ("0") {
+            case "0" -> "zero";
+            case "1" -> "one";
+          };
+      }
+    }
+  selections:
+    - anchor: { line: 4, character: 21 }
+      active: { line: 4, character: 21 }
+  marks: {}
+finalState:
+  documentContents: |-
+    class Aaa {
+      static void bbb() {
+        var s =
+          switch ("0") {
+            case "0" -> "zero";
+
+            case "1" -> "one";
+          };
+      }
+    }
+  selections:
+    - anchor: { line: 5, character: 8 }
+      active: { line: 5, character: 8 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      modifiers: [{ type: containingScope, scopeType: { type: branch } }],
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/java/takeArg.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/java/takeArg.yml
new file mode 100644
index 0000000000..42bc12cd30
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/java/takeArg.yml
@@ -0,0 +1,42 @@
+languageId: java
+command:
+  version: 1
+  spokenForm: take arg
+  action: setSelection
+  targets:
+    - type: primitive
+      modifier: { type: containingScope, scopeType: argumentOrParameter }
+initialState:
+  documentContents: |
+
+    public class MyClass {
+        public MyClass (String name, int value) {
+
+        }
+    }
+  selections:
+    - anchor: { line: 2, character: 26 }
+      active: { line: 2, character: 26 }
+  marks: {}
+finalState:
+  documentContents: |
+
+    public class MyClass {
+        public MyClass (String name, int value) {
+
+        }
+    }
+  selections:
+    - anchor: { line: 2, character: 20 }
+      active: { line: 2, character: 31 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      modifier: { type: containingScope, scopeType: argumentOrParameter },
+      insideOutsideType: inside,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/java/takeArg2.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/java/takeArg2.yml
new file mode 100644
index 0000000000..1ed0f95f36
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/java/takeArg2.yml
@@ -0,0 +1,34 @@
+languageId: java
+command:
+  version: 1
+  spokenForm: take arg
+  action: setSelection
+  targets:
+    - type: primitive
+      modifier: { type: containingScope, scopeType: argumentOrParameter }
+initialState:
+  documentContents: |
+
+    myFunk(1, 2, 3);
+  selections:
+    - anchor: { line: 1, character: 8 }
+      active: { line: 1, character: 8 }
+  marks: {}
+finalState:
+  documentContents: |
+
+    myFunk(1, 2, 3);
+  selections:
+    - anchor: { line: 1, character: 7 }
+      active: { line: 1, character: 8 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      modifier: { type: containingScope, scopeType: argumentOrParameter },
+      insideOutsideType: inside,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/java/takeCall.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/java/takeCall.yml
new file mode 100644
index 0000000000..74698d85a6
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/java/takeCall.yml
@@ -0,0 +1,34 @@
+languageId: java
+command:
+  version: 1
+  spokenForm: take call
+  action: setSelection
+  targets:
+    - type: primitive
+      modifier: { type: containingScope, scopeType: functionCall }
+initialState:
+  documentContents: |
+
+    myFunk(1, 2, 3);
+  selections:
+    - anchor: { line: 1, character: 5 }
+      active: { line: 1, character: 5 }
+  marks: {}
+finalState:
+  documentContents: |
+
+    myFunk(1, 2, 3);
+  selections:
+    - anchor: { line: 1, character: 0 }
+      active: { line: 1, character: 15 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      modifier: { type: containingScope, scopeType: functionCall },
+      insideOutsideType: inside,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/java/takeClass.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/java/takeClass.yml
new file mode 100644
index 0000000000..8a41e05f46
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/java/takeClass.yml
@@ -0,0 +1,38 @@
+languageId: java
+command:
+  version: 1
+  spokenForm: take class
+  action: setSelection
+  targets:
+    - type: primitive
+      modifier: { type: containingScope, scopeType: class }
+initialState:
+  documentContents: |
+
+    public class MyClass {
+
+    }
+  selections:
+    - anchor: { line: 2, character: 0 }
+      active: { line: 2, character: 0 }
+  marks: {}
+finalState:
+  documentContents: |
+
+    public class MyClass {
+
+    }
+  selections:
+    - anchor: { line: 1, character: 0 }
+      active: { line: 3, character: 1 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      modifier: { type: containingScope, scopeType: class },
+      insideOutsideType: inside,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/java/takeClassName.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/java/takeClassName.yml
new file mode 100644
index 0000000000..29239d0312
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/java/takeClassName.yml
@@ -0,0 +1,38 @@
+languageId: java
+command:
+  version: 1
+  spokenForm: take class name
+  action: setSelection
+  targets:
+    - type: primitive
+      modifier: { type: containingScope, scopeType: className }
+initialState:
+  documentContents: |
+
+    public class MyClass {
+
+    }
+  selections:
+    - anchor: { line: 2, character: 0 }
+      active: { line: 2, character: 0 }
+  marks: {}
+finalState:
+  documentContents: |
+
+    public class MyClass {
+
+    }
+  selections:
+    - anchor: { line: 1, character: 13 }
+      active: { line: 1, character: 20 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      modifier: { type: containingScope, scopeType: className },
+      insideOutsideType: inside,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/java/takeComment.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/java/takeComment.yml
new file mode 100644
index 0000000000..048457ccb8
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/java/takeComment.yml
@@ -0,0 +1,34 @@
+languageId: java
+command:
+  version: 1
+  spokenForm: take comment
+  action: setSelection
+  targets:
+    - type: primitive
+      modifier: { type: containingScope, scopeType: comment }
+initialState:
+  documentContents: |
+
+    // Hello world
+  selections:
+    - anchor: { line: 1, character: 2 }
+      active: { line: 1, character: 2 }
+  marks: {}
+finalState:
+  documentContents: |
+
+    // Hello world
+  selections:
+    - anchor: { line: 1, character: 0 }
+      active: { line: 1, character: 14 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      modifier: { type: containingScope, scopeType: comment },
+      insideOutsideType: inside,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/java/takeCondition.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/java/takeCondition.yml
new file mode 100644
index 0000000000..5018ea0ce0
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/java/takeCondition.yml
@@ -0,0 +1,58 @@
+languageId: java
+command:
+  version: 1
+  spokenForm: take condition
+  action: setSelection
+  targets:
+    - type: primitive
+      modifier:
+        { type: containingScope, scopeType: condition, includeSiblings: false }
+initialState:
+  documentContents: |-
+    public class MyClass {
+        private MyClass () {
+            if (true) {
+
+            }
+            while (true) {
+
+            }
+            for (int i = 0; i < 5; ++i) {
+
+            }
+        }
+    }
+  selections:
+    - anchor: { line: 3, character: 0 }
+      active: { line: 3, character: 0 }
+  marks: {}
+finalState:
+  documentContents: |-
+    public class MyClass {
+        private MyClass () {
+            if (true) {
+
+            }
+            while (true) {
+
+            }
+            for (int i = 0; i < 5; ++i) {
+
+            }
+        }
+    }
+  selections:
+    - anchor: { line: 2, character: 12 }
+      active: { line: 2, character: 16 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        { type: containingScope, scopeType: condition, includeSiblings: false },
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/java/takeCondition2.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/java/takeCondition2.yml
new file mode 100644
index 0000000000..d75310430e
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/java/takeCondition2.yml
@@ -0,0 +1,58 @@
+languageId: java
+command:
+  version: 1
+  spokenForm: take condition
+  action: setSelection
+  targets:
+    - type: primitive
+      modifier:
+        { type: containingScope, scopeType: condition, includeSiblings: false }
+initialState:
+  documentContents: |-
+    public class MyClass {
+        private MyClass () {
+            if (true) {
+
+            }
+            while (true) {
+
+            }
+            for (int i = 0; i < 5; ++i) {
+
+            }
+        }
+    }
+  selections:
+    - anchor: { line: 6, character: 0 }
+      active: { line: 6, character: 0 }
+  marks: {}
+finalState:
+  documentContents: |-
+    public class MyClass {
+        private MyClass () {
+            if (true) {
+
+            }
+            while (true) {
+
+            }
+            for (int i = 0; i < 5; ++i) {
+
+            }
+        }
+    }
+  selections:
+    - anchor: { line: 5, character: 15 }
+      active: { line: 5, character: 19 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        { type: containingScope, scopeType: condition, includeSiblings: false },
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/java/takeCondition3.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/java/takeCondition3.yml
new file mode 100644
index 0000000000..4304aaa961
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/java/takeCondition3.yml
@@ -0,0 +1,58 @@
+languageId: java
+command:
+  version: 1
+  spokenForm: take condition
+  action: setSelection
+  targets:
+    - type: primitive
+      modifier:
+        { type: containingScope, scopeType: condition, includeSiblings: false }
+initialState:
+  documentContents: |-
+    public class MyClass {
+        private MyClass () {
+            if (true) {
+
+            }
+            while (true) {
+
+            }
+            for (int i = 0; i < 5; ++i) {
+
+            }
+        }
+    }
+  selections:
+    - anchor: { line: 9, character: 0 }
+      active: { line: 9, character: 0 }
+  marks: {}
+finalState:
+  documentContents: |-
+    public class MyClass {
+        private MyClass () {
+            if (true) {
+
+            }
+            while (true) {
+
+            }
+            for (int i = 0; i < 5; ++i) {
+
+            }
+        }
+    }
+  selections:
+    - anchor: { line: 8, character: 24 }
+      active: { line: 8, character: 29 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        { type: containingScope, scopeType: condition, includeSiblings: false },
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/java/takeEveryArg.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/java/takeEveryArg.yml
new file mode 100644
index 0000000000..27c4ac642d
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/java/takeEveryArg.yml
@@ -0,0 +1,54 @@
+languageId: java
+command:
+  version: 1
+  spokenForm: take every arg
+  action: setSelection
+  targets:
+    - type: primitive
+      modifier:
+        {
+          type: containingScope,
+          scopeType: argumentOrParameter,
+          includeSiblings: true,
+        }
+initialState:
+  documentContents: |
+
+    public class MyClass {
+        public MyClass (String name, int value) {
+
+        }
+    }
+  selections:
+    - anchor: { line: 2, character: 20 }
+      active: { line: 2, character: 20 }
+  marks: {}
+finalState:
+  documentContents: |
+
+    public class MyClass {
+        public MyClass (String name, int value) {
+
+        }
+    }
+  selections:
+    - anchor: { line: 2, character: 20 }
+      active: { line: 2, character: 31 }
+    - anchor: { line: 2, character: 33 }
+      active: { line: 2, character: 42 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      modifier:
+        {
+          type: containingScope,
+          scopeType: argumentOrParameter,
+          includeSiblings: true,
+        },
+      insideOutsideType: inside,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/java/takeEveryArg2.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/java/takeEveryArg2.yml
new file mode 100644
index 0000000000..33d7854bb5
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/java/takeEveryArg2.yml
@@ -0,0 +1,48 @@
+languageId: java
+command:
+  version: 1
+  spokenForm: take every arg
+  action: setSelection
+  targets:
+    - type: primitive
+      modifier:
+        {
+          type: containingScope,
+          scopeType: argumentOrParameter,
+          includeSiblings: true,
+        }
+initialState:
+  documentContents: |
+
+    myFunk(1, 2, 3);
+  selections:
+    - anchor: { line: 1, character: 8 }
+      active: { line: 1, character: 8 }
+  marks: {}
+finalState:
+  documentContents: |
+
+    myFunk(1, 2, 3);
+  selections:
+    - anchor: { line: 1, character: 7 }
+      active: { line: 1, character: 8 }
+    - anchor: { line: 1, character: 10 }
+      active: { line: 1, character: 11 }
+    - anchor: { line: 1, character: 13 }
+      active: { line: 1, character: 14 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      modifier:
+        {
+          type: containingScope,
+          scopeType: argumentOrParameter,
+          includeSiblings: true,
+        },
+      insideOutsideType: inside,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/java/takeEveryItem.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/java/takeEveryItem.yml
new file mode 100644
index 0000000000..12e8ee489c
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/java/takeEveryItem.yml
@@ -0,0 +1,48 @@
+languageId: java
+command:
+  version: 1
+  spokenForm: take every item
+  action: setSelection
+  targets:
+    - type: primitive
+      modifier:
+        {
+          type: containingScope,
+          scopeType: collectionItem,
+          includeSiblings: true,
+        }
+initialState:
+  documentContents: |
+
+    int[] values = {1, 2, 3};
+  selections:
+    - anchor: { line: 1, character: 17 }
+      active: { line: 1, character: 17 }
+  marks: {}
+finalState:
+  documentContents: |
+
+    int[] values = {1, 2, 3};
+  selections:
+    - anchor: { line: 1, character: 16 }
+      active: { line: 1, character: 17 }
+    - anchor: { line: 1, character: 19 }
+      active: { line: 1, character: 20 }
+    - anchor: { line: 1, character: 22 }
+      active: { line: 1, character: 23 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      modifier:
+        {
+          type: containingScope,
+          scopeType: collectionItem,
+          includeSiblings: true,
+        },
+      insideOutsideType: inside,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/java/takeFunk.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/java/takeFunk.yml
new file mode 100644
index 0000000000..59d544d7de
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/java/takeFunk.yml
@@ -0,0 +1,42 @@
+languageId: java
+command:
+  version: 1
+  spokenForm: take funk
+  action: setSelection
+  targets:
+    - type: primitive
+      modifier: { type: containingScope, scopeType: namedFunction }
+initialState:
+  documentContents: |
+
+    public class MyClass {
+        void myFunk () {
+
+        }
+    }
+  selections:
+    - anchor: { line: 3, character: 0 }
+      active: { line: 3, character: 0 }
+  marks: {}
+finalState:
+  documentContents: |
+
+    public class MyClass {
+        void myFunk () {
+
+        }
+    }
+  selections:
+    - anchor: { line: 2, character: 4 }
+      active: { line: 4, character: 5 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      modifier: { type: containingScope, scopeType: namedFunction },
+      insideOutsideType: inside,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/java/takeFunk2.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/java/takeFunk2.yml
new file mode 100644
index 0000000000..ac9bf3e4df
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/java/takeFunk2.yml
@@ -0,0 +1,42 @@
+languageId: java
+command:
+  version: 1
+  spokenForm: take funk
+  action: setSelection
+  targets:
+    - type: primitive
+      modifier: { type: containingScope, scopeType: namedFunction }
+initialState:
+  documentContents: |
+
+    public class MyClass {
+        public MyClass () {
+
+        }
+    }
+  selections:
+    - anchor: { line: 3, character: 0 }
+      active: { line: 3, character: 0 }
+  marks: {}
+finalState:
+  documentContents: |
+
+    public class MyClass {
+        public MyClass () {
+
+        }
+    }
+  selections:
+    - anchor: { line: 2, character: 4 }
+      active: { line: 4, character: 5 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      modifier: { type: containingScope, scopeType: namedFunction },
+      insideOutsideType: inside,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/java/takeFunkName.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/java/takeFunkName.yml
new file mode 100644
index 0000000000..53f2940063
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/java/takeFunkName.yml
@@ -0,0 +1,42 @@
+languageId: java
+command:
+  version: 1
+  spokenForm: take funk name
+  action: setSelection
+  targets:
+    - type: primitive
+      modifier: { type: containingScope, scopeType: functionName }
+initialState:
+  documentContents: |
+
+    public class MyClass {
+        void myFunk () {
+
+        }
+    }
+  selections:
+    - anchor: { line: 3, character: 0 }
+      active: { line: 3, character: 0 }
+  marks: {}
+finalState:
+  documentContents: |
+
+    public class MyClass {
+        void myFunk () {
+
+        }
+    }
+  selections:
+    - anchor: { line: 2, character: 9 }
+      active: { line: 2, character: 15 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      modifier: { type: containingScope, scopeType: functionName },
+      insideOutsideType: inside,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/java/takeFunkName2.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/java/takeFunkName2.yml
new file mode 100644
index 0000000000..6a6c8d3a59
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/java/takeFunkName2.yml
@@ -0,0 +1,42 @@
+languageId: java
+command:
+  version: 1
+  spokenForm: take funk name
+  action: setSelection
+  targets:
+    - type: primitive
+      modifier: { type: containingScope, scopeType: functionName }
+initialState:
+  documentContents: |
+
+    public class MyClass {
+        public MyClass () {
+
+        }
+    }
+  selections:
+    - anchor: { line: 3, character: 0 }
+      active: { line: 3, character: 0 }
+  marks: {}
+finalState:
+  documentContents: |
+
+    public class MyClass {
+        public MyClass () {
+
+        }
+    }
+  selections:
+    - anchor: { line: 2, character: 11 }
+      active: { line: 2, character: 18 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      modifier: { type: containingScope, scopeType: functionName },
+      insideOutsideType: inside,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/java/takeIf.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/java/takeIf.yml
new file mode 100644
index 0000000000..3806252d53
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/java/takeIf.yml
@@ -0,0 +1,38 @@
+languageId: java
+command:
+  version: 1
+  spokenForm: take if
+  action: setSelection
+  targets:
+    - type: primitive
+      modifier: { type: containingScope, scopeType: ifStatement }
+initialState:
+  documentContents: |
+
+    if () {
+
+    }
+  selections:
+    - anchor: { line: 2, character: 0 }
+      active: { line: 2, character: 0 }
+  marks: {}
+finalState:
+  documentContents: |
+
+    if () {
+
+    }
+  selections:
+    - anchor: { line: 1, character: 0 }
+      active: { line: 3, character: 1 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      modifier: { type: containingScope, scopeType: ifStatement },
+      insideOutsideType: inside,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/java/takeItem.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/java/takeItem.yml
new file mode 100644
index 0000000000..6738a217f9
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/java/takeItem.yml
@@ -0,0 +1,34 @@
+languageId: java
+command:
+  version: 1
+  spokenForm: take item
+  action: setSelection
+  targets:
+    - type: primitive
+      modifier: { type: containingScope, scopeType: collectionItem }
+initialState:
+  documentContents: |
+
+    int[] values = {1, 2, 3};
+  selections:
+    - anchor: { line: 1, character: 16 }
+      active: { line: 1, character: 16 }
+  marks: {}
+finalState:
+  documentContents: |
+
+    int[] values = {1, 2, 3};
+  selections:
+    - anchor: { line: 1, character: 16 }
+      active: { line: 1, character: 17 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      modifier: { type: containingScope, scopeType: collectionItem },
+      insideOutsideType: inside,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/java/takeList.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/java/takeList.yml
new file mode 100644
index 0000000000..e247f0c682
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/java/takeList.yml
@@ -0,0 +1,34 @@
+languageId: java
+command:
+  version: 1
+  spokenForm: take list
+  action: setSelection
+  targets:
+    - type: primitive
+      modifier: { type: containingScope, scopeType: list }
+initialState:
+  documentContents: |
+
+    int[] values = {1, 2, 3};
+  selections:
+    - anchor: { line: 1, character: 17 }
+      active: { line: 1, character: 17 }
+  marks: {}
+finalState:
+  documentContents: |
+
+    int[] values = {1, 2, 3};
+  selections:
+    - anchor: { line: 1, character: 15 }
+      active: { line: 1, character: 24 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      modifier: { type: containingScope, scopeType: list },
+      insideOutsideType: inside,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/java/takeMap.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/java/takeMap.yml
new file mode 100644
index 0000000000..d566bf6c6f
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/java/takeMap.yml
@@ -0,0 +1,46 @@
+languageId: java
+command:
+  version: 1
+  spokenForm: take map
+  action: setSelection
+  targets:
+    - type: primitive
+      modifier: { type: containingScope, scopeType: map }
+initialState:
+  documentContents: |
+
+    List<String> value = new ArrayList() {
+        {
+            add("a");
+            add("b");
+            add("c");
+        }
+    };
+  selections:
+    - anchor: { line: 3, character: 8 }
+      active: { line: 3, character: 8 }
+  marks: {}
+finalState:
+  documentContents: |
+
+    List<String> value = new ArrayList() {
+        {
+            add("a");
+            add("b");
+            add("c");
+        }
+    };
+  selections:
+    - anchor: { line: 2, character: 4 }
+      active: { line: 6, character: 5 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      modifier: { type: containingScope, scopeType: map },
+      insideOutsideType: inside,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/java/takeName.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/java/takeName.yml
new file mode 100644
index 0000000000..922b93ca9c
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/java/takeName.yml
@@ -0,0 +1,42 @@
+languageId: java
+command:
+  version: 1
+  spokenForm: take name
+  action: setSelection
+  targets:
+    - type: primitive
+      modifier: { type: containingScope, scopeType: name }
+initialState:
+  documentContents: |
+
+    public class MyClass {
+        void myFunk () {
+
+        }
+    }
+  selections:
+    - anchor: { line: 3, character: 0 }
+      active: { line: 3, character: 0 }
+  marks: {}
+finalState:
+  documentContents: |
+
+    public class MyClass {
+        void myFunk () {
+
+        }
+    }
+  selections:
+    - anchor: { line: 2, character: 9 }
+      active: { line: 2, character: 15 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      modifier: { type: containingScope, scopeType: name },
+      insideOutsideType: inside,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/java/takeName2.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/java/takeName2.yml
new file mode 100644
index 0000000000..e308c9bade
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/java/takeName2.yml
@@ -0,0 +1,42 @@
+languageId: java
+command:
+  version: 1
+  spokenForm: take name
+  action: setSelection
+  targets:
+    - type: primitive
+      modifier: { type: containingScope, scopeType: name }
+initialState:
+  documentContents: |
+
+    public class MyClass {
+        public MyClass (String name, int value) {
+
+        }
+    }
+  selections:
+    - anchor: { line: 2, character: 26 }
+      active: { line: 2, character: 26 }
+  marks: {}
+finalState:
+  documentContents: |
+
+    public class MyClass {
+        public MyClass (String name, int value) {
+
+        }
+    }
+  selections:
+    - anchor: { line: 2, character: 27 }
+      active: { line: 2, character: 31 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      modifier: { type: containingScope, scopeType: name },
+      insideOutsideType: inside,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/java/takeName3.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/java/takeName3.yml
new file mode 100644
index 0000000000..317bbb6a99
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/java/takeName3.yml
@@ -0,0 +1,34 @@
+languageId: java
+command:
+  version: 1
+  spokenForm: take name
+  action: setSelection
+  targets:
+    - type: primitive
+      modifier: { type: containingScope, scopeType: name }
+initialState:
+  documentContents: |
+
+    String value = "hello world";
+  selections:
+    - anchor: { line: 1, character: 15 }
+      active: { line: 1, character: 15 }
+  marks: {}
+finalState:
+  documentContents: |
+
+    String value = "hello world";
+  selections:
+    - anchor: { line: 1, character: 7 }
+      active: { line: 1, character: 12 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      modifier: { type: containingScope, scopeType: name },
+      insideOutsideType: inside,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/java/takeState.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/java/takeState.yml
new file mode 100644
index 0000000000..1e43f4fc9b
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/java/takeState.yml
@@ -0,0 +1,38 @@
+languageId: java
+command:
+  version: 1
+  spokenForm: take state
+  action: setSelection
+  targets:
+    - type: primitive
+      modifier: { type: containingScope, scopeType: statement }
+initialState:
+  documentContents: |
+
+    public class MyClass {
+
+    }
+  selections:
+    - anchor: { line: 2, character: 0 }
+      active: { line: 2, character: 0 }
+  marks: {}
+finalState:
+  documentContents: |
+
+    public class MyClass {
+
+    }
+  selections:
+    - anchor: { line: 1, character: 0 }
+      active: { line: 3, character: 1 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      modifier: { type: containingScope, scopeType: statement },
+      insideOutsideType: inside,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/java/takeString.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/java/takeString.yml
new file mode 100644
index 0000000000..f22e26a205
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/java/takeString.yml
@@ -0,0 +1,34 @@
+languageId: java
+command:
+  version: 1
+  spokenForm: take string
+  action: setSelection
+  targets:
+    - type: primitive
+      modifier: { type: containingScope, scopeType: string }
+initialState:
+  documentContents: |
+
+    String value = "hello world";
+  selections:
+    - anchor: { line: 1, character: 22 }
+      active: { line: 1, character: 22 }
+  marks: {}
+finalState:
+  documentContents: |
+
+    String value = "hello world";
+  selections:
+    - anchor: { line: 1, character: 15 }
+      active: { line: 1, character: 28 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      modifier: { type: containingScope, scopeType: string },
+      insideOutsideType: inside,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/java/takeType.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/java/takeType.yml
new file mode 100644
index 0000000000..303e00e197
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/java/takeType.yml
@@ -0,0 +1,42 @@
+languageId: java
+command:
+  version: 1
+  spokenForm: take type
+  action: setSelection
+  targets:
+    - type: primitive
+      modifier: { type: containingScope, scopeType: type }
+initialState:
+  documentContents: |
+
+    public class MyClass {
+        void myFunk () {
+
+        }
+    }
+  selections:
+    - anchor: { line: 3, character: 0 }
+      active: { line: 3, character: 0 }
+  marks: {}
+finalState:
+  documentContents: |
+
+    public class MyClass {
+        void myFunk () {
+
+        }
+    }
+  selections:
+    - anchor: { line: 2, character: 4 }
+      active: { line: 2, character: 8 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      modifier: { type: containingScope, scopeType: type },
+      insideOutsideType: inside,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/java/takeType2.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/java/takeType2.yml
new file mode 100644
index 0000000000..d278f146bb
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/java/takeType2.yml
@@ -0,0 +1,42 @@
+languageId: java
+command:
+  version: 1
+  spokenForm: take type
+  action: setSelection
+  targets:
+    - type: primitive
+      modifier: { type: containingScope, scopeType: type }
+initialState:
+  documentContents: |
+
+    public class MyClass {
+        public MyClass (String name, int value) {
+
+        }
+    }
+  selections:
+    - anchor: { line: 2, character: 27 }
+      active: { line: 2, character: 27 }
+  marks: {}
+finalState:
+  documentContents: |
+
+    public class MyClass {
+        public MyClass (String name, int value) {
+
+        }
+    }
+  selections:
+    - anchor: { line: 2, character: 20 }
+      active: { line: 2, character: 26 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      modifier: { type: containingScope, scopeType: type },
+      insideOutsideType: inside,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/java/takeType3.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/java/takeType3.yml
new file mode 100644
index 0000000000..a12b121765
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/java/takeType3.yml
@@ -0,0 +1,34 @@
+languageId: java
+command:
+  version: 1
+  spokenForm: take type
+  action: setSelection
+  targets:
+    - type: primitive
+      modifier: { type: containingScope, scopeType: type }
+initialState:
+  documentContents: |
+
+    String value = "hello world";
+  selections:
+    - anchor: { line: 1, character: 15 }
+      active: { line: 1, character: 15 }
+  marks: {}
+finalState:
+  documentContents: |
+
+    String value = "hello world";
+  selections:
+    - anchor: { line: 1, character: 0 }
+      active: { line: 1, character: 6 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      modifier: { type: containingScope, scopeType: type },
+      insideOutsideType: inside,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/java/takeTypeBlueLook.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/java/takeTypeBlueLook.yml
new file mode 100644
index 0000000000..d6eddfd1cd
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/java/takeTypeBlueLook.yml
@@ -0,0 +1,48 @@
+languageId: java
+command:
+  version: 1
+  spokenForm: take type blue look
+  action: setSelection
+  targets:
+    - type: primitive
+      modifier:
+        { type: containingScope, scopeType: type, includeSiblings: false }
+      mark: { type: decoratedSymbol, symbolColor: blue, character: l }
+initialState:
+  documentContents: |-
+    public class MyClass {
+        private MyClass () {
+            Map<String, String> map = new HashMap<String, String>();
+            List<String> list = new ArrayList<String>();
+        }
+    }
+  selections:
+    - anchor: { line: 2, character: 38 }
+      active: { line: 2, character: 61 }
+  marks:
+    blue.l:
+      start: { line: 3, character: 8 }
+      end: { line: 3, character: 12 }
+finalState:
+  documentContents: |-
+    public class MyClass {
+        private MyClass () {
+            Map<String, String> map = new HashMap<String, String>();
+            List<String> list = new ArrayList<String>();
+        }
+    }
+  selections:
+    - anchor: { line: 3, character: 8 }
+      active: { line: 3, character: 20 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: decoratedSymbol, symbolColor: blue, character: l },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        { type: containingScope, scopeType: type, includeSiblings: false },
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/java/takeTypeGust.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/java/takeTypeGust.yml
new file mode 100644
index 0000000000..aa07718a44
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/java/takeTypeGust.yml
@@ -0,0 +1,48 @@
+languageId: java
+command:
+  version: 1
+  spokenForm: take type gust
+  action: setSelection
+  targets:
+    - type: primitive
+      modifier:
+        { type: containingScope, scopeType: type, includeSiblings: false }
+      mark: { type: decoratedSymbol, symbolColor: default, character: g }
+initialState:
+  documentContents: |-
+    public class MyClass {
+        private MyClass () {
+            Map<String, String> map = new HashMap<String, String>();
+            List<String> list = new ArrayList<String>();
+        }
+    }
+  selections:
+    - anchor: { line: 3, character: 8 }
+      active: { line: 3, character: 20 }
+  marks:
+    default.g:
+      start: { line: 3, character: 13 }
+      end: { line: 3, character: 19 }
+finalState:
+  documentContents: |-
+    public class MyClass {
+        private MyClass () {
+            Map<String, String> map = new HashMap<String, String>();
+            List<String> list = new ArrayList<String>();
+        }
+    }
+  selections:
+    - anchor: { line: 3, character: 8 }
+      active: { line: 3, character: 20 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: decoratedSymbol, symbolColor: default, character: g },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        { type: containingScope, scopeType: type, includeSiblings: false },
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/java/takeTypeGust2.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/java/takeTypeGust2.yml
new file mode 100644
index 0000000000..29a4b800c1
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/java/takeTypeGust2.yml
@@ -0,0 +1,48 @@
+languageId: java
+command:
+  version: 1
+  spokenForm: take type gust
+  action: setSelection
+  targets:
+    - type: primitive
+      modifier:
+        { type: containingScope, scopeType: type, includeSiblings: false }
+      mark: { type: decoratedSymbol, symbolColor: default, character: g }
+initialState:
+  documentContents: |-
+    public class MyClass {
+        private MyClass () {
+            Map<String, String> map = new HashMap<String, String>();
+            List<String> list = new ArrayList<String>();
+        }
+    }
+  selections:
+    - anchor: { line: 3, character: 32 }
+      active: { line: 3, character: 49 }
+  marks:
+    default.g:
+      start: { line: 3, character: 42 }
+      end: { line: 3, character: 48 }
+finalState:
+  documentContents: |-
+    public class MyClass {
+        private MyClass () {
+            Map<String, String> map = new HashMap<String, String>();
+            List<String> list = new ArrayList<String>();
+        }
+    }
+  selections:
+    - anchor: { line: 3, character: 32 }
+      active: { line: 3, character: 49 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: decoratedSymbol, symbolColor: default, character: g },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        { type: containingScope, scopeType: type, includeSiblings: false },
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/java/takeTypeHarp.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/java/takeTypeHarp.yml
new file mode 100644
index 0000000000..662f8b69ab
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/java/takeTypeHarp.yml
@@ -0,0 +1,48 @@
+languageId: java
+command:
+  version: 1
+  spokenForm: take type harp
+  action: setSelection
+  targets:
+    - type: primitive
+      modifier:
+        { type: containingScope, scopeType: type, includeSiblings: false }
+      mark: { type: decoratedSymbol, symbolColor: default, character: h }
+initialState:
+  documentContents: |-
+    public class MyClass {
+        private MyClass () {
+            Map<String, String> map = new HashMap<String, String>();
+            List<String> list = new ArrayList<String>();
+        }
+    }
+  selections:
+    - anchor: { line: 2, character: 8 }
+      active: { line: 2, character: 27 }
+  marks:
+    default.h:
+      start: { line: 2, character: 38 }
+      end: { line: 2, character: 45 }
+finalState:
+  documentContents: |-
+    public class MyClass {
+        private MyClass () {
+            Map<String, String> map = new HashMap<String, String>();
+            List<String> list = new ArrayList<String>();
+        }
+    }
+  selections:
+    - anchor: { line: 2, character: 38 }
+      active: { line: 2, character: 61 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: decoratedSymbol, symbolColor: default, character: h },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        { type: containingScope, scopeType: type, includeSiblings: false },
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/java/takeTypeLook.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/java/takeTypeLook.yml
new file mode 100644
index 0000000000..901fad7ba6
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/java/takeTypeLook.yml
@@ -0,0 +1,48 @@
+languageId: java
+command:
+  version: 1
+  spokenForm: take type look
+  action: setSelection
+  targets:
+    - type: primitive
+      modifier:
+        { type: containingScope, scopeType: type, includeSiblings: false }
+      mark: { type: decoratedSymbol, symbolColor: default, character: l }
+initialState:
+  documentContents: |-
+    public class MyClass {
+        private MyClass () {
+            Map<String, String> map = new HashMap<String, String>();
+            List<String> list = new ArrayList<String>();
+        }
+    }
+  selections:
+    - anchor: { line: 2, character: 27 }
+      active: { line: 2, character: 27 }
+  marks:
+    default.l:
+      start: { line: 3, character: 21 }
+      end: { line: 3, character: 25 }
+finalState:
+  documentContents: |-
+    public class MyClass {
+        private MyClass () {
+            Map<String, String> map = new HashMap<String, String>();
+            List<String> list = new ArrayList<String>();
+        }
+    }
+  selections:
+    - anchor: { line: 3, character: 8 }
+      active: { line: 3, character: 20 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: decoratedSymbol, symbolColor: default, character: l },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        { type: containingScope, scopeType: type, includeSiblings: false },
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/java/takeTypePit.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/java/takeTypePit.yml
new file mode 100644
index 0000000000..93f71c094d
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/java/takeTypePit.yml
@@ -0,0 +1,48 @@
+languageId: java
+command:
+  version: 1
+  spokenForm: take type pit
+  action: setSelection
+  targets:
+    - type: primitive
+      modifier:
+        { type: containingScope, scopeType: type, includeSiblings: false }
+      mark: { type: decoratedSymbol, symbolColor: default, character: p }
+initialState:
+  documentContents: |-
+    public class MyClass {
+        private MyClass () {
+            Map<String, String> map = new HashMap<String, String>();
+            List<String> list = new ArrayList<String>();
+        }
+    }
+  selections:
+    - anchor: { line: 3, character: 52 }
+      active: { line: 3, character: 52 }
+  marks:
+    default.p:
+      start: { line: 2, character: 8 }
+      end: { line: 2, character: 11 }
+finalState:
+  documentContents: |-
+    public class MyClass {
+        private MyClass () {
+            Map<String, String> map = new HashMap<String, String>();
+            List<String> list = new ArrayList<String>();
+        }
+    }
+  selections:
+    - anchor: { line: 2, character: 8 }
+      active: { line: 2, character: 27 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: decoratedSymbol, symbolColor: default, character: p },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        { type: containingScope, scopeType: type, includeSiblings: false },
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/java/takeTypeSoon.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/java/takeTypeSoon.yml
new file mode 100644
index 0000000000..7b409e7c7b
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/java/takeTypeSoon.yml
@@ -0,0 +1,48 @@
+languageId: java
+command:
+  version: 1
+  spokenForm: take type soon
+  action: setSelection
+  targets:
+    - type: primitive
+      modifier:
+        { type: containingScope, scopeType: type, includeSiblings: false }
+      mark: { type: decoratedSymbol, symbolColor: default, character: s }
+initialState:
+  documentContents: |-
+    public class MyClass {
+        private MyClass () {
+            Map<String, String> map = new HashMap<String, String>();
+            List<String> list = new ArrayList<String>();
+        }
+    }
+  selections:
+    - anchor: { line: 2, character: 8 }
+      active: { line: 2, character: 27 }
+  marks:
+    default.s:
+      start: { line: 2, character: 12 }
+      end: { line: 2, character: 18 }
+finalState:
+  documentContents: |-
+    public class MyClass {
+        private MyClass () {
+            Map<String, String> map = new HashMap<String, String>();
+            List<String> list = new ArrayList<String>();
+        }
+    }
+  selections:
+    - anchor: { line: 2, character: 8 }
+      active: { line: 2, character: 27 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: decoratedSymbol, symbolColor: default, character: s },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        { type: containingScope, scopeType: type, includeSiblings: false },
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/java/takeTypeSoon2.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/java/takeTypeSoon2.yml
new file mode 100644
index 0000000000..48e2fe1942
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/java/takeTypeSoon2.yml
@@ -0,0 +1,48 @@
+languageId: java
+command:
+  version: 1
+  spokenForm: take type soon
+  action: setSelection
+  targets:
+    - type: primitive
+      modifier:
+        { type: containingScope, scopeType: type, includeSiblings: false }
+      mark: { type: decoratedSymbol, symbolColor: default, character: s }
+initialState:
+  documentContents: |-
+    public class MyClass {
+        private MyClass () {
+            Map<String, String> map = new HashMap<String, String>();
+            List<String> list = new ArrayList<String>();
+        }
+    }
+  selections:
+    - anchor: { line: 2, character: 38 }
+      active: { line: 2, character: 61 }
+  marks:
+    default.s:
+      start: { line: 2, character: 54 }
+      end: { line: 2, character: 60 }
+finalState:
+  documentContents: |-
+    public class MyClass {
+        private MyClass () {
+            Map<String, String> map = new HashMap<String, String>();
+            List<String> list = new ArrayList<String>();
+        }
+    }
+  selections:
+    - anchor: { line: 2, character: 38 }
+      active: { line: 2, character: 61 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: decoratedSymbol, symbolColor: default, character: s },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        { type: containingScope, scopeType: type, includeSiblings: false },
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/java/takeTypeTrap.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/java/takeTypeTrap.yml
new file mode 100644
index 0000000000..b335fee8c1
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/java/takeTypeTrap.yml
@@ -0,0 +1,48 @@
+languageId: java
+command:
+  version: 1
+  spokenForm: take type trap
+  action: setSelection
+  targets:
+    - type: primitive
+      modifier:
+        { type: containingScope, scopeType: type, includeSiblings: false }
+      mark: { type: decoratedSymbol, symbolColor: default, character: t }
+initialState:
+  documentContents: |-
+    public class MyClass {
+        private MyClass () {
+            Map<String, String> map = new HashMap<String, String>();
+            List<String> list = new ArrayList<String>();
+        }
+    }
+  selections:
+    - anchor: { line: 2, character: 8 }
+      active: { line: 2, character: 27 }
+  marks:
+    default.t:
+      start: { line: 2, character: 20 }
+      end: { line: 2, character: 26 }
+finalState:
+  documentContents: |-
+    public class MyClass {
+        private MyClass () {
+            Map<String, String> map = new HashMap<String, String>();
+            List<String> list = new ArrayList<String>();
+        }
+    }
+  selections:
+    - anchor: { line: 2, character: 8 }
+      active: { line: 2, character: 27 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: decoratedSymbol, symbolColor: default, character: t },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        { type: containingScope, scopeType: type, includeSiblings: false },
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/java/takeTypeTrap2.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/java/takeTypeTrap2.yml
new file mode 100644
index 0000000000..f3e5475c59
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/java/takeTypeTrap2.yml
@@ -0,0 +1,48 @@
+languageId: java
+command:
+  version: 1
+  spokenForm: take type trap
+  action: setSelection
+  targets:
+    - type: primitive
+      modifier:
+        { type: containingScope, scopeType: type, includeSiblings: false }
+      mark: { type: decoratedSymbol, symbolColor: default, character: t }
+initialState:
+  documentContents: |-
+    public class MyClass {
+        private MyClass () {
+            Map<String, String> map = new HashMap<String, String>();
+            List<String> list = new ArrayList<String>();
+        }
+    }
+  selections:
+    - anchor: { line: 2, character: 38 }
+      active: { line: 2, character: 61 }
+  marks:
+    default.t:
+      start: { line: 2, character: 46 }
+      end: { line: 2, character: 52 }
+finalState:
+  documentContents: |-
+    public class MyClass {
+        private MyClass () {
+            Map<String, String> map = new HashMap<String, String>();
+            List<String> list = new ArrayList<String>();
+        }
+    }
+  selections:
+    - anchor: { line: 2, character: 38 }
+      active: { line: 2, character: 61 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: decoratedSymbol, symbolColor: default, character: t },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        { type: containingScope, scopeType: type, includeSiblings: false },
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/java/takeTypeYank.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/java/takeTypeYank.yml
new file mode 100644
index 0000000000..5f3d54176a
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/java/takeTypeYank.yml
@@ -0,0 +1,48 @@
+languageId: java
+command:
+  version: 1
+  spokenForm: take type yank
+  action: setSelection
+  targets:
+    - type: primitive
+      modifier:
+        { type: containingScope, scopeType: type, includeSiblings: false }
+      mark: { type: decoratedSymbol, symbolColor: default, character: "y" }
+initialState:
+  documentContents: |-
+    public class MyClass {
+        private MyClass () {
+            Map<String, String> map = new HashMap<String, String>();
+            List<String> list = new ArrayList<String>();
+        }
+    }
+  selections:
+    - anchor: { line: 3, character: 8 }
+      active: { line: 3, character: 20 }
+  marks:
+    default.y:
+      start: { line: 3, character: 32 }
+      end: { line: 3, character: 41 }
+finalState:
+  documentContents: |-
+    public class MyClass {
+        private MyClass () {
+            Map<String, String> map = new HashMap<String, String>();
+            List<String> list = new ArrayList<String>();
+        }
+    }
+  selections:
+    - anchor: { line: 3, character: 32 }
+      active: { line: 3, character: 49 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: decoratedSymbol, symbolColor: default, character: "y" },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        { type: containingScope, scopeType: type, includeSiblings: false },
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/java/takeValue.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/java/takeValue.yml
new file mode 100644
index 0000000000..d4e35452cf
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/java/takeValue.yml
@@ -0,0 +1,34 @@
+languageId: java
+command:
+  version: 1
+  spokenForm: take value
+  action: setSelection
+  targets:
+    - type: primitive
+      modifier: { type: containingScope, scopeType: value }
+initialState:
+  documentContents: |
+
+    String value = "hello world";
+  selections:
+    - anchor: { line: 1, character: 12 }
+      active: { line: 1, character: 12 }
+  marks: {}
+finalState:
+  documentContents: |
+
+    String value = "hello world";
+  selections:
+    - anchor: { line: 1, character: 15 }
+      active: { line: 1, character: 28 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      modifier: { type: containingScope, scopeType: value },
+      insideOutsideType: inside,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/java/tryCatchWrapThis.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/java/tryCatchWrapThis.yml
new file mode 100644
index 0000000000..8de8b8a3c6
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/java/tryCatchWrapThis.yml
@@ -0,0 +1,37 @@
+languageId: java
+command:
+  version: 1
+  spokenForm: try catch wrap this
+  action: wrapWithSnippet
+  targets:
+    - type: primitive
+      mark: { type: cursor }
+  extraArgs: [tryCatchStatement.body]
+initialState:
+  documentContents: int foo = 0;
+  selections:
+    - anchor: { line: 0, character: 6 }
+      active: { line: 0, character: 6 }
+  marks: {}
+finalState:
+  documentContents: |-
+    try {
+        int foo = 0;
+    } catch () {
+
+    }
+  selections:
+    - anchor: { line: 2, character: 9 }
+      active: { line: 2, character: 9 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        { type: containingScope, scopeType: statement, includeSiblings: false },
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/java/tryCatchWrapThis2.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/java/tryCatchWrapThis2.yml
new file mode 100644
index 0000000000..d6f184dc11
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/java/tryCatchWrapThis2.yml
@@ -0,0 +1,54 @@
+languageId: java
+command:
+  version: 1
+  spokenForm: try catch wrap this
+  action: wrapWithSnippet
+  targets:
+    - type: primitive
+      mark: { type: cursor }
+  extraArgs: [tryCatchStatement.body]
+initialState:
+  documentContents: |-
+    if (true) {
+        int foo = 0;
+    }
+
+    int bar = 1;
+  selections:
+    - anchor: { line: 4, character: 0 }
+      active: { line: 4, character: 0 }
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+  marks: {}
+finalState:
+  documentContents: |-
+    try {
+        if (true) {
+            int foo = 0;
+        }
+    } catch () {
+
+    }
+
+    try {
+        int bar = 1;
+    } catch () {
+
+    }
+  selections:
+    - anchor: { line: 10, character: 9 }
+      active: { line: 10, character: 9 }
+    - anchor: { line: 4, character: 9 }
+      active: { line: 4, character: 9 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        { type: containingScope, scopeType: statement, includeSiblings: false },
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/javascript/clearCoreWhale.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/javascript/clearCoreWhale.yml
new file mode 100644
index 0000000000..c8c923e139
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/javascript/clearCoreWhale.yml
@@ -0,0 +1,33 @@
+languageId: javascript
+command:
+  spokenForm: clear core whale
+  version: 2
+  targets:
+    - type: primitive
+      modifiers:
+        - { type: interiorOnly }
+      mark: { type: decoratedSymbol, symbolColor: default, character: w }
+  usePrePhraseSnapshot: true
+  action: { name: clearAndSetSelection }
+initialState:
+  documentContents: "'(hello world) testing'"
+  selections:
+    - anchor: { line: 0, character: 22 }
+      active: { line: 0, character: 22 }
+  marks:
+    default.w:
+      start: { line: 0, character: 8 }
+      end: { line: 0, character: 13 }
+finalState:
+  documentContents: "'() testing'"
+  selections:
+    - anchor: { line: 0, character: 2 }
+      active: { line: 0, character: 2 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: decoratedSymbol, symbolColor: default, character: w },
+      modifiers: [{ type: interiorOnly }],
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/json/takeItem.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/json/takeItem.yml
new file mode 100644
index 0000000000..1c4feb067f
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/json/takeItem.yml
@@ -0,0 +1,38 @@
+languageId: json
+command:
+  version: 1
+  spokenForm: take item
+  action: setSelection
+  targets:
+    - type: primitive
+      modifier: { type: containingScope, scopeType: collectionItem }
+initialState:
+  documentContents: |
+
+    {
+        "foo": "bar"
+    }
+  selections:
+    - anchor: { line: 2, character: 9 }
+      active: { line: 2, character: 9 }
+  marks: {}
+finalState:
+  documentContents: |
+
+    {
+        "foo": "bar"
+    }
+  selections:
+    - anchor: { line: 2, character: 4 }
+      active: { line: 2, character: 16 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      modifier: { type: containingScope, scopeType: collectionItem },
+      insideOutsideType: inside,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/json/takeItem2.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/json/takeItem2.yml
new file mode 100644
index 0000000000..b9853a6588
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/json/takeItem2.yml
@@ -0,0 +1,38 @@
+languageId: json
+command:
+  version: 1
+  spokenForm: take item
+  action: setSelection
+  targets:
+    - type: primitive
+      modifier: { type: containingScope, scopeType: collectionItem }
+initialState:
+  documentContents: |
+
+    {
+        "foo": [1, 2, 3]
+    }
+  selections:
+    - anchor: { line: 2, character: 13 }
+      active: { line: 2, character: 13 }
+  marks: {}
+finalState:
+  documentContents: |
+
+    {
+        "foo": [1, 2, 3]
+    }
+  selections:
+    - anchor: { line: 2, character: 12 }
+      active: { line: 2, character: 13 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      modifier: { type: containingScope, scopeType: collectionItem },
+      insideOutsideType: inside,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/json/takeKey.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/json/takeKey.yml
new file mode 100644
index 0000000000..e553a07268
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/json/takeKey.yml
@@ -0,0 +1,38 @@
+languageId: json
+command:
+  version: 1
+  spokenForm: take key
+  action: setSelection
+  targets:
+    - type: primitive
+      modifier: { type: containingScope, scopeType: collectionKey }
+initialState:
+  documentContents: |
+
+    {
+        "foo": "bar"
+    }
+  selections:
+    - anchor: { line: 2, character: 10 }
+      active: { line: 2, character: 10 }
+  marks: {}
+finalState:
+  documentContents: |
+
+    {
+        "foo": "bar"
+    }
+  selections:
+    - anchor: { line: 2, character: 4 }
+      active: { line: 2, character: 9 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      modifier: { type: containingScope, scopeType: collectionKey },
+      insideOutsideType: inside,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/json/takeList.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/json/takeList.yml
new file mode 100644
index 0000000000..61733bf313
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/json/takeList.yml
@@ -0,0 +1,38 @@
+languageId: json
+command:
+  version: 1
+  spokenForm: take list
+  action: setSelection
+  targets:
+    - type: primitive
+      modifier: { type: containingScope, scopeType: list }
+initialState:
+  documentContents: |
+
+    {
+        "foo": [1, 2, 3]
+    }
+  selections:
+    - anchor: { line: 2, character: 19 }
+      active: { line: 2, character: 19 }
+  marks: {}
+finalState:
+  documentContents: |
+
+    {
+        "foo": [1, 2, 3]
+    }
+  selections:
+    - anchor: { line: 2, character: 11 }
+      active: { line: 2, character: 20 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      modifier: { type: containingScope, scopeType: list },
+      insideOutsideType: inside,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/json/takeString.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/json/takeString.yml
new file mode 100644
index 0000000000..39abb8362c
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/json/takeString.yml
@@ -0,0 +1,38 @@
+languageId: json
+command:
+  version: 1
+  spokenForm: take string
+  action: setSelection
+  targets:
+    - type: primitive
+      modifier: { type: containingScope, scopeType: string }
+initialState:
+  documentContents: |
+
+    {
+        "foo": "bar"
+    }
+  selections:
+    - anchor: { line: 2, character: 12 }
+      active: { line: 2, character: 12 }
+  marks: {}
+finalState:
+  documentContents: |
+
+    {
+        "foo": "bar"
+    }
+  selections:
+    - anchor: { line: 2, character: 11 }
+      active: { line: 2, character: 16 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      modifier: { type: containingScope, scopeType: string },
+      insideOutsideType: inside,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/json/takeValue.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/json/takeValue.yml
new file mode 100644
index 0000000000..045ab2d04d
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/json/takeValue.yml
@@ -0,0 +1,38 @@
+languageId: json
+command:
+  version: 1
+  spokenForm: take value
+  action: setSelection
+  targets:
+    - type: primitive
+      modifier: { type: containingScope, scopeType: value }
+initialState:
+  documentContents: |
+
+    {
+        "foo": "bar"
+    }
+  selections:
+    - anchor: { line: 2, character: 9 }
+      active: { line: 2, character: 9 }
+  marks: {}
+finalState:
+  documentContents: |
+
+    {
+        "foo": "bar"
+    }
+  selections:
+    - anchor: { line: 2, character: 11 }
+      active: { line: 2, character: 16 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      modifier: { type: containingScope, scopeType: value },
+      insideOutsideType: inside,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/jsx/takeAttribute.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/jsx/takeAttribute.yml
new file mode 100644
index 0000000000..fc1b93afef
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/jsx/takeAttribute.yml
@@ -0,0 +1,38 @@
+languageId: javascript
+command:
+  version: 1
+  spokenForm: take attribute
+  action: setSelection
+  targets:
+    - type: primitive
+      modifier: { type: containingScope, scopeType: attribute }
+initialState:
+  documentContents: |
+
+    const Foo = (
+      <div id="bar" name="foo">bar</div>
+    );
+  selections:
+    - anchor: { line: 2, character: 14 }
+      active: { line: 2, character: 14 }
+  marks: {}
+finalState:
+  documentContents: |
+
+    const Foo = (
+      <div id="bar" name="foo">bar</div>
+    );
+  selections:
+    - anchor: { line: 2, character: 7 }
+      active: { line: 2, character: 15 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      modifier: { type: containingScope, scopeType: attribute },
+      insideOutsideType: inside,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/jsx/takeElement.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/jsx/takeElement.yml
new file mode 100644
index 0000000000..e17dc78d21
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/jsx/takeElement.yml
@@ -0,0 +1,38 @@
+languageId: javascript
+command:
+  version: 1
+  spokenForm: take element
+  action: setSelection
+  targets:
+    - type: primitive
+      modifier: { type: containingScope, scopeType: xmlElement }
+initialState:
+  documentContents: |
+
+    const Foo = (
+      <div id="bar" name="foo">bar</div>
+    );
+  selections:
+    - anchor: { line: 2, character: 15 }
+      active: { line: 2, character: 15 }
+  marks: {}
+finalState:
+  documentContents: |
+
+    const Foo = (
+      <div id="bar" name="foo">bar</div>
+    );
+  selections:
+    - anchor: { line: 2, character: 2 }
+      active: { line: 2, character: 36 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      modifier: { type: containingScope, scopeType: xmlElement },
+      insideOutsideType: inside,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/jsx/takeEndTag.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/jsx/takeEndTag.yml
new file mode 100644
index 0000000000..a6d2ed46c2
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/jsx/takeEndTag.yml
@@ -0,0 +1,38 @@
+languageId: javascript
+command:
+  version: 1
+  spokenForm: take end tag
+  action: setSelection
+  targets:
+    - type: primitive
+      modifier: { type: containingScope, scopeType: xmlEndTag }
+initialState:
+  documentContents: |
+
+    const Foo = (
+      <div id="bar" name="foo">bar</div>
+    );
+  selections:
+    - anchor: { line: 2, character: 15 }
+      active: { line: 2, character: 15 }
+  marks: {}
+finalState:
+  documentContents: |
+
+    const Foo = (
+      <div id="bar" name="foo">bar</div>
+    );
+  selections:
+    - anchor: { line: 2, character: 30 }
+      active: { line: 2, character: 36 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      modifier: { type: containingScope, scopeType: xmlEndTag },
+      insideOutsideType: inside,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/jsx/takeEveryAttribute.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/jsx/takeEveryAttribute.yml
new file mode 100644
index 0000000000..d2a04d1deb
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/jsx/takeEveryAttribute.yml
@@ -0,0 +1,42 @@
+languageId: javascript
+command:
+  version: 1
+  spokenForm: take every attribute
+  action: setSelection
+  targets:
+    - type: primitive
+      modifier:
+        { type: containingScope, scopeType: attribute, includeSiblings: true }
+initialState:
+  documentContents: |
+
+    const Foo = (
+      <div id="bar" name="foo">bar</div>
+    );
+  selections:
+    - anchor: { line: 2, character: 7 }
+      active: { line: 2, character: 15 }
+  marks: {}
+finalState:
+  documentContents: |
+
+    const Foo = (
+      <div id="bar" name="foo">bar</div>
+    );
+  selections:
+    - anchor: { line: 2, character: 7 }
+      active: { line: 2, character: 15 }
+    - anchor: { line: 2, character: 16 }
+      active: { line: 2, character: 26 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      modifier:
+        { type: containingScope, scopeType: attribute, includeSiblings: true },
+      insideOutsideType: inside,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/jsx/takeKey.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/jsx/takeKey.yml
new file mode 100644
index 0000000000..cf9022cfb8
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/jsx/takeKey.yml
@@ -0,0 +1,38 @@
+languageId: javascript
+command:
+  version: 1
+  spokenForm: take key
+  action: setSelection
+  targets:
+    - type: primitive
+      modifier: { type: containingScope, scopeType: collectionKey }
+initialState:
+  documentContents: |
+
+    const Foo = (
+      <div id="bar" name="foo">bar</div>
+    );
+  selections:
+    - anchor: { line: 2, character: 10 }
+      active: { line: 2, character: 10 }
+  marks: {}
+finalState:
+  documentContents: |
+
+    const Foo = (
+      <div id="bar" name="foo">bar</div>
+    );
+  selections:
+    - anchor: { line: 2, character: 7 }
+      active: { line: 2, character: 9 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      modifier: { type: containingScope, scopeType: collectionKey },
+      insideOutsideType: inside,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/jsx/takeStartTag.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/jsx/takeStartTag.yml
new file mode 100644
index 0000000000..a8552dbd7e
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/jsx/takeStartTag.yml
@@ -0,0 +1,38 @@
+languageId: javascript
+command:
+  version: 1
+  spokenForm: take start tag
+  action: setSelection
+  targets:
+    - type: primitive
+      modifier: { type: containingScope, scopeType: xmlStartTag }
+initialState:
+  documentContents: |
+
+    const Foo = (
+      <div id="bar" name="foo">bar</div>
+    );
+  selections:
+    - anchor: { line: 2, character: 15 }
+      active: { line: 2, character: 15 }
+  marks: {}
+finalState:
+  documentContents: |
+
+    const Foo = (
+      <div id="bar" name="foo">bar</div>
+    );
+  selections:
+    - anchor: { line: 2, character: 2 }
+      active: { line: 2, character: 27 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      modifier: { type: containingScope, scopeType: xmlStartTag },
+      insideOutsideType: inside,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/jsx/takeTags.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/jsx/takeTags.yml
new file mode 100644
index 0000000000..46b37feef0
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/jsx/takeTags.yml
@@ -0,0 +1,40 @@
+languageId: javascript
+command:
+  version: 1
+  spokenForm: take tags
+  action: setSelection
+  targets:
+    - type: primitive
+      modifier: { type: containingScope, scopeType: xmlBothTags }
+initialState:
+  documentContents: |
+
+    const Foo = (
+      <div id="bar" name="foo">bar</div>
+    );
+  selections:
+    - anchor: { line: 2, character: 15 }
+      active: { line: 2, character: 15 }
+  marks: {}
+finalState:
+  documentContents: |
+
+    const Foo = (
+      <div id="bar" name="foo">bar</div>
+    );
+  selections:
+    - anchor: { line: 2, character: 2 }
+      active: { line: 2, character: 27 }
+    - anchor: { line: 2, character: 30 }
+      active: { line: 2, character: 36 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      modifier: { type: containingScope, scopeType: xmlBothTags },
+      insideOutsideType: inside,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/jsx/takeValue.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/jsx/takeValue.yml
new file mode 100644
index 0000000000..6f6e2722a2
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/jsx/takeValue.yml
@@ -0,0 +1,38 @@
+languageId: javascript
+command:
+  version: 1
+  spokenForm: take value
+  action: setSelection
+  targets:
+    - type: primitive
+      modifier: { type: containingScope, scopeType: value }
+initialState:
+  documentContents: |
+
+    const Foo = (
+      <div id="bar" name="foo">bar</div>
+    );
+  selections:
+    - anchor: { line: 2, character: 7 }
+      active: { line: 2, character: 9 }
+  marks: {}
+finalState:
+  documentContents: |
+
+    const Foo = (
+      <div id="bar" name="foo">bar</div>
+    );
+  selections:
+    - anchor: { line: 2, character: 10 }
+      active: { line: 2, character: 15 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      modifier: { type: containingScope, scopeType: value },
+      insideOutsideType: inside,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/latex/changeArg.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/latex/changeArg.yml
new file mode 100644
index 0000000000..bbf2ead678
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/latex/changeArg.yml
@@ -0,0 +1,45 @@
+languageId: latex
+command:
+  version: 1
+  spokenForm: change arg
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier:
+        {
+          type: containingScope,
+          scopeType: argumentOrParameter,
+          includeSiblings: false,
+        }
+initialState:
+  documentContents: |
+    \begin{itemize}
+    \end{itemize}
+  selections:
+    - anchor: { line: 0, character: 11 }
+      active: { line: 0, character: 11 }
+  marks: {}
+finalState:
+  documentContents: |
+    \begin{}
+    \end{itemize}
+  selections:
+    - anchor: { line: 0, character: 7 }
+      active: { line: 0, character: 7 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        {
+          type: containingScope,
+          scopeType: argumentOrParameter,
+          includeSiblings: false,
+        },
+      isImplicit: false,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/latex/changeArg2.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/latex/changeArg2.yml
new file mode 100644
index 0000000000..69b56a02d3
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/latex/changeArg2.yml
@@ -0,0 +1,43 @@
+languageId: latex
+command:
+  version: 1
+  spokenForm: change arg
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier:
+        {
+          type: containingScope,
+          scopeType: argumentOrParameter,
+          includeSiblings: false,
+        }
+initialState:
+  documentContents: |
+    \section{some section}
+  selections:
+    - anchor: { line: 0, character: 16 }
+      active: { line: 0, character: 16 }
+  marks: {}
+finalState:
+  documentContents: |
+    \section{}
+  selections:
+    - anchor: { line: 0, character: 9 }
+      active: { line: 0, character: 9 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        {
+          type: containingScope,
+          scopeType: argumentOrParameter,
+          includeSiblings: false,
+        },
+      isImplicit: false,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/latex/changeArg3.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/latex/changeArg3.yml
new file mode 100644
index 0000000000..fbfc8893d6
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/latex/changeArg3.yml
@@ -0,0 +1,43 @@
+languageId: latex
+command:
+  version: 1
+  spokenForm: change arg
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier:
+        {
+          type: containingScope,
+          scopeType: argumentOrParameter,
+          includeSiblings: false,
+        }
+initialState:
+  documentContents: |
+    \href{https://some.url}{some text}
+  selections:
+    - anchor: { line: 0, character: 14 }
+      active: { line: 0, character: 14 }
+  marks: {}
+finalState:
+  documentContents: |
+    \href{}{some text}
+  selections:
+    - anchor: { line: 0, character: 6 }
+      active: { line: 0, character: 6 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        {
+          type: containingScope,
+          scopeType: argumentOrParameter,
+          includeSiblings: false,
+        },
+      isImplicit: false,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/latex/changeArg4.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/latex/changeArg4.yml
new file mode 100644
index 0000000000..7d28b19ecc
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/latex/changeArg4.yml
@@ -0,0 +1,41 @@
+languageId: latex
+command:
+  version: 1
+  spokenForm: change arg
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier:
+        {
+          type: containingScope,
+          scopeType: argumentOrParameter,
+          includeSiblings: false,
+        }
+initialState:
+  documentContents: \usepackage[utf8]{inputenc}
+  selections:
+    - anchor: { line: 0, character: 14 }
+      active: { line: 0, character: 14 }
+  marks: {}
+finalState:
+  documentContents: \usepackage[]{inputenc}
+  selections:
+    - anchor: { line: 0, character: 12 }
+      active: { line: 0, character: 12 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        {
+          type: containingScope,
+          scopeType: argumentOrParameter,
+          includeSiblings: false,
+        },
+      isImplicit: false,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/latex/changeArg5.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/latex/changeArg5.yml
new file mode 100644
index 0000000000..1a22b458a5
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/latex/changeArg5.yml
@@ -0,0 +1,41 @@
+languageId: latex
+command:
+  version: 1
+  spokenForm: change arg
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier:
+        {
+          type: containingScope,
+          scopeType: argumentOrParameter,
+          includeSiblings: false,
+        }
+initialState:
+  documentContents: \usepackage[utf8]{inputenc}
+  selections:
+    - anchor: { line: 0, character: 22 }
+      active: { line: 0, character: 22 }
+  marks: {}
+finalState:
+  documentContents: \usepackage[utf8]{}
+  selections:
+    - anchor: { line: 0, character: 18 }
+      active: { line: 0, character: 18 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        {
+          type: containingScope,
+          scopeType: argumentOrParameter,
+          includeSiblings: false,
+        },
+      isImplicit: false,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/latex/changeCall.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/latex/changeCall.yml
new file mode 100644
index 0000000000..84f0e1c097
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/latex/changeCall.yml
@@ -0,0 +1,43 @@
+languageId: latex
+command:
+  version: 1
+  spokenForm: change command
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier:
+        {
+          type: containingScope,
+          scopeType: functionCall,
+          includeSiblings: false,
+        }
+initialState:
+  documentContents: |
+    \href{https://some.url}{some text} \LaTeX
+  selections:
+    - anchor: { line: 0, character: 6 }
+      active: { line: 0, character: 6 }
+  marks: {}
+finalState:
+  documentContents: |2
+     \LaTeX
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        {
+          type: containingScope,
+          scopeType: functionCall,
+          includeSiblings: false,
+        },
+      isImplicit: false,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/latex/changeCall2.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/latex/changeCall2.yml
new file mode 100644
index 0000000000..068c092a9c
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/latex/changeCall2.yml
@@ -0,0 +1,45 @@
+languageId: latex
+command:
+  version: 1
+  spokenForm: change command
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier:
+        {
+          type: containingScope,
+          scopeType: functionCall,
+          includeSiblings: false,
+        }
+initialState:
+  documentContents: |
+    \begin{itemize}
+    \end{itemize}
+  selections:
+    - anchor: { line: 0, character: 5 }
+      active: { line: 0, character: 5 }
+  marks: {}
+finalState:
+  documentContents: |
+
+    \end{itemize}
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        {
+          type: containingScope,
+          scopeType: functionCall,
+          includeSiblings: false,
+        },
+      isImplicit: false,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/latex/changeCall3.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/latex/changeCall3.yml
new file mode 100644
index 0000000000..bfe699663b
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/latex/changeCall3.yml
@@ -0,0 +1,43 @@
+languageId: latex
+command:
+  version: 1
+  spokenForm: change command
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier:
+        {
+          type: containingScope,
+          scopeType: functionCall,
+          includeSiblings: false,
+        }
+initialState:
+  documentContents: |
+    \section{some section}
+  selections:
+    - anchor: { line: 0, character: 5 }
+      active: { line: 0, character: 5 }
+  marks: {}
+finalState:
+  documentContents: |+
+
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        {
+          type: containingScope,
+          scopeType: functionCall,
+          includeSiblings: false,
+        },
+      isImplicit: false,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/latex/changeCall4.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/latex/changeCall4.yml
new file mode 100644
index 0000000000..40110886cc
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/latex/changeCall4.yml
@@ -0,0 +1,43 @@
+languageId: latex
+command:
+  version: 1
+  spokenForm: change command
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier:
+        {
+          type: containingScope,
+          scopeType: functionCall,
+          includeSiblings: false,
+        }
+initialState:
+  documentContents: |
+    \section
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+  marks: {}
+finalState:
+  documentContents: |+
+
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        {
+          type: containingScope,
+          scopeType: functionCall,
+          includeSiblings: false,
+        },
+      isImplicit: false,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/latex/changeCall5.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/latex/changeCall5.yml
new file mode 100644
index 0000000000..e6449bc166
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/latex/changeCall5.yml
@@ -0,0 +1,43 @@
+languageId: latex
+command:
+  version: 1
+  spokenForm: change command
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier:
+        {
+          type: containingScope,
+          scopeType: functionCall,
+          includeSiblings: false,
+        }
+initialState:
+  documentContents: |
+    \section{some section}{}
+  selections:
+    - anchor: { line: 0, character: 6 }
+      active: { line: 0, character: 6 }
+  marks: {}
+finalState:
+  documentContents: |
+    {}
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        {
+          type: containingScope,
+          scopeType: functionCall,
+          includeSiblings: false,
+        },
+      isImplicit: false,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/latex/changeCallee.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/latex/changeCallee.yml
new file mode 100644
index 0000000000..8b8ee27068
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/latex/changeCallee.yml
@@ -0,0 +1,41 @@
+languageId: latex
+command:
+  version: 1
+  spokenForm: change callee
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier:
+        {
+          type: containingScope,
+          scopeType: functionCallee,
+          includeSiblings: false,
+        }
+initialState:
+  documentContents: \href{https://some.url}{some text} \LaTeX
+  selections:
+    - anchor: { line: 0, character: 3 }
+      active: { line: 0, character: 3 }
+  marks: {}
+finalState:
+  documentContents: "{https://some.url}{some text} \\LaTeX"
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        {
+          type: containingScope,
+          scopeType: functionCallee,
+          includeSiblings: false,
+        },
+      isImplicit: false,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/latex/changeChapter.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/latex/changeChapter.yml
new file mode 100644
index 0000000000..10b137d167
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/latex/changeChapter.yml
@@ -0,0 +1,39 @@
+languageId: latex
+command:
+  version: 1
+  spokenForm: change chapter
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier:
+        { type: containingScope, scopeType: chapter, includeSiblings: false }
+initialState:
+  documentContents: |
+    \chapter{1}
+    \section{child}
+    some text
+    \chapter{2}
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+  marks: {}
+finalState:
+  documentContents: |
+
+    \chapter{2}
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        { type: containingScope, scopeType: chapter, includeSiblings: false },
+      isImplicit: false,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/latex/changeComment.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/latex/changeComment.yml
new file mode 100644
index 0000000000..2716fc8945
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/latex/changeComment.yml
@@ -0,0 +1,37 @@
+languageId: latex
+command:
+  version: 1
+  spokenForm: change comment
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier:
+        { type: containingScope, scopeType: comment, includeSiblings: false }
+initialState:
+  documentContents: |
+    \iffalse
+    some comment
+    \fi
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+  marks: {}
+finalState:
+  documentContents: |+
+
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        { type: containingScope, scopeType: comment, includeSiblings: false },
+      isImplicit: false,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/latex/changeComment2.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/latex/changeComment2.yml
new file mode 100644
index 0000000000..b68900c31d
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/latex/changeComment2.yml
@@ -0,0 +1,35 @@
+languageId: latex
+command:
+  version: 1
+  spokenForm: change comment
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier:
+        { type: containingScope, scopeType: comment, includeSiblings: false }
+initialState:
+  documentContents: |
+    \LaTeX % some comment
+  selections:
+    - anchor: { line: 0, character: 8 }
+      active: { line: 0, character: 8 }
+  marks: {}
+finalState:
+  documentContents: |
+    \LaTeX
+  selections:
+    - anchor: { line: 0, character: 7 }
+      active: { line: 0, character: 7 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        { type: containingScope, scopeType: comment, includeSiblings: false },
+      isImplicit: false,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/latex/changeCurly.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/latex/changeCurly.yml
new file mode 100644
index 0000000000..37c3d8e248
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/latex/changeCurly.yml
@@ -0,0 +1,33 @@
+languageId: latex
+command:
+  version: 1
+  spokenForm: change curly
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier: { type: surroundingPair, delimiter: curlyBrackets }
+initialState:
+  documentContents: |
+    \href{https://some.url}{some text}
+  selections:
+    - anchor: { line: 0, character: 27 }
+      active: { line: 0, character: 27 }
+  marks: {}
+finalState:
+  documentContents: |
+    \href{https://some.url}
+  selections:
+    - anchor: { line: 0, character: 23 }
+      active: { line: 0, character: 23 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier: { type: surroundingPair, delimiter: curlyBrackets },
+      isImplicit: false,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/latex/changeEnvironment.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/latex/changeEnvironment.yml
new file mode 100644
index 0000000000..61943e3b41
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/latex/changeEnvironment.yml
@@ -0,0 +1,46 @@
+languageId: latex
+command:
+  version: 1
+  spokenForm: change environment
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier:
+        {
+          type: containingScope,
+          scopeType: environment,
+          includeSiblings: false,
+        }
+initialState:
+  documentContents: |
+    \begin{itemize}
+        \item one \LaTeX
+        \item two \LaTeX
+    \end{itemize}
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+  marks: {}
+finalState:
+  documentContents: |+
+
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        {
+          type: containingScope,
+          scopeType: environment,
+          includeSiblings: false,
+        },
+      isImplicit: false,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/latex/changeEveryArg.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/latex/changeEveryArg.yml
new file mode 100644
index 0000000000..2ed5b19a80
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/latex/changeEveryArg.yml
@@ -0,0 +1,45 @@
+languageId: latex
+command:
+  version: 1
+  spokenForm: change every arg
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier:
+        {
+          type: containingScope,
+          scopeType: argumentOrParameter,
+          includeSiblings: true,
+        }
+initialState:
+  documentContents: |
+    \href{https://some.url}{some text}
+  selections:
+    - anchor: { line: 0, character: 6 }
+      active: { line: 0, character: 6 }
+  marks: {}
+finalState:
+  documentContents: |
+    \href{}{}
+  selections:
+    - anchor: { line: 0, character: 6 }
+      active: { line: 0, character: 6 }
+    - anchor: { line: 0, character: 8 }
+      active: { line: 0, character: 8 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        {
+          type: containingScope,
+          scopeType: argumentOrParameter,
+          includeSiblings: true,
+        },
+      isImplicit: false,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/latex/changeEveryItem.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/latex/changeEveryItem.yml
new file mode 100644
index 0000000000..a14e8e6253
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/latex/changeEveryItem.yml
@@ -0,0 +1,51 @@
+languageId: latex
+command:
+  version: 1
+  spokenForm: change every item
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier:
+        {
+          type: containingScope,
+          scopeType: collectionItem,
+          includeSiblings: true,
+        }
+initialState:
+  documentContents: |-
+    \begin{itemize}
+        \item one \LaTeX
+        \item two \LaTeX
+    \end{itemize}
+  selections:
+    - anchor: { line: 1, character: 10 }
+      active: { line: 1, character: 10 }
+  marks: {}
+finalState:
+  documentContents: |-
+    \begin{itemize}
+        \item
+        \item
+    \end{itemize}
+  selections:
+    - anchor: { line: 1, character: 10 }
+      active: { line: 1, character: 10 }
+    - anchor: { line: 2, character: 10 }
+      active: { line: 2, character: 10 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        {
+          type: containingScope,
+          scopeType: collectionItem,
+          includeSiblings: true,
+        },
+      isImplicit: false,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/latex/changeItem.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/latex/changeItem.yml
new file mode 100644
index 0000000000..f33c1c3741
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/latex/changeItem.yml
@@ -0,0 +1,49 @@
+languageId: latex
+command:
+  version: 1
+  spokenForm: change item
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier:
+        {
+          type: containingScope,
+          scopeType: collectionItem,
+          includeSiblings: false,
+        }
+initialState:
+  documentContents: |-
+    \begin{itemize}
+        \item one \LaTeX
+        \item two \LaTeX
+    \end{itemize}
+  selections:
+    - anchor: { line: 1, character: 11 }
+      active: { line: 1, character: 11 }
+  marks: {}
+finalState:
+  documentContents: |-
+    \begin{itemize}
+        \item
+        \item two \LaTeX
+    \end{itemize}
+  selections:
+    - anchor: { line: 1, character: 10 }
+      active: { line: 1, character: 10 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        {
+          type: containingScope,
+          scopeType: collectionItem,
+          includeSiblings: false,
+        },
+      isImplicit: false,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/latex/changeName.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/latex/changeName.yml
new file mode 100644
index 0000000000..cb50cf0768
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/latex/changeName.yml
@@ -0,0 +1,37 @@
+languageId: latex
+command:
+  version: 1
+  spokenForm: change name
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier:
+        { type: containingScope, scopeType: name, includeSiblings: false }
+initialState:
+  documentContents: |-
+    \section{some section}
+    Some Text
+  selections:
+    - anchor: { line: 1, character: 7 }
+      active: { line: 1, character: 7 }
+  marks: {}
+finalState:
+  documentContents: |-
+    \section{}
+    Some Text
+  selections:
+    - anchor: { line: 0, character: 9 }
+      active: { line: 0, character: 9 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        { type: containingScope, scopeType: name, includeSiblings: false },
+      isImplicit: false,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/latex/changeName2.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/latex/changeName2.yml
new file mode 100644
index 0000000000..935f12dd93
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/latex/changeName2.yml
@@ -0,0 +1,37 @@
+languageId: latex
+command:
+  version: 1
+  spokenForm: change name
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier:
+        { type: containingScope, scopeType: name, includeSiblings: false }
+initialState:
+  documentContents: |-
+    \section{some section}
+    Some Text
+  selections:
+    - anchor: { line: 0, character: 12 }
+      active: { line: 0, character: 12 }
+  marks: {}
+finalState:
+  documentContents: |-
+    \section{}
+    Some Text
+  selections:
+    - anchor: { line: 0, character: 9 }
+      active: { line: 0, character: 9 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        { type: containingScope, scopeType: name, includeSiblings: false },
+      isImplicit: false,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/latex/changeName3.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/latex/changeName3.yml
new file mode 100644
index 0000000000..ff9679a865
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/latex/changeName3.yml
@@ -0,0 +1,39 @@
+languageId: latex
+command:
+  version: 1
+  spokenForm: change name
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier:
+        { type: containingScope, scopeType: name, includeSiblings: false }
+initialState:
+  documentContents: |-
+    \section{some section}
+    \subsection
+    Some Text
+  selections:
+    - anchor: { line: 2, character: 4 }
+      active: { line: 2, character: 4 }
+  marks: {}
+finalState:
+  documentContents: |-
+    \section{}
+    \subsection
+    Some Text
+  selections:
+    - anchor: { line: 0, character: 9 }
+      active: { line: 0, character: 9 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        { type: containingScope, scopeType: name, includeSiblings: false },
+      isImplicit: false,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/latex/changeParagraph.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/latex/changeParagraph.yml
new file mode 100644
index 0000000000..9d162a46cb
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/latex/changeParagraph.yml
@@ -0,0 +1,43 @@
+languageId: latex
+command:
+  version: 1
+  spokenForm: change paragraph
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier:
+        {
+          type: containingScope,
+          scopeType: namedParagraph,
+          includeSiblings: false,
+        }
+initialState:
+  documentContents: |
+    \paragraph{1}
+    \subparagraph{child}
+    some text
+    \paragraph{2}
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+  marks: {}
+finalState:
+  documentContents: |
+
+    \paragraph{2}
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        { type: containingScope, scopeType: paragraph, includeSiblings: false },
+      isImplicit: false,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/latex/changePart.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/latex/changePart.yml
new file mode 100644
index 0000000000..36ae7992af
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/latex/changePart.yml
@@ -0,0 +1,39 @@
+languageId: latex
+command:
+  version: 1
+  spokenForm: change part
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier:
+        { type: containingScope, scopeType: part, includeSiblings: false }
+initialState:
+  documentContents: |
+    \part{1}
+    \chapter{child}
+    some text
+    \part{2}
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+  marks: {}
+finalState:
+  documentContents: |
+
+    \part{2}
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        { type: containingScope, scopeType: part, includeSiblings: false },
+      isImplicit: false,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/latex/changeSection.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/latex/changeSection.yml
new file mode 100644
index 0000000000..ad2d1dc301
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/latex/changeSection.yml
@@ -0,0 +1,39 @@
+languageId: latex
+command:
+  version: 1
+  spokenForm: change section
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier:
+        { type: containingScope, scopeType: section, includeSiblings: false }
+initialState:
+  documentContents: |
+    \section{1}
+    \subsection{child}
+    some text
+    \section{2}
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+  marks: {}
+finalState:
+  documentContents: |
+
+    \section{2}
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        { type: containingScope, scopeType: section, includeSiblings: false },
+      isImplicit: false,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/latex/changeSubparagraph.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/latex/changeSubparagraph.yml
new file mode 100644
index 0000000000..64ff31bf5c
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/latex/changeSubparagraph.yml
@@ -0,0 +1,46 @@
+languageId: latex
+command:
+  version: 1
+  spokenForm: change subparagraph
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier:
+        {
+          type: containingScope,
+          scopeType: subParagraph,
+          includeSiblings: false,
+        }
+initialState:
+  documentContents: |
+    \subparagraph{1}
+    some text
+    \subparagraph{2}
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+  marks: {}
+finalState:
+  documentContents: |
+
+    \subparagraph{2}
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        {
+          type: containingScope,
+          scopeType: subParagraph,
+          includeSiblings: false,
+        },
+      isImplicit: false,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/latex/changeSubsection.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/latex/changeSubsection.yml
new file mode 100644
index 0000000000..eed76537c2
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/latex/changeSubsection.yml
@@ -0,0 +1,43 @@
+languageId: latex
+command:
+  version: 1
+  spokenForm: change subsection
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier:
+        { type: containingScope, scopeType: subSection, includeSiblings: false }
+initialState:
+  documentContents: |
+    \subsection{1}
+    \subsubsection{child}
+    some text
+    \subsection{2}
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+  marks: {}
+finalState:
+  documentContents: |
+
+    \subsection{2}
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        {
+          type: containingScope,
+          scopeType: subSection,
+          includeSiblings: false,
+        },
+      isImplicit: false,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/latex/changeSubsubsection.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/latex/changeSubsubsection.yml
new file mode 100644
index 0000000000..5dda56f6f2
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/latex/changeSubsubsection.yml
@@ -0,0 +1,47 @@
+languageId: latex
+command:
+  version: 1
+  spokenForm: change subsubsection
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier:
+        {
+          type: containingScope,
+          scopeType: subSubSection,
+          includeSiblings: false,
+        }
+initialState:
+  documentContents: |-
+    \subsubsection{1}
+    \paragraph{child}
+    some text
+    \subsubsection{2}
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+  marks: {}
+finalState:
+  documentContents: |-
+
+    \subsubsection{2}
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        {
+          type: containingScope,
+          scopeType: subSubSection,
+          includeSiblings: false,
+        },
+      isImplicit: false,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/latex/chuckArg.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/latex/chuckArg.yml
new file mode 100644
index 0000000000..1a43bb3d0a
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/latex/chuckArg.yml
@@ -0,0 +1,41 @@
+languageId: latex
+command:
+  version: 1
+  spokenForm: chuck arg
+  action: remove
+  targets:
+    - type: primitive
+      modifier:
+        {
+          type: containingScope,
+          scopeType: argumentOrParameter,
+          includeSiblings: false,
+        }
+initialState:
+  documentContents: \usepackage[utf8]{inputenc}
+  selections:
+    - anchor: { line: 0, character: 14 }
+      active: { line: 0, character: 14 }
+  marks: {}
+finalState:
+  documentContents: \usepackage{inputenc}
+  selections:
+    - anchor: { line: 0, character: 11 }
+      active: { line: 0, character: 11 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: outside,
+      modifier:
+        {
+          type: containingScope,
+          scopeType: argumentOrParameter,
+          includeSiblings: false,
+        },
+      isImplicit: false,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/latex/chuckArg2.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/latex/chuckArg2.yml
new file mode 100644
index 0000000000..7b1388f094
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/latex/chuckArg2.yml
@@ -0,0 +1,41 @@
+languageId: latex
+command:
+  version: 1
+  spokenForm: chuck arg
+  action: remove
+  targets:
+    - type: primitive
+      modifier:
+        {
+          type: containingScope,
+          scopeType: argumentOrParameter,
+          includeSiblings: false,
+        }
+initialState:
+  documentContents: \usepackage[utf8]{inputenc}
+  selections:
+    - anchor: { line: 0, character: 21 }
+      active: { line: 0, character: 21 }
+  marks: {}
+finalState:
+  documentContents: \usepackage[utf8]
+  selections:
+    - anchor: { line: 0, character: 17 }
+      active: { line: 0, character: 17 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: outside,
+      modifier:
+        {
+          type: containingScope,
+          scopeType: argumentOrParameter,
+          includeSiblings: false,
+        },
+      isImplicit: false,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/latex/chuckArg3.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/latex/chuckArg3.yml
new file mode 100644
index 0000000000..f8fcf08a10
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/latex/chuckArg3.yml
@@ -0,0 +1,41 @@
+languageId: latex
+command:
+  version: 1
+  spokenForm: chuck arg
+  action: remove
+  targets:
+    - type: primitive
+      modifier:
+        {
+          type: containingScope,
+          scopeType: argumentOrParameter,
+          includeSiblings: false,
+        }
+initialState:
+  documentContents: \section{some section}
+  selections:
+    - anchor: { line: 0, character: 16 }
+      active: { line: 0, character: 16 }
+  marks: {}
+finalState:
+  documentContents: \section
+  selections:
+    - anchor: { line: 0, character: 8 }
+      active: { line: 0, character: 8 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: outside,
+      modifier:
+        {
+          type: containingScope,
+          scopeType: argumentOrParameter,
+          includeSiblings: false,
+        },
+      isImplicit: false,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/latex/chuckArg4.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/latex/chuckArg4.yml
new file mode 100644
index 0000000000..0547e39357
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/latex/chuckArg4.yml
@@ -0,0 +1,45 @@
+languageId: latex
+command:
+  version: 1
+  spokenForm: chuck arg
+  action: remove
+  targets:
+    - type: primitive
+      modifier:
+        {
+          type: containingScope,
+          scopeType: argumentOrParameter,
+          includeSiblings: false,
+        }
+initialState:
+  documentContents: |-
+    \begin{itemize}
+    \end{itemize}
+  selections:
+    - anchor: { line: 0, character: 10 }
+      active: { line: 0, character: 10 }
+  marks: {}
+finalState:
+  documentContents: |-
+    \begin
+    \end{itemize}
+  selections:
+    - anchor: { line: 0, character: 6 }
+      active: { line: 0, character: 6 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: outside,
+      modifier:
+        {
+          type: containingScope,
+          scopeType: argumentOrParameter,
+          includeSiblings: false,
+        },
+      isImplicit: false,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/latex/chuckEveryItem.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/latex/chuckEveryItem.yml
new file mode 100644
index 0000000000..52f50e6f78
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/latex/chuckEveryItem.yml
@@ -0,0 +1,49 @@
+languageId: latex
+command:
+  version: 1
+  spokenForm: chuck every item
+  action: remove
+  targets:
+    - type: primitive
+      modifier:
+        {
+          type: containingScope,
+          scopeType: collectionItem,
+          includeSiblings: true,
+        }
+initialState:
+  documentContents: |-
+    \begin{itemize}
+        \item one \LaTeX
+        \item two \LaTeX
+    \end{itemize}
+  selections:
+    - anchor: { line: 1, character: 10 }
+      active: { line: 1, character: 10 }
+  marks: {}
+finalState:
+  documentContents: |-
+    \begin{itemize}
+
+
+    \end{itemize}
+  selections:
+    - anchor: { line: 1, character: 4 }
+      active: { line: 1, character: 4 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: outside,
+      modifier:
+        {
+          type: containingScope,
+          scopeType: collectionItem,
+          includeSiblings: true,
+        },
+      isImplicit: false,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/latex/chuckItem.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/latex/chuckItem.yml
new file mode 100644
index 0000000000..23d7a1bcbe
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/latex/chuckItem.yml
@@ -0,0 +1,49 @@
+languageId: latex
+command:
+  version: 1
+  spokenForm: chuck item
+  action: remove
+  targets:
+    - type: primitive
+      modifier:
+        {
+          type: containingScope,
+          scopeType: collectionItem,
+          includeSiblings: false,
+        }
+initialState:
+  documentContents: |-
+    \begin{itemize}
+        \item one \LaTeX
+        \item two \LaTeX
+    \end{itemize}
+  selections:
+    - anchor: { line: 1, character: 11 }
+      active: { line: 1, character: 11 }
+  marks: {}
+finalState:
+  documentContents: |-
+    \begin{itemize}
+
+        \item two \LaTeX
+    \end{itemize}
+  selections:
+    - anchor: { line: 1, character: 4 }
+      active: { line: 1, character: 4 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: outside,
+      modifier:
+        {
+          type: containingScope,
+          scopeType: collectionItem,
+          includeSiblings: false,
+        },
+      isImplicit: false,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/latex/chuckName.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/latex/chuckName.yml
new file mode 100644
index 0000000000..cc462d7e35
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/latex/chuckName.yml
@@ -0,0 +1,33 @@
+languageId: latex
+command:
+  version: 1
+  spokenForm: chuck name
+  action: remove
+  targets:
+    - type: primitive
+      modifier:
+        { type: containingScope, scopeType: name, includeSiblings: false }
+initialState:
+  documentContents: \section{some section}
+  selections:
+    - anchor: { line: 0, character: 13 }
+      active: { line: 0, character: 13 }
+  marks: {}
+finalState:
+  documentContents: \section
+  selections:
+    - anchor: { line: 0, character: 8 }
+      active: { line: 0, character: 8 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: outside,
+      modifier:
+        { type: containingScope, scopeType: name, includeSiblings: false },
+      isImplicit: false,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/latex/clearRound.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/latex/clearRound.yml
new file mode 100644
index 0000000000..9bb57cae4c
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/latex/clearRound.yml
@@ -0,0 +1,36 @@
+languageId: latex
+command:
+  spokenForm: clear round
+  version: 2
+  targets:
+    - type: primitive
+      modifiers:
+        - type: containingScope
+          scopeType: { type: surroundingPair, delimiter: parentheses }
+  usePrePhraseSnapshot: true
+  action: { name: clearAndSetSelection }
+initialState:
+  documentContents: hello (there)
+  selections:
+    - anchor: { line: 0, character: 10 }
+      active: { line: 0, character: 10 }
+  marks: {}
+finalState:
+  documentContents: "hello "
+  selections:
+    - anchor: { line: 0, character: 6 }
+      active: { line: 0, character: 6 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      modifiers:
+        [
+          {
+            type: containingScope,
+            scopeType: { type: surroundingPair, delimiter: parentheses },
+          },
+        ],
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/markdown/changeName.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/markdown/changeName.yml
new file mode 100644
index 0000000000..e0e30321f8
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/markdown/changeName.yml
@@ -0,0 +1,39 @@
+languageId: markdown
+command:
+  version: 1
+  spokenForm: change name
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier:
+        { type: containingScope, scopeType: name, includeSiblings: false }
+initialState:
+  documentContents: |-
+    # Hello world
+
+    Testing testing
+  selections:
+    - anchor: { line: 2, character: 14 }
+      active: { line: 2, character: 14 }
+  marks: {}
+finalState:
+  documentContents: |-
+    #
+
+    Testing testing
+  selections:
+    - anchor: { line: 0, character: 2 }
+      active: { line: 0, character: 2 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        { type: containingScope, scopeType: name, includeSiblings: false },
+      isImplicit: false,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/markdown/changeName2.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/markdown/changeName2.yml
new file mode 100644
index 0000000000..abb6af1ab1
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/markdown/changeName2.yml
@@ -0,0 +1,39 @@
+languageId: markdown
+command:
+  version: 1
+  spokenForm: change name
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier:
+        { type: containingScope, scopeType: name, includeSiblings: false }
+initialState:
+  documentContents: |-
+    # Hello world
+
+    Testing testing
+  selections:
+    - anchor: { line: 0, character: 10 }
+      active: { line: 0, character: 10 }
+  marks: {}
+finalState:
+  documentContents: |-
+    #
+
+    Testing testing
+  selections:
+    - anchor: { line: 0, character: 2 }
+      active: { line: 0, character: 2 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        { type: containingScope, scopeType: name, includeSiblings: false },
+      isImplicit: false,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/markdown/changeOneSection.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/markdown/changeOneSection.yml
new file mode 100644
index 0000000000..36e02d8d6c
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/markdown/changeOneSection.yml
@@ -0,0 +1,50 @@
+languageId: markdown
+command:
+  version: 1
+  spokenForm: change one section
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier:
+        {
+          type: containingScope,
+          scopeType: sectionLevelOne,
+          includeSiblings: false,
+        }
+initialState:
+  documentContents: |-
+    # Hello world
+
+    Testing testing
+
+    ## Some test
+
+    Hello there
+
+    ## Another test
+  selections:
+    - anchor: { line: 6, character: 9 }
+      active: { line: 6, character: 9 }
+  marks: {}
+finalState:
+  documentContents: ""
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        {
+          type: containingScope,
+          scopeType: sectionLevelOne,
+          includeSiblings: false,
+        },
+      isImplicit: false,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/markdown/changeOneSection2.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/markdown/changeOneSection2.yml
new file mode 100644
index 0000000000..d18e6cfb3c
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/markdown/changeOneSection2.yml
@@ -0,0 +1,53 @@
+languageId: markdown
+command:
+  version: 1
+  spokenForm: change one section
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier:
+        {
+          type: containingScope,
+          scopeType: sectionLevelOne,
+          includeSiblings: false,
+        }
+initialState:
+  documentContents: |-
+    # Hello world
+
+    Testing testing
+
+    ## Some test
+
+    Hello there
+
+    # Another test
+  selections:
+    - anchor: { line: 6, character: 8 }
+      active: { line: 6, character: 8 }
+  marks: {}
+finalState:
+  documentContents: |-
+
+
+    # Another test
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        {
+          type: containingScope,
+          scopeType: sectionLevelOne,
+          includeSiblings: false,
+        },
+      isImplicit: false,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/markdown/changeSection.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/markdown/changeSection.yml
new file mode 100644
index 0000000000..77bcfefef5
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/markdown/changeSection.yml
@@ -0,0 +1,36 @@
+languageId: markdown
+command:
+  version: 1
+  spokenForm: change section
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier:
+        { type: containingScope, scopeType: section, includeSiblings: false }
+initialState:
+  documentContents: |-
+    # Hello world
+
+    Testing testing
+  selections:
+    - anchor: { line: 0, character: 10 }
+      active: { line: 0, character: 10 }
+  marks: {}
+finalState:
+  documentContents: ""
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        { type: containingScope, scopeType: section, includeSiblings: false },
+      isImplicit: false,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/markdown/changeSection2.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/markdown/changeSection2.yml
new file mode 100644
index 0000000000..6a81e387cc
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/markdown/changeSection2.yml
@@ -0,0 +1,36 @@
+languageId: markdown
+command:
+  version: 1
+  spokenForm: change section
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier:
+        { type: containingScope, scopeType: section, includeSiblings: false }
+initialState:
+  documentContents: |-
+    # Hello world
+
+    Testing testing
+  selections:
+    - anchor: { line: 2, character: 10 }
+      active: { line: 2, character: 10 }
+  marks: {}
+finalState:
+  documentContents: ""
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        { type: containingScope, scopeType: section, includeSiblings: false },
+      isImplicit: false,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/markdown/changeSection3.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/markdown/changeSection3.yml
new file mode 100644
index 0000000000..3ff7eb1624
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/markdown/changeSection3.yml
@@ -0,0 +1,38 @@
+languageId: markdown
+command:
+  version: 1
+  spokenForm: change section
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier:
+        { type: containingScope, scopeType: section, includeSiblings: false }
+initialState:
+  documentContents: |-
+    # Hello world
+
+    Testing testing
+
+    ## Some test
+  selections:
+    - anchor: { line: 2, character: 12 }
+      active: { line: 2, character: 12 }
+  marks: {}
+finalState:
+  documentContents: ""
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        { type: containingScope, scopeType: section, includeSiblings: false },
+      isImplicit: false,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/markdown/changeSection4.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/markdown/changeSection4.yml
new file mode 100644
index 0000000000..b7f415c60e
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/markdown/changeSection4.yml
@@ -0,0 +1,41 @@
+languageId: markdown
+command:
+  version: 1
+  spokenForm: change section
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier:
+        { type: containingScope, scopeType: section, includeSiblings: false }
+initialState:
+  documentContents: |-
+    # Hello world
+
+    Testing testing
+
+    # Some test
+  selections:
+    - anchor: { line: 2, character: 11 }
+      active: { line: 2, character: 11 }
+  marks: {}
+finalState:
+  documentContents: |-
+
+
+    # Some test
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        { type: containingScope, scopeType: section, includeSiblings: false },
+      isImplicit: false,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/markdown/changeSection5.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/markdown/changeSection5.yml
new file mode 100644
index 0000000000..72c1a092c4
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/markdown/changeSection5.yml
@@ -0,0 +1,49 @@
+languageId: markdown
+command:
+  version: 1
+  spokenForm: change section
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier:
+        { type: containingScope, scopeType: section, includeSiblings: false }
+initialState:
+  documentContents: |-
+    # Hello world
+
+    Testing testing
+
+    ## Some test
+
+    Hello there
+
+    # Another test
+  selections:
+    - anchor: { line: 6, character: 9 }
+      active: { line: 6, character: 9 }
+  marks: {}
+finalState:
+  documentContents: |-
+    # Hello world
+
+    Testing testing
+
+
+
+    # Another test
+  selections:
+    - anchor: { line: 4, character: 0 }
+      active: { line: 4, character: 0 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        { type: containingScope, scopeType: section, includeSiblings: false },
+      isImplicit: false,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/markdown/changeSection6.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/markdown/changeSection6.yml
new file mode 100644
index 0000000000..da8a7a08f3
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/markdown/changeSection6.yml
@@ -0,0 +1,46 @@
+languageId: markdown
+command:
+  version: 1
+  spokenForm: change section
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier:
+        { type: containingScope, scopeType: section, includeSiblings: false }
+initialState:
+  documentContents: |-
+    # Hello world
+
+    Testing testing
+
+    ## Some test
+
+    Hello there
+
+    ### Another test
+  selections:
+    - anchor: { line: 6, character: 8 }
+      active: { line: 6, character: 8 }
+  marks: {}
+finalState:
+  documentContents: |+
+    # Hello world
+
+    Testing testing
+
+  selections:
+    - anchor: { line: 4, character: 0 }
+      active: { line: 4, character: 0 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        { type: containingScope, scopeType: section, includeSiblings: false },
+      isImplicit: false,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/markdown/chuckItem.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/markdown/chuckItem.yml
new file mode 100644
index 0000000000..a1a877dfe5
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/markdown/chuckItem.yml
@@ -0,0 +1,47 @@
+languageId: markdown
+command:
+  version: 1
+  spokenForm: chuck item
+  action: remove
+  targets:
+    - type: primitive
+      modifier:
+        {
+          type: containingScope,
+          scopeType: collectionItem,
+          includeSiblings: false,
+        }
+initialState:
+  documentContents: |-
+
+    - hello world
+    - whatever now
+  selections:
+    - anchor: { line: 1, character: 12 }
+      active: { line: 1, character: 12 }
+  marks: {}
+finalState:
+  documentContents: |-
+
+
+    - whatever now
+  selections:
+    - anchor: { line: 1, character: 0 }
+      active: { line: 1, character: 0 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: outside,
+      modifier:
+        {
+          type: containingScope,
+          scopeType: collectionItem,
+          includeSiblings: false,
+        },
+      isImplicit: false,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/markdown/chuckName.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/markdown/chuckName.yml
new file mode 100644
index 0000000000..94db161937
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/markdown/chuckName.yml
@@ -0,0 +1,38 @@
+languageId: markdown
+command:
+  version: 1
+  spokenForm: chuck name
+  action: remove
+  targets:
+    - type: primitive
+      modifier:
+        { type: containingScope, scopeType: name, includeSiblings: false }
+initialState:
+  documentContents: |-
+    # Hello world
+
+    Testing testing
+  selections:
+    - anchor: { line: 2, character: 14 }
+      active: { line: 2, character: 14 }
+  marks: {}
+finalState:
+  documentContents: |-
+
+    Testing testing
+  selections:
+    - anchor: { line: 1, character: 14 }
+      active: { line: 1, character: 14 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: outside,
+      modifier:
+        { type: containingScope, scopeType: name, includeSiblings: false },
+      isImplicit: false,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/markdown/clearComment.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/markdown/clearComment.yml
new file mode 100644
index 0000000000..9a9cdf3862
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/markdown/clearComment.yml
@@ -0,0 +1,33 @@
+languageId: markdown
+command:
+  version: 1
+  spokenForm: clear comment
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier:
+        { type: containingScope, scopeType: comment, includeSiblings: false }
+initialState:
+  documentContents: <!-- hello world -->
+  selections:
+    - anchor: { line: 0, character: 16 }
+      active: { line: 0, character: 16 }
+  marks: {}
+finalState:
+  documentContents: ""
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        { type: containingScope, scopeType: comment, includeSiblings: false },
+      isImplicit: false,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/markdown/clearItem.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/markdown/clearItem.yml
new file mode 100644
index 0000000000..7b9ebb4cff
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/markdown/clearItem.yml
@@ -0,0 +1,47 @@
+languageId: markdown
+command:
+  version: 1
+  spokenForm: clear item
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier:
+        {
+          type: containingScope,
+          scopeType: collectionItem,
+          includeSiblings: false,
+        }
+initialState:
+  documentContents: |-
+
+    - hello world
+    - whatever now
+  selections:
+    - anchor: { line: 1, character: 12 }
+      active: { line: 1, character: 12 }
+  marks: {}
+finalState:
+  documentContents: |-
+
+    -
+    - whatever now
+  selections:
+    - anchor: { line: 1, character: 2 }
+      active: { line: 1, character: 2 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        {
+          type: containingScope,
+          scopeType: collectionItem,
+          includeSiblings: false,
+        },
+      isImplicit: false,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/markdown/clearList.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/markdown/clearList.yml
new file mode 100644
index 0000000000..abfe564675
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/markdown/clearList.yml
@@ -0,0 +1,37 @@
+languageId: markdown
+command:
+  version: 1
+  spokenForm: clear list
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier:
+        { type: containingScope, scopeType: list, includeSiblings: false }
+initialState:
+  documentContents: |-
+
+    - hello world
+    - this is a test
+  selections:
+    - anchor: { line: 1, character: 12 }
+      active: { line: 1, character: 12 }
+  marks: {}
+finalState:
+  documentContents: |+
+
+  selections:
+    - anchor: { line: 1, character: 0 }
+      active: { line: 1, character: 0 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        { type: containingScope, scopeType: list, includeSiblings: false },
+      isImplicit: false,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/php/changeArg.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/php/changeArg.yml
new file mode 100644
index 0000000000..61af01ed0d
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/php/changeArg.yml
@@ -0,0 +1,53 @@
+languageId: php
+command:
+  version: 1
+  spokenForm: change arg
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier:
+        {
+          type: containingScope,
+          scopeType: argumentOrParameter,
+          includeSiblings: false,
+        }
+initialState:
+  documentContents: |-
+    <?php
+
+    function myFunc($value)
+    {
+
+    }
+  selections:
+    - anchor: { line: 2, character: 20 }
+      active: { line: 2, character: 20 }
+  marks: {}
+finalState:
+  documentContents: |-
+    <?php
+
+    function myFunc()
+    {
+
+    }
+  selections:
+    - anchor: { line: 2, character: 16 }
+      active: { line: 2, character: 16 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        {
+          type: containingScope,
+          scopeType: argumentOrParameter,
+          includeSiblings: false,
+        },
+      isImplicit: false,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/php/changeArg10.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/php/changeArg10.yml
new file mode 100644
index 0000000000..af7ed5299d
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/php/changeArg10.yml
@@ -0,0 +1,47 @@
+languageId: php
+command:
+  version: 1
+  spokenForm: change arg
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier:
+        {
+          type: containingScope,
+          scopeType: argumentOrParameter,
+          includeSiblings: false,
+        }
+initialState:
+  documentContents: |-
+    <?php
+
+    myFunc($value, $num, $param);
+  selections:
+    - anchor: { line: 2, character: 16 }
+      active: { line: 2, character: 16 }
+  marks: {}
+finalState:
+  documentContents: |-
+    <?php
+
+    myFunc($value, , $param);
+  selections:
+    - anchor: { line: 2, character: 15 }
+      active: { line: 2, character: 15 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        {
+          type: containingScope,
+          scopeType: argumentOrParameter,
+          includeSiblings: false,
+        },
+      isImplicit: false,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/php/changeArg2.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/php/changeArg2.yml
new file mode 100644
index 0000000000..f3dbc32175
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/php/changeArg2.yml
@@ -0,0 +1,53 @@
+languageId: php
+command:
+  version: 1
+  spokenForm: change arg
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier:
+        {
+          type: containingScope,
+          scopeType: argumentOrParameter,
+          includeSiblings: false,
+        }
+initialState:
+  documentContents: |-
+    <?php
+
+    function myFunc(...$nums)
+    {
+
+    }
+  selections:
+    - anchor: { line: 2, character: 20 }
+      active: { line: 2, character: 20 }
+  marks: {}
+finalState:
+  documentContents: |-
+    <?php
+
+    function myFunc()
+    {
+
+    }
+  selections:
+    - anchor: { line: 2, character: 16 }
+      active: { line: 2, character: 16 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        {
+          type: containingScope,
+          scopeType: argumentOrParameter,
+          includeSiblings: false,
+        },
+      isImplicit: false,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/php/changeArg3.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/php/changeArg3.yml
new file mode 100644
index 0000000000..5f3e40e04d
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/php/changeArg3.yml
@@ -0,0 +1,53 @@
+languageId: php
+command:
+  version: 1
+  spokenForm: change arg
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier:
+        {
+          type: containingScope,
+          scopeType: argumentOrParameter,
+          includeSiblings: false,
+        }
+initialState:
+  documentContents: |-
+    <?php
+
+    function myFunc($value, ...$nums)
+    {
+
+    }
+  selections:
+    - anchor: { line: 2, character: 20 }
+      active: { line: 2, character: 20 }
+  marks: {}
+finalState:
+  documentContents: |-
+    <?php
+
+    function myFunc(, ...$nums)
+    {
+
+    }
+  selections:
+    - anchor: { line: 2, character: 16 }
+      active: { line: 2, character: 16 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        {
+          type: containingScope,
+          scopeType: argumentOrParameter,
+          includeSiblings: false,
+        },
+      isImplicit: false,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/php/changeArg4.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/php/changeArg4.yml
new file mode 100644
index 0000000000..3d3605d1d9
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/php/changeArg4.yml
@@ -0,0 +1,53 @@
+languageId: php
+command:
+  version: 1
+  spokenForm: change arg
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier:
+        {
+          type: containingScope,
+          scopeType: argumentOrParameter,
+          includeSiblings: false,
+        }
+initialState:
+  documentContents: |-
+    <?php
+
+    function myFunc($value, ...$nums)
+    {
+
+    }
+  selections:
+    - anchor: { line: 2, character: 28 }
+      active: { line: 2, character: 28 }
+  marks: {}
+finalState:
+  documentContents: |-
+    <?php
+
+    function myFunc($value, )
+    {
+
+    }
+  selections:
+    - anchor: { line: 2, character: 24 }
+      active: { line: 2, character: 24 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        {
+          type: containingScope,
+          scopeType: argumentOrParameter,
+          includeSiblings: false,
+        },
+      isImplicit: false,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/php/changeArg5.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/php/changeArg5.yml
new file mode 100644
index 0000000000..ddbfa583e9
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/php/changeArg5.yml
@@ -0,0 +1,53 @@
+languageId: php
+command:
+  version: 1
+  spokenForm: change arg
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier:
+        {
+          type: containingScope,
+          scopeType: argumentOrParameter,
+          includeSiblings: false,
+        }
+initialState:
+  documentContents: |-
+    <?php
+
+    function myFunc($value, $num, $param)
+    {
+
+    }
+  selections:
+    - anchor: { line: 2, character: 26 }
+      active: { line: 2, character: 26 }
+  marks: {}
+finalState:
+  documentContents: |-
+    <?php
+
+    function myFunc($value, , $param)
+    {
+
+    }
+  selections:
+    - anchor: { line: 2, character: 24 }
+      active: { line: 2, character: 24 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        {
+          type: containingScope,
+          scopeType: argumentOrParameter,
+          includeSiblings: false,
+        },
+      isImplicit: false,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/php/changeArg6.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/php/changeArg6.yml
new file mode 100644
index 0000000000..0ecaddb9d6
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/php/changeArg6.yml
@@ -0,0 +1,47 @@
+languageId: php
+command:
+  version: 1
+  spokenForm: change arg
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier:
+        {
+          type: containingScope,
+          scopeType: argumentOrParameter,
+          includeSiblings: false,
+        }
+initialState:
+  documentContents: |-
+    <?php
+
+    myFunc($value);
+  selections:
+    - anchor: { line: 2, character: 11 }
+      active: { line: 2, character: 11 }
+  marks: {}
+finalState:
+  documentContents: |-
+    <?php
+
+    myFunc();
+  selections:
+    - anchor: { line: 2, character: 7 }
+      active: { line: 2, character: 7 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        {
+          type: containingScope,
+          scopeType: argumentOrParameter,
+          includeSiblings: false,
+        },
+      isImplicit: false,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/php/changeArg7.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/php/changeArg7.yml
new file mode 100644
index 0000000000..4c8e7f2006
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/php/changeArg7.yml
@@ -0,0 +1,47 @@
+languageId: php
+command:
+  version: 1
+  spokenForm: change arg
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier:
+        {
+          type: containingScope,
+          scopeType: argumentOrParameter,
+          includeSiblings: false,
+        }
+initialState:
+  documentContents: |-
+    <?php
+
+    myFunc(...$nums);"
+  selections:
+    - anchor: { line: 2, character: 11 }
+      active: { line: 2, character: 11 }
+  marks: {}
+finalState:
+  documentContents: |-
+    <?php
+
+    myFunc();"
+  selections:
+    - anchor: { line: 2, character: 7 }
+      active: { line: 2, character: 7 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        {
+          type: containingScope,
+          scopeType: argumentOrParameter,
+          includeSiblings: false,
+        },
+      isImplicit: false,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/php/changeArg8.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/php/changeArg8.yml
new file mode 100644
index 0000000000..7fbf46c4fa
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/php/changeArg8.yml
@@ -0,0 +1,47 @@
+languageId: php
+command:
+  version: 1
+  spokenForm: change arg
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier:
+        {
+          type: containingScope,
+          scopeType: argumentOrParameter,
+          includeSiblings: false,
+        }
+initialState:
+  documentContents: |-
+    <?php
+
+    myFunc($value, ...$nums);
+  selections:
+    - anchor: { line: 2, character: 11 }
+      active: { line: 2, character: 11 }
+  marks: {}
+finalState:
+  documentContents: |-
+    <?php
+
+    myFunc(, ...$nums);
+  selections:
+    - anchor: { line: 2, character: 7 }
+      active: { line: 2, character: 7 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        {
+          type: containingScope,
+          scopeType: argumentOrParameter,
+          includeSiblings: false,
+        },
+      isImplicit: false,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/php/changeArg9.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/php/changeArg9.yml
new file mode 100644
index 0000000000..b0140b91e6
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/php/changeArg9.yml
@@ -0,0 +1,47 @@
+languageId: php
+command:
+  version: 1
+  spokenForm: change arg
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier:
+        {
+          type: containingScope,
+          scopeType: argumentOrParameter,
+          includeSiblings: false,
+        }
+initialState:
+  documentContents: |-
+    <?php
+
+    myFunc($value, ...$nums);
+  selections:
+    - anchor: { line: 2, character: 19 }
+      active: { line: 2, character: 19 }
+  marks: {}
+finalState:
+  documentContents: |-
+    <?php
+
+    myFunc($value, );
+  selections:
+    - anchor: { line: 2, character: 15 }
+      active: { line: 2, character: 15 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        {
+          type: containingScope,
+          scopeType: argumentOrParameter,
+          includeSiblings: false,
+        },
+      isImplicit: false,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/php/changeCall.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/php/changeCall.yml
new file mode 100644
index 0000000000..62c10cf276
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/php/changeCall.yml
@@ -0,0 +1,47 @@
+languageId: php
+command:
+  version: 1
+  spokenForm: change call
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier:
+        {
+          type: containingScope,
+          scopeType: functionCall,
+          includeSiblings: false,
+        }
+initialState:
+  documentContents: |-
+    <?php
+
+    myFunk(1, 2, 3);
+  selections:
+    - anchor: { line: 2, character: 6 }
+      active: { line: 2, character: 6 }
+  marks: {}
+finalState:
+  documentContents: |-
+    <?php
+
+    ;
+  selections:
+    - anchor: { line: 2, character: 0 }
+      active: { line: 2, character: 0 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        {
+          type: containingScope,
+          scopeType: functionCall,
+          includeSiblings: false,
+        },
+      isImplicit: false,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/php/changeCall2.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/php/changeCall2.yml
new file mode 100644
index 0000000000..0ebf058921
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/php/changeCall2.yml
@@ -0,0 +1,47 @@
+languageId: php
+command:
+  version: 1
+  spokenForm: change call
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier:
+        {
+          type: containingScope,
+          scopeType: functionCall,
+          includeSiblings: false,
+        }
+initialState:
+  documentContents: |-
+    <?php
+
+    new MyClass();
+  selections:
+    - anchor: { line: 2, character: 4 }
+      active: { line: 2, character: 4 }
+  marks: {}
+finalState:
+  documentContents: |-
+    <?php
+
+    ;
+  selections:
+    - anchor: { line: 2, character: 0 }
+      active: { line: 2, character: 0 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        {
+          type: containingScope,
+          scopeType: functionCall,
+          includeSiblings: false,
+        },
+      isImplicit: false,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/php/changeClass.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/php/changeClass.yml
new file mode 100644
index 0000000000..d38eef3a51
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/php/changeClass.yml
@@ -0,0 +1,41 @@
+languageId: php
+command:
+  version: 1
+  spokenForm: change class
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier:
+        { type: containingScope, scopeType: class, includeSiblings: false }
+initialState:
+  documentContents: |-
+    <?php
+
+    class MyClass
+    {
+
+    }
+  selections:
+    - anchor: { line: 4, character: 0 }
+      active: { line: 4, character: 0 }
+  marks: {}
+finalState:
+  documentContents: |+
+    <?php
+
+  selections:
+    - anchor: { line: 2, character: 0 }
+      active: { line: 2, character: 0 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        { type: containingScope, scopeType: class, includeSiblings: false },
+      isImplicit: false,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/php/changeClassName.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/php/changeClassName.yml
new file mode 100644
index 0000000000..53bffc4905
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/php/changeClassName.yml
@@ -0,0 +1,45 @@
+languageId: php
+command:
+  version: 1
+  spokenForm: change class name
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier:
+        { type: containingScope, scopeType: className, includeSiblings: false }
+initialState:
+  documentContents: |-
+    <?php
+
+    class MyClass
+    {
+
+    }
+  selections:
+    - anchor: { line: 4, character: 0 }
+      active: { line: 4, character: 0 }
+  marks: {}
+finalState:
+  documentContents: |-
+    <?php
+
+    class
+    {
+
+    }
+  selections:
+    - anchor: { line: 2, character: 6 }
+      active: { line: 2, character: 6 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        { type: containingScope, scopeType: className, includeSiblings: false },
+      isImplicit: false,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/php/changeComment.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/php/changeComment.yml
new file mode 100644
index 0000000000..5ce34eb697
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/php/changeComment.yml
@@ -0,0 +1,38 @@
+languageId: php
+command:
+  version: 1
+  spokenForm: change comment
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier:
+        { type: containingScope, scopeType: comment, includeSiblings: false }
+initialState:
+  documentContents: |-
+    <?php
+
+    // Hello world!
+  selections:
+    - anchor: { line: 2, character: 2 }
+      active: { line: 2, character: 2 }
+  marks: {}
+finalState:
+  documentContents: |+
+    <?php
+
+  selections:
+    - anchor: { line: 2, character: 0 }
+      active: { line: 2, character: 0 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        { type: containingScope, scopeType: comment, includeSiblings: false },
+      isImplicit: false,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/php/changeEveryArg.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/php/changeEveryArg.yml
new file mode 100644
index 0000000000..64babce541
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/php/changeEveryArg.yml
@@ -0,0 +1,55 @@
+languageId: php
+command:
+  version: 1
+  spokenForm: change every arg
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier:
+        {
+          type: containingScope,
+          scopeType: argumentOrParameter,
+          includeSiblings: true,
+        }
+initialState:
+  documentContents: |-
+    <?php
+
+    function myFunc($value, $nums)
+    {
+
+    }
+  selections:
+    - anchor: { line: 2, character: 20 }
+      active: { line: 2, character: 20 }
+  marks: {}
+finalState:
+  documentContents: |-
+    <?php
+
+    function myFunc(, )
+    {
+
+    }
+  selections:
+    - anchor: { line: 2, character: 16 }
+      active: { line: 2, character: 16 }
+    - anchor: { line: 2, character: 18 }
+      active: { line: 2, character: 18 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        {
+          type: containingScope,
+          scopeType: argumentOrParameter,
+          includeSiblings: true,
+        },
+      isImplicit: false,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/php/changeEveryItem.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/php/changeEveryItem.yml
new file mode 100644
index 0000000000..1b6846cb96
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/php/changeEveryItem.yml
@@ -0,0 +1,51 @@
+languageId: php
+command:
+  version: 1
+  spokenForm: change every item
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier:
+        {
+          type: containingScope,
+          scopeType: collectionItem,
+          includeSiblings: true,
+        }
+initialState:
+  documentContents: |-
+    <?php
+
+    [1, 2, 3];
+  selections:
+    - anchor: { line: 2, character: 4 }
+      active: { line: 2, character: 4 }
+  marks: {}
+finalState:
+  documentContents: |-
+    <?php
+
+    [, , ];
+  selections:
+    - anchor: { line: 2, character: 1 }
+      active: { line: 2, character: 1 }
+    - anchor: { line: 2, character: 3 }
+      active: { line: 2, character: 3 }
+    - anchor: { line: 2, character: 5 }
+      active: { line: 2, character: 5 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        {
+          type: containingScope,
+          scopeType: collectionItem,
+          includeSiblings: true,
+        },
+      isImplicit: false,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/php/changeFunk.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/php/changeFunk.yml
new file mode 100644
index 0000000000..272758dc9f
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/php/changeFunk.yml
@@ -0,0 +1,48 @@
+languageId: php
+command:
+  version: 1
+  spokenForm: change funk
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier:
+        {
+          type: containingScope,
+          scopeType: namedFunction,
+          includeSiblings: false,
+        }
+initialState:
+  documentContents: |-
+    <?php
+
+    function myFunc() {
+
+    }
+  selections:
+    - anchor: { line: 3, character: 0 }
+      active: { line: 3, character: 0 }
+  marks: {}
+finalState:
+  documentContents: |+
+    <?php
+
+  selections:
+    - anchor: { line: 2, character: 0 }
+      active: { line: 2, character: 0 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        {
+          type: containingScope,
+          scopeType: namedFunction,
+          includeSiblings: false,
+        },
+      isImplicit: false,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/php/changeFunkName.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/php/changeFunkName.yml
new file mode 100644
index 0000000000..4a5e8cc4fd
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/php/changeFunkName.yml
@@ -0,0 +1,53 @@
+languageId: php
+command:
+  version: 1
+  spokenForm: change funk name
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier:
+        {
+          type: containingScope,
+          scopeType: functionName,
+          includeSiblings: false,
+        }
+initialState:
+  documentContents: |-
+    <?php
+
+    function helloWorld()
+    {
+
+    }
+  selections:
+    - anchor: { line: 4, character: 0 }
+      active: { line: 4, character: 0 }
+  marks: {}
+finalState:
+  documentContents: |-
+    <?php
+
+    function ()
+    {
+
+    }
+  selections:
+    - anchor: { line: 2, character: 9 }
+      active: { line: 2, character: 9 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        {
+          type: containingScope,
+          scopeType: functionName,
+          includeSiblings: false,
+        },
+      isImplicit: false,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/php/changeFunkName2.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/php/changeFunkName2.yml
new file mode 100644
index 0000000000..aff038dad6
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/php/changeFunkName2.yml
@@ -0,0 +1,59 @@
+languageId: php
+command:
+  version: 1
+  spokenForm: change funk name
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier:
+        {
+          type: containingScope,
+          scopeType: functionName,
+          includeSiblings: false,
+        }
+initialState:
+  documentContents: |-
+    <?php
+
+    class MyClass
+    {
+        public function helloWorld()
+        {
+
+        }
+    }
+  selections:
+    - anchor: { line: 6, character: 0 }
+      active: { line: 6, character: 0 }
+  marks: {}
+finalState:
+  documentContents: |-
+    <?php
+
+    class MyClass
+    {
+        public function ()
+        {
+
+        }
+    }
+  selections:
+    - anchor: { line: 4, character: 20 }
+      active: { line: 4, character: 20 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        {
+          type: containingScope,
+          scopeType: functionName,
+          includeSiblings: false,
+        },
+      isImplicit: false,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/php/changeIfState.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/php/changeIfState.yml
new file mode 100644
index 0000000000..28ed80ae16
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/php/changeIfState.yml
@@ -0,0 +1,48 @@
+languageId: php
+command:
+  version: 1
+  spokenForm: change if state
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier:
+        {
+          type: containingScope,
+          scopeType: ifStatement,
+          includeSiblings: false,
+        }
+initialState:
+  documentContents: |-
+    <?php
+
+    if (true) {
+        return;
+    }
+  selections:
+    - anchor: { line: 3, character: 4 }
+      active: { line: 3, character: 4 }
+  marks: {}
+finalState:
+  documentContents: |+
+    <?php
+
+  selections:
+    - anchor: { line: 2, character: 0 }
+      active: { line: 2, character: 0 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        {
+          type: containingScope,
+          scopeType: ifStatement,
+          includeSiblings: false,
+        },
+      isImplicit: false,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/php/changeItem.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/php/changeItem.yml
new file mode 100644
index 0000000000..914388dd2c
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/php/changeItem.yml
@@ -0,0 +1,47 @@
+languageId: php
+command:
+  version: 1
+  spokenForm: change item
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier:
+        {
+          type: containingScope,
+          scopeType: collectionItem,
+          includeSiblings: false,
+        }
+initialState:
+  documentContents: |-
+    <?php
+
+    [1, 2, 3];
+  selections:
+    - anchor: { line: 2, character: 5 }
+      active: { line: 2, character: 5 }
+  marks: {}
+finalState:
+  documentContents: |-
+    <?php
+
+    [1, , 3];
+  selections:
+    - anchor: { line: 2, character: 4 }
+      active: { line: 2, character: 4 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        {
+          type: containingScope,
+          scopeType: collectionItem,
+          includeSiblings: false,
+        },
+      isImplicit: false,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/php/changeItem2.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/php/changeItem2.yml
new file mode 100644
index 0000000000..5078fbebb1
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/php/changeItem2.yml
@@ -0,0 +1,47 @@
+languageId: php
+command:
+  version: 1
+  spokenForm: change item
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier:
+        {
+          type: containingScope,
+          scopeType: collectionItem,
+          includeSiblings: false,
+        }
+initialState:
+  documentContents: |-
+    <?php
+
+    [1, 2, 3];
+  selections:
+    - anchor: { line: 2, character: 7 }
+      active: { line: 2, character: 7 }
+  marks: {}
+finalState:
+  documentContents: |-
+    <?php
+
+    [1, 2, ];
+  selections:
+    - anchor: { line: 2, character: 7 }
+      active: { line: 2, character: 7 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        {
+          type: containingScope,
+          scopeType: collectionItem,
+          includeSiblings: false,
+        },
+      isImplicit: false,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/php/changeItem3.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/php/changeItem3.yml
new file mode 100644
index 0000000000..0e45b4cca8
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/php/changeItem3.yml
@@ -0,0 +1,47 @@
+languageId: php
+command:
+  version: 1
+  spokenForm: change item
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier:
+        {
+          type: containingScope,
+          scopeType: collectionItem,
+          includeSiblings: false,
+        }
+initialState:
+  documentContents: |-
+    <?php
+
+    [1];
+  selections:
+    - anchor: { line: 2, character: 1 }
+      active: { line: 2, character: 1 }
+  marks: {}
+finalState:
+  documentContents: |-
+    <?php
+
+    [];
+  selections:
+    - anchor: { line: 2, character: 1 }
+      active: { line: 2, character: 1 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        {
+          type: containingScope,
+          scopeType: collectionItem,
+          includeSiblings: false,
+        },
+      isImplicit: false,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/php/changeItem4.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/php/changeItem4.yml
new file mode 100644
index 0000000000..d40a4b2109
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/php/changeItem4.yml
@@ -0,0 +1,47 @@
+languageId: php
+command:
+  version: 1
+  spokenForm: change item
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier:
+        {
+          type: containingScope,
+          scopeType: collectionItem,
+          includeSiblings: false,
+        }
+initialState:
+  documentContents: |-
+    <?php
+
+    ['first' => 1, 'second' => 2, 'third' => 3];
+  selections:
+    - anchor: { line: 2, character: 24 }
+      active: { line: 2, character: 24 }
+  marks: {}
+finalState:
+  documentContents: |-
+    <?php
+
+    ['first' => 1, , 'third' => 3];
+  selections:
+    - anchor: { line: 2, character: 15 }
+      active: { line: 2, character: 15 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        {
+          type: containingScope,
+          scopeType: collectionItem,
+          includeSiblings: false,
+        },
+      isImplicit: false,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/php/changeItem5.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/php/changeItem5.yml
new file mode 100644
index 0000000000..60da025622
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/php/changeItem5.yml
@@ -0,0 +1,47 @@
+languageId: php
+command:
+  version: 1
+  spokenForm: change item
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier:
+        {
+          type: containingScope,
+          scopeType: collectionItem,
+          includeSiblings: false,
+        }
+initialState:
+  documentContents: |-
+    <?php
+
+    ['first' => 1];
+  selections:
+    - anchor: { line: 2, character: 8 }
+      active: { line: 2, character: 8 }
+  marks: {}
+finalState:
+  documentContents: |-
+    <?php
+
+    [];
+  selections:
+    - anchor: { line: 2, character: 1 }
+      active: { line: 2, character: 1 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        {
+          type: containingScope,
+          scopeType: collectionItem,
+          includeSiblings: false,
+        },
+      isImplicit: false,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/php/changeKey.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/php/changeKey.yml
new file mode 100644
index 0000000000..f3d2122d0b
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/php/changeKey.yml
@@ -0,0 +1,47 @@
+languageId: php
+command:
+  version: 1
+  spokenForm: change key
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier:
+        {
+          type: containingScope,
+          scopeType: collectionKey,
+          includeSiblings: false,
+        }
+initialState:
+  documentContents: |-
+    <?php
+
+    ['num' => 1];
+  selections:
+    - anchor: { line: 2, character: 9 }
+      active: { line: 2, character: 9 }
+  marks: {}
+finalState:
+  documentContents: |-
+    <?php
+
+    [ => 1];
+  selections:
+    - anchor: { line: 2, character: 1 }
+      active: { line: 2, character: 1 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        {
+          type: containingScope,
+          scopeType: collectionKey,
+          includeSiblings: false,
+        },
+      isImplicit: false,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/php/changeKey2.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/php/changeKey2.yml
new file mode 100644
index 0000000000..92aca8b7e9
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/php/changeKey2.yml
@@ -0,0 +1,47 @@
+languageId: php
+command:
+  version: 1
+  spokenForm: change key
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier:
+        {
+          type: containingScope,
+          scopeType: collectionKey,
+          includeSiblings: false,
+        }
+initialState:
+  documentContents: |-
+    <?php
+
+    ['num' => 1];
+  selections:
+    - anchor: { line: 2, character: 3 }
+      active: { line: 2, character: 3 }
+  marks: {}
+finalState:
+  documentContents: |-
+    <?php
+
+    [ => 1];
+  selections:
+    - anchor: { line: 2, character: 1 }
+      active: { line: 2, character: 1 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        {
+          type: containingScope,
+          scopeType: collectionKey,
+          includeSiblings: false,
+        },
+      isImplicit: false,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/php/changeLambda.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/php/changeLambda.yml
new file mode 100644
index 0000000000..b1af022f8e
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/php/changeLambda.yml
@@ -0,0 +1,49 @@
+languageId: php
+command:
+  version: 1
+  spokenForm: change lambda
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier:
+        {
+          type: containingScope,
+          scopeType: anonymousFunction,
+          includeSiblings: false,
+        }
+initialState:
+  documentContents: |-
+    <?php
+
+    $myFunc = function() {
+
+    };
+  selections:
+    - anchor: { line: 3, character: 0 }
+      active: { line: 3, character: 0 }
+  marks: {}
+finalState:
+  documentContents: |-
+    <?php
+
+    $myFunc = ;
+  selections:
+    - anchor: { line: 2, character: 10 }
+      active: { line: 2, character: 10 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        {
+          type: containingScope,
+          scopeType: anonymousFunction,
+          includeSiblings: false,
+        },
+      isImplicit: false,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/php/changeLambda2.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/php/changeLambda2.yml
new file mode 100644
index 0000000000..6770fab9f5
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/php/changeLambda2.yml
@@ -0,0 +1,47 @@
+languageId: php
+command:
+  version: 1
+  spokenForm: change lambda
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier:
+        {
+          type: containingScope,
+          scopeType: anonymousFunction,
+          includeSiblings: false,
+        }
+initialState:
+  documentContents: |-
+    <?php
+
+    $myFunc = fn() => 'Hello world';
+  selections:
+    - anchor: { line: 2, character: 25 }
+      active: { line: 2, character: 25 }
+  marks: {}
+finalState:
+  documentContents: |-
+    <?php
+
+    $myFunc = ;
+  selections:
+    - anchor: { line: 2, character: 10 }
+      active: { line: 2, character: 10 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        {
+          type: containingScope,
+          scopeType: anonymousFunction,
+          includeSiblings: false,
+        },
+      isImplicit: false,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/php/changeLambda3.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/php/changeLambda3.yml
new file mode 100644
index 0000000000..51b2d5b186
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/php/changeLambda3.yml
@@ -0,0 +1,49 @@
+languageId: php
+command:
+  version: 1
+  spokenForm: change lambda
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier:
+        {
+          type: containingScope,
+          scopeType: anonymousFunction,
+          includeSiblings: false,
+        }
+initialState:
+  documentContents: |-
+    <?php
+
+    myFunc(function() {
+
+    });
+  selections:
+    - anchor: { line: 3, character: 0 }
+      active: { line: 3, character: 0 }
+  marks: {}
+finalState:
+  documentContents: |-
+    <?php
+
+    myFunc();
+  selections:
+    - anchor: { line: 2, character: 7 }
+      active: { line: 2, character: 7 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        {
+          type: containingScope,
+          scopeType: anonymousFunction,
+          includeSiblings: false,
+        },
+      isImplicit: false,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/php/changeLambda4.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/php/changeLambda4.yml
new file mode 100644
index 0000000000..5e6410b344
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/php/changeLambda4.yml
@@ -0,0 +1,47 @@
+languageId: php
+command:
+  version: 1
+  spokenForm: change lambda
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier:
+        {
+          type: containingScope,
+          scopeType: anonymousFunction,
+          includeSiblings: false,
+        }
+initialState:
+  documentContents: |-
+    <?php
+
+    myFunc(fn() => 'Hello world');
+  selections:
+    - anchor: { line: 2, character: 22 }
+      active: { line: 2, character: 22 }
+  marks: {}
+finalState:
+  documentContents: |-
+    <?php
+
+    myFunc();
+  selections:
+    - anchor: { line: 2, character: 7 }
+      active: { line: 2, character: 7 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        {
+          type: containingScope,
+          scopeType: anonymousFunction,
+          includeSiblings: false,
+        },
+      isImplicit: false,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/php/changeName.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/php/changeName.yml
new file mode 100644
index 0000000000..3900a62351
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/php/changeName.yml
@@ -0,0 +1,45 @@
+languageId: php
+command:
+  version: 1
+  spokenForm: change name
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier:
+        { type: containingScope, scopeType: name, includeSiblings: false }
+initialState:
+  documentContents: |-
+    <?php
+
+    function helloWorld()
+    {
+
+    }
+  selections:
+    - anchor: { line: 4, character: 0 }
+      active: { line: 4, character: 0 }
+  marks: {}
+finalState:
+  documentContents: |-
+    <?php
+
+    function ()
+    {
+
+    }
+  selections:
+    - anchor: { line: 2, character: 9 }
+      active: { line: 2, character: 9 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        { type: containingScope, scopeType: name, includeSiblings: false },
+      isImplicit: false,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/php/changeName2.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/php/changeName2.yml
new file mode 100644
index 0000000000..693d8f4cf3
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/php/changeName2.yml
@@ -0,0 +1,45 @@
+languageId: php
+command:
+  version: 1
+  spokenForm: change name
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier:
+        { type: containingScope, scopeType: name, includeSiblings: false }
+initialState:
+  documentContents: |-
+    <?php
+
+    class MyClass
+    {
+
+    }
+  selections:
+    - anchor: { line: 4, character: 0 }
+      active: { line: 4, character: 0 }
+  marks: {}
+finalState:
+  documentContents: |-
+    <?php
+
+    class
+    {
+
+    }
+  selections:
+    - anchor: { line: 2, character: 6 }
+      active: { line: 2, character: 6 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        { type: containingScope, scopeType: name, includeSiblings: false },
+      isImplicit: false,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/php/changeName3.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/php/changeName3.yml
new file mode 100644
index 0000000000..8ae73b1d98
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/php/changeName3.yml
@@ -0,0 +1,51 @@
+languageId: php
+command:
+  version: 1
+  spokenForm: change name
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier:
+        { type: containingScope, scopeType: name, includeSiblings: false }
+initialState:
+  documentContents: |-
+    <?php
+
+    class MyClass
+    {
+        public function helloWorld()
+        {
+
+        }
+    }
+  selections:
+    - anchor: { line: 6, character: 0 }
+      active: { line: 6, character: 0 }
+  marks: {}
+finalState:
+  documentContents: |-
+    <?php
+
+    class MyClass
+    {
+        public function ()
+        {
+
+        }
+    }
+  selections:
+    - anchor: { line: 4, character: 20 }
+      active: { line: 4, character: 20 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        { type: containingScope, scopeType: name, includeSiblings: false },
+      isImplicit: false,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/php/changeName4.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/php/changeName4.yml
new file mode 100644
index 0000000000..454ba0c2fb
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/php/changeName4.yml
@@ -0,0 +1,55 @@
+languageId: php
+command:
+  version: 1
+  spokenForm: change name
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier:
+        { type: containingScope, scopeType: name, includeSiblings: false }
+initialState:
+  documentContents: |-
+    <?php
+
+    class MyClass
+    {
+        public $value = 'default';
+
+        public function helloWorld()
+        {
+
+        }
+    }
+  selections:
+    - anchor: { line: 5, character: 0 }
+      active: { line: 5, character: 0 }
+  marks: {}
+finalState:
+  documentContents: |-
+    <?php
+
+    class
+    {
+        public $value = 'default';
+
+        public function helloWorld()
+        {
+
+        }
+    }
+  selections:
+    - anchor: { line: 2, character: 6 }
+      active: { line: 2, character: 6 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        { type: containingScope, scopeType: name, includeSiblings: false },
+      isImplicit: false,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/php/changeName5.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/php/changeName5.yml
new file mode 100644
index 0000000000..cf0f121169
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/php/changeName5.yml
@@ -0,0 +1,39 @@
+languageId: php
+command:
+  version: 1
+  spokenForm: change name
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier:
+        { type: containingScope, scopeType: name, includeSiblings: false }
+initialState:
+  documentContents: |-
+    <?php
+
+    $value = 'Hello world';
+  selections:
+    - anchor: { line: 2, character: 15 }
+      active: { line: 2, character: 15 }
+  marks: {}
+finalState:
+  documentContents: |-
+    <?php
+
+     = 'Hello world';
+  selections:
+    - anchor: { line: 2, character: 0 }
+      active: { line: 2, character: 0 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        { type: containingScope, scopeType: name, includeSiblings: false },
+      isImplicit: false,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/php/changeName6.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/php/changeName6.yml
new file mode 100644
index 0000000000..7984f4a25d
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/php/changeName6.yml
@@ -0,0 +1,39 @@
+languageId: php
+command:
+  version: 1
+  spokenForm: change name
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier:
+        { type: containingScope, scopeType: name, includeSiblings: false }
+initialState:
+  documentContents: |-
+    <?php
+
+    $value = 'Hello world';
+  selections:
+    - anchor: { line: 2, character: 4 }
+      active: { line: 2, character: 4 }
+  marks: {}
+finalState:
+  documentContents: |-
+    <?php
+
+     = 'Hello world';
+  selections:
+    - anchor: { line: 2, character: 0 }
+      active: { line: 2, character: 0 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        { type: containingScope, scopeType: name, includeSiblings: false },
+      isImplicit: false,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/php/changeRound.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/php/changeRound.yml
new file mode 100644
index 0000000000..59f9892a10
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/php/changeRound.yml
@@ -0,0 +1,37 @@
+languageId: php
+command:
+  version: 1
+  spokenForm: change round
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier: { type: surroundingPair, delimiter: parentheses }
+initialState:
+  documentContents: |-
+    <?php
+
+    "Hello (world)";
+  selections:
+    - anchor: { line: 2, character: 11 }
+      active: { line: 2, character: 11 }
+  marks: {}
+finalState:
+  documentContents: |-
+    <?php
+
+    "Hello ";
+  selections:
+    - anchor: { line: 2, character: 7 }
+      active: { line: 2, character: 7 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier: { type: surroundingPair, delimiter: parentheses },
+      isImplicit: false,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/php/changeString.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/php/changeString.yml
new file mode 100644
index 0000000000..f67e34194d
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/php/changeString.yml
@@ -0,0 +1,37 @@
+languageId: php
+command:
+  version: 1
+  spokenForm: change string
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier: { type: surroundingPair, delimiter: string }
+initialState:
+  documentContents: |-
+    <?php
+
+    "Hello world";
+  selections:
+    - anchor: { line: 2, character: 7 }
+      active: { line: 2, character: 7 }
+  marks: {}
+finalState:
+  documentContents: |-
+    <?php
+
+    ;
+  selections:
+    - anchor: { line: 2, character: 0 }
+      active: { line: 2, character: 0 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier: { type: surroundingPair, delimiter: string },
+      isImplicit: false,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/php/changeString2.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/php/changeString2.yml
new file mode 100644
index 0000000000..c64fe02115
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/php/changeString2.yml
@@ -0,0 +1,37 @@
+languageId: php
+command:
+  version: 1
+  spokenForm: change string
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier: { type: surroundingPair, delimiter: string }
+initialState:
+  documentContents: |-
+    <?php
+
+    "Hello {$name}";
+  selections:
+    - anchor: { line: 2, character: 11 }
+      active: { line: 2, character: 11 }
+  marks: {}
+finalState:
+  documentContents: |-
+    <?php
+
+    ;
+  selections:
+    - anchor: { line: 2, character: 0 }
+      active: { line: 2, character: 0 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier: { type: surroundingPair, delimiter: string },
+      isImplicit: false,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/php/changeType.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/php/changeType.yml
new file mode 100644
index 0000000000..7d8931167e
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/php/changeType.yml
@@ -0,0 +1,43 @@
+languageId: php
+command:
+  version: 1
+  spokenForm: change type
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier:
+        { type: containingScope, scopeType: type, includeSiblings: false }
+initialState:
+  documentContents: |-
+    <?php
+
+    function myFunc(string $str) {
+
+    }
+  selections:
+    - anchor: { line: 2, character: 25 }
+      active: { line: 2, character: 25 }
+  marks: {}
+finalState:
+  documentContents: |-
+    <?php
+
+    function myFunc( $str) {
+
+    }
+  selections:
+    - anchor: { line: 2, character: 16 }
+      active: { line: 2, character: 16 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        { type: containingScope, scopeType: type, includeSiblings: false },
+      isImplicit: false,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/php/changeType2.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/php/changeType2.yml
new file mode 100644
index 0000000000..90c84a2b7b
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/php/changeType2.yml
@@ -0,0 +1,43 @@
+languageId: php
+command:
+  version: 1
+  spokenForm: change type
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier:
+        { type: containingScope, scopeType: type, includeSiblings: false }
+initialState:
+  documentContents: |-
+    <?php
+
+    function myFunc(string $str) {
+
+    }
+  selections:
+    - anchor: { line: 2, character: 19 }
+      active: { line: 2, character: 19 }
+  marks: {}
+finalState:
+  documentContents: |-
+    <?php
+
+    function myFunc( $str) {
+
+    }
+  selections:
+    - anchor: { line: 2, character: 16 }
+      active: { line: 2, character: 16 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        { type: containingScope, scopeType: type, includeSiblings: false },
+      isImplicit: false,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/php/changeType3.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/php/changeType3.yml
new file mode 100644
index 0000000000..095f6833c0
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/php/changeType3.yml
@@ -0,0 +1,43 @@
+languageId: php
+command:
+  version: 1
+  spokenForm: change type
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier:
+        { type: containingScope, scopeType: type, includeSiblings: false }
+initialState:
+  documentContents: |-
+    <?php
+
+    function myFunc(array ...$nums) {
+
+    }
+  selections:
+    - anchor: { line: 2, character: 25 }
+      active: { line: 2, character: 25 }
+  marks: {}
+finalState:
+  documentContents: |-
+    <?php
+
+    function myFunc( ...$nums) {
+
+    }
+  selections:
+    - anchor: { line: 2, character: 16 }
+      active: { line: 2, character: 16 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        { type: containingScope, scopeType: type, includeSiblings: false },
+      isImplicit: false,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/php/changeType4.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/php/changeType4.yml
new file mode 100644
index 0000000000..5088c1963e
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/php/changeType4.yml
@@ -0,0 +1,39 @@
+languageId: php
+command:
+  version: 1
+  spokenForm: change type
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier:
+        { type: containingScope, scopeType: type, includeSiblings: false }
+initialState:
+  documentContents: |-
+    <?php
+
+    (string) $str;
+  selections:
+    - anchor: { line: 2, character: 10 }
+      active: { line: 2, character: 10 }
+  marks: {}
+finalState:
+  documentContents: |-
+    <?php
+
+    () $str;
+  selections:
+    - anchor: { line: 2, character: 1 }
+      active: { line: 2, character: 1 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        { type: containingScope, scopeType: type, includeSiblings: false },
+      isImplicit: false,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/php/changeType5.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/php/changeType5.yml
new file mode 100644
index 0000000000..4e5919b218
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/php/changeType5.yml
@@ -0,0 +1,47 @@
+languageId: php
+command:
+  version: 1
+  spokenForm: change type
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier:
+        { type: containingScope, scopeType: type, includeSiblings: false }
+initialState:
+  documentContents: |-
+    <?php
+
+    try {
+
+    } catch (Exception $e) {
+
+    }
+  selections:
+    - anchor: { line: 4, character: 20 }
+      active: { line: 4, character: 20 }
+  marks: {}
+finalState:
+  documentContents: |-
+    <?php
+
+    try {
+
+    } catch ( $e) {
+
+    }
+  selections:
+    - anchor: { line: 4, character: 9 }
+      active: { line: 4, character: 9 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        { type: containingScope, scopeType: type, includeSiblings: false },
+      isImplicit: false,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/php/changeType6.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/php/changeType6.yml
new file mode 100644
index 0000000000..1a1af82b94
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/php/changeType6.yml
@@ -0,0 +1,43 @@
+languageId: php
+command:
+  version: 1
+  spokenForm: change type
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier:
+        { type: containingScope, scopeType: type, includeSiblings: false }
+initialState:
+  documentContents: |-
+    <?php
+
+    class MyClass {
+        public string $value = 'default';
+    }
+  selections:
+    - anchor: { line: 3, character: 32 }
+      active: { line: 3, character: 32 }
+  marks: {}
+finalState:
+  documentContents: |-
+    <?php
+
+    class MyClass {
+        public  $value = 'default';
+    }
+  selections:
+    - anchor: { line: 3, character: 11 }
+      active: { line: 3, character: 11 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        { type: containingScope, scopeType: type, includeSiblings: false },
+      isImplicit: false,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/php/changeValue.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/php/changeValue.yml
new file mode 100644
index 0000000000..94bbd06a5d
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/php/changeValue.yml
@@ -0,0 +1,39 @@
+languageId: php
+command:
+  version: 1
+  spokenForm: change value
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier:
+        { type: containingScope, scopeType: value, includeSiblings: false }
+initialState:
+  documentContents: |-
+    <?php
+
+    ['num' => 1];
+  selections:
+    - anchor: { line: 2, character: 9 }
+      active: { line: 2, character: 9 }
+  marks: {}
+finalState:
+  documentContents: |-
+    <?php
+
+    ['num' => ];
+  selections:
+    - anchor: { line: 2, character: 10 }
+      active: { line: 2, character: 10 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        { type: containingScope, scopeType: value, includeSiblings: false },
+      isImplicit: false,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/php/changeValue2.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/php/changeValue2.yml
new file mode 100644
index 0000000000..9ccf60327f
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/php/changeValue2.yml
@@ -0,0 +1,39 @@
+languageId: php
+command:
+  version: 1
+  spokenForm: change value
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier:
+        { type: containingScope, scopeType: value, includeSiblings: false }
+initialState:
+  documentContents: |-
+    <?php
+
+    $value = 'Hello world';
+  selections:
+    - anchor: { line: 2, character: 15 }
+      active: { line: 2, character: 15 }
+  marks: {}
+finalState:
+  documentContents: |-
+    <?php
+
+    $value = ;
+  selections:
+    - anchor: { line: 2, character: 9 }
+      active: { line: 2, character: 9 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        { type: containingScope, scopeType: value, includeSiblings: false },
+      isImplicit: false,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/php/changeValue3.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/php/changeValue3.yml
new file mode 100644
index 0000000000..3396b7d6ba
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/php/changeValue3.yml
@@ -0,0 +1,39 @@
+languageId: php
+command:
+  version: 1
+  spokenForm: change value
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier:
+        { type: containingScope, scopeType: value, includeSiblings: false }
+initialState:
+  documentContents: |-
+    <?php
+
+    $value += 42;
+  selections:
+    - anchor: { line: 2, character: 6 }
+      active: { line: 2, character: 6 }
+  marks: {}
+finalState:
+  documentContents: |-
+    <?php
+
+    $value += ;
+  selections:
+    - anchor: { line: 2, character: 10 }
+      active: { line: 2, character: 10 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        { type: containingScope, scopeType: value, includeSiblings: false },
+      isImplicit: false,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/php/changeValue4.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/php/changeValue4.yml
new file mode 100644
index 0000000000..d832c9eb03
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/php/changeValue4.yml
@@ -0,0 +1,39 @@
+languageId: php
+command:
+  version: 1
+  spokenForm: change value
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier:
+        { type: containingScope, scopeType: value, includeSiblings: false }
+initialState:
+  documentContents: |-
+    <?php
+
+    return $value;
+  selections:
+    - anchor: { line: 2, character: 6 }
+      active: { line: 2, character: 6 }
+  marks: {}
+finalState:
+  documentContents: |-
+    <?php
+
+    return ;
+  selections:
+    - anchor: { line: 2, character: 7 }
+      active: { line: 2, character: 7 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        { type: containingScope, scopeType: value, includeSiblings: false },
+      isImplicit: false,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/php/changeValue5.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/php/changeValue5.yml
new file mode 100644
index 0000000000..118112aeb2
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/php/changeValue5.yml
@@ -0,0 +1,39 @@
+languageId: php
+command:
+  version: 1
+  spokenForm: change value
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier:
+        { type: containingScope, scopeType: value, includeSiblings: false }
+initialState:
+  documentContents: |-
+    <?php
+
+    ['num' => 1];
+  selections:
+    - anchor: { line: 2, character: 3 }
+      active: { line: 2, character: 3 }
+  marks: {}
+finalState:
+  documentContents: |-
+    <?php
+
+    ['num' => ];
+  selections:
+    - anchor: { line: 2, character: 10 }
+      active: { line: 2, character: 10 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        { type: containingScope, scopeType: value, includeSiblings: false },
+      isImplicit: false,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/php/changeValue6.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/php/changeValue6.yml
new file mode 100644
index 0000000000..a2e3ba8dd6
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/php/changeValue6.yml
@@ -0,0 +1,39 @@
+languageId: php
+command:
+  version: 1
+  spokenForm: change value
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier:
+        { type: containingScope, scopeType: value, includeSiblings: false }
+initialState:
+  documentContents: |-
+    <?php
+
+    $value = 'Hello world';
+  selections:
+    - anchor: { line: 2, character: 3 }
+      active: { line: 2, character: 3 }
+  marks: {}
+finalState:
+  documentContents: |-
+    <?php
+
+    $value = ;
+  selections:
+    - anchor: { line: 2, character: 9 }
+      active: { line: 2, character: 9 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        { type: containingScope, scopeType: value, includeSiblings: false },
+      isImplicit: false,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/php/changeValue7.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/php/changeValue7.yml
new file mode 100644
index 0000000000..3d4730d54a
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/php/changeValue7.yml
@@ -0,0 +1,39 @@
+languageId: php
+command:
+  version: 1
+  spokenForm: change value
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier:
+        { type: containingScope, scopeType: value, includeSiblings: false }
+initialState:
+  documentContents: |-
+    <?php
+
+    yield $value;
+  selections:
+    - anchor: { line: 2, character: 9 }
+      active: { line: 2, character: 9 }
+  marks: {}
+finalState:
+  documentContents: |-
+    <?php
+
+    yield ;
+  selections:
+    - anchor: { line: 2, character: 6 }
+      active: { line: 2, character: 6 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        { type: containingScope, scopeType: value, includeSiblings: false },
+      isImplicit: false,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/php/chuckArg.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/php/chuckArg.yml
new file mode 100644
index 0000000000..07e2383e5b
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/php/chuckArg.yml
@@ -0,0 +1,53 @@
+languageId: php
+command:
+  version: 1
+  spokenForm: chuck arg
+  action: remove
+  targets:
+    - type: primitive
+      modifier:
+        {
+          type: containingScope,
+          scopeType: argumentOrParameter,
+          includeSiblings: false,
+        }
+initialState:
+  documentContents: |-
+    <?php
+
+    function myFunc($value)
+    {
+
+    }
+  selections:
+    - anchor: { line: 2, character: 20 }
+      active: { line: 2, character: 20 }
+  marks: {}
+finalState:
+  documentContents: |-
+    <?php
+
+    function myFunc()
+    {
+
+    }
+  selections:
+    - anchor: { line: 2, character: 16 }
+      active: { line: 2, character: 16 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: outside,
+      modifier:
+        {
+          type: containingScope,
+          scopeType: argumentOrParameter,
+          includeSiblings: false,
+        },
+      isImplicit: false,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/php/chuckArg10.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/php/chuckArg10.yml
new file mode 100644
index 0000000000..46c2398eca
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/php/chuckArg10.yml
@@ -0,0 +1,47 @@
+languageId: php
+command:
+  version: 1
+  spokenForm: chuck arg
+  action: remove
+  targets:
+    - type: primitive
+      modifier:
+        {
+          type: containingScope,
+          scopeType: argumentOrParameter,
+          includeSiblings: false,
+        }
+initialState:
+  documentContents: |-
+    <?php
+
+    myFunc($value, $num, $param);
+  selections:
+    - anchor: { line: 2, character: 16 }
+      active: { line: 2, character: 16 }
+  marks: {}
+finalState:
+  documentContents: |-
+    <?php
+
+    myFunc($value, $param);
+  selections:
+    - anchor: { line: 2, character: 15 }
+      active: { line: 2, character: 15 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: outside,
+      modifier:
+        {
+          type: containingScope,
+          scopeType: argumentOrParameter,
+          includeSiblings: false,
+        },
+      isImplicit: false,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/php/chuckArg2.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/php/chuckArg2.yml
new file mode 100644
index 0000000000..a41106d12a
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/php/chuckArg2.yml
@@ -0,0 +1,53 @@
+languageId: php
+command:
+  version: 1
+  spokenForm: chuck arg
+  action: remove
+  targets:
+    - type: primitive
+      modifier:
+        {
+          type: containingScope,
+          scopeType: argumentOrParameter,
+          includeSiblings: false,
+        }
+initialState:
+  documentContents: |-
+    <?php
+
+    function myFunc(...$nums)
+    {
+
+    }
+  selections:
+    - anchor: { line: 2, character: 20 }
+      active: { line: 2, character: 20 }
+  marks: {}
+finalState:
+  documentContents: |-
+    <?php
+
+    function myFunc()
+    {
+
+    }
+  selections:
+    - anchor: { line: 2, character: 16 }
+      active: { line: 2, character: 16 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: outside,
+      modifier:
+        {
+          type: containingScope,
+          scopeType: argumentOrParameter,
+          includeSiblings: false,
+        },
+      isImplicit: false,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/php/chuckArg3.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/php/chuckArg3.yml
new file mode 100644
index 0000000000..6314c8d7a6
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/php/chuckArg3.yml
@@ -0,0 +1,53 @@
+languageId: php
+command:
+  version: 1
+  spokenForm: chuck arg
+  action: remove
+  targets:
+    - type: primitive
+      modifier:
+        {
+          type: containingScope,
+          scopeType: argumentOrParameter,
+          includeSiblings: false,
+        }
+initialState:
+  documentContents: |-
+    <?php
+
+    function myFunc($value, ...$nums)
+    {
+
+    }
+  selections:
+    - anchor: { line: 2, character: 20 }
+      active: { line: 2, character: 20 }
+  marks: {}
+finalState:
+  documentContents: |-
+    <?php
+
+    function myFunc(...$nums)
+    {
+
+    }
+  selections:
+    - anchor: { line: 2, character: 16 }
+      active: { line: 2, character: 16 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: outside,
+      modifier:
+        {
+          type: containingScope,
+          scopeType: argumentOrParameter,
+          includeSiblings: false,
+        },
+      isImplicit: false,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/php/chuckArg4.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/php/chuckArg4.yml
new file mode 100644
index 0000000000..fe359ff039
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/php/chuckArg4.yml
@@ -0,0 +1,53 @@
+languageId: php
+command:
+  version: 1
+  spokenForm: chuck arg
+  action: remove
+  targets:
+    - type: primitive
+      modifier:
+        {
+          type: containingScope,
+          scopeType: argumentOrParameter,
+          includeSiblings: false,
+        }
+initialState:
+  documentContents: |-
+    <?php
+
+    function myFunc($value, ...$nums)
+    {
+
+    }
+  selections:
+    - anchor: { line: 2, character: 28 }
+      active: { line: 2, character: 28 }
+  marks: {}
+finalState:
+  documentContents: |-
+    <?php
+
+    function myFunc($value)
+    {
+
+    }
+  selections:
+    - anchor: { line: 2, character: 22 }
+      active: { line: 2, character: 22 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: outside,
+      modifier:
+        {
+          type: containingScope,
+          scopeType: argumentOrParameter,
+          includeSiblings: false,
+        },
+      isImplicit: false,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/php/chuckArg5.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/php/chuckArg5.yml
new file mode 100644
index 0000000000..fc9e9f2ec3
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/php/chuckArg5.yml
@@ -0,0 +1,53 @@
+languageId: php
+command:
+  version: 1
+  spokenForm: chuck arg
+  action: remove
+  targets:
+    - type: primitive
+      modifier:
+        {
+          type: containingScope,
+          scopeType: argumentOrParameter,
+          includeSiblings: false,
+        }
+initialState:
+  documentContents: |-
+    <?php
+
+    function myFunc($value, $num, $param)
+    {
+
+    }
+  selections:
+    - anchor: { line: 2, character: 26 }
+      active: { line: 2, character: 26 }
+  marks: {}
+finalState:
+  documentContents: |-
+    <?php
+
+    function myFunc($value, $param)
+    {
+
+    }
+  selections:
+    - anchor: { line: 2, character: 24 }
+      active: { line: 2, character: 24 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: outside,
+      modifier:
+        {
+          type: containingScope,
+          scopeType: argumentOrParameter,
+          includeSiblings: false,
+        },
+      isImplicit: false,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/php/chuckArg6.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/php/chuckArg6.yml
new file mode 100644
index 0000000000..29e0f51ec9
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/php/chuckArg6.yml
@@ -0,0 +1,47 @@
+languageId: php
+command:
+  version: 1
+  spokenForm: chuck arg
+  action: remove
+  targets:
+    - type: primitive
+      modifier:
+        {
+          type: containingScope,
+          scopeType: argumentOrParameter,
+          includeSiblings: false,
+        }
+initialState:
+  documentContents: |-
+    <?php
+
+    myFunc($value);"
+  selections:
+    - anchor: { line: 2, character: 11 }
+      active: { line: 2, character: 11 }
+  marks: {}
+finalState:
+  documentContents: |-
+    <?php
+
+    myFunc();"
+  selections:
+    - anchor: { line: 2, character: 7 }
+      active: { line: 2, character: 7 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: outside,
+      modifier:
+        {
+          type: containingScope,
+          scopeType: argumentOrParameter,
+          includeSiblings: false,
+        },
+      isImplicit: false,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/php/chuckArg7.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/php/chuckArg7.yml
new file mode 100644
index 0000000000..a6cf6567c3
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/php/chuckArg7.yml
@@ -0,0 +1,47 @@
+languageId: php
+command:
+  version: 1
+  spokenForm: chuck arg
+  action: remove
+  targets:
+    - type: primitive
+      modifier:
+        {
+          type: containingScope,
+          scopeType: argumentOrParameter,
+          includeSiblings: false,
+        }
+initialState:
+  documentContents: |-
+    <?php
+
+    myFunc(...$nums);
+  selections:
+    - anchor: { line: 2, character: 11 }
+      active: { line: 2, character: 11 }
+  marks: {}
+finalState:
+  documentContents: |-
+    <?php
+
+    myFunc();
+  selections:
+    - anchor: { line: 2, character: 7 }
+      active: { line: 2, character: 7 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: outside,
+      modifier:
+        {
+          type: containingScope,
+          scopeType: argumentOrParameter,
+          includeSiblings: false,
+        },
+      isImplicit: false,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/php/chuckArg8.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/php/chuckArg8.yml
new file mode 100644
index 0000000000..036c17b158
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/php/chuckArg8.yml
@@ -0,0 +1,47 @@
+languageId: php
+command:
+  version: 1
+  spokenForm: chuck arg
+  action: remove
+  targets:
+    - type: primitive
+      modifier:
+        {
+          type: containingScope,
+          scopeType: argumentOrParameter,
+          includeSiblings: false,
+        }
+initialState:
+  documentContents: |-
+    <?php
+
+    myFunc($value, ...$nums);
+  selections:
+    - anchor: { line: 2, character: 11 }
+      active: { line: 2, character: 11 }
+  marks: {}
+finalState:
+  documentContents: |-
+    <?php
+
+    myFunc(...$nums);
+  selections:
+    - anchor: { line: 2, character: 7 }
+      active: { line: 2, character: 7 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: outside,
+      modifier:
+        {
+          type: containingScope,
+          scopeType: argumentOrParameter,
+          includeSiblings: false,
+        },
+      isImplicit: false,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/php/chuckArg9.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/php/chuckArg9.yml
new file mode 100644
index 0000000000..debbeb16b4
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/php/chuckArg9.yml
@@ -0,0 +1,47 @@
+languageId: php
+command:
+  version: 1
+  spokenForm: chuck arg
+  action: remove
+  targets:
+    - type: primitive
+      modifier:
+        {
+          type: containingScope,
+          scopeType: argumentOrParameter,
+          includeSiblings: false,
+        }
+initialState:
+  documentContents: |-
+    <?php
+
+    myFunc($value, ...$nums);
+  selections:
+    - anchor: { line: 2, character: 19 }
+      active: { line: 2, character: 19 }
+  marks: {}
+finalState:
+  documentContents: |-
+    <?php
+
+    myFunc($value);
+  selections:
+    - anchor: { line: 2, character: 13 }
+      active: { line: 2, character: 13 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: outside,
+      modifier:
+        {
+          type: containingScope,
+          scopeType: argumentOrParameter,
+          includeSiblings: false,
+        },
+      isImplicit: false,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/php/chuckEveryArg.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/php/chuckEveryArg.yml
new file mode 100644
index 0000000000..ffd4671038
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/php/chuckEveryArg.yml
@@ -0,0 +1,53 @@
+languageId: php
+command:
+  version: 1
+  spokenForm: chuck every arg
+  action: remove
+  targets:
+    - type: primitive
+      modifier:
+        {
+          type: containingScope,
+          scopeType: argumentOrParameter,
+          includeSiblings: true,
+        }
+initialState:
+  documentContents: |-
+    <?php
+
+    function myFunc($value, $nums)
+    {
+
+    }
+  selections:
+    - anchor: { line: 2, character: 20 }
+      active: { line: 2, character: 20 }
+  marks: {}
+finalState:
+  documentContents: |-
+    <?php
+
+    function myFunc()
+    {
+
+    }
+  selections:
+    - anchor: { line: 2, character: 16 }
+      active: { line: 2, character: 16 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: outside,
+      modifier:
+        {
+          type: containingScope,
+          scopeType: argumentOrParameter,
+          includeSiblings: true,
+        },
+      isImplicit: false,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/php/chuckEveryItem.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/php/chuckEveryItem.yml
new file mode 100644
index 0000000000..c7bef2791d
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/php/chuckEveryItem.yml
@@ -0,0 +1,47 @@
+languageId: php
+command:
+  version: 1
+  spokenForm: chuck every item
+  action: remove
+  targets:
+    - type: primitive
+      modifier:
+        {
+          type: containingScope,
+          scopeType: collectionItem,
+          includeSiblings: true,
+        }
+initialState:
+  documentContents: |-
+    <?php
+
+    [1, 2, 3];
+  selections:
+    - anchor: { line: 2, character: 4 }
+      active: { line: 2, character: 4 }
+  marks: {}
+finalState:
+  documentContents: |-
+    <?php
+
+    [];
+  selections:
+    - anchor: { line: 2, character: 1 }
+      active: { line: 2, character: 1 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: outside,
+      modifier:
+        {
+          type: containingScope,
+          scopeType: collectionItem,
+          includeSiblings: true,
+        },
+      isImplicit: false,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/php/chuckFunk.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/php/chuckFunk.yml
new file mode 100644
index 0000000000..c8d8d93f48
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/php/chuckFunk.yml
@@ -0,0 +1,48 @@
+languageId: php
+command:
+  version: 1
+  spokenForm: chuck funk
+  action: remove
+  targets:
+    - type: primitive
+      modifier:
+        {
+          type: containingScope,
+          scopeType: namedFunction,
+          includeSiblings: false,
+        }
+initialState:
+  documentContents: |-
+    <?php
+
+    $myFunc = function() {
+
+    };
+  selections:
+    - anchor: { line: 3, character: 0 }
+      active: { line: 3, character: 0 }
+  marks: {}
+finalState:
+  documentContents: |+
+    <?php
+
+  selections:
+    - anchor: { line: 2, character: 0 }
+      active: { line: 2, character: 0 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: outside,
+      modifier:
+        {
+          type: containingScope,
+          scopeType: namedFunction,
+          includeSiblings: false,
+        },
+      isImplicit: false,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/php/chuckFunk2.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/php/chuckFunk2.yml
new file mode 100644
index 0000000000..0087359a50
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/php/chuckFunk2.yml
@@ -0,0 +1,46 @@
+languageId: php
+command:
+  version: 1
+  spokenForm: chuck funk
+  action: remove
+  targets:
+    - type: primitive
+      modifier:
+        {
+          type: containingScope,
+          scopeType: namedFunction,
+          includeSiblings: false,
+        }
+initialState:
+  documentContents: |-
+    <?php
+
+    $myFunc = fn() => 'Hello world';
+  selections:
+    - anchor: { line: 2, character: 25 }
+      active: { line: 2, character: 25 }
+  marks: {}
+finalState:
+  documentContents: |+
+    <?php
+
+  selections:
+    - anchor: { line: 2, character: 0 }
+      active: { line: 2, character: 0 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: outside,
+      modifier:
+        {
+          type: containingScope,
+          scopeType: namedFunction,
+          includeSiblings: false,
+        },
+      isImplicit: false,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/php/chuckInside.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/php/chuckInside.yml
new file mode 100644
index 0000000000..5b86a69342
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/php/chuckInside.yml
@@ -0,0 +1,47 @@
+languageId: php
+command:
+  version: 1
+  spokenForm: chuck inside
+  action: remove
+  targets:
+    - type: primitive
+      modifier:
+        {
+          type: surroundingPair,
+          delimiter: any,
+          delimiterInclusion: interiorOnly,
+        }
+initialState:
+  documentContents: |-
+    <?php
+
+    "hello world";
+  selections:
+    - anchor: { line: 2, character: 7 }
+      active: { line: 2, character: 7 }
+  marks: {}
+finalState:
+  documentContents: |-
+    <?php
+
+    "";
+  selections:
+    - anchor: { line: 2, character: 1 }
+      active: { line: 2, character: 1 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: outside,
+      modifier:
+        {
+          type: surroundingPair,
+          delimiter: any,
+          delimiterInclusion: interiorOnly,
+        },
+      isImplicit: false,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/php/chuckItem.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/php/chuckItem.yml
new file mode 100644
index 0000000000..aa9233fcf6
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/php/chuckItem.yml
@@ -0,0 +1,47 @@
+languageId: php
+command:
+  version: 1
+  spokenForm: chuck item
+  action: remove
+  targets:
+    - type: primitive
+      modifier:
+        {
+          type: containingScope,
+          scopeType: collectionItem,
+          includeSiblings: false,
+        }
+initialState:
+  documentContents: |-
+    <?php
+
+    [1, 2, 3];
+  selections:
+    - anchor: { line: 2, character: 5 }
+      active: { line: 2, character: 5 }
+  marks: {}
+finalState:
+  documentContents: |-
+    <?php
+
+    [1, 3];
+  selections:
+    - anchor: { line: 2, character: 4 }
+      active: { line: 2, character: 4 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: outside,
+      modifier:
+        {
+          type: containingScope,
+          scopeType: collectionItem,
+          includeSiblings: false,
+        },
+      isImplicit: false,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/php/chuckItem2.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/php/chuckItem2.yml
new file mode 100644
index 0000000000..e7da57e2f9
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/php/chuckItem2.yml
@@ -0,0 +1,47 @@
+languageId: php
+command:
+  version: 1
+  spokenForm: chuck item
+  action: remove
+  targets:
+    - type: primitive
+      modifier:
+        {
+          type: containingScope,
+          scopeType: collectionItem,
+          includeSiblings: false,
+        }
+initialState:
+  documentContents: |-
+    <?php
+
+    [1, 2, 3];
+  selections:
+    - anchor: { line: 2, character: 7 }
+      active: { line: 2, character: 7 }
+  marks: {}
+finalState:
+  documentContents: |-
+    <?php
+
+    [1, 2];
+  selections:
+    - anchor: { line: 2, character: 5 }
+      active: { line: 2, character: 5 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: outside,
+      modifier:
+        {
+          type: containingScope,
+          scopeType: collectionItem,
+          includeSiblings: false,
+        },
+      isImplicit: false,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/php/chuckItem3.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/php/chuckItem3.yml
new file mode 100644
index 0000000000..418ce1ca18
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/php/chuckItem3.yml
@@ -0,0 +1,47 @@
+languageId: php
+command:
+  version: 1
+  spokenForm: chuck item
+  action: remove
+  targets:
+    - type: primitive
+      modifier:
+        {
+          type: containingScope,
+          scopeType: collectionItem,
+          includeSiblings: false,
+        }
+initialState:
+  documentContents: |-
+    <?php
+
+    [1];
+  selections:
+    - anchor: { line: 2, character: 1 }
+      active: { line: 2, character: 1 }
+  marks: {}
+finalState:
+  documentContents: |-
+    <?php
+
+    [];
+  selections:
+    - anchor: { line: 2, character: 1 }
+      active: { line: 2, character: 1 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: outside,
+      modifier:
+        {
+          type: containingScope,
+          scopeType: collectionItem,
+          includeSiblings: false,
+        },
+      isImplicit: false,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/php/chuckItem4.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/php/chuckItem4.yml
new file mode 100644
index 0000000000..bcbfd8ebbb
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/php/chuckItem4.yml
@@ -0,0 +1,47 @@
+languageId: php
+command:
+  version: 1
+  spokenForm: chuck item
+  action: remove
+  targets:
+    - type: primitive
+      modifier:
+        {
+          type: containingScope,
+          scopeType: collectionItem,
+          includeSiblings: false,
+        }
+initialState:
+  documentContents: |-
+    <?php
+
+    ['first' => 1, 'second' => 2, 'third' => 3];
+  selections:
+    - anchor: { line: 2, character: 24 }
+      active: { line: 2, character: 24 }
+  marks: {}
+finalState:
+  documentContents: |-
+    <?php
+
+    ['first' => 1, 'third' => 3];
+  selections:
+    - anchor: { line: 2, character: 15 }
+      active: { line: 2, character: 15 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: outside,
+      modifier:
+        {
+          type: containingScope,
+          scopeType: collectionItem,
+          includeSiblings: false,
+        },
+      isImplicit: false,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/php/chuckItem5.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/php/chuckItem5.yml
new file mode 100644
index 0000000000..fc96ab1652
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/php/chuckItem5.yml
@@ -0,0 +1,47 @@
+languageId: php
+command:
+  version: 1
+  spokenForm: chuck item
+  action: remove
+  targets:
+    - type: primitive
+      modifier:
+        {
+          type: containingScope,
+          scopeType: collectionItem,
+          includeSiblings: false,
+        }
+initialState:
+  documentContents: |-
+    <?php
+
+    ['first' => 1];
+  selections:
+    - anchor: { line: 2, character: 11 }
+      active: { line: 2, character: 11 }
+  marks: {}
+finalState:
+  documentContents: |-
+    <?php
+
+    [];
+  selections:
+    - anchor: { line: 2, character: 1 }
+      active: { line: 2, character: 1 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: outside,
+      modifier:
+        {
+          type: containingScope,
+          scopeType: collectionItem,
+          includeSiblings: false,
+        },
+      isImplicit: false,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/php/chuckKey.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/php/chuckKey.yml
new file mode 100644
index 0000000000..9a927536bc
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/php/chuckKey.yml
@@ -0,0 +1,47 @@
+languageId: php
+command:
+  version: 1
+  spokenForm: chuck key
+  action: remove
+  targets:
+    - type: primitive
+      modifier:
+        {
+          type: containingScope,
+          scopeType: collectionKey,
+          includeSiblings: false,
+        }
+initialState:
+  documentContents: |-
+    <?php
+
+    ['num' => 1];
+  selections:
+    - anchor: { line: 2, character: 9 }
+      active: { line: 2, character: 9 }
+  marks: {}
+finalState:
+  documentContents: |-
+    <?php
+
+    [1];
+  selections:
+    - anchor: { line: 2, character: 1 }
+      active: { line: 2, character: 1 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: outside,
+      modifier:
+        {
+          type: containingScope,
+          scopeType: collectionKey,
+          includeSiblings: false,
+        },
+      isImplicit: false,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/php/chuckKey2.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/php/chuckKey2.yml
new file mode 100644
index 0000000000..171d2ca5dc
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/php/chuckKey2.yml
@@ -0,0 +1,47 @@
+languageId: php
+command:
+  version: 1
+  spokenForm: chuck key
+  action: remove
+  targets:
+    - type: primitive
+      modifier:
+        {
+          type: containingScope,
+          scopeType: collectionKey,
+          includeSiblings: false,
+        }
+initialState:
+  documentContents: |-
+    <?php
+
+    ['num' => 1];
+  selections:
+    - anchor: { line: 2, character: 3 }
+      active: { line: 2, character: 3 }
+  marks: {}
+finalState:
+  documentContents: |-
+    <?php
+
+    [1];
+  selections:
+    - anchor: { line: 2, character: 1 }
+      active: { line: 2, character: 1 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: outside,
+      modifier:
+        {
+          type: containingScope,
+          scopeType: collectionKey,
+          includeSiblings: false,
+        },
+      isImplicit: false,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/php/chuckPair.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/php/chuckPair.yml
new file mode 100644
index 0000000000..16d3486d7f
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/php/chuckPair.yml
@@ -0,0 +1,37 @@
+languageId: php
+command:
+  version: 1
+  spokenForm: chuck pair
+  action: remove
+  targets:
+    - type: primitive
+      modifier: { type: surroundingPair, delimiter: any }
+initialState:
+  documentContents: |-
+    <?php
+
+    "hello world";
+  selections:
+    - anchor: { line: 2, character: 7 }
+      active: { line: 2, character: 7 }
+  marks: {}
+finalState:
+  documentContents: |-
+    <?php
+
+    ;
+  selections:
+    - anchor: { line: 2, character: 0 }
+      active: { line: 2, character: 0 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: outside,
+      modifier: { type: surroundingPair, delimiter: any },
+      isImplicit: false,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/php/chuckType.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/php/chuckType.yml
new file mode 100644
index 0000000000..db48dd5c7f
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/php/chuckType.yml
@@ -0,0 +1,43 @@
+languageId: php
+command:
+  version: 1
+  spokenForm: chuck type
+  action: remove
+  targets:
+    - type: primitive
+      modifier:
+        { type: containingScope, scopeType: type, includeSiblings: false }
+initialState:
+  documentContents: |-
+    <?php
+
+    function myFunc(string $str) {
+
+    }
+  selections:
+    - anchor: { line: 2, character: 25 }
+      active: { line: 2, character: 25 }
+  marks: {}
+finalState:
+  documentContents: |-
+    <?php
+
+    function myFunc($str) {
+
+    }
+  selections:
+    - anchor: { line: 2, character: 18 }
+      active: { line: 2, character: 18 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: outside,
+      modifier:
+        { type: containingScope, scopeType: type, includeSiblings: false },
+      isImplicit: false,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/php/chuckType2.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/php/chuckType2.yml
new file mode 100644
index 0000000000..57a19148c7
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/php/chuckType2.yml
@@ -0,0 +1,43 @@
+languageId: php
+command:
+  version: 1
+  spokenForm: chuck type
+  action: remove
+  targets:
+    - type: primitive
+      modifier:
+        { type: containingScope, scopeType: type, includeSiblings: false }
+initialState:
+  documentContents: |-
+    <?php
+
+    function myFunc(string $str) {
+
+    }
+  selections:
+    - anchor: { line: 2, character: 19 }
+      active: { line: 2, character: 19 }
+  marks: {}
+finalState:
+  documentContents: |-
+    <?php
+
+    function myFunc($str) {
+
+    }
+  selections:
+    - anchor: { line: 2, character: 16 }
+      active: { line: 2, character: 16 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: outside,
+      modifier:
+        { type: containingScope, scopeType: type, includeSiblings: false },
+      isImplicit: false,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/php/chuckType3.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/php/chuckType3.yml
new file mode 100644
index 0000000000..2f09e4ff96
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/php/chuckType3.yml
@@ -0,0 +1,43 @@
+languageId: php
+command:
+  version: 1
+  spokenForm: chuck type
+  action: remove
+  targets:
+    - type: primitive
+      modifier:
+        { type: containingScope, scopeType: type, includeSiblings: false }
+initialState:
+  documentContents: |-
+    <?php
+
+    function myFunc(array ...$nums) {
+
+    }
+  selections:
+    - anchor: { line: 2, character: 25 }
+      active: { line: 2, character: 25 }
+  marks: {}
+finalState:
+  documentContents: |-
+    <?php
+
+    function myFunc(...$nums) {
+
+    }
+  selections:
+    - anchor: { line: 2, character: 19 }
+      active: { line: 2, character: 19 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: outside,
+      modifier:
+        { type: containingScope, scopeType: type, includeSiblings: false },
+      isImplicit: false,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/php/chuckType4.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/php/chuckType4.yml
new file mode 100644
index 0000000000..b6e72275b4
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/php/chuckType4.yml
@@ -0,0 +1,39 @@
+languageId: php
+command:
+  version: 1
+  spokenForm: chuck type
+  action: remove
+  targets:
+    - type: primitive
+      modifier:
+        { type: containingScope, scopeType: type, includeSiblings: false }
+initialState:
+  documentContents: |-
+    <?php
+
+    (string) $str;
+  selections:
+    - anchor: { line: 2, character: 10 }
+      active: { line: 2, character: 10 }
+  marks: {}
+finalState:
+  documentContents: |-
+    <?php
+
+    $str;
+  selections:
+    - anchor: { line: 2, character: 1 }
+      active: { line: 2, character: 1 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: outside,
+      modifier:
+        { type: containingScope, scopeType: type, includeSiblings: false },
+      isImplicit: false,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/php/chuckType5.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/php/chuckType5.yml
new file mode 100644
index 0000000000..f05470af62
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/php/chuckType5.yml
@@ -0,0 +1,39 @@
+languageId: php
+command:
+  version: 1
+  spokenForm: chuck type
+  action: remove
+  targets:
+    - type: primitive
+      modifier:
+        { type: containingScope, scopeType: type, includeSiblings: false }
+initialState:
+  documentContents: |-
+    <?php
+
+    $str = ( string ) $num;
+  selections:
+    - anchor: { line: 2, character: 18 }
+      active: { line: 2, character: 18 }
+  marks: {}
+finalState:
+  documentContents: |-
+    <?php
+
+    $str = $num;
+  selections:
+    - anchor: { line: 2, character: 7 }
+      active: { line: 2, character: 7 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: outside,
+      modifier:
+        { type: containingScope, scopeType: type, includeSiblings: false },
+      isImplicit: false,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/php/chuckValue.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/php/chuckValue.yml
new file mode 100644
index 0000000000..ecac44a87d
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/php/chuckValue.yml
@@ -0,0 +1,39 @@
+languageId: php
+command:
+  version: 1
+  spokenForm: chuck value
+  action: remove
+  targets:
+    - type: primitive
+      modifier:
+        { type: containingScope, scopeType: value, includeSiblings: false }
+initialState:
+  documentContents: |-
+    <?php
+
+    ['num' => 1];
+  selections:
+    - anchor: { line: 2, character: 9 }
+      active: { line: 2, character: 9 }
+  marks: {}
+finalState:
+  documentContents: |-
+    <?php
+
+    ['num'];
+  selections:
+    - anchor: { line: 2, character: 6 }
+      active: { line: 2, character: 6 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: outside,
+      modifier:
+        { type: containingScope, scopeType: value, includeSiblings: false },
+      isImplicit: false,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/php/chuckValue10.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/php/chuckValue10.yml
new file mode 100644
index 0000000000..ea93b55e70
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/php/chuckValue10.yml
@@ -0,0 +1,39 @@
+languageId: php
+command:
+  version: 1
+  spokenForm: chuck value
+  action: remove
+  targets:
+    - type: primitive
+      modifier:
+        { type: containingScope, scopeType: value, includeSiblings: false }
+initialState:
+  documentContents: |-
+    <?php
+
+    yield $value;
+  selections:
+    - anchor: { line: 2, character: 9 }
+      active: { line: 2, character: 9 }
+  marks: {}
+finalState:
+  documentContents: |-
+    <?php
+
+    yield;
+  selections:
+    - anchor: { line: 2, character: 5 }
+      active: { line: 2, character: 5 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: outside,
+      modifier:
+        { type: containingScope, scopeType: value, includeSiblings: false },
+      isImplicit: false,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/php/chuckValue2.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/php/chuckValue2.yml
new file mode 100644
index 0000000000..dbdfce9830
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/php/chuckValue2.yml
@@ -0,0 +1,39 @@
+languageId: php
+command:
+  version: 1
+  spokenForm: chuck value
+  action: remove
+  targets:
+    - type: primitive
+      modifier:
+        { type: containingScope, scopeType: value, includeSiblings: false }
+initialState:
+  documentContents: |-
+    <?php
+
+    $value = 'Hello world';
+  selections:
+    - anchor: { line: 2, character: 3 }
+      active: { line: 2, character: 3 }
+  marks: {}
+finalState:
+  documentContents: |-
+    <?php
+
+    $value;
+  selections:
+    - anchor: { line: 2, character: 3 }
+      active: { line: 2, character: 3 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: outside,
+      modifier:
+        { type: containingScope, scopeType: value, includeSiblings: false },
+      isImplicit: false,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/php/chuckValue3.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/php/chuckValue3.yml
new file mode 100644
index 0000000000..0d3edf32be
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/php/chuckValue3.yml
@@ -0,0 +1,39 @@
+languageId: php
+command:
+  version: 1
+  spokenForm: chuck value
+  action: remove
+  targets:
+    - type: primitive
+      modifier:
+        { type: containingScope, scopeType: value, includeSiblings: false }
+initialState:
+  documentContents: |-
+    <?php
+
+    $value += 42;
+  selections:
+    - anchor: { line: 2, character: 3 }
+      active: { line: 2, character: 3 }
+  marks: {}
+finalState:
+  documentContents: |-
+    <?php
+
+    $value;
+  selections:
+    - anchor: { line: 2, character: 3 }
+      active: { line: 2, character: 3 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: outside,
+      modifier:
+        { type: containingScope, scopeType: value, includeSiblings: false },
+      isImplicit: false,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/php/chuckValue4.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/php/chuckValue4.yml
new file mode 100644
index 0000000000..a70d357c41
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/php/chuckValue4.yml
@@ -0,0 +1,39 @@
+languageId: php
+command:
+  version: 1
+  spokenForm: chuck value
+  action: remove
+  targets:
+    - type: primitive
+      modifier:
+        { type: containingScope, scopeType: value, includeSiblings: false }
+initialState:
+  documentContents: |-
+    <?php
+
+    return $value;
+  selections:
+    - anchor: { line: 2, character: 3 }
+      active: { line: 2, character: 3 }
+  marks: {}
+finalState:
+  documentContents: |-
+    <?php
+
+    return;
+  selections:
+    - anchor: { line: 2, character: 3 }
+      active: { line: 2, character: 3 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: outside,
+      modifier:
+        { type: containingScope, scopeType: value, includeSiblings: false },
+      isImplicit: false,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/php/chuckValue5.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/php/chuckValue5.yml
new file mode 100644
index 0000000000..e0f7d6b500
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/php/chuckValue5.yml
@@ -0,0 +1,39 @@
+languageId: php
+command:
+  version: 1
+  spokenForm: chuck value
+  action: remove
+  targets:
+    - type: primitive
+      modifier:
+        { type: containingScope, scopeType: value, includeSiblings: false }
+initialState:
+  documentContents: |-
+    <?php
+
+    $value = 'Hello world';
+  selections:
+    - anchor: { line: 2, character: 16 }
+      active: { line: 2, character: 16 }
+  marks: {}
+finalState:
+  documentContents: |-
+    <?php
+
+    $value;
+  selections:
+    - anchor: { line: 2, character: 6 }
+      active: { line: 2, character: 6 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: outside,
+      modifier:
+        { type: containingScope, scopeType: value, includeSiblings: false },
+      isImplicit: false,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/php/chuckValue6.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/php/chuckValue6.yml
new file mode 100644
index 0000000000..753a7c7b09
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/php/chuckValue6.yml
@@ -0,0 +1,39 @@
+languageId: php
+command:
+  version: 1
+  spokenForm: chuck value
+  action: remove
+  targets:
+    - type: primitive
+      modifier:
+        { type: containingScope, scopeType: value, includeSiblings: false }
+initialState:
+  documentContents: |-
+    <?php
+
+    $value = 42;
+  selections:
+    - anchor: { line: 2, character: 10 }
+      active: { line: 2, character: 10 }
+  marks: {}
+finalState:
+  documentContents: |-
+    <?php
+
+    $value;
+  selections:
+    - anchor: { line: 2, character: 6 }
+      active: { line: 2, character: 6 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: outside,
+      modifier:
+        { type: containingScope, scopeType: value, includeSiblings: false },
+      isImplicit: false,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/php/chuckValue7.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/php/chuckValue7.yml
new file mode 100644
index 0000000000..eae7581b3f
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/php/chuckValue7.yml
@@ -0,0 +1,39 @@
+languageId: php
+command:
+  version: 1
+  spokenForm: chuck value
+  action: remove
+  targets:
+    - type: primitive
+      modifier:
+        { type: containingScope, scopeType: value, includeSiblings: false }
+initialState:
+  documentContents: |-
+    <?php
+
+    return $value;
+  selections:
+    - anchor: { line: 2, character: 10 }
+      active: { line: 2, character: 10 }
+  marks: {}
+finalState:
+  documentContents: |-
+    <?php
+
+    return;
+  selections:
+    - anchor: { line: 2, character: 6 }
+      active: { line: 2, character: 6 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: outside,
+      modifier:
+        { type: containingScope, scopeType: value, includeSiblings: false },
+      isImplicit: false,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/php/chuckValue8.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/php/chuckValue8.yml
new file mode 100644
index 0000000000..0068b74843
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/php/chuckValue8.yml
@@ -0,0 +1,39 @@
+languageId: php
+command:
+  version: 1
+  spokenForm: chuck value
+  action: remove
+  targets:
+    - type: primitive
+      modifier:
+        { type: containingScope, scopeType: value, includeSiblings: false }
+initialState:
+  documentContents: |-
+    <?php
+
+    ['num' => 1];
+  selections:
+    - anchor: { line: 2, character: 3 }
+      active: { line: 2, character: 3 }
+  marks: {}
+finalState:
+  documentContents: |-
+    <?php
+
+    ['num'];
+  selections:
+    - anchor: { line: 2, character: 3 }
+      active: { line: 2, character: 3 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: outside,
+      modifier:
+        { type: containingScope, scopeType: value, includeSiblings: false },
+      isImplicit: false,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/php/chuckValue9.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/php/chuckValue9.yml
new file mode 100644
index 0000000000..149345d137
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/php/chuckValue9.yml
@@ -0,0 +1,39 @@
+languageId: php
+command:
+  version: 1
+  spokenForm: chuck value
+  action: remove
+  targets:
+    - type: primitive
+      modifier:
+        { type: containingScope, scopeType: value, includeSiblings: false }
+initialState:
+  documentContents: |-
+    <?php
+
+    $value = 'Hello world';
+  selections:
+    - anchor: { line: 2, character: 15 }
+      active: { line: 2, character: 15 }
+  marks: {}
+finalState:
+  documentContents: |-
+    <?php
+
+    $value;
+  selections:
+    - anchor: { line: 2, character: 6 }
+      active: { line: 2, character: 6 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: outside,
+      modifier:
+        { type: containingScope, scopeType: value, includeSiblings: false },
+      isImplicit: false,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/php/elseWrapThis.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/php/elseWrapThis.yml
new file mode 100644
index 0000000000..5cc1d92593
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/php/elseWrapThis.yml
@@ -0,0 +1,43 @@
+languageId: php
+command:
+  version: 1
+  spokenForm: else wrap this
+  action: wrapWithSnippet
+  targets:
+    - type: primitive
+      mark: { type: cursor }
+  extraArgs: [ifElseStatement.alternative]
+initialState:
+  documentContents: |-
+    <?php
+
+    $foo = "Hello world";
+  selections:
+    - anchor: { line: 2, character: 7 }
+      active: { line: 2, character: 7 }
+  marks: {}
+finalState:
+  documentContents: |-
+    <?php
+
+    if () {
+
+    } else {
+        $foo = "Hello world";
+    }
+  selections:
+    - anchor: { line: 2, character: 4 }
+      active: { line: 2, character: 4 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        { type: containingScope, scopeType: statement, includeSiblings: false },
+      isImplicit: false,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/php/ifElseWrapThis.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/php/ifElseWrapThis.yml
new file mode 100644
index 0000000000..53978722ee
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/php/ifElseWrapThis.yml
@@ -0,0 +1,43 @@
+languageId: php
+command:
+  version: 1
+  spokenForm: if else wrap this
+  action: wrapWithSnippet
+  targets:
+    - type: primitive
+      mark: { type: cursor }
+  extraArgs: [ifElseStatement.consequence]
+initialState:
+  documentContents: |-
+    <?php
+
+    $foo = "Hello world";
+  selections:
+    - anchor: { line: 2, character: 7 }
+      active: { line: 2, character: 7 }
+  marks: {}
+finalState:
+  documentContents: |-
+    <?php
+
+    if () {
+        $foo = "Hello world";
+    } else {
+
+    }
+  selections:
+    - anchor: { line: 2, character: 4 }
+      active: { line: 2, character: 4 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        { type: containingScope, scopeType: statement, includeSiblings: false },
+      isImplicit: false,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/php/ifWrapThis.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/php/ifWrapThis.yml
new file mode 100644
index 0000000000..da7259b4bc
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/php/ifWrapThis.yml
@@ -0,0 +1,41 @@
+languageId: php
+command:
+  version: 1
+  spokenForm: if wrap this
+  action: wrapWithSnippet
+  targets:
+    - type: primitive
+      mark: { type: cursor }
+  extraArgs: [ifStatement.consequence]
+initialState:
+  documentContents: |-
+    <?php
+
+    $foo = "Hello world";
+  selections:
+    - anchor: { line: 2, character: 7 }
+      active: { line: 2, character: 7 }
+  marks: {}
+finalState:
+  documentContents: |-
+    <?php
+
+    if () {
+        $foo = "Hello world";
+    }
+  selections:
+    - anchor: { line: 2, character: 4 }
+      active: { line: 2, character: 4 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        { type: containingScope, scopeType: statement, includeSiblings: false },
+      isImplicit: false,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/php/tryWrapThis.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/php/tryWrapThis.yml
new file mode 100644
index 0000000000..9a1d34c48f
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/php/tryWrapThis.yml
@@ -0,0 +1,43 @@
+languageId: php
+command:
+  version: 1
+  spokenForm: try wrap this
+  action: wrapWithSnippet
+  targets:
+    - type: primitive
+      mark: { type: cursor }
+  extraArgs: [tryCatchStatement.body]
+initialState:
+  documentContents: |-
+    <?php
+
+    $foo = "Hello world";
+  selections:
+    - anchor: { line: 2, character: 7 }
+      active: { line: 2, character: 7 }
+  marks: {}
+finalState:
+  documentContents: |-
+    <?php
+
+    try {
+        $foo = "Hello world";
+    } catch () {
+
+    }
+  selections:
+    - anchor: { line: 4, character: 9 }
+      active: { line: 4, character: 9 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        { type: containingScope, scopeType: statement, includeSiblings: false },
+      isImplicit: false,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/php/tryWrapThis2.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/php/tryWrapThis2.yml
new file mode 100644
index 0000000000..4abdafd999
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/php/tryWrapThis2.yml
@@ -0,0 +1,59 @@
+languageId: php
+command:
+  version: 1
+  spokenForm: try wrap this
+  action: wrapWithSnippet
+  targets:
+    - type: primitive
+      mark: { type: cursor }
+  extraArgs: [tryCatchStatement.body]
+initialState:
+  documentContents: |-
+    <?php
+
+    if (true) {
+        $foo = "Hello world";
+    }
+
+    $bar = 42;
+  selections:
+    - anchor: { line: 2, character: 0 }
+      active: { line: 2, character: 0 }
+    - anchor: { line: 6, character: 0 }
+      active: { line: 6, character: 0 }
+  marks: {}
+finalState:
+  documentContents: |-
+    <?php
+
+    try {
+        if (true) {
+            $foo = "Hello world";
+        }
+    } catch () {
+
+    }
+
+    try {
+        $bar = 42;
+    } catch () {
+
+    }
+  selections:
+    - anchor: { line: 6, character: 9 }
+      active: { line: 6, character: 9 }
+    - anchor: { line: 12, character: 9 }
+      active: { line: 12, character: 9 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        { type: containingScope, scopeType: statement, includeSiblings: false },
+      isImplicit: false,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/python/changeCallee.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/python/changeCallee.yml
new file mode 100644
index 0000000000..4bc593fec4
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/python/changeCallee.yml
@@ -0,0 +1,41 @@
+languageId: python
+command:
+  version: 1
+  spokenForm: change callee
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier:
+        {
+          type: containingScope,
+          scopeType: functionCallee,
+          includeSiblings: false,
+        }
+initialState:
+  documentContents: test()()
+  selections:
+    - anchor: { line: 0, character: 7 }
+      active: { line: 0, character: 7 }
+  marks: {}
+finalState:
+  documentContents: ()
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        {
+          type: containingScope,
+          scopeType: functionCallee,
+          includeSiblings: false,
+        },
+      isImplicit: false,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/python/changeCallee3.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/python/changeCallee3.yml
new file mode 100644
index 0000000000..f6b948580e
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/python/changeCallee3.yml
@@ -0,0 +1,41 @@
+languageId: python
+command:
+  version: 1
+  spokenForm: change callee
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier:
+        {
+          type: containingScope,
+          scopeType: functionCallee,
+          includeSiblings: false,
+        }
+initialState:
+  documentContents: "eval(action)[0]()\r\n"
+  selections:
+    - anchor: { line: 0, character: 16 }
+      active: { line: 0, character: 16 }
+  marks: {}
+finalState:
+  documentContents: "()\r\n"
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        {
+          type: containingScope,
+          scopeType: functionCallee,
+          includeSiblings: false,
+        },
+      isImplicit: false,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/python/changeCallee4.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/python/changeCallee4.yml
new file mode 100644
index 0000000000..cc36b5f5b3
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/python/changeCallee4.yml
@@ -0,0 +1,41 @@
+languageId: python
+command:
+  version: 1
+  spokenForm: change callee
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier:
+        {
+          type: containingScope,
+          scopeType: functionCallee,
+          includeSiblings: false,
+        }
+initialState:
+  documentContents: object.method()
+  selections:
+    - anchor: { line: 0, character: 14 }
+      active: { line: 0, character: 14 }
+  marks: {}
+finalState:
+  documentContents: ()
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        {
+          type: containingScope,
+          scopeType: functionCallee,
+          includeSiblings: false,
+        },
+      isImplicit: false,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/python/changeCalleeParen.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/python/changeCalleeParen.yml
new file mode 100644
index 0000000000..8e98e733c4
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/python/changeCalleeParen.yml
@@ -0,0 +1,45 @@
+languageId: python
+command:
+  version: 1
+  spokenForm: change callee paren
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier:
+        {
+          type: containingScope,
+          scopeType: functionCallee,
+          includeSiblings: false,
+        }
+      mark: { type: decoratedSymbol, symbolColor: default, character: ( }
+initialState:
+  documentContents: test()
+  selections:
+    - anchor: { line: 0, character: 6 }
+      active: { line: 0, character: 6 }
+  marks:
+    default.(:
+      start: { line: 0, character: 4 }
+      end: { line: 0, character: 5 }
+finalState:
+  documentContents: ()
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: decoratedSymbol, symbolColor: default, character: ( },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        {
+          type: containingScope,
+          scopeType: functionCallee,
+          includeSiblings: false,
+        },
+      isImplicit: false,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/python/chuckArgDrum.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/python/chuckArgDrum.yml
new file mode 100644
index 0000000000..1eebb3b28d
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/python/chuckArgDrum.yml
@@ -0,0 +1,45 @@
+languageId: python
+command:
+  version: 1
+  spokenForm: chuck arg drum
+  action: remove
+  targets:
+    - type: primitive
+      modifier:
+        {
+          type: containingScope,
+          scopeType: argumentOrParameter,
+          includeSiblings: false,
+        }
+      mark: { type: decoratedSymbol, symbolColor: default, character: d }
+initialState:
+  documentContents: '" ".join((word for word in word_list), (word for word in word_list))'
+  selections:
+    - anchor: { line: 0, character: 39 }
+      active: { line: 0, character: 67 }
+  marks:
+    default.d:
+      start: { line: 0, character: 19 }
+      end: { line: 0, character: 23 }
+finalState:
+  documentContents: '" ".join((word for word in word_list))'
+  selections:
+    - anchor: { line: 0, character: 9 }
+      active: { line: 0, character: 37 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: decoratedSymbol, symbolColor: default, character: d },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: outside,
+      modifier:
+        {
+          type: containingScope,
+          scopeType: argumentOrParameter,
+          includeSiblings: false,
+        },
+      isImplicit: false,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/python/chuckArgFine.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/python/chuckArgFine.yml
new file mode 100644
index 0000000000..1878598d84
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/python/chuckArgFine.yml
@@ -0,0 +1,45 @@
+languageId: python
+command:
+  version: 1
+  spokenForm: chuck arg fine
+  action: remove
+  targets:
+    - type: primitive
+      modifier:
+        {
+          type: containingScope,
+          scopeType: argumentOrParameter,
+          includeSiblings: false,
+        }
+      mark: { type: decoratedSymbol, symbolColor: default, character: f }
+initialState:
+  documentContents: '" ".join((word for word in word_list), "words")'
+  selections:
+    - anchor: { line: 0, character: 47 }
+      active: { line: 0, character: 47 }
+  marks:
+    default.f:
+      start: { line: 0, character: 15 }
+      end: { line: 0, character: 18 }
+finalState:
+  documentContents: '" ".join("words")'
+  selections:
+    - anchor: { line: 0, character: 17 }
+      active: { line: 0, character: 17 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: decoratedSymbol, symbolColor: default, character: f },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: outside,
+      modifier:
+        {
+          type: containingScope,
+          scopeType: argumentOrParameter,
+          includeSiblings: false,
+        },
+      isImplicit: false,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/python/chuckArgWhale.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/python/chuckArgWhale.yml
new file mode 100644
index 0000000000..51b0cf5b8b
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/python/chuckArgWhale.yml
@@ -0,0 +1,45 @@
+languageId: python
+command:
+  version: 1
+  spokenForm: chuck arg whale
+  action: remove
+  targets:
+    - type: primitive
+      modifier:
+        {
+          type: containingScope,
+          scopeType: argumentOrParameter,
+          includeSiblings: false,
+        }
+      mark: { type: decoratedSymbol, symbolColor: default, character: w }
+initialState:
+  documentContents: '" ".join(word for word in word_list)'
+  selections:
+    - anchor: { line: 0, character: 36 }
+      active: { line: 0, character: 36 }
+  marks:
+    default.w:
+      start: { line: 0, character: 18 }
+      end: { line: 0, character: 22 }
+finalState:
+  documentContents: '" ".join()'
+  selections:
+    - anchor: { line: 0, character: 10 }
+      active: { line: 0, character: 10 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: decoratedSymbol, symbolColor: default, character: w },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: outside,
+      modifier:
+        {
+          type: containingScope,
+          scopeType: argumentOrParameter,
+          includeSiblings: false,
+        },
+      isImplicit: false,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/python/chuckEveryArgAir.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/python/chuckEveryArgAir.yml
new file mode 100644
index 0000000000..6b106d3b04
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/python/chuckEveryArgAir.yml
@@ -0,0 +1,45 @@
+languageId: python
+command:
+  version: 1
+  spokenForm: chuck every arg air
+  action: remove
+  targets:
+    - type: primitive
+      modifier:
+        {
+          type: containingScope,
+          scopeType: argumentOrParameter,
+          includeSiblings: true,
+        }
+      mark: { type: decoratedSymbol, symbolColor: default, character: a }
+initialState:
+  documentContents: '" ".join((word for word in word_list), (name for name in name_list))'
+  selections:
+    - anchor: { line: 0, character: 68 }
+      active: { line: 0, character: 68 }
+  marks:
+    default.a:
+      start: { line: 0, character: 40 }
+      end: { line: 0, character: 44 }
+finalState:
+  documentContents: '" ".join()'
+  selections:
+    - anchor: { line: 0, character: 10 }
+      active: { line: 0, character: 10 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: decoratedSymbol, symbolColor: default, character: a },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: outside,
+      modifier:
+        {
+          type: containingScope,
+          scopeType: argumentOrParameter,
+          includeSiblings: true,
+        },
+      isImplicit: false,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/python/chuckEveryArgRed.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/python/chuckEveryArgRed.yml
new file mode 100644
index 0000000000..75db6c48b3
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/python/chuckEveryArgRed.yml
@@ -0,0 +1,45 @@
+languageId: python
+command:
+  version: 1
+  spokenForm: chuck every arg red
+  action: remove
+  targets:
+    - type: primitive
+      modifier:
+        {
+          type: containingScope,
+          scopeType: argumentOrParameter,
+          includeSiblings: true,
+        }
+      mark: { type: decoratedSymbol, symbolColor: default, character: r }
+initialState:
+  documentContents: '" ".join(word for word in word_list)'
+  selections:
+    - anchor: { line: 0, character: 36 }
+      active: { line: 0, character: 36 }
+  marks:
+    default.r:
+      start: { line: 0, character: 9 }
+      end: { line: 0, character: 13 }
+finalState:
+  documentContents: '" ".join()'
+  selections:
+    - anchor: { line: 0, character: 10 }
+      active: { line: 0, character: 10 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: decoratedSymbol, symbolColor: default, character: r },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: outside,
+      modifier:
+        {
+          type: containingScope,
+          scopeType: argumentOrParameter,
+          includeSiblings: true,
+        },
+      isImplicit: false,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/python/chuckEveryArgSit.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/python/chuckEveryArgSit.yml
new file mode 100644
index 0000000000..4a57178e4d
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/python/chuckEveryArgSit.yml
@@ -0,0 +1,45 @@
+languageId: python
+command:
+  version: 1
+  spokenForm: chuck every arg sit
+  action: remove
+  targets:
+    - type: primitive
+      modifier:
+        {
+          type: containingScope,
+          scopeType: argumentOrParameter,
+          includeSiblings: true,
+        }
+      mark: { type: decoratedSymbol, symbolColor: default, character: i }
+initialState:
+  documentContents: '" ".join((word for word in word_list), another_argument)'
+  selections:
+    - anchor: { line: 0, character: 56 }
+      active: { line: 0, character: 56 }
+  marks:
+    default.i:
+      start: { line: 0, character: 24 }
+      end: { line: 0, character: 26 }
+finalState:
+  documentContents: '" ".join()'
+  selections:
+    - anchor: { line: 0, character: 10 }
+      active: { line: 0, character: 10 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: decoratedSymbol, symbolColor: default, character: i },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: outside,
+      modifier:
+        {
+          type: containingScope,
+          scopeType: argumentOrParameter,
+          includeSiblings: true,
+        },
+      isImplicit: false,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/python/chuckKey.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/python/chuckKey.yml
new file mode 100644
index 0000000000..dea1b03728
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/python/chuckKey.yml
@@ -0,0 +1,48 @@
+languageId: python
+command:
+  version: 1
+  spokenForm: chuck key
+  action: remove
+  targets:
+    - type: primitive
+      modifier:
+        {
+          type: containingScope,
+          scopeType: collectionKey,
+          includeSiblings: false,
+        }
+initialState:
+  documentContents: |-
+    {
+        "foo": "bar",
+        "baz": "bongo",
+    }
+  selections:
+    - anchor: { line: 1, character: 5 }
+      active: { line: 1, character: 5 }
+  marks: {}
+finalState:
+  documentContents: |-
+    {
+        "bar",
+        "baz": "bongo",
+    }
+  selections:
+    - anchor: { line: 1, character: 4 }
+      active: { line: 1, character: 4 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: outside,
+      modifier:
+        {
+          type: containingScope,
+          scopeType: collectionKey,
+          includeSiblings: false,
+        },
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/python/chuckKey2.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/python/chuckKey2.yml
new file mode 100644
index 0000000000..42bffec9c3
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/python/chuckKey2.yml
@@ -0,0 +1,48 @@
+languageId: python
+command:
+  version: 1
+  spokenForm: chuck key
+  action: remove
+  targets:
+    - type: primitive
+      modifier:
+        {
+          type: containingScope,
+          scopeType: collectionKey,
+          includeSiblings: false,
+        }
+initialState:
+  documentContents: |-
+    {
+        "foo": "bar",
+        "baz": "bongo",
+    }
+  selections:
+    - anchor: { line: 1, character: 12 }
+      active: { line: 1, character: 12 }
+  marks: {}
+finalState:
+  documentContents: |-
+    {
+        "bar",
+        "baz": "bongo",
+    }
+  selections:
+    - anchor: { line: 1, character: 5 }
+      active: { line: 1, character: 5 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: outside,
+      modifier:
+        {
+          type: containingScope,
+          scopeType: collectionKey,
+          includeSiblings: false,
+        },
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/python/chuckType.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/python/chuckType.yml
new file mode 100644
index 0000000000..5c250cb664
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/python/chuckType.yml
@@ -0,0 +1,32 @@
+languageId: python
+command:
+  version: 1
+  spokenForm: chuck type
+  action: remove
+  targets:
+    - type: primitive
+      modifier:
+        { type: containingScope, scopeType: type, includeSiblings: false }
+initialState:
+  documentContents: "foo: str = 'hello'"
+  selections:
+    - anchor: { line: 0, character: 1 }
+      active: { line: 0, character: 1 }
+  marks: {}
+finalState:
+  documentContents: foo = 'hello'
+  selections:
+    - anchor: { line: 0, character: 1 }
+      active: { line: 0, character: 1 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: outside,
+      modifier:
+        { type: containingScope, scopeType: type, includeSiblings: false },
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/python/chuckTypeSoon.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/python/chuckTypeSoon.yml
new file mode 100644
index 0000000000..049019b0ea
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/python/chuckTypeSoon.yml
@@ -0,0 +1,40 @@
+languageId: python
+command:
+  version: 1
+  spokenForm: chuck type soon
+  action: remove
+  targets:
+    - type: primitive
+      modifier:
+        { type: containingScope, scopeType: type, includeSiblings: false }
+      mark: { type: decoratedSymbol, symbolColor: default, character: s }
+initialState:
+  documentContents: |-
+    def my_funk(value: str) -> str:
+        pass
+  selections:
+    - anchor: { line: 1, character: 8 }
+      active: { line: 1, character: 8 }
+  marks:
+    default.s:
+      start: { line: 0, character: 19 }
+      end: { line: 0, character: 22 }
+finalState:
+  documentContents: |-
+    def my_funk(value) -> str:
+        pass
+  selections:
+    - anchor: { line: 1, character: 8 }
+      active: { line: 1, character: 8 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: decoratedSymbol, symbolColor: default, character: s },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: outside,
+      modifier:
+        { type: containingScope, scopeType: type, includeSiblings: false },
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/python/chuckTypeTrap.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/python/chuckTypeTrap.yml
new file mode 100644
index 0000000000..695f4e6ae2
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/python/chuckTypeTrap.yml
@@ -0,0 +1,40 @@
+languageId: python
+command:
+  version: 1
+  spokenForm: chuck type trap
+  action: remove
+  targets:
+    - type: primitive
+      modifier:
+        { type: containingScope, scopeType: type, includeSiblings: false }
+      mark: { type: decoratedSymbol, symbolColor: default, character: t }
+initialState:
+  documentContents: |-
+    def my_funk(value: str) -> str:
+        pass
+  selections:
+    - anchor: { line: 1, character: 8 }
+      active: { line: 1, character: 8 }
+  marks:
+    default.t:
+      start: { line: 0, character: 27 }
+      end: { line: 0, character: 30 }
+finalState:
+  documentContents: |-
+    def my_funk(value: str):
+        pass
+  selections:
+    - anchor: { line: 1, character: 8 }
+      active: { line: 1, character: 8 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: decoratedSymbol, symbolColor: default, character: t },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: outside,
+      modifier:
+        { type: containingScope, scopeType: type, includeSiblings: false },
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/python/chuckValue.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/python/chuckValue.yml
new file mode 100644
index 0000000000..47edc16a99
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/python/chuckValue.yml
@@ -0,0 +1,32 @@
+languageId: python
+command:
+  version: 1
+  spokenForm: chuck value
+  action: remove
+  targets:
+    - type: primitive
+      modifier:
+        { type: containingScope, scopeType: value, includeSiblings: false }
+initialState:
+  documentContents: 'foo: str = "hello"'
+  selections:
+    - anchor: { line: 0, character: 2 }
+      active: { line: 0, character: 2 }
+  marks: {}
+finalState:
+  documentContents: "foo: str"
+  selections:
+    - anchor: { line: 0, character: 2 }
+      active: { line: 0, character: 2 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: outside,
+      modifier:
+        { type: containingScope, scopeType: value, includeSiblings: false },
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/python/chuckValue2.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/python/chuckValue2.yml
new file mode 100644
index 0000000000..32a94989df
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/python/chuckValue2.yml
@@ -0,0 +1,36 @@
+languageId: python
+command:
+  version: 1
+  spokenForm: chuck value
+  action: remove
+  targets:
+    - type: primitive
+      modifier:
+        { type: containingScope, scopeType: value, includeSiblings: false }
+initialState:
+  documentContents: |-
+    def foo():
+        return "hello"
+  selections:
+    - anchor: { line: 1, character: 14 }
+      active: { line: 1, character: 14 }
+  marks: {}
+finalState:
+  documentContents: |-
+    def foo():
+        return
+  selections:
+    - anchor: { line: 1, character: 10 }
+      active: { line: 1, character: 10 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: outside,
+      modifier:
+        { type: containingScope, scopeType: value, includeSiblings: false },
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/python/chuckValue3.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/python/chuckValue3.yml
new file mode 100644
index 0000000000..6cb39327a7
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/python/chuckValue3.yml
@@ -0,0 +1,107 @@
+languageId: python
+command:
+  version: 1
+  spokenForm: chuck value
+  action: remove
+  targets:
+    - type: primitive
+      modifier:
+        { type: containingScope, scopeType: value, includeSiblings: false }
+initialState:
+  documentContents: |
+    a = 1;
+    a += 1;
+    a -= 1;
+    a *= 1;
+    a /= 1;
+    a %= 1;
+    a //= 1;
+    a **= 1;
+    a &= 1;
+    a |= 1;
+    a ^= 1;
+    a <<= 1;
+    a >>= 1;
+  selections:
+    - anchor: { line: 12, character: 6 }
+      active: { line: 12, character: 7 }
+    - anchor: { line: 1, character: 5 }
+      active: { line: 1, character: 6 }
+    - anchor: { line: 2, character: 5 }
+      active: { line: 2, character: 6 }
+    - anchor: { line: 3, character: 5 }
+      active: { line: 3, character: 6 }
+    - anchor: { line: 4, character: 5 }
+      active: { line: 4, character: 6 }
+    - anchor: { line: 5, character: 5 }
+      active: { line: 5, character: 6 }
+    - anchor: { line: 6, character: 6 }
+      active: { line: 6, character: 7 }
+    - anchor: { line: 7, character: 6 }
+      active: { line: 7, character: 7 }
+    - anchor: { line: 8, character: 5 }
+      active: { line: 8, character: 6 }
+    - anchor: { line: 9, character: 5 }
+      active: { line: 9, character: 6 }
+    - anchor: { line: 10, character: 5 }
+      active: { line: 10, character: 6 }
+    - anchor: { line: 11, character: 6 }
+      active: { line: 11, character: 7 }
+    - anchor: { line: 0, character: 4 }
+      active: { line: 0, character: 5 }
+  marks: {}
+finalState:
+  documentContents: |
+    a;
+    a;
+    a;
+    a;
+    a;
+    a;
+    a;
+    a;
+    a;
+    a;
+    a;
+    a;
+    a;
+  selections:
+    - anchor: { line: 12, character: 1 }
+      active: { line: 12, character: 1 }
+    - anchor: { line: 1, character: 1 }
+      active: { line: 1, character: 1 }
+    - anchor: { line: 2, character: 1 }
+      active: { line: 2, character: 1 }
+    - anchor: { line: 3, character: 1 }
+      active: { line: 3, character: 1 }
+    - anchor: { line: 4, character: 1 }
+      active: { line: 4, character: 1 }
+    - anchor: { line: 5, character: 1 }
+      active: { line: 5, character: 1 }
+    - anchor: { line: 6, character: 1 }
+      active: { line: 6, character: 1 }
+    - anchor: { line: 7, character: 1 }
+      active: { line: 7, character: 1 }
+    - anchor: { line: 8, character: 1 }
+      active: { line: 8, character: 1 }
+    - anchor: { line: 9, character: 1 }
+      active: { line: 9, character: 1 }
+    - anchor: { line: 10, character: 1 }
+      active: { line: 10, character: 1 }
+    - anchor: { line: 11, character: 1 }
+      active: { line: 11, character: 1 }
+    - anchor: { line: 0, character: 1 }
+      active: { line: 0, character: 1 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: outside,
+      modifier:
+        { type: containingScope, scopeType: value, includeSiblings: false },
+      isImplicit: false,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/python/clearBranch.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/python/clearBranch.yml
new file mode 100644
index 0000000000..f84acd39e8
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/python/clearBranch.yml
@@ -0,0 +1,39 @@
+languageId: python
+command:
+  spokenForm: clear branch
+  version: 3
+  targets:
+    - type: primitive
+      modifiers:
+        - type: containingScope
+          scopeType: { type: branch }
+  usePrePhraseSnapshot: true
+  action: { name: clearAndSetSelection }
+initialState:
+  documentContents: |
+    match 0:
+        case [0]:
+            pass
+        case [1]:
+            pass
+  selections:
+    - anchor: { line: 2, character: 10 }
+      active: { line: 2, character: 10 }
+  marks: {}
+finalState:
+  documentContents: |
+    match 0:
+
+        case [1]:
+            pass
+  selections:
+    - anchor: { line: 1, character: 4 }
+      active: { line: 1, character: 4 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      modifiers: [{ type: containingScope, scopeType: { type: branch } }],
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/python/clearBranch10.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/python/clearBranch10.yml
new file mode 100644
index 0000000000..ce1178d0ff
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/python/clearBranch10.yml
@@ -0,0 +1,40 @@
+languageId: python
+command:
+  version: 3
+  spokenForm: clear branch
+  action: { name: clearAndSetSelection }
+  targets:
+    - type: primitive
+      modifiers:
+        - type: containingScope
+          scopeType: { type: branch }
+  usePrePhraseSnapshot: false
+initialState:
+  documentContents: |-
+    try:
+      pass
+    except:
+      pass
+    finally:
+      pass
+  selections:
+    - anchor: { line: 5, character: 2 }
+      active: { line: 5, character: 2 }
+  marks: {}
+finalState:
+  documentContents: |
+    try:
+      pass
+    except:
+      pass
+  selections:
+    - anchor: { line: 4, character: 0 }
+      active: { line: 4, character: 0 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      modifiers: [{ type: containingScope, scopeType: { type: branch } }],
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/python/clearBranch11.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/python/clearBranch11.yml
new file mode 100644
index 0000000000..86fe391cf9
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/python/clearBranch11.yml
@@ -0,0 +1,30 @@
+languageId: python
+command:
+  version: 3
+  spokenForm: clear branch
+  action: { name: clearAndSetSelection }
+  targets:
+    - type: primitive
+      modifiers:
+        - type: containingScope
+          scopeType: { type: branch }
+  usePrePhraseSnapshot: true
+initialState:
+  documentContents: aaa = bbb if ccc else ddd
+  selections:
+    - anchor: { line: 0, character: 6 }
+      active: { line: 0, character: 6 }
+  marks: {}
+finalState:
+  documentContents: aaa =  if ccc else ddd
+  selections:
+    - anchor: { line: 0, character: 6 }
+      active: { line: 0, character: 6 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      modifiers: [{ type: containingScope, scopeType: { type: branch } }],
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/python/clearBranch12.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/python/clearBranch12.yml
new file mode 100644
index 0000000000..210ca7159f
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/python/clearBranch12.yml
@@ -0,0 +1,30 @@
+languageId: python
+command:
+  version: 3
+  spokenForm: clear branch
+  action: { name: clearAndSetSelection }
+  targets:
+    - type: primitive
+      modifiers:
+        - type: containingScope
+          scopeType: { type: branch }
+  usePrePhraseSnapshot: false
+initialState:
+  documentContents: aaa = bbb if ccc else ddd
+  selections:
+    - anchor: { line: 0, character: 22 }
+      active: { line: 0, character: 22 }
+  marks: {}
+finalState:
+  documentContents: "aaa = bbb if ccc else "
+  selections:
+    - anchor: { line: 0, character: 22 }
+      active: { line: 0, character: 22 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      modifiers: [{ type: containingScope, scopeType: { type: branch } }],
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/python/clearBranch13.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/python/clearBranch13.yml
new file mode 100644
index 0000000000..a07daadf85
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/python/clearBranch13.yml
@@ -0,0 +1,26 @@
+languageId: python
+command:
+  version: 3
+  spokenForm: clear branch
+  action: { name: clearAndSetSelection }
+  targets:
+    - type: primitive
+      modifiers:
+        - type: containingScope
+          scopeType: { type: branch }
+  usePrePhraseSnapshot: true
+initialState:
+  documentContents: aaa = bbb if ccc else ddd
+  selections:
+    - anchor: { line: 0, character: 13 }
+      active: { line: 0, character: 13 }
+  marks: {}
+thrownError: { name: NoContainingScopeError }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      modifiers: [{ type: containingScope, scopeType: { type: branch } }],
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/python/clearBranch14.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/python/clearBranch14.yml
new file mode 100644
index 0000000000..38cb72e967
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/python/clearBranch14.yml
@@ -0,0 +1,41 @@
+languageId: python
+command:
+  version: 3
+  spokenForm: clear branch
+  action: { name: clearAndSetSelection }
+  targets:
+    - type: primitive
+      modifiers:
+        - type: containingScope
+          scopeType: { type: branch }
+  usePrePhraseSnapshot: true
+initialState:
+  documentContents: |-
+    try:
+      pass
+    except* ValueError as eg:
+      pass
+    else:
+      pass
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+  marks: {}
+finalState:
+  documentContents: |-
+
+    except* ValueError as eg:
+      pass
+    else:
+      pass
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      modifiers: [{ type: containingScope, scopeType: { type: branch } }],
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/python/clearBranch15.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/python/clearBranch15.yml
new file mode 100644
index 0000000000..0fb43dcfe0
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/python/clearBranch15.yml
@@ -0,0 +1,41 @@
+languageId: python
+command:
+  version: 3
+  spokenForm: clear branch
+  action: { name: clearAndSetSelection }
+  targets:
+    - type: primitive
+      modifiers:
+        - type: containingScope
+          scopeType: { type: branch }
+  usePrePhraseSnapshot: false
+initialState:
+  documentContents: |-
+    try:
+      pass
+    except* ValueError as eg:
+      pass
+    else:
+      pass
+  selections:
+    - anchor: { line: 2, character: 0 }
+      active: { line: 2, character: 0 }
+  marks: {}
+finalState:
+  documentContents: |-
+    try:
+      pass
+
+    else:
+      pass
+  selections:
+    - anchor: { line: 2, character: 0 }
+      active: { line: 2, character: 0 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      modifiers: [{ type: containingScope, scopeType: { type: branch } }],
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/python/clearBranch16.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/python/clearBranch16.yml
new file mode 100644
index 0000000000..c9991bacef
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/python/clearBranch16.yml
@@ -0,0 +1,40 @@
+languageId: python
+command:
+  version: 3
+  spokenForm: clear branch
+  action: { name: clearAndSetSelection }
+  targets:
+    - type: primitive
+      modifiers:
+        - type: containingScope
+          scopeType: { type: branch }
+  usePrePhraseSnapshot: false
+initialState:
+  documentContents: |-
+    try:
+      pass
+    except* ValueError as eg:
+      pass
+    else:
+      pass
+  selections:
+    - anchor: { line: 4, character: 0 }
+      active: { line: 4, character: 0 }
+  marks: {}
+finalState:
+  documentContents: |
+    try:
+      pass
+    except* ValueError as eg:
+      pass
+  selections:
+    - anchor: { line: 4, character: 0 }
+      active: { line: 4, character: 0 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      modifiers: [{ type: containingScope, scopeType: { type: branch } }],
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/python/clearBranch17.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/python/clearBranch17.yml
new file mode 100644
index 0000000000..bdd24f520c
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/python/clearBranch17.yml
@@ -0,0 +1,36 @@
+languageId: python
+command:
+  version: 3
+  spokenForm: clear branch
+  action: { name: clearAndSetSelection }
+  targets:
+    - type: primitive
+      modifiers:
+        - type: containingScope
+          scopeType: { type: branch }
+  usePrePhraseSnapshot: true
+initialState:
+  documentContents: |-
+    while True:
+      pass
+    else:
+      pass
+  selections:
+    - anchor: { line: 3, character: 2 }
+      active: { line: 3, character: 2 }
+  marks: {}
+finalState:
+  documentContents: |
+    while True:
+      pass
+  selections:
+    - anchor: { line: 2, character: 0 }
+      active: { line: 2, character: 0 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      modifiers: [{ type: containingScope, scopeType: { type: branch } }],
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/python/clearBranch18.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/python/clearBranch18.yml
new file mode 100644
index 0000000000..fa85660edf
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/python/clearBranch18.yml
@@ -0,0 +1,37 @@
+languageId: python
+command:
+  version: 3
+  spokenForm: clear branch
+  action: { name: clearAndSetSelection }
+  targets:
+    - type: primitive
+      modifiers:
+        - type: containingScope
+          scopeType: { type: branch }
+  usePrePhraseSnapshot: false
+initialState:
+  documentContents: |-
+    while True:
+      pass
+    else:
+      pass
+  selections:
+    - anchor: { line: 1, character: 2 }
+      active: { line: 1, character: 2 }
+  marks: {}
+finalState:
+  documentContents: |-
+
+    else:
+      pass
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      modifiers: [{ type: containingScope, scopeType: { type: branch } }],
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/python/clearBranch19.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/python/clearBranch19.yml
new file mode 100644
index 0000000000..5fef5ab101
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/python/clearBranch19.yml
@@ -0,0 +1,36 @@
+languageId: python
+command:
+  version: 3
+  spokenForm: clear branch
+  action: { name: clearAndSetSelection }
+  targets:
+    - type: primitive
+      modifiers:
+        - type: containingScope
+          scopeType: { type: branch }
+  usePrePhraseSnapshot: false
+initialState:
+  documentContents: |-
+    for aaa in bbb:
+      pass
+    else:
+      pass
+  selections:
+    - anchor: { line: 3, character: 2 }
+      active: { line: 3, character: 2 }
+  marks: {}
+finalState:
+  documentContents: |
+    for aaa in bbb:
+      pass
+  selections:
+    - anchor: { line: 2, character: 0 }
+      active: { line: 2, character: 0 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      modifiers: [{ type: containingScope, scopeType: { type: branch } }],
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/python/clearBranch2.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/python/clearBranch2.yml
new file mode 100644
index 0000000000..ada3e09e90
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/python/clearBranch2.yml
@@ -0,0 +1,41 @@
+languageId: python
+command:
+  version: 3
+  spokenForm: clear branch
+  action: { name: clearAndSetSelection }
+  targets:
+    - type: primitive
+      modifiers:
+        - type: containingScope
+          scopeType: { type: branch }
+  usePrePhraseSnapshot: true
+initialState:
+  documentContents: |-
+    if True:
+        pass
+    elif False:
+        pass
+    else:
+        pass
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+  marks: {}
+finalState:
+  documentContents: |-
+
+    elif False:
+        pass
+    else:
+        pass
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      modifiers: [{ type: containingScope, scopeType: { type: branch } }],
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/python/clearBranch20.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/python/clearBranch20.yml
new file mode 100644
index 0000000000..f9a3aa24fa
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/python/clearBranch20.yml
@@ -0,0 +1,37 @@
+languageId: python
+command:
+  version: 3
+  spokenForm: clear branch
+  action: { name: clearAndSetSelection }
+  targets:
+    - type: primitive
+      modifiers:
+        - type: containingScope
+          scopeType: { type: branch }
+  usePrePhraseSnapshot: false
+initialState:
+  documentContents: |-
+    for aaa in bbb:
+      pass
+    else:
+      pass
+  selections:
+    - anchor: { line: 1, character: 2 }
+      active: { line: 1, character: 2 }
+  marks: {}
+finalState:
+  documentContents: |-
+
+    else:
+      pass
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      modifiers: [{ type: containingScope, scopeType: { type: branch } }],
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/python/clearBranch3.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/python/clearBranch3.yml
new file mode 100644
index 0000000000..9bfa5e7644
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/python/clearBranch3.yml
@@ -0,0 +1,41 @@
+languageId: python
+command:
+  version: 3
+  spokenForm: clear branch
+  action: { name: clearAndSetSelection }
+  targets:
+    - type: primitive
+      modifiers:
+        - type: containingScope
+          scopeType: { type: branch }
+  usePrePhraseSnapshot: false
+initialState:
+  documentContents: |-
+    if True:
+        pass
+    elif False:
+        pass
+    else:
+        pass
+  selections:
+    - anchor: { line: 1, character: 4 }
+      active: { line: 1, character: 4 }
+  marks: {}
+finalState:
+  documentContents: |-
+
+    elif False:
+        pass
+    else:
+        pass
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      modifiers: [{ type: containingScope, scopeType: { type: branch } }],
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/python/clearBranch4.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/python/clearBranch4.yml
new file mode 100644
index 0000000000..a4d69eaaaa
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/python/clearBranch4.yml
@@ -0,0 +1,41 @@
+languageId: python
+command:
+  version: 3
+  spokenForm: clear branch
+  action: { name: clearAndSetSelection }
+  targets:
+    - type: primitive
+      modifiers:
+        - type: containingScope
+          scopeType: { type: branch }
+  usePrePhraseSnapshot: false
+initialState:
+  documentContents: |-
+    if True:
+        pass
+    elif False:
+        pass
+    else:
+        pass
+  selections:
+    - anchor: { line: 2, character: 0 }
+      active: { line: 2, character: 0 }
+  marks: {}
+finalState:
+  documentContents: |-
+    if True:
+        pass
+
+    else:
+        pass
+  selections:
+    - anchor: { line: 2, character: 0 }
+      active: { line: 2, character: 0 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      modifiers: [{ type: containingScope, scopeType: { type: branch } }],
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/python/clearBranch5.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/python/clearBranch5.yml
new file mode 100644
index 0000000000..203c609c69
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/python/clearBranch5.yml
@@ -0,0 +1,41 @@
+languageId: python
+command:
+  version: 3
+  spokenForm: clear branch
+  action: { name: clearAndSetSelection }
+  targets:
+    - type: primitive
+      modifiers:
+        - type: containingScope
+          scopeType: { type: branch }
+  usePrePhraseSnapshot: false
+initialState:
+  documentContents: |-
+    if True:
+        pass
+    elif False:
+        pass
+    else:
+        pass
+  selections:
+    - anchor: { line: 3, character: 4 }
+      active: { line: 3, character: 4 }
+  marks: {}
+finalState:
+  documentContents: |-
+    if True:
+        pass
+
+    else:
+        pass
+  selections:
+    - anchor: { line: 2, character: 0 }
+      active: { line: 2, character: 0 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      modifiers: [{ type: containingScope, scopeType: { type: branch } }],
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/python/clearBranch6.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/python/clearBranch6.yml
new file mode 100644
index 0000000000..12a5950c80
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/python/clearBranch6.yml
@@ -0,0 +1,40 @@
+languageId: python
+command:
+  version: 3
+  spokenForm: clear branch
+  action: { name: clearAndSetSelection }
+  targets:
+    - type: primitive
+      modifiers:
+        - type: containingScope
+          scopeType: { type: branch }
+  usePrePhraseSnapshot: false
+initialState:
+  documentContents: |-
+    if True:
+        pass
+    elif False:
+        pass
+    else:
+        pass
+  selections:
+    - anchor: { line: 4, character: 0 }
+      active: { line: 4, character: 0 }
+  marks: {}
+finalState:
+  documentContents: |
+    if True:
+        pass
+    elif False:
+        pass
+  selections:
+    - anchor: { line: 4, character: 0 }
+      active: { line: 4, character: 0 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      modifiers: [{ type: containingScope, scopeType: { type: branch } }],
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/python/clearBranch7.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/python/clearBranch7.yml
new file mode 100644
index 0000000000..ca01657ac8
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/python/clearBranch7.yml
@@ -0,0 +1,40 @@
+languageId: python
+command:
+  version: 3
+  spokenForm: clear branch
+  action: { name: clearAndSetSelection }
+  targets:
+    - type: primitive
+      modifiers:
+        - type: containingScope
+          scopeType: { type: branch }
+  usePrePhraseSnapshot: false
+initialState:
+  documentContents: |-
+    if True:
+        pass
+    elif False:
+        pass
+    else:
+        pass
+  selections:
+    - anchor: { line: 5, character: 4 }
+      active: { line: 5, character: 4 }
+  marks: {}
+finalState:
+  documentContents: |
+    if True:
+        pass
+    elif False:
+        pass
+  selections:
+    - anchor: { line: 4, character: 0 }
+      active: { line: 4, character: 0 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      modifiers: [{ type: containingScope, scopeType: { type: branch } }],
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/python/clearBranch8.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/python/clearBranch8.yml
new file mode 100644
index 0000000000..5f86e64ba8
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/python/clearBranch8.yml
@@ -0,0 +1,41 @@
+languageId: python
+command:
+  version: 3
+  spokenForm: clear branch
+  action: { name: clearAndSetSelection }
+  targets:
+    - type: primitive
+      modifiers:
+        - type: containingScope
+          scopeType: { type: branch }
+  usePrePhraseSnapshot: true
+initialState:
+  documentContents: |-
+    try:
+      pass
+    except:
+      pass
+    finally:
+      pass
+  selections:
+    - anchor: { line: 1, character: 2 }
+      active: { line: 1, character: 2 }
+  marks: {}
+finalState:
+  documentContents: |-
+
+    except:
+      pass
+    finally:
+      pass
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      modifiers: [{ type: containingScope, scopeType: { type: branch } }],
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/python/clearBranch9.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/python/clearBranch9.yml
new file mode 100644
index 0000000000..6f806b12ae
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/python/clearBranch9.yml
@@ -0,0 +1,41 @@
+languageId: python
+command:
+  version: 3
+  spokenForm: clear branch
+  action: { name: clearAndSetSelection }
+  targets:
+    - type: primitive
+      modifiers:
+        - type: containingScope
+          scopeType: { type: branch }
+  usePrePhraseSnapshot: false
+initialState:
+  documentContents: |-
+    try:
+      pass
+    except:
+      pass
+    finally:
+      pass
+  selections:
+    - anchor: { line: 3, character: 2 }
+      active: { line: 3, character: 2 }
+  marks: {}
+finalState:
+  documentContents: |-
+    try:
+      pass
+
+    finally:
+      pass
+  selections:
+    - anchor: { line: 2, character: 0 }
+      active: { line: 2, character: 0 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      modifiers: [{ type: containingScope, scopeType: { type: branch } }],
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/python/clearCondition.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/python/clearCondition.yml
new file mode 100644
index 0000000000..dcf40eff99
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/python/clearCondition.yml
@@ -0,0 +1,30 @@
+languageId: python
+command:
+  spokenForm: clear condition
+  version: 3
+  targets:
+    - type: primitive
+      modifiers:
+        - type: containingScope
+          scopeType: { type: condition }
+  usePrePhraseSnapshot: true
+  action: { name: clearAndSetSelection }
+initialState:
+  documentContents: aaa if bbb else ccc
+  selections:
+    - anchor: { line: 0, character: 16 }
+      active: { line: 0, character: 16 }
+  marks: {}
+finalState:
+  documentContents: aaa if  else ccc
+  selections:
+    - anchor: { line: 0, character: 7 }
+      active: { line: 0, character: 7 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      modifiers: [{ type: containingScope, scopeType: { type: condition } }],
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/python/clearCondition2.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/python/clearCondition2.yml
new file mode 100644
index 0000000000..b60ae7b110
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/python/clearCondition2.yml
@@ -0,0 +1,30 @@
+languageId: python
+command:
+  spokenForm: clear condition
+  version: 3
+  targets:
+    - type: primitive
+      modifiers:
+        - type: containingScope
+          scopeType: { type: condition }
+  usePrePhraseSnapshot: true
+  action: { name: clearAndSetSelection }
+initialState:
+  documentContents: "[aaa for aaa in bbb if ccc]"
+  selections:
+    - anchor: { line: 0, character: 1 }
+      active: { line: 0, character: 1 }
+  marks: {}
+finalState:
+  documentContents: "[aaa for aaa in bbb if ]"
+  selections:
+    - anchor: { line: 0, character: 23 }
+      active: { line: 0, character: 23 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      modifiers: [{ type: containingScope, scopeType: { type: condition } }],
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/python/clearCondition3.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/python/clearCondition3.yml
new file mode 100644
index 0000000000..5d0d0872c5
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/python/clearCondition3.yml
@@ -0,0 +1,30 @@
+languageId: python
+command:
+  spokenForm: clear condition
+  version: 3
+  targets:
+    - type: primitive
+      modifiers:
+        - type: containingScope
+          scopeType: { type: condition }
+  usePrePhraseSnapshot: true
+  action: { name: clearAndSetSelection }
+initialState:
+  documentContents: (aaa for aaa in bbb if ccc)
+  selections:
+    - anchor: { line: 0, character: 1 }
+      active: { line: 0, character: 1 }
+  marks: {}
+finalState:
+  documentContents: (aaa for aaa in bbb if )
+  selections:
+    - anchor: { line: 0, character: 23 }
+      active: { line: 0, character: 23 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      modifiers: [{ type: containingScope, scopeType: { type: condition } }],
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/python/clearCondition4.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/python/clearCondition4.yml
new file mode 100644
index 0000000000..66b11f5eca
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/python/clearCondition4.yml
@@ -0,0 +1,30 @@
+languageId: python
+command:
+  spokenForm: clear condition
+  version: 3
+  targets:
+    - type: primitive
+      modifiers:
+        - type: containingScope
+          scopeType: { type: condition }
+  usePrePhraseSnapshot: false
+  action: { name: clearAndSetSelection }
+initialState:
+  documentContents: "{aaa for aaa in bbb if ccc}"
+  selections:
+    - anchor: { line: 0, character: 1 }
+      active: { line: 0, character: 1 }
+  marks: {}
+finalState:
+  documentContents: "{aaa for aaa in bbb if }"
+  selections:
+    - anchor: { line: 0, character: 23 }
+      active: { line: 0, character: 23 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      modifiers: [{ type: containingScope, scopeType: { type: condition } }],
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/python/clearCondition5.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/python/clearCondition5.yml
new file mode 100644
index 0000000000..767f154243
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/python/clearCondition5.yml
@@ -0,0 +1,30 @@
+languageId: python
+command:
+  spokenForm: clear condition
+  version: 3
+  targets:
+    - type: primitive
+      modifiers:
+        - type: containingScope
+          scopeType: { type: condition }
+  usePrePhraseSnapshot: false
+  action: { name: clearAndSetSelection }
+initialState:
+  documentContents: "{aaa: aaa for aaa in bbb if ccc}"
+  selections:
+    - anchor: { line: 0, character: 1 }
+      active: { line: 0, character: 1 }
+  marks: {}
+finalState:
+  documentContents: "{aaa: aaa for aaa in bbb if }"
+  selections:
+    - anchor: { line: 0, character: 28 }
+      active: { line: 0, character: 28 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      modifiers: [{ type: containingScope, scopeType: { type: condition } }],
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/python/clearCondition6.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/python/clearCondition6.yml
new file mode 100644
index 0000000000..989f879c22
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/python/clearCondition6.yml
@@ -0,0 +1,36 @@
+languageId: python
+command:
+  spokenForm: clear condition
+  version: 3
+  targets:
+    - type: primitive
+      modifiers:
+        - type: containingScope
+          scopeType: { type: condition }
+  usePrePhraseSnapshot: true
+  action: { name: clearAndSetSelection }
+initialState:
+  documentContents: |-
+    match 0:
+        case a if a > 1:
+            pass
+  selections:
+    - anchor: { line: 2, character: 8 }
+      active: { line: 2, character: 8 }
+  marks: {}
+finalState:
+  documentContents: |-
+    match 0:
+        case a if :
+            pass
+  selections:
+    - anchor: { line: 1, character: 14 }
+      active: { line: 1, character: 14 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      modifiers: [{ type: containingScope, scopeType: { type: condition } }],
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/python/clearEveryItem.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/python/clearEveryItem.yml
new file mode 100644
index 0000000000..5dfb9c52a2
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/python/clearEveryItem.yml
@@ -0,0 +1,34 @@
+languageId: python
+command:
+  spokenForm: clear every item
+  version: 2
+  targets:
+    - type: primitive
+      modifiers:
+        - type: everyScope
+          scopeType: { type: collectionItem }
+  usePrePhraseSnapshot: true
+  action: { name: clearAndSetSelection }
+initialState:
+  documentContents: from talon import Context, Module, actions
+  selections:
+    - anchor: { line: 0, character: 25 }
+      active: { line: 0, character: 25 }
+  marks: {}
+finalState:
+  documentContents: "from talon import , , "
+  selections:
+    - anchor: { line: 0, character: 18 }
+      active: { line: 0, character: 18 }
+    - anchor: { line: 0, character: 20 }
+      active: { line: 0, character: 20 }
+    - anchor: { line: 0, character: 22 }
+      active: { line: 0, character: 22 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      modifiers: [{ type: everyScope, scopeType: { type: collectionItem } }],
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/python/clearEveryItem2.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/python/clearEveryItem2.yml
new file mode 100644
index 0000000000..efd5393889
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/python/clearEveryItem2.yml
@@ -0,0 +1,36 @@
+languageId: python
+command:
+  spokenForm: clear every item
+  version: 2
+  targets:
+    - type: primitive
+      modifiers:
+        - type: everyScope
+          scopeType: { type: collectionItem }
+  usePrePhraseSnapshot: true
+  action: { name: clearAndSetSelection }
+initialState:
+  documentContents: |-
+    def aaa():
+        global bbb, ccc
+  selections:
+    - anchor: { line: 1, character: 14 }
+      active: { line: 1, character: 14 }
+  marks: {}
+finalState:
+  documentContents: |-
+    def aaa():
+        global ,
+  selections:
+    - anchor: { line: 1, character: 11 }
+      active: { line: 1, character: 11 }
+    - anchor: { line: 1, character: 13 }
+      active: { line: 1, character: 13 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      modifiers: [{ type: everyScope, scopeType: { type: collectionItem } }],
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/python/clearEveryValue.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/python/clearEveryValue.yml
new file mode 100644
index 0000000000..78a2840cfe
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/python/clearEveryValue.yml
@@ -0,0 +1,42 @@
+languageId: python
+command:
+  version: 1
+  spokenForm: clear every value
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier:
+        { type: containingScope, scopeType: value, includeSiblings: true }
+initialState:
+  documentContents: |-
+    {
+        "foo": "bar",
+        "baz": "bongo",
+    }
+  selections:
+    - anchor: { line: 1, character: 13 }
+      active: { line: 1, character: 13 }
+  marks: {}
+finalState:
+  documentContents: |-
+    {
+        "foo": ,
+        "baz": ,
+    }
+  selections:
+    - anchor: { line: 1, character: 11 }
+      active: { line: 1, character: 11 }
+    - anchor: { line: 2, character: 11 }
+      active: { line: 2, character: 11 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        { type: containingScope, scopeType: value, includeSiblings: true },
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/python/clearName.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/python/clearName.yml
new file mode 100644
index 0000000000..03b945a68e
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/python/clearName.yml
@@ -0,0 +1,33 @@
+languageId: python
+command:
+  version: 1
+  spokenForm: clear name
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier:
+        { type: containingScope, scopeType: name, includeSiblings: false }
+initialState:
+  documentContents: a += "world"
+  selections:
+    - anchor: { line: 0, character: 6 }
+      active: { line: 0, character: 6 }
+  marks: {}
+finalState:
+  documentContents: ' += "world"'
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        { type: containingScope, scopeType: name, includeSiblings: false },
+      isImplicit: false,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/python/clearSubject.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/python/clearSubject.yml
new file mode 100644
index 0000000000..03726f091f
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/python/clearSubject.yml
@@ -0,0 +1,42 @@
+languageId: python
+command:
+  spokenForm: clear subject
+  version: 3
+  targets:
+    - type: primitive
+      modifiers:
+        - type: containingScope
+          scopeType: { type: switchStatementSubject }
+  usePrePhraseSnapshot: true
+  action: { name: clearAndSetSelection }
+initialState:
+  documentContents: |
+    match 0:
+        case [0]:
+            pass
+  selections:
+    - anchor: { line: 2, character: 8 }
+      active: { line: 2, character: 8 }
+  marks: {}
+finalState:
+  documentContents: |
+    match :
+        case [0]:
+            pass
+  selections:
+    - anchor: { line: 0, character: 6 }
+      active: { line: 0, character: 6 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      modifiers:
+        [
+          {
+            type: containingScope,
+            scopeType: { type: switchStatementSubject },
+          },
+        ],
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/python/clearValue.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/python/clearValue.yml
new file mode 100644
index 0000000000..d9949b8464
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/python/clearValue.yml
@@ -0,0 +1,36 @@
+languageId: python
+command:
+  version: 1
+  spokenForm: clear value
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier:
+        { type: containingScope, scopeType: value, includeSiblings: false }
+initialState:
+  documentContents: |-
+    def foo():
+        return "hello"
+  selections:
+    - anchor: { line: 1, character: 14 }
+      active: { line: 1, character: 14 }
+  marks: {}
+finalState:
+  documentContents: |-
+    def foo():
+        return
+  selections:
+    - anchor: { line: 1, character: 11 }
+      active: { line: 1, character: 11 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        { type: containingScope, scopeType: value, includeSiblings: false },
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/python/clearValue2.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/python/clearValue2.yml
new file mode 100644
index 0000000000..e50bb141eb
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/python/clearValue2.yml
@@ -0,0 +1,36 @@
+languageId: python
+command:
+  version: 1
+  spokenForm: clear value
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier:
+        { type: containingScope, scopeType: value, includeSiblings: false }
+initialState:
+  documentContents: |-
+    def foo():
+        return "hello"
+  selections:
+    - anchor: { line: 1, character: 7 }
+      active: { line: 1, character: 7 }
+  marks: {}
+finalState:
+  documentContents: |-
+    def foo():
+        return
+  selections:
+    - anchor: { line: 1, character: 11 }
+      active: { line: 1, character: 11 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        { type: containingScope, scopeType: value, includeSiblings: false },
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/python/clearValue3.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/python/clearValue3.yml
new file mode 100644
index 0000000000..616440a23c
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/python/clearValue3.yml
@@ -0,0 +1,33 @@
+languageId: python
+command:
+  version: 1
+  spokenForm: clear value
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier:
+        { type: containingScope, scopeType: value, includeSiblings: false }
+initialState:
+  documentContents: a += "world"
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+  marks: {}
+finalState:
+  documentContents: "a += "
+  selections:
+    - anchor: { line: 0, character: 5 }
+      active: { line: 0, character: 5 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        { type: containingScope, scopeType: value, includeSiblings: false },
+      isImplicit: false,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/python/ditchBranch.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/python/ditchBranch.yml
new file mode 100644
index 0000000000..b1a8f07ae0
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/python/ditchBranch.yml
@@ -0,0 +1,41 @@
+languageId: python
+command:
+  version: 3
+  spokenForm: ditch branch
+  action: { name: remove }
+  targets:
+    - type: primitive
+      modifiers:
+        - type: containingScope
+          scopeType: { type: branch }
+  usePrePhraseSnapshot: true
+initialState:
+  documentContents: |-
+    if True:
+        pass
+    elif False:
+        pass
+    else:
+        pass
+  selections:
+    - anchor: { line: 2, character: 0 }
+      active: { line: 2, character: 0 }
+  marks: {}
+finalState:
+  documentContents: |-
+    if True:
+        pass
+
+    else:
+        pass
+  selections:
+    - anchor: { line: 2, character: 0 }
+      active: { line: 2, character: 0 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      modifiers: [{ type: containingScope, scopeType: { type: branch } }],
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/python/ditchBranch2.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/python/ditchBranch2.yml
new file mode 100644
index 0000000000..1522944c7b
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/python/ditchBranch2.yml
@@ -0,0 +1,40 @@
+languageId: python
+command:
+  version: 3
+  spokenForm: ditch branch
+  action: { name: remove }
+  targets:
+    - type: primitive
+      modifiers:
+        - type: containingScope
+          scopeType: { type: branch }
+  usePrePhraseSnapshot: false
+initialState:
+  documentContents: |-
+    if True:
+        pass
+    elif False:
+        pass
+    else:
+        pass
+  selections:
+    - anchor: { line: 4, character: 0 }
+      active: { line: 4, character: 0 }
+  marks: {}
+finalState:
+  documentContents: |
+    if True:
+        pass
+    elif False:
+        pass
+  selections:
+    - anchor: { line: 4, character: 0 }
+      active: { line: 4, character: 0 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      modifiers: [{ type: containingScope, scopeType: { type: branch } }],
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/python/ditchCondition.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/python/ditchCondition.yml
new file mode 100644
index 0000000000..61f7733d64
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/python/ditchCondition.yml
@@ -0,0 +1,30 @@
+languageId: python
+command:
+  spokenForm: ditch condition
+  version: 3
+  targets:
+    - type: primitive
+      modifiers:
+        - type: containingScope
+          scopeType: { type: condition }
+  usePrePhraseSnapshot: true
+  action: { name: remove }
+initialState:
+  documentContents: "[aaa for aaa in bbb if ccc]"
+  selections:
+    - anchor: { line: 0, character: 1 }
+      active: { line: 0, character: 1 }
+  marks: {}
+finalState:
+  documentContents: "[aaa for aaa in bbb ]"
+  selections:
+    - anchor: { line: 0, character: 1 }
+      active: { line: 0, character: 1 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      modifiers: [{ type: containingScope, scopeType: { type: condition } }],
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/python/ditchCondition2.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/python/ditchCondition2.yml
new file mode 100644
index 0000000000..7bf75e52fd
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/python/ditchCondition2.yml
@@ -0,0 +1,36 @@
+languageId: python
+command:
+  spokenForm: ditch condition
+  version: 3
+  targets:
+    - type: primitive
+      modifiers:
+        - type: containingScope
+          scopeType: { type: condition }
+  usePrePhraseSnapshot: true
+  action: { name: remove }
+initialState:
+  documentContents: |-
+    match 0:
+        case a if a > 1:
+            pass
+  selections:
+    - anchor: { line: 2, character: 8 }
+      active: { line: 2, character: 8 }
+  marks: {}
+finalState:
+  documentContents: |-
+    match 0:
+        case a :
+            pass
+  selections:
+    - anchor: { line: 2, character: 8 }
+      active: { line: 2, character: 8 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      modifiers: [{ type: containingScope, scopeType: { type: condition } }],
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/python/elseStateWrapThis.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/python/elseStateWrapThis.yml
new file mode 100644
index 0000000000..fe47d6a5db
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/python/elseStateWrapThis.yml
@@ -0,0 +1,36 @@
+languageId: python
+command:
+  version: 1
+  spokenForm: else state wrap this
+  action: wrapWithSnippet
+  targets:
+    - type: primitive
+      mark: { type: cursor }
+  extraArgs: [ifElseStatement.alternative]
+initialState:
+  documentContents: foo = "hello"
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+  marks: {}
+finalState:
+  documentContents: |-
+    if :
+
+    else:
+        foo = "hello"
+  selections:
+    - anchor: { line: 0, character: 3 }
+      active: { line: 0, character: 3 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        { type: containingScope, scopeType: statement, includeSiblings: false },
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/python/ifElseWrapThis.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/python/ifElseWrapThis.yml
new file mode 100644
index 0000000000..ce5c808b1b
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/python/ifElseWrapThis.yml
@@ -0,0 +1,36 @@
+languageId: python
+command:
+  version: 1
+  spokenForm: if else wrap this
+  action: wrapWithSnippet
+  targets:
+    - type: primitive
+      mark: { type: cursor }
+  extraArgs: [ifElseStatement.consequence]
+initialState:
+  documentContents: foo = "hello"
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+  marks: {}
+finalState:
+  documentContents: |-
+    if :
+        foo = "hello"
+    else:
+
+  selections:
+    - anchor: { line: 0, character: 3 }
+      active: { line: 0, character: 3 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        { type: containingScope, scopeType: statement, includeSiblings: false },
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/python/ifStateWrapThis.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/python/ifStateWrapThis.yml
new file mode 100644
index 0000000000..0816c4cbf9
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/python/ifStateWrapThis.yml
@@ -0,0 +1,34 @@
+languageId: python
+command:
+  version: 1
+  spokenForm: if state wrap this
+  action: wrapWithSnippet
+  targets:
+    - type: primitive
+      mark: { type: cursor }
+  extraArgs: [ifStatement.consequence]
+initialState:
+  documentContents: foo = "hello"
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+  marks: {}
+finalState:
+  documentContents: |-
+    if :
+        foo = "hello"
+  selections:
+    - anchor: { line: 0, character: 3 }
+      active: { line: 0, character: 3 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        { type: containingScope, scopeType: statement, includeSiblings: false },
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/python/takeArg.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/python/takeArg.yml
new file mode 100644
index 0000000000..ed698afecc
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/python/takeArg.yml
@@ -0,0 +1,36 @@
+languageId: python
+command:
+  version: 1
+  spokenForm: take arg
+  action: setSelection
+  targets:
+    - type: primitive
+      modifier: { type: containingScope, scopeType: argumentOrParameter }
+initialState:
+  documentContents: |
+
+    def my_funk(name: str, value) -> str:
+        return
+  selections:
+    - anchor: { line: 1, character: 12 }
+      active: { line: 1, character: 12 }
+  marks: {}
+finalState:
+  documentContents: |
+
+    def my_funk(name: str, value) -> str:
+        return
+  selections:
+    - anchor: { line: 1, character: 12 }
+      active: { line: 1, character: 21 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      modifier: { type: containingScope, scopeType: argumentOrParameter },
+      insideOutsideType: inside,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/python/takeArg2.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/python/takeArg2.yml
new file mode 100644
index 0000000000..c4d3041f16
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/python/takeArg2.yml
@@ -0,0 +1,34 @@
+languageId: python
+command:
+  version: 1
+  spokenForm: take arg
+  action: setSelection
+  targets:
+    - type: primitive
+      modifier: { type: containingScope, scopeType: argumentOrParameter }
+initialState:
+  documentContents: |-
+
+    my_funk(1, 2, 3)
+  selections:
+    - anchor: { line: 1, character: 8 }
+      active: { line: 1, character: 8 }
+  marks: {}
+finalState:
+  documentContents: |-
+
+    my_funk(1, 2, 3)
+  selections:
+    - anchor: { line: 1, character: 8 }
+      active: { line: 1, character: 9 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      modifier: { type: containingScope, scopeType: argumentOrParameter },
+      insideOutsideType: inside,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/python/takeArgDrum.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/python/takeArgDrum.yml
new file mode 100644
index 0000000000..b35d44a1a3
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/python/takeArgDrum.yml
@@ -0,0 +1,45 @@
+languageId: python
+command:
+  version: 1
+  spokenForm: take arg drum
+  action: setSelection
+  targets:
+    - type: primitive
+      modifier:
+        {
+          type: containingScope,
+          scopeType: argumentOrParameter,
+          includeSiblings: false,
+        }
+      mark: { type: decoratedSymbol, symbolColor: default, character: d }
+initialState:
+  documentContents: '" ".join((word for word in word_list), "words")'
+  selections:
+    - anchor: { line: 0, character: 47 }
+      active: { line: 0, character: 47 }
+  marks:
+    default.d:
+      start: { line: 0, character: 19 }
+      end: { line: 0, character: 23 }
+finalState:
+  documentContents: '" ".join((word for word in word_list), "words")'
+  selections:
+    - anchor: { line: 0, character: 9 }
+      active: { line: 0, character: 37 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: decoratedSymbol, symbolColor: default, character: d },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        {
+          type: containingScope,
+          scopeType: argumentOrParameter,
+          includeSiblings: false,
+        },
+      isImplicit: false,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/python/takeArgRed.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/python/takeArgRed.yml
new file mode 100644
index 0000000000..1ccff1a802
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/python/takeArgRed.yml
@@ -0,0 +1,45 @@
+languageId: python
+command:
+  version: 1
+  spokenForm: take arg red
+  action: setSelection
+  targets:
+    - type: primitive
+      modifier:
+        {
+          type: containingScope,
+          scopeType: argumentOrParameter,
+          includeSiblings: false,
+        }
+      mark: { type: decoratedSymbol, symbolColor: default, character: r }
+initialState:
+  documentContents: '" ".join(word for word in word_list)'
+  selections:
+    - anchor: { line: 0, character: 36 }
+      active: { line: 0, character: 36 }
+  marks:
+    default.r:
+      start: { line: 0, character: 9 }
+      end: { line: 0, character: 13 }
+finalState:
+  documentContents: '" ".join(word for word in word_list)'
+  selections:
+    - anchor: { line: 0, character: 9 }
+      active: { line: 0, character: 35 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: decoratedSymbol, symbolColor: default, character: r },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        {
+          type: containingScope,
+          scopeType: argumentOrParameter,
+          includeSiblings: false,
+        },
+      isImplicit: false,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/python/takeArgWhale.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/python/takeArgWhale.yml
new file mode 100644
index 0000000000..99112ef3d8
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/python/takeArgWhale.yml
@@ -0,0 +1,45 @@
+languageId: python
+command:
+  version: 1
+  spokenForm: take arg whale
+  action: setSelection
+  targets:
+    - type: primitive
+      modifier:
+        {
+          type: containingScope,
+          scopeType: argumentOrParameter,
+          includeSiblings: false,
+        }
+      mark: { type: decoratedSymbol, symbolColor: default, character: w }
+initialState:
+  documentContents: '" ".join((word for word in word_list), (word for word in word_list))'
+  selections:
+    - anchor: { line: 0, character: 68 }
+      active: { line: 0, character: 68 }
+  marks:
+    default.w:
+      start: { line: 0, character: 49 }
+      end: { line: 0, character: 53 }
+finalState:
+  documentContents: '" ".join((word for word in word_list), (word for word in word_list))'
+  selections:
+    - anchor: { line: 0, character: 39 }
+      active: { line: 0, character: 67 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: decoratedSymbol, symbolColor: default, character: w },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        {
+          type: containingScope,
+          scopeType: argumentOrParameter,
+          includeSiblings: false,
+        },
+      isImplicit: false,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/python/takeCall.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/python/takeCall.yml
new file mode 100644
index 0000000000..7ee1e684e8
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/python/takeCall.yml
@@ -0,0 +1,34 @@
+languageId: python
+command:
+  version: 1
+  spokenForm: take call
+  action: setSelection
+  targets:
+    - type: primitive
+      modifier: { type: containingScope, scopeType: functionCall }
+initialState:
+  documentContents: |-
+
+    my_funk(1, 2, 3)
+  selections:
+    - anchor: { line: 1, character: 4 }
+      active: { line: 1, character: 4 }
+  marks: {}
+finalState:
+  documentContents: |-
+
+    my_funk(1, 2, 3)
+  selections:
+    - anchor: { line: 1, character: 0 }
+      active: { line: 1, character: 16 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      modifier: { type: containingScope, scopeType: functionCall },
+      insideOutsideType: inside,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/python/takeClass.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/python/takeClass.yml
new file mode 100644
index 0000000000..18e54f02d0
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/python/takeClass.yml
@@ -0,0 +1,36 @@
+languageId: python
+command:
+  version: 1
+  spokenForm: take class
+  action: setSelection
+  targets:
+    - type: primitive
+      modifier: { type: containingScope, scopeType: class }
+initialState:
+  documentContents: |-
+
+    class MyClass:
+        """"""
+  selections:
+    - anchor: { line: 2, character: 4 }
+      active: { line: 2, character: 4 }
+  marks: {}
+finalState:
+  documentContents: |-
+
+    class MyClass:
+        """"""
+  selections:
+    - anchor: { line: 1, character: 0 }
+      active: { line: 2, character: 10 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      modifier: { type: containingScope, scopeType: class },
+      insideOutsideType: inside,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/python/takeClass2.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/python/takeClass2.yml
new file mode 100644
index 0000000000..2679c5e7b0
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/python/takeClass2.yml
@@ -0,0 +1,38 @@
+languageId: python
+command:
+  version: 1
+  spokenForm: take class
+  action: setSelection
+  targets:
+    - type: primitive
+      modifier: { type: containingScope, scopeType: class }
+initialState:
+  documentContents: |-
+
+    @annotation
+    class MyClass:
+        """"""
+  selections:
+    - anchor: { line: 3, character: 4 }
+      active: { line: 3, character: 4 }
+  marks: {}
+finalState:
+  documentContents: |-
+
+    @annotation
+    class MyClass:
+        """"""
+  selections:
+    - anchor: { line: 1, character: 0 }
+      active: { line: 3, character: 10 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      modifier: { type: containingScope, scopeType: class },
+      insideOutsideType: inside,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/python/takeClassName.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/python/takeClassName.yml
new file mode 100644
index 0000000000..f42dd73463
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/python/takeClassName.yml
@@ -0,0 +1,36 @@
+languageId: python
+command:
+  version: 1
+  spokenForm: take class name
+  action: setSelection
+  targets:
+    - type: primitive
+      modifier: { type: containingScope, scopeType: className }
+initialState:
+  documentContents: |-
+
+    class MyClass:
+        """"""
+  selections:
+    - anchor: { line: 2, character: 4 }
+      active: { line: 2, character: 4 }
+  marks: {}
+finalState:
+  documentContents: |-
+
+    class MyClass:
+        """"""
+  selections:
+    - anchor: { line: 1, character: 6 }
+      active: { line: 1, character: 13 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      modifier: { type: containingScope, scopeType: className },
+      insideOutsideType: inside,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/python/takeComment.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/python/takeComment.yml
new file mode 100644
index 0000000000..967211ad50
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/python/takeComment.yml
@@ -0,0 +1,34 @@
+languageId: python
+command:
+  version: 1
+  spokenForm: take comment
+  action: setSelection
+  targets:
+    - type: primitive
+      modifier: { type: containingScope, scopeType: comment }
+initialState:
+  documentContents: |
+
+    # Hello world
+  selections:
+    - anchor: { line: 1, character: 1 }
+      active: { line: 1, character: 1 }
+  marks: {}
+finalState:
+  documentContents: |
+
+    # Hello world
+  selections:
+    - anchor: { line: 1, character: 0 }
+      active: { line: 1, character: 13 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      modifier: { type: containingScope, scopeType: comment },
+      insideOutsideType: inside,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/python/takeCondition.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/python/takeCondition.yml
new file mode 100644
index 0000000000..406a6e9afd
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/python/takeCondition.yml
@@ -0,0 +1,42 @@
+languageId: python
+command:
+  version: 1
+  spokenForm: take condition
+  action: setSelection
+  targets:
+    - type: primitive
+      modifier:
+        { type: containingScope, scopeType: condition, includeSiblings: false }
+initialState:
+  documentContents: |-
+    if True:
+        pass
+
+    while True:
+        pass
+  selections:
+    - anchor: { line: 4, character: 4 }
+      active: { line: 4, character: 4 }
+  marks: {}
+finalState:
+  documentContents: |-
+    if True:
+        pass
+
+    while True:
+        pass
+  selections:
+    - anchor: { line: 3, character: 6 }
+      active: { line: 3, character: 10 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        { type: containingScope, scopeType: condition, includeSiblings: false },
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/python/takeCondition2.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/python/takeCondition2.yml
new file mode 100644
index 0000000000..8f289a0500
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/python/takeCondition2.yml
@@ -0,0 +1,42 @@
+languageId: python
+command:
+  version: 1
+  spokenForm: take condition
+  action: setSelection
+  targets:
+    - type: primitive
+      modifier:
+        { type: containingScope, scopeType: condition, includeSiblings: false }
+initialState:
+  documentContents: |-
+    if True:
+        pass
+
+    while True:
+        pass
+  selections:
+    - anchor: { line: 1, character: 4 }
+      active: { line: 1, character: 4 }
+  marks: {}
+finalState:
+  documentContents: |-
+    if True:
+        pass
+
+    while True:
+        pass
+  selections:
+    - anchor: { line: 0, character: 3 }
+      active: { line: 0, character: 7 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        { type: containingScope, scopeType: condition, includeSiblings: false },
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/python/takeEveryArg.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/python/takeEveryArg.yml
new file mode 100644
index 0000000000..7071fc0ff7
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/python/takeEveryArg.yml
@@ -0,0 +1,48 @@
+languageId: python
+command:
+  version: 1
+  spokenForm: take every arg
+  action: setSelection
+  targets:
+    - type: primitive
+      modifier:
+        {
+          type: containingScope,
+          scopeType: argumentOrParameter,
+          includeSiblings: true,
+        }
+initialState:
+  documentContents: |
+
+    def my_funk(name: str, value) -> str:
+        return
+  selections:
+    - anchor: { line: 1, character: 12 }
+      active: { line: 1, character: 12 }
+  marks: {}
+finalState:
+  documentContents: |
+
+    def my_funk(name: str, value) -> str:
+        return
+  selections:
+    - anchor: { line: 1, character: 12 }
+      active: { line: 1, character: 21 }
+    - anchor: { line: 1, character: 23 }
+      active: { line: 1, character: 28 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      modifier:
+        {
+          type: containingScope,
+          scopeType: argumentOrParameter,
+          includeSiblings: true,
+        },
+      insideOutsideType: inside,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/python/takeEveryArg2.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/python/takeEveryArg2.yml
new file mode 100644
index 0000000000..b67d067d18
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/python/takeEveryArg2.yml
@@ -0,0 +1,48 @@
+languageId: python
+command:
+  version: 1
+  spokenForm: take every arg
+  action: setSelection
+  targets:
+    - type: primitive
+      modifier:
+        {
+          type: containingScope,
+          scopeType: argumentOrParameter,
+          includeSiblings: true,
+        }
+initialState:
+  documentContents: |-
+
+    my_funk(1, 2, 3)
+  selections:
+    - anchor: { line: 1, character: 8 }
+      active: { line: 1, character: 8 }
+  marks: {}
+finalState:
+  documentContents: |-
+
+    my_funk(1, 2, 3)
+  selections:
+    - anchor: { line: 1, character: 8 }
+      active: { line: 1, character: 9 }
+    - anchor: { line: 1, character: 11 }
+      active: { line: 1, character: 12 }
+    - anchor: { line: 1, character: 14 }
+      active: { line: 1, character: 15 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      modifier:
+        {
+          type: containingScope,
+          scopeType: argumentOrParameter,
+          includeSiblings: true,
+        },
+      insideOutsideType: inside,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/python/takeEveryItem.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/python/takeEveryItem.yml
new file mode 100644
index 0000000000..e873db3825
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/python/takeEveryItem.yml
@@ -0,0 +1,48 @@
+languageId: python
+command:
+  version: 1
+  spokenForm: take every item
+  action: setSelection
+  targets:
+    - type: primitive
+      modifier:
+        {
+          type: containingScope,
+          scopeType: collectionItem,
+          includeSiblings: true,
+        }
+initialState:
+  documentContents: |
+
+    value = [1, 2, 3]
+  selections:
+    - anchor: { line: 1, character: 9 }
+      active: { line: 1, character: 9 }
+  marks: {}
+finalState:
+  documentContents: |
+
+    value = [1, 2, 3]
+  selections:
+    - anchor: { line: 1, character: 9 }
+      active: { line: 1, character: 10 }
+    - anchor: { line: 1, character: 12 }
+      active: { line: 1, character: 13 }
+    - anchor: { line: 1, character: 15 }
+      active: { line: 1, character: 16 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      modifier:
+        {
+          type: containingScope,
+          scopeType: collectionItem,
+          includeSiblings: true,
+        },
+      insideOutsideType: inside,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/python/takeEveryItem2.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/python/takeEveryItem2.yml
new file mode 100644
index 0000000000..19a12edece
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/python/takeEveryItem2.yml
@@ -0,0 +1,48 @@
+languageId: python
+command:
+  version: 1
+  spokenForm: take every item
+  action: setSelection
+  targets:
+    - type: primitive
+      modifier:
+        {
+          type: containingScope,
+          scopeType: collectionItem,
+          includeSiblings: true,
+        }
+initialState:
+  documentContents: |
+
+    value = {1, 2, 3}
+  selections:
+    - anchor: { line: 1, character: 9 }
+      active: { line: 1, character: 9 }
+  marks: {}
+finalState:
+  documentContents: |
+
+    value = {1, 2, 3}
+  selections:
+    - anchor: { line: 1, character: 9 }
+      active: { line: 1, character: 10 }
+    - anchor: { line: 1, character: 12 }
+      active: { line: 1, character: 13 }
+    - anchor: { line: 1, character: 15 }
+      active: { line: 1, character: 16 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      modifier:
+        {
+          type: containingScope,
+          scopeType: collectionItem,
+          includeSiblings: true,
+        },
+      insideOutsideType: inside,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/python/takeEveryItem3.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/python/takeEveryItem3.yml
new file mode 100644
index 0000000000..4866ec4dd5
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/python/takeEveryItem3.yml
@@ -0,0 +1,48 @@
+languageId: python
+command:
+  version: 1
+  spokenForm: take every item
+  action: setSelection
+  targets:
+    - type: primitive
+      modifier:
+        {
+          type: containingScope,
+          scopeType: collectionItem,
+          includeSiblings: true,
+        }
+initialState:
+  documentContents: |
+
+    value = {a: 1, b: 2, c: 3}
+  selections:
+    - anchor: { line: 1, character: 9 }
+      active: { line: 1, character: 9 }
+  marks: {}
+finalState:
+  documentContents: |
+
+    value = {a: 1, b: 2, c: 3}
+  selections:
+    - anchor: { line: 1, character: 9 }
+      active: { line: 1, character: 13 }
+    - anchor: { line: 1, character: 15 }
+      active: { line: 1, character: 19 }
+    - anchor: { line: 1, character: 21 }
+      active: { line: 1, character: 25 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      modifier:
+        {
+          type: containingScope,
+          scopeType: collectionItem,
+          includeSiblings: true,
+        },
+      insideOutsideType: inside,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/python/takeFunk.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/python/takeFunk.yml
new file mode 100644
index 0000000000..1048188e3f
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/python/takeFunk.yml
@@ -0,0 +1,36 @@
+languageId: python
+command:
+  version: 1
+  spokenForm: take funk
+  action: setSelection
+  targets:
+    - type: primitive
+      modifier: { type: containingScope, scopeType: namedFunction }
+initialState:
+  documentContents: |
+
+    def my_funk(name: str, value) -> str:
+        return
+  selections:
+    - anchor: { line: 2, character: 4 }
+      active: { line: 2, character: 4 }
+  marks: {}
+finalState:
+  documentContents: |
+
+    def my_funk(name: str, value) -> str:
+        return
+  selections:
+    - anchor: { line: 1, character: 0 }
+      active: { line: 2, character: 10 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      modifier: { type: containingScope, scopeType: namedFunction },
+      insideOutsideType: inside,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/python/takeFunk2.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/python/takeFunk2.yml
new file mode 100644
index 0000000000..5e0564f5b1
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/python/takeFunk2.yml
@@ -0,0 +1,38 @@
+languageId: python
+command:
+  version: 1
+  spokenForm: take funk
+  action: setSelection
+  targets:
+    - type: primitive
+      modifier: { type: containingScope, scopeType: namedFunction }
+initialState:
+  documentContents: |-
+
+    @annotation
+    def my_funk(name: str, value) -> str:
+        return
+  selections:
+    - anchor: { line: 3, character: 4 }
+      active: { line: 3, character: 4 }
+  marks: {}
+finalState:
+  documentContents: |-
+
+    @annotation
+    def my_funk(name: str, value) -> str:
+        return
+  selections:
+    - anchor: { line: 1, character: 0 }
+      active: { line: 3, character: 10 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      modifier: { type: containingScope, scopeType: namedFunction },
+      insideOutsideType: inside,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/python/takeFunkName.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/python/takeFunkName.yml
new file mode 100644
index 0000000000..c15706083e
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/python/takeFunkName.yml
@@ -0,0 +1,36 @@
+languageId: python
+command:
+  version: 1
+  spokenForm: take funk name
+  action: setSelection
+  targets:
+    - type: primitive
+      modifier: { type: containingScope, scopeType: functionName }
+initialState:
+  documentContents: |
+
+    def my_funk(name: str, value) -> str:
+        return
+  selections:
+    - anchor: { line: 2, character: 4 }
+      active: { line: 2, character: 4 }
+  marks: {}
+finalState:
+  documentContents: |
+
+    def my_funk(name: str, value) -> str:
+        return
+  selections:
+    - anchor: { line: 1, character: 4 }
+      active: { line: 1, character: 11 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      modifier: { type: containingScope, scopeType: functionName },
+      insideOutsideType: inside,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/python/takeIf.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/python/takeIf.yml
new file mode 100644
index 0000000000..868c66ae9d
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/python/takeIf.yml
@@ -0,0 +1,36 @@
+languageId: python
+command:
+  version: 1
+  spokenForm: take if
+  action: setSelection
+  targets:
+    - type: primitive
+      modifier: { type: containingScope, scopeType: ifStatement }
+initialState:
+  documentContents: |-
+
+    if True:
+        return
+  selections:
+    - anchor: { line: 2, character: 4 }
+      active: { line: 2, character: 4 }
+  marks: {}
+finalState:
+  documentContents: |-
+
+    if True:
+        return
+  selections:
+    - anchor: { line: 1, character: 0 }
+      active: { line: 2, character: 10 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      modifier: { type: containingScope, scopeType: ifStatement },
+      insideOutsideType: inside,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/python/takeItem.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/python/takeItem.yml
new file mode 100644
index 0000000000..d4ee31831a
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/python/takeItem.yml
@@ -0,0 +1,34 @@
+languageId: python
+command:
+  version: 1
+  spokenForm: take item
+  action: setSelection
+  targets:
+    - type: primitive
+      modifier: { type: containingScope, scopeType: collectionItem }
+initialState:
+  documentContents: |
+
+    value = [1, 2, 3]
+  selections:
+    - anchor: { line: 1, character: 9 }
+      active: { line: 1, character: 9 }
+  marks: {}
+finalState:
+  documentContents: |
+
+    value = [1, 2, 3]
+  selections:
+    - anchor: { line: 1, character: 9 }
+      active: { line: 1, character: 10 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      modifier: { type: containingScope, scopeType: collectionItem },
+      insideOutsideType: inside,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/python/takeItem2.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/python/takeItem2.yml
new file mode 100644
index 0000000000..77f7faec58
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/python/takeItem2.yml
@@ -0,0 +1,34 @@
+languageId: python
+command:
+  version: 1
+  spokenForm: take item
+  action: setSelection
+  targets:
+    - type: primitive
+      modifier: { type: containingScope, scopeType: collectionItem }
+initialState:
+  documentContents: |
+
+    value = {1, 2, 3}
+  selections:
+    - anchor: { line: 1, character: 9 }
+      active: { line: 1, character: 9 }
+  marks: {}
+finalState:
+  documentContents: |
+
+    value = {1, 2, 3}
+  selections:
+    - anchor: { line: 1, character: 9 }
+      active: { line: 1, character: 10 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      modifier: { type: containingScope, scopeType: collectionItem },
+      insideOutsideType: inside,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/python/takeItem3.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/python/takeItem3.yml
new file mode 100644
index 0000000000..ccfdfb255c
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/python/takeItem3.yml
@@ -0,0 +1,34 @@
+languageId: python
+command:
+  version: 1
+  spokenForm: take item
+  action: setSelection
+  targets:
+    - type: primitive
+      modifier: { type: containingScope, scopeType: collectionItem }
+initialState:
+  documentContents: |
+
+    value = {a: 1, b: 2, c: 3}
+  selections:
+    - anchor: { line: 1, character: 9 }
+      active: { line: 1, character: 9 }
+  marks: {}
+finalState:
+  documentContents: |
+
+    value = {a: 1, b: 2, c: 3}
+  selections:
+    - anchor: { line: 1, character: 9 }
+      active: { line: 1, character: 13 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      modifier: { type: containingScope, scopeType: collectionItem },
+      insideOutsideType: inside,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/python/takeKey.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/python/takeKey.yml
new file mode 100644
index 0000000000..aae34ab3d5
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/python/takeKey.yml
@@ -0,0 +1,34 @@
+languageId: python
+command:
+  version: 1
+  spokenForm: take key
+  action: setSelection
+  targets:
+    - type: primitive
+      modifier: { type: containingScope, scopeType: collectionKey }
+initialState:
+  documentContents: |
+
+    value = {a: 1, b: 2, c: 3}
+  selections:
+    - anchor: { line: 1, character: 12 }
+      active: { line: 1, character: 12 }
+  marks: {}
+finalState:
+  documentContents: |
+
+    value = {a: 1, b: 2, c: 3}
+  selections:
+    - anchor: { line: 1, character: 9 }
+      active: { line: 1, character: 10 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      modifier: { type: containingScope, scopeType: collectionKey },
+      insideOutsideType: inside,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/python/takeLambda.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/python/takeLambda.yml
new file mode 100644
index 0000000000..721307e5ac
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/python/takeLambda.yml
@@ -0,0 +1,34 @@
+languageId: python
+command:
+  version: 1
+  spokenForm: take lambda
+  action: setSelection
+  targets:
+    - type: primitive
+      modifier: { type: containingScope, scopeType: anonymousFunction }
+initialState:
+  documentContents: |
+
+    value = lambda x: x
+  selections:
+    - anchor: { line: 1, character: 14 }
+      active: { line: 1, character: 14 }
+  marks: {}
+finalState:
+  documentContents: |
+
+    value = lambda x: x
+  selections:
+    - anchor: { line: 1, character: 8 }
+      active: { line: 1, character: 19 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      modifier: { type: containingScope, scopeType: anonymousFunction },
+      insideOutsideType: inside,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/python/takeLambdaMade.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/python/takeLambdaMade.yml
new file mode 100644
index 0000000000..8ee4db7c3f
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/python/takeLambdaMade.yml
@@ -0,0 +1,48 @@
+languageId: python
+command:
+  version: 1
+  spokenForm: take lambda made
+  action: setSelection
+  targets:
+    - type: primitive
+      modifier:
+        {
+          type: containingScope,
+          scopeType: anonymousFunction,
+          includeSiblings: false,
+        }
+      mark: { type: decoratedSymbol, symbolColor: default, character: m }
+initialState:
+  documentContents: |-
+
+    lambda a: print("hello")
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+  marks:
+    default.m:
+      start: { line: 1, character: 0 }
+      end: { line: 1, character: 6 }
+finalState:
+  documentContents: |-
+
+    lambda a: print("hello")
+  selections:
+    - anchor: { line: 1, character: 0 }
+      active: { line: 1, character: 24 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: decoratedSymbol, symbolColor: default, character: m },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        {
+          type: containingScope,
+          scopeType: anonymousFunction,
+          includeSiblings: false,
+        },
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/python/takeLambdaPit.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/python/takeLambdaPit.yml
new file mode 100644
index 0000000000..20464a5ac3
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/python/takeLambdaPit.yml
@@ -0,0 +1,48 @@
+languageId: python
+command:
+  version: 1
+  spokenForm: take lambda pit
+  action: setSelection
+  targets:
+    - type: primitive
+      modifier:
+        {
+          type: containingScope,
+          scopeType: anonymousFunction,
+          includeSiblings: false,
+        }
+      mark: { type: decoratedSymbol, symbolColor: default, character: p }
+initialState:
+  documentContents: |-
+
+    lambda a: print("hello")
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+  marks:
+    default.p:
+      start: { line: 1, character: 10 }
+      end: { line: 1, character: 15 }
+finalState:
+  documentContents: |-
+
+    lambda a: print("hello")
+  selections:
+    - anchor: { line: 1, character: 0 }
+      active: { line: 1, character: 24 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: decoratedSymbol, symbolColor: default, character: p },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        {
+          type: containingScope,
+          scopeType: anonymousFunction,
+          includeSiblings: false,
+        },
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/python/takeList.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/python/takeList.yml
new file mode 100644
index 0000000000..1886f82391
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/python/takeList.yml
@@ -0,0 +1,34 @@
+languageId: python
+command:
+  version: 1
+  spokenForm: take list
+  action: setSelection
+  targets:
+    - type: primitive
+      modifier: { type: containingScope, scopeType: list }
+initialState:
+  documentContents: |
+
+    value = [1, 2, 3]
+  selections:
+    - anchor: { line: 1, character: 9 }
+      active: { line: 1, character: 9 }
+  marks: {}
+finalState:
+  documentContents: |
+
+    value = [1, 2, 3]
+  selections:
+    - anchor: { line: 1, character: 8 }
+      active: { line: 1, character: 17 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      modifier: { type: containingScope, scopeType: list },
+      insideOutsideType: inside,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/python/takeList2.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/python/takeList2.yml
new file mode 100644
index 0000000000..109ede795b
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/python/takeList2.yml
@@ -0,0 +1,34 @@
+languageId: python
+command:
+  version: 1
+  spokenForm: take list
+  action: setSelection
+  targets:
+    - type: primitive
+      modifier: { type: containingScope, scopeType: list }
+initialState:
+  documentContents: |
+
+    value = {1, 2, 3}
+  selections:
+    - anchor: { line: 1, character: 9 }
+      active: { line: 1, character: 9 }
+  marks: {}
+finalState:
+  documentContents: |
+
+    value = {1, 2, 3}
+  selections:
+    - anchor: { line: 1, character: 8 }
+      active: { line: 1, character: 17 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      modifier: { type: containingScope, scopeType: list },
+      insideOutsideType: inside,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/python/takeMap.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/python/takeMap.yml
new file mode 100644
index 0000000000..b03001413e
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/python/takeMap.yml
@@ -0,0 +1,34 @@
+languageId: python
+command:
+  version: 1
+  spokenForm: take map
+  action: setSelection
+  targets:
+    - type: primitive
+      modifier: { type: containingScope, scopeType: map }
+initialState:
+  documentContents: |
+
+    value = {a: 1, b: 2, c: 3}
+  selections:
+    - anchor: { line: 1, character: 9 }
+      active: { line: 1, character: 9 }
+  marks: {}
+finalState:
+  documentContents: |
+
+    value = {a: 1, b: 2, c: 3}
+  selections:
+    - anchor: { line: 1, character: 8 }
+      active: { line: 1, character: 26 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      modifier: { type: containingScope, scopeType: map },
+      insideOutsideType: inside,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/python/takeName.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/python/takeName.yml
new file mode 100644
index 0000000000..140dafb095
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/python/takeName.yml
@@ -0,0 +1,34 @@
+languageId: python
+command:
+  version: 1
+  spokenForm: take name
+  action: setSelection
+  targets:
+    - type: primitive
+      modifier: { type: containingScope, scopeType: name }
+initialState:
+  documentContents: |
+
+    value = "hello world"
+  selections:
+    - anchor: { line: 1, character: 7 }
+      active: { line: 1, character: 7 }
+  marks: {}
+finalState:
+  documentContents: |
+
+    value = "hello world"
+  selections:
+    - anchor: { line: 1, character: 0 }
+      active: { line: 1, character: 5 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      modifier: { type: containingScope, scopeType: name },
+      insideOutsideType: inside,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/python/takeName2.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/python/takeName2.yml
new file mode 100644
index 0000000000..c252c57d86
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/python/takeName2.yml
@@ -0,0 +1,36 @@
+languageId: python
+command:
+  version: 1
+  spokenForm: take name
+  action: setSelection
+  targets:
+    - type: primitive
+      modifier: { type: containingScope, scopeType: name }
+initialState:
+  documentContents: |
+
+    def my_funk(name: str, value) -> str:
+        return
+  selections:
+    - anchor: { line: 1, character: 19 }
+      active: { line: 1, character: 19 }
+  marks: {}
+finalState:
+  documentContents: |
+
+    def my_funk(name: str, value) -> str:
+        return
+  selections:
+    - anchor: { line: 1, character: 12 }
+      active: { line: 1, character: 16 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      modifier: { type: containingScope, scopeType: name },
+      insideOutsideType: inside,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/python/takeName3.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/python/takeName3.yml
new file mode 100644
index 0000000000..45a0e84e47
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/python/takeName3.yml
@@ -0,0 +1,36 @@
+languageId: python
+command:
+  version: 1
+  spokenForm: take name
+  action: setSelection
+  targets:
+    - type: primitive
+      modifier: { type: containingScope, scopeType: name }
+initialState:
+  documentContents: |-
+
+    class MyClass:
+        """"""
+  selections:
+    - anchor: { line: 2, character: 4 }
+      active: { line: 2, character: 4 }
+  marks: {}
+finalState:
+  documentContents: |-
+
+    class MyClass:
+        """"""
+  selections:
+    - anchor: { line: 1, character: 6 }
+      active: { line: 1, character: 13 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      modifier: { type: containingScope, scopeType: name },
+      insideOutsideType: inside,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/python/takeState.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/python/takeState.yml
new file mode 100644
index 0000000000..d213d203e2
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/python/takeState.yml
@@ -0,0 +1,34 @@
+languageId: python
+command:
+  version: 1
+  spokenForm: take state
+  action: setSelection
+  targets:
+    - type: primitive
+      modifier: { type: containingScope, scopeType: statement }
+initialState:
+  documentContents: |
+
+    value = "hello world"
+  selections:
+    - anchor: { line: 1, character: 6 }
+      active: { line: 1, character: 6 }
+  marks: {}
+finalState:
+  documentContents: |
+
+    value = "hello world"
+  selections:
+    - anchor: { line: 1, character: 0 }
+      active: { line: 1, character: 21 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      modifier: { type: containingScope, scopeType: statement },
+      insideOutsideType: inside,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/python/takeString.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/python/takeString.yml
new file mode 100644
index 0000000000..f1e0b6b847
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/python/takeString.yml
@@ -0,0 +1,34 @@
+languageId: python
+command:
+  version: 1
+  spokenForm: take string
+  action: setSelection
+  targets:
+    - type: primitive
+      modifier: { type: containingScope, scopeType: string }
+initialState:
+  documentContents: |
+
+    value = "hello world"
+  selections:
+    - anchor: { line: 1, character: 15 }
+      active: { line: 1, character: 15 }
+  marks: {}
+finalState:
+  documentContents: |
+
+    value = "hello world"
+  selections:
+    - anchor: { line: 1, character: 8 }
+      active: { line: 1, character: 21 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      modifier: { type: containingScope, scopeType: string },
+      insideOutsideType: inside,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/python/takeType.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/python/takeType.yml
new file mode 100644
index 0000000000..afe629a3e5
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/python/takeType.yml
@@ -0,0 +1,36 @@
+languageId: python
+command:
+  version: 1
+  spokenForm: take type
+  action: setSelection
+  targets:
+    - type: primitive
+      modifier: { type: containingScope, scopeType: type }
+initialState:
+  documentContents: |
+
+    def my_funk(name: str, value) -> str:
+        return
+  selections:
+    - anchor: { line: 2, character: 4 }
+      active: { line: 2, character: 4 }
+  marks: {}
+finalState:
+  documentContents: |
+
+    def my_funk(name: str, value) -> str:
+        return
+  selections:
+    - anchor: { line: 1, character: 33 }
+      active: { line: 1, character: 36 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      modifier: { type: containingScope, scopeType: type },
+      insideOutsideType: inside,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/python/takeType2.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/python/takeType2.yml
new file mode 100644
index 0000000000..c659521795
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/python/takeType2.yml
@@ -0,0 +1,36 @@
+languageId: python
+command:
+  version: 1
+  spokenForm: take type
+  action: setSelection
+  targets:
+    - type: primitive
+      modifier: { type: containingScope, scopeType: type }
+initialState:
+  documentContents: |
+
+    def my_funk(name: str, value) -> str:
+        return
+  selections:
+    - anchor: { line: 1, character: 16 }
+      active: { line: 1, character: 16 }
+  marks: {}
+finalState:
+  documentContents: |
+
+    def my_funk(name: str, value) -> str:
+        return
+  selections:
+    - anchor: { line: 1, character: 18 }
+      active: { line: 1, character: 21 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      modifier: { type: containingScope, scopeType: type },
+      insideOutsideType: inside,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/python/takeValue.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/python/takeValue.yml
new file mode 100644
index 0000000000..185becdc61
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/python/takeValue.yml
@@ -0,0 +1,34 @@
+languageId: python
+command:
+  version: 1
+  spokenForm: take value
+  action: setSelection
+  targets:
+    - type: primitive
+      modifier: { type: containingScope, scopeType: value }
+initialState:
+  documentContents: |
+
+    value = "hello world"
+  selections:
+    - anchor: { line: 1, character: 5 }
+      active: { line: 1, character: 5 }
+  marks: {}
+finalState:
+  documentContents: |
+
+    value = "hello world"
+  selections:
+    - anchor: { line: 1, character: 8 }
+      active: { line: 1, character: 21 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      modifier: { type: containingScope, scopeType: value },
+      insideOutsideType: inside,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/python/takeValue2.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/python/takeValue2.yml
new file mode 100644
index 0000000000..4f51085a85
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/python/takeValue2.yml
@@ -0,0 +1,34 @@
+languageId: python
+command:
+  version: 1
+  spokenForm: take value
+  action: setSelection
+  targets:
+    - type: primitive
+      modifier: { type: containingScope, scopeType: value }
+initialState:
+  documentContents: |
+
+    value = {a: 1, b: 2, c: 3}
+  selections:
+    - anchor: { line: 1, character: 10 }
+      active: { line: 1, character: 10 }
+  marks: {}
+finalState:
+  documentContents: |
+
+    value = {a: 1, b: 2, c: 3}
+  selections:
+    - anchor: { line: 1, character: 12 }
+      active: { line: 1, character: 13 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      modifier: { type: containingScope, scopeType: value },
+      insideOutsideType: inside,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/python/takeValueZero.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/python/takeValueZero.yml
new file mode 100644
index 0000000000..42b26b82d7
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/python/takeValueZero.yml
@@ -0,0 +1,42 @@
+languageId: python
+command:
+  version: 1
+  spokenForm: take value zero
+  action: setSelection
+  targets:
+    - type: primitive
+      modifier:
+        { type: containingScope, scopeType: value, includeSiblings: false }
+      mark: { type: decoratedSymbol, symbolColor: default, character: "0" }
+initialState:
+  documentContents: |-
+    {
+        "foo": bar[0]
+    }
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+  marks:
+    default.0:
+      start: { line: 1, character: 15 }
+      end: { line: 1, character: 16 }
+finalState:
+  documentContents: |-
+    {
+        "foo": bar[0]
+    }
+  selections:
+    - anchor: { line: 1, character: 11 }
+      active: { line: 1, character: 17 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: decoratedSymbol, symbolColor: default, character: "0" },
+      selectionType: token,
+      position: contents,
+      modifier:
+        { type: containingScope, scopeType: value, includeSiblings: false },
+      insideOutsideType: inside,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/python/tryCatchWrapThis.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/python/tryCatchWrapThis.yml
new file mode 100644
index 0000000000..05425cbb1d
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/python/tryCatchWrapThis.yml
@@ -0,0 +1,36 @@
+languageId: python
+command:
+  version: 1
+  spokenForm: try catch wrap this
+  action: wrapWithSnippet
+  targets:
+    - type: primitive
+      mark: { type: cursor }
+  extraArgs: [tryCatchStatement.body]
+initialState:
+  documentContents: foo = "hello"
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+  marks: {}
+finalState:
+  documentContents: |-
+    try:
+        foo = "hello"
+    except :
+
+  selections:
+    - anchor: { line: 2, character: 7 }
+      active: { line: 2, character: 7 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        { type: containingScope, scopeType: statement, includeSiblings: false },
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/python/tryCatchWrapThis2.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/python/tryCatchWrapThis2.yml
new file mode 100644
index 0000000000..b43c8060a8
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/python/tryCatchWrapThis2.yml
@@ -0,0 +1,50 @@
+languageId: python
+command:
+  version: 1
+  spokenForm: try catch wrap this
+  action: wrapWithSnippet
+  targets:
+    - type: primitive
+      mark: { type: cursor }
+  extraArgs: [tryCatchStatement.body]
+initialState:
+  documentContents: |-
+    if True:
+        foo = "hello"
+
+    bar = "hello"
+  selections:
+    - anchor: { line: 3, character: 0 }
+      active: { line: 3, character: 0 }
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+  marks: {}
+finalState:
+  documentContents: |-
+    try:
+        if True:
+            foo = "hello"
+    except :
+
+
+    try:
+        bar = "hello"
+    except :
+
+  selections:
+    - anchor: { line: 8, character: 7 }
+      active: { line: 8, character: 7 }
+    - anchor: { line: 3, character: 7 }
+      active: { line: 3, character: 7 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        { type: containingScope, scopeType: statement, includeSiblings: false },
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/ruby/changeArg.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/ruby/changeArg.yml
new file mode 100644
index 0000000000..3dc1422d34
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/ruby/changeArg.yml
@@ -0,0 +1,47 @@
+languageId: ruby
+command:
+  version: 1
+  spokenForm: change arg
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier:
+        {
+          type: containingScope,
+          scopeType: argumentOrParameter,
+          includeSiblings: false,
+        }
+initialState:
+  documentContents: |-
+    def hello(name)
+
+    end
+  selections:
+    - anchor: { line: 0, character: 13 }
+      active: { line: 0, character: 13 }
+  marks: {}
+finalState:
+  documentContents: |-
+    def hello()
+
+    end
+  selections:
+    - anchor: { line: 0, character: 10 }
+      active: { line: 0, character: 10 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        {
+          type: containingScope,
+          scopeType: argumentOrParameter,
+          includeSiblings: false,
+        },
+      isImplicit: false,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/ruby/changeArgWhale.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/ruby/changeArgWhale.yml
new file mode 100644
index 0000000000..63937bc0a3
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/ruby/changeArgWhale.yml
@@ -0,0 +1,45 @@
+languageId: ruby
+command:
+  version: 1
+  spokenForm: change arg whale
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier:
+        {
+          type: containingScope,
+          scopeType: argumentOrParameter,
+          includeSiblings: false,
+        }
+      mark: { type: decoratedSymbol, symbolColor: default, character: w }
+initialState:
+  documentContents: a.call(hello, world)
+  selections:
+    - anchor: { line: 0, character: 20 }
+      active: { line: 0, character: 20 }
+  marks:
+    default.w:
+      start: { line: 0, character: 14 }
+      end: { line: 0, character: 19 }
+finalState:
+  documentContents: a.call(hello, )
+  selections:
+    - anchor: { line: 0, character: 14 }
+      active: { line: 0, character: 14 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: decoratedSymbol, symbolColor: default, character: w },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        {
+          type: containingScope,
+          scopeType: argumentOrParameter,
+          includeSiblings: false,
+        },
+      isImplicit: false,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/ruby/changeArgWhale2.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/ruby/changeArgWhale2.yml
new file mode 100644
index 0000000000..c32cabcf97
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/ruby/changeArgWhale2.yml
@@ -0,0 +1,45 @@
+languageId: ruby
+command:
+  version: 1
+  spokenForm: change arg whale
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier:
+        {
+          type: containingScope,
+          scopeType: argumentOrParameter,
+          includeSiblings: false,
+        }
+      mark: { type: decoratedSymbol, symbolColor: default, character: w }
+initialState:
+  documentContents: a(hello, world)
+  selections:
+    - anchor: { line: 0, character: 11 }
+      active: { line: 0, character: 11 }
+  marks:
+    default.w:
+      start: { line: 0, character: 9 }
+      end: { line: 0, character: 14 }
+finalState:
+  documentContents: a(hello, )
+  selections:
+    - anchor: { line: 0, character: 9 }
+      active: { line: 0, character: 9 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: decoratedSymbol, symbolColor: default, character: w },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        {
+          type: containingScope,
+          scopeType: argumentOrParameter,
+          includeSiblings: false,
+        },
+      isImplicit: false,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/ruby/changeArgWhale3.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/ruby/changeArgWhale3.yml
new file mode 100644
index 0000000000..34e97c273d
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/ruby/changeArgWhale3.yml
@@ -0,0 +1,45 @@
+languageId: ruby
+command:
+  version: 1
+  spokenForm: change arg whale
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier:
+        {
+          type: containingScope,
+          scopeType: argumentOrParameter,
+          includeSiblings: false,
+        }
+      mark: { type: decoratedSymbol, symbolColor: default, character: w }
+initialState:
+  documentContents: yield(hello, world)
+  selections:
+    - anchor: { line: 0, character: 17 }
+      active: { line: 0, character: 17 }
+  marks:
+    default.w:
+      start: { line: 0, character: 13 }
+      end: { line: 0, character: 18 }
+finalState:
+  documentContents: yield(hello, )
+  selections:
+    - anchor: { line: 0, character: 13 }
+      active: { line: 0, character: 13 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: decoratedSymbol, symbolColor: default, character: w },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        {
+          type: containingScope,
+          scopeType: argumentOrParameter,
+          includeSiblings: false,
+        },
+      isImplicit: false,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/ruby/changeCall.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/ruby/changeCall.yml
new file mode 100644
index 0000000000..a8c0782fef
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/ruby/changeCall.yml
@@ -0,0 +1,41 @@
+languageId: ruby
+command:
+  version: 1
+  spokenForm: change call
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier:
+        {
+          type: containingScope,
+          scopeType: functionCall,
+          includeSiblings: false,
+        }
+initialState:
+  documentContents: a(1, 2)
+  selections:
+    - anchor: { line: 0, character: 6 }
+      active: { line: 0, character: 6 }
+  marks: {}
+finalState:
+  documentContents: ""
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        {
+          type: containingScope,
+          scopeType: functionCall,
+          includeSiblings: false,
+        },
+      isImplicit: false,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/ruby/changeClass.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/ruby/changeClass.yml
new file mode 100644
index 0000000000..1851f1c7ce
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/ruby/changeClass.yml
@@ -0,0 +1,36 @@
+languageId: ruby
+command:
+  version: 1
+  spokenForm: change class
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier:
+        { type: containingScope, scopeType: class, includeSiblings: false }
+initialState:
+  documentContents: |-
+    class Hi
+
+    end
+  selections:
+    - anchor: { line: 1, character: 0 }
+      active: { line: 1, character: 0 }
+  marks: {}
+finalState:
+  documentContents: ""
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        { type: containingScope, scopeType: class, includeSiblings: false },
+      isImplicit: false,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/ruby/changeComment.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/ruby/changeComment.yml
new file mode 100644
index 0000000000..f98d86c6f6
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/ruby/changeComment.yml
@@ -0,0 +1,33 @@
+languageId: ruby
+command:
+  version: 1
+  spokenForm: change comment
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier:
+        { type: containingScope, scopeType: comment, includeSiblings: false }
+initialState:
+  documentContents: "# Hello World"
+  selections:
+    - anchor: { line: 0, character: 9 }
+      active: { line: 0, character: 9 }
+  marks: {}
+finalState:
+  documentContents: ""
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        { type: containingScope, scopeType: comment, includeSiblings: false },
+      isImplicit: false,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/ruby/changeComment2.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/ruby/changeComment2.yml
new file mode 100644
index 0000000000..eec945331e
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/ruby/changeComment2.yml
@@ -0,0 +1,33 @@
+languageId: ruby
+command:
+  version: 1
+  spokenForm: change comment
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier:
+        { type: containingScope, scopeType: comment, includeSiblings: false }
+initialState:
+  documentContents: "a = 0 # Hello World"
+  selections:
+    - anchor: { line: 0, character: 8 }
+      active: { line: 0, character: 8 }
+  marks: {}
+finalState:
+  documentContents: "a = 0 "
+  selections:
+    - anchor: { line: 0, character: 6 }
+      active: { line: 0, character: 6 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        { type: containingScope, scopeType: comment, includeSiblings: false },
+      isImplicit: false,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/ruby/changeComment3.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/ruby/changeComment3.yml
new file mode 100644
index 0000000000..a52fe1f733
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/ruby/changeComment3.yml
@@ -0,0 +1,36 @@
+languageId: ruby
+command:
+  version: 1
+  spokenForm: change comment
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier:
+        { type: containingScope, scopeType: comment, includeSiblings: false }
+initialState:
+  documentContents: |-
+    =begin
+       Hi
+    =end
+  selections:
+    - anchor: { line: 1, character: 3 }
+      active: { line: 1, character: 3 }
+  marks: {}
+finalState:
+  documentContents: ""
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        { type: containingScope, scopeType: comment, includeSiblings: false },
+      isImplicit: false,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/ruby/changeCondition.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/ruby/changeCondition.yml
new file mode 100644
index 0000000000..5c8112c67a
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/ruby/changeCondition.yml
@@ -0,0 +1,39 @@
+languageId: ruby
+command:
+  version: 1
+  spokenForm: change condition
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier:
+        { type: containingScope, scopeType: condition, includeSiblings: false }
+initialState:
+  documentContents: |-
+    if true
+
+    end
+  selections:
+    - anchor: { line: 1, character: 0 }
+      active: { line: 1, character: 0 }
+  marks: {}
+finalState:
+  documentContents: |-
+    if
+
+    end
+  selections:
+    - anchor: { line: 0, character: 3 }
+      active: { line: 0, character: 3 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        { type: containingScope, scopeType: condition, includeSiblings: false },
+      isImplicit: false,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/ruby/changeEveryArg.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/ruby/changeEveryArg.yml
new file mode 100644
index 0000000000..f2703d8bbd
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/ruby/changeEveryArg.yml
@@ -0,0 +1,43 @@
+languageId: ruby
+command:
+  version: 1
+  spokenForm: change every arg
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier:
+        {
+          type: containingScope,
+          scopeType: argumentOrParameter,
+          includeSiblings: true,
+        }
+initialState:
+  documentContents: a.call(hello, world)
+  selections:
+    - anchor: { line: 0, character: 17 }
+      active: { line: 0, character: 17 }
+  marks: {}
+finalState:
+  documentContents: a.call(, )
+  selections:
+    - anchor: { line: 0, character: 7 }
+      active: { line: 0, character: 7 }
+    - anchor: { line: 0, character: 9 }
+      active: { line: 0, character: 9 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        {
+          type: containingScope,
+          scopeType: argumentOrParameter,
+          includeSiblings: true,
+        },
+      isImplicit: false,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/ruby/changeEveryArg2.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/ruby/changeEveryArg2.yml
new file mode 100644
index 0000000000..967c552f07
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/ruby/changeEveryArg2.yml
@@ -0,0 +1,43 @@
+languageId: ruby
+command:
+  version: 1
+  spokenForm: change every arg
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier:
+        {
+          type: containingScope,
+          scopeType: argumentOrParameter,
+          includeSiblings: true,
+        }
+initialState:
+  documentContents: a(hello, world)
+  selections:
+    - anchor: { line: 0, character: 11 }
+      active: { line: 0, character: 11 }
+  marks: {}
+finalState:
+  documentContents: a(, )
+  selections:
+    - anchor: { line: 0, character: 2 }
+      active: { line: 0, character: 2 }
+    - anchor: { line: 0, character: 4 }
+      active: { line: 0, character: 4 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        {
+          type: containingScope,
+          scopeType: argumentOrParameter,
+          includeSiblings: true,
+        },
+      isImplicit: false,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/ruby/changeEveryArg3.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/ruby/changeEveryArg3.yml
new file mode 100644
index 0000000000..2824f844e7
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/ruby/changeEveryArg3.yml
@@ -0,0 +1,43 @@
+languageId: ruby
+command:
+  version: 1
+  spokenForm: change every arg
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier:
+        {
+          type: containingScope,
+          scopeType: argumentOrParameter,
+          includeSiblings: true,
+        }
+initialState:
+  documentContents: yield(hello, world)
+  selections:
+    - anchor: { line: 0, character: 17 }
+      active: { line: 0, character: 17 }
+  marks: {}
+finalState:
+  documentContents: yield(, )
+  selections:
+    - anchor: { line: 0, character: 6 }
+      active: { line: 0, character: 6 }
+    - anchor: { line: 0, character: 8 }
+      active: { line: 0, character: 8 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        {
+          type: containingScope,
+          scopeType: argumentOrParameter,
+          includeSiblings: true,
+        },
+      isImplicit: false,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/ruby/changeEveryItem.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/ruby/changeEveryItem.yml
new file mode 100644
index 0000000000..20c8b57f0b
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/ruby/changeEveryItem.yml
@@ -0,0 +1,45 @@
+languageId: ruby
+command:
+  version: 1
+  spokenForm: change every item
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier:
+        {
+          type: containingScope,
+          scopeType: collectionItem,
+          includeSiblings: true,
+        }
+initialState:
+  documentContents: "[1, 2, 3]"
+  selections:
+    - anchor: { line: 0, character: 6 }
+      active: { line: 0, character: 6 }
+  marks: {}
+finalState:
+  documentContents: "[, , ]"
+  selections:
+    - anchor: { line: 0, character: 1 }
+      active: { line: 0, character: 1 }
+    - anchor: { line: 0, character: 3 }
+      active: { line: 0, character: 3 }
+    - anchor: { line: 0, character: 5 }
+      active: { line: 0, character: 5 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        {
+          type: containingScope,
+          scopeType: collectionItem,
+          includeSiblings: true,
+        },
+      isImplicit: false,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/ruby/changeEveryKey.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/ruby/changeEveryKey.yml
new file mode 100644
index 0000000000..81a6c23cb7
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/ruby/changeEveryKey.yml
@@ -0,0 +1,43 @@
+languageId: ruby
+command:
+  version: 1
+  spokenForm: change every key
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier:
+        {
+          type: containingScope,
+          scopeType: collectionKey,
+          includeSiblings: true,
+        }
+initialState:
+  documentContents: h = {"1" => "one", "2" => "two"}
+  selections:
+    - anchor: { line: 0, character: 30 }
+      active: { line: 0, character: 30 }
+  marks: {}
+finalState:
+  documentContents: h = { => "one",  => "two"}
+  selections:
+    - anchor: { line: 0, character: 5 }
+      active: { line: 0, character: 5 }
+    - anchor: { line: 0, character: 16 }
+      active: { line: 0, character: 16 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        {
+          type: containingScope,
+          scopeType: collectionKey,
+          includeSiblings: true,
+        },
+      isImplicit: false,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/ruby/changeEveryKey2.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/ruby/changeEveryKey2.yml
new file mode 100644
index 0000000000..5987baec3d
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/ruby/changeEveryKey2.yml
@@ -0,0 +1,43 @@
+languageId: ruby
+command:
+  version: 1
+  spokenForm: change every key
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier:
+        {
+          type: containingScope,
+          scopeType: collectionKey,
+          includeSiblings: true,
+        }
+initialState:
+  documentContents: 'h = {"1": "one", "2": "two" }'
+  selections:
+    - anchor: { line: 0, character: 25 }
+      active: { line: 0, character: 25 }
+  marks: {}
+finalState:
+  documentContents: 'h = {: "one", : "two" }'
+  selections:
+    - anchor: { line: 0, character: 5 }
+      active: { line: 0, character: 5 }
+    - anchor: { line: 0, character: 14 }
+      active: { line: 0, character: 14 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        {
+          type: containingScope,
+          scopeType: collectionKey,
+          includeSiblings: true,
+        },
+      isImplicit: false,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/ruby/changeEveryKey3.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/ruby/changeEveryKey3.yml
new file mode 100644
index 0000000000..5303f580ff
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/ruby/changeEveryKey3.yml
@@ -0,0 +1,43 @@
+languageId: ruby
+command:
+  version: 1
+  spokenForm: change every key
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier:
+        {
+          type: containingScope,
+          scopeType: collectionKey,
+          includeSiblings: true,
+        }
+initialState:
+  documentContents: h = {"1" => "one", "2" => "two" }
+  selections:
+    - anchor: { line: 0, character: 28 }
+      active: { line: 0, character: 28 }
+  marks: {}
+finalState:
+  documentContents: h = { => "one",  => "two" }
+  selections:
+    - anchor: { line: 0, character: 5 }
+      active: { line: 0, character: 5 }
+    - anchor: { line: 0, character: 16 }
+      active: { line: 0, character: 16 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        {
+          type: containingScope,
+          scopeType: collectionKey,
+          includeSiblings: true,
+        },
+      isImplicit: false,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/ruby/changeEveryKey4.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/ruby/changeEveryKey4.yml
new file mode 100644
index 0000000000..9f48234888
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/ruby/changeEveryKey4.yml
@@ -0,0 +1,43 @@
+languageId: ruby
+command:
+  version: 1
+  spokenForm: change every key
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier:
+        {
+          type: containingScope,
+          scopeType: collectionKey,
+          includeSiblings: true,
+        }
+initialState:
+  documentContents: 'h = { one: "one", two: "two" }'
+  selections:
+    - anchor: { line: 0, character: 21 }
+      active: { line: 0, character: 21 }
+  marks: {}
+finalState:
+  documentContents: 'h = { : "one", : "two" }'
+  selections:
+    - anchor: { line: 0, character: 6 }
+      active: { line: 0, character: 6 }
+    - anchor: { line: 0, character: 15 }
+      active: { line: 0, character: 15 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        {
+          type: containingScope,
+          scopeType: collectionKey,
+          includeSiblings: true,
+        },
+      isImplicit: false,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/ruby/changeFunk.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/ruby/changeFunk.yml
new file mode 100644
index 0000000000..60a9dd23b1
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/ruby/changeFunk.yml
@@ -0,0 +1,44 @@
+languageId: ruby
+command:
+  version: 1
+  spokenForm: change funk
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier:
+        {
+          type: containingScope,
+          scopeType: namedFunction,
+          includeSiblings: false,
+        }
+initialState:
+  documentContents: |-
+    def hello_world
+        puts "hi"
+    end
+  selections:
+    - anchor: { line: 1, character: 3 }
+      active: { line: 1, character: 3 }
+  marks: {}
+finalState:
+  documentContents: ""
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        {
+          type: containingScope,
+          scopeType: namedFunction,
+          includeSiblings: false,
+        },
+      isImplicit: false,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/ruby/changeFunk2.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/ruby/changeFunk2.yml
new file mode 100644
index 0000000000..c25014e0d3
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/ruby/changeFunk2.yml
@@ -0,0 +1,34 @@
+languageId: ruby
+command:
+  spokenForm: change funk
+  version: 2
+  targets:
+    - type: primitive
+      modifiers:
+        - type: containingScope
+          scopeType: { type: namedFunction }
+  usePrePhraseSnapshot: true
+  action: { name: clearAndSetSelection }
+initialState:
+  documentContents: |-
+    def self.hello_world
+      puts "hi"
+    end
+  selections:
+    - anchor: { line: 1, character: 2 }
+      active: { line: 1, character: 2 }
+  marks: {}
+finalState:
+  documentContents: ""
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      modifiers:
+        [{ type: containingScope, scopeType: { type: namedFunction } }],
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/ruby/changeFunk3.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/ruby/changeFunk3.yml
new file mode 100644
index 0000000000..4cc1799743
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/ruby/changeFunk3.yml
@@ -0,0 +1,34 @@
+languageId: ruby
+command:
+  spokenForm: change funk
+  version: 2
+  targets:
+    - type: primitive
+      modifiers:
+        - type: containingScope
+          scopeType: { type: namedFunction }
+  usePrePhraseSnapshot: true
+  action: { name: clearAndSetSelection }
+initialState:
+  documentContents: |-
+    def Thing.hello_world
+      puts "hi"
+    end
+  selections:
+    - anchor: { line: 1, character: 2 }
+      active: { line: 1, character: 2 }
+  marks: {}
+finalState:
+  documentContents: ""
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      modifiers:
+        [{ type: containingScope, scopeType: { type: namedFunction } }],
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/ruby/changeFunk4.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/ruby/changeFunk4.yml
new file mode 100644
index 0000000000..7bd22e2735
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/ruby/changeFunk4.yml
@@ -0,0 +1,43 @@
+languageId: ruby
+command:
+  spokenForm: change funk
+  version: 2
+  targets:
+    - type: primitive
+      modifiers:
+        - type: containingScope
+          scopeType: { type: namedFunction }
+  usePrePhraseSnapshot: true
+  action: { name: clearAndSetSelection }
+initialState:
+  documentContents: |-
+    class Test
+      class << self
+        def hello_world
+          puts "hi"
+        end
+      end
+    end
+  selections:
+    - anchor: { line: 3, character: 6 }
+      active: { line: 3, character: 6 }
+  marks: {}
+finalState:
+  documentContents: |-
+    class Test
+      class << self
+
+      end
+    end
+  selections:
+    - anchor: { line: 2, character: 4 }
+      active: { line: 2, character: 4 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      modifiers:
+        [{ type: containingScope, scopeType: { type: namedFunction } }],
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/ruby/changeFunkName.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/ruby/changeFunkName.yml
new file mode 100644
index 0000000000..10ecc823c8
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/ruby/changeFunkName.yml
@@ -0,0 +1,36 @@
+languageId: ruby
+command:
+  spokenForm: change funk name
+  version: 2
+  targets:
+    - type: primitive
+      modifiers:
+        - type: containingScope
+          scopeType: { type: functionName }
+  usePrePhraseSnapshot: true
+  action: { name: clearAndSetSelection }
+initialState:
+  documentContents: |-
+    def self.hello_world
+      puts "hi"
+    end
+  selections:
+    - anchor: { line: 1, character: 2 }
+      active: { line: 1, character: 2 }
+  marks: {}
+finalState:
+  documentContents: |-
+    def self.
+      puts "hi"
+    end
+  selections:
+    - anchor: { line: 0, character: 9 }
+      active: { line: 0, character: 9 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      modifiers: [{ type: containingScope, scopeType: { type: functionName } }],
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/ruby/changeFunkName2.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/ruby/changeFunkName2.yml
new file mode 100644
index 0000000000..89d48918e3
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/ruby/changeFunkName2.yml
@@ -0,0 +1,36 @@
+languageId: ruby
+command:
+  spokenForm: change funk name
+  version: 2
+  targets:
+    - type: primitive
+      modifiers:
+        - type: containingScope
+          scopeType: { type: functionName }
+  usePrePhraseSnapshot: true
+  action: { name: clearAndSetSelection }
+initialState:
+  documentContents: |-
+    def Thing.hello_world
+      puts "hi"
+    end
+  selections:
+    - anchor: { line: 1, character: 2 }
+      active: { line: 1, character: 2 }
+  marks: {}
+finalState:
+  documentContents: |-
+    def Thing.
+      puts "hi"
+    end
+  selections:
+    - anchor: { line: 0, character: 10 }
+      active: { line: 0, character: 10 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      modifiers: [{ type: containingScope, scopeType: { type: functionName } }],
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/ruby/changeFunkName3.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/ruby/changeFunkName3.yml
new file mode 100644
index 0000000000..216bbae14f
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/ruby/changeFunkName3.yml
@@ -0,0 +1,44 @@
+languageId: ruby
+command:
+  spokenForm: change funk name
+  version: 2
+  targets:
+    - type: primitive
+      modifiers:
+        - type: containingScope
+          scopeType: { type: functionName }
+  usePrePhraseSnapshot: true
+  action: { name: clearAndSetSelection }
+initialState:
+  documentContents: |-
+    class Test
+      class << self
+        def hello_world
+          puts "hi"
+        end
+      end
+    end
+  selections:
+    - anchor: { line: 3, character: 6 }
+      active: { line: 3, character: 6 }
+  marks: {}
+finalState:
+  documentContents: |-
+    class Test
+      class << self
+        def
+          puts "hi"
+        end
+      end
+    end
+  selections:
+    - anchor: { line: 2, character: 8 }
+      active: { line: 2, character: 8 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      modifiers: [{ type: containingScope, scopeType: { type: functionName } }],
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/ruby/changeIfState.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/ruby/changeIfState.yml
new file mode 100644
index 0000000000..15433dc8ef
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/ruby/changeIfState.yml
@@ -0,0 +1,44 @@
+languageId: ruby
+command:
+  version: 1
+  spokenForm: change if state
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier:
+        {
+          type: containingScope,
+          scopeType: ifStatement,
+          includeSiblings: false,
+        }
+initialState:
+  documentContents: |-
+    if true
+
+    end
+  selections:
+    - anchor: { line: 2, character: 2 }
+      active: { line: 2, character: 2 }
+  marks: {}
+finalState:
+  documentContents: ""
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        {
+          type: containingScope,
+          scopeType: ifStatement,
+          includeSiblings: false,
+        },
+      isImplicit: false,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/ruby/changeItemThis.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/ruby/changeItemThis.yml
new file mode 100644
index 0000000000..ae3af0c0ce
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/ruby/changeItemThis.yml
@@ -0,0 +1,42 @@
+languageId: ruby
+command:
+  version: 1
+  spokenForm: change item this
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier:
+        {
+          type: containingScope,
+          scopeType: collectionItem,
+          includeSiblings: false,
+        }
+      mark: { type: cursor }
+initialState:
+  documentContents: "[1, 2, 3]"
+  selections:
+    - anchor: { line: 0, character: 4 }
+      active: { line: 0, character: 4 }
+  marks: {}
+finalState:
+  documentContents: "[1, , 3]"
+  selections:
+    - anchor: { line: 0, character: 4 }
+      active: { line: 0, character: 4 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        {
+          type: containingScope,
+          scopeType: collectionItem,
+          includeSiblings: false,
+        },
+      isImplicit: false,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/ruby/changeKey.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/ruby/changeKey.yml
new file mode 100644
index 0000000000..3a1bde0b7e
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/ruby/changeKey.yml
@@ -0,0 +1,41 @@
+languageId: ruby
+command:
+  version: 1
+  spokenForm: change key
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier:
+        {
+          type: containingScope,
+          scopeType: collectionKey,
+          includeSiblings: false,
+        }
+initialState:
+  documentContents: h = {"1" => "one"}
+  selections:
+    - anchor: { line: 0, character: 11 }
+      active: { line: 0, character: 11 }
+  marks: {}
+finalState:
+  documentContents: h = { => "one"}
+  selections:
+    - anchor: { line: 0, character: 5 }
+      active: { line: 0, character: 5 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        {
+          type: containingScope,
+          scopeType: collectionKey,
+          includeSiblings: false,
+        },
+      isImplicit: false,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/ruby/changeKey2.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/ruby/changeKey2.yml
new file mode 100644
index 0000000000..903972e799
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/ruby/changeKey2.yml
@@ -0,0 +1,41 @@
+languageId: ruby
+command:
+  version: 1
+  spokenForm: change key
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier:
+        {
+          type: containingScope,
+          scopeType: collectionKey,
+          includeSiblings: false,
+        }
+initialState:
+  documentContents: 'h = {"1": "one" }'
+  selections:
+    - anchor: { line: 0, character: 11 }
+      active: { line: 0, character: 11 }
+  marks: {}
+finalState:
+  documentContents: 'h = {: "one" }'
+  selections:
+    - anchor: { line: 0, character: 5 }
+      active: { line: 0, character: 5 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        {
+          type: containingScope,
+          scopeType: collectionKey,
+          includeSiblings: false,
+        },
+      isImplicit: false,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/ruby/changeLambda.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/ruby/changeLambda.yml
new file mode 100644
index 0000000000..05daca4d5c
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/ruby/changeLambda.yml
@@ -0,0 +1,41 @@
+languageId: ruby
+command:
+  version: 1
+  spokenForm: change lambda
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier:
+        {
+          type: containingScope,
+          scopeType: anonymousFunction,
+          includeSiblings: false,
+        }
+initialState:
+  documentContents: hi = -> { puts "Hi!" }
+  selections:
+    - anchor: { line: 0, character: 17 }
+      active: { line: 0, character: 17 }
+  marks: {}
+finalState:
+  documentContents: "hi = "
+  selections:
+    - anchor: { line: 0, character: 5 }
+      active: { line: 0, character: 5 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        {
+          type: containingScope,
+          scopeType: anonymousFunction,
+          includeSiblings: false,
+        },
+      isImplicit: false,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/ruby/changeLambda2.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/ruby/changeLambda2.yml
new file mode 100644
index 0000000000..f81dc13523
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/ruby/changeLambda2.yml
@@ -0,0 +1,47 @@
+languageId: ruby
+command:
+  version: 1
+  spokenForm: change lambda
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier:
+        {
+          type: containingScope,
+          scopeType: anonymousFunction,
+          includeSiblings: false,
+        }
+initialState:
+  documentContents: |+
+    [1,2,3].each do |i|
+        puts i
+    end
+
+  selections:
+    - anchor: { line: 1, character: 10 }
+      active: { line: 1, character: 10 }
+  marks: {}
+finalState:
+  documentContents: |+
+    [1,2,3].each
+
+  selections:
+    - anchor: { line: 0, character: 13 }
+      active: { line: 0, character: 13 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        {
+          type: containingScope,
+          scopeType: anonymousFunction,
+          includeSiblings: false,
+        },
+      isImplicit: false,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/ruby/changeLambda3.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/ruby/changeLambda3.yml
new file mode 100644
index 0000000000..24ce4e4646
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/ruby/changeLambda3.yml
@@ -0,0 +1,43 @@
+languageId: ruby
+command:
+  version: 1
+  spokenForm: change lambda
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier:
+        {
+          type: containingScope,
+          scopeType: anonymousFunction,
+          includeSiblings: false,
+        }
+initialState:
+  documentContents: |
+    [1,2,3].each { |i| puts i }
+  selections:
+    - anchor: { line: 0, character: 26 }
+      active: { line: 0, character: 26 }
+  marks: {}
+finalState:
+  documentContents: |
+    [1,2,3].each
+  selections:
+    - anchor: { line: 0, character: 13 }
+      active: { line: 0, character: 13 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        {
+          type: containingScope,
+          scopeType: anonymousFunction,
+          includeSiblings: false,
+        },
+      isImplicit: false,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/ruby/changeLambda4.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/ruby/changeLambda4.yml
new file mode 100644
index 0000000000..9f8f31a8b7
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/ruby/changeLambda4.yml
@@ -0,0 +1,41 @@
+languageId: ruby
+command:
+  version: 1
+  spokenForm: change lambda
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier:
+        {
+          type: containingScope,
+          scopeType: anonymousFunction,
+          includeSiblings: false,
+        }
+initialState:
+  documentContents: Proc.new { puts "hi" }
+  selections:
+    - anchor: { line: 0, character: 20 }
+      active: { line: 0, character: 20 }
+  marks: {}
+finalState:
+  documentContents: ""
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        {
+          type: containingScope,
+          scopeType: anonymousFunction,
+          includeSiblings: false,
+        },
+      isImplicit: false,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/ruby/changeLambda5.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/ruby/changeLambda5.yml
new file mode 100644
index 0000000000..4957e86753
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/ruby/changeLambda5.yml
@@ -0,0 +1,41 @@
+languageId: ruby
+command:
+  version: 1
+  spokenForm: change lambda
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier:
+        {
+          type: containingScope,
+          scopeType: anonymousFunction,
+          includeSiblings: false,
+        }
+initialState:
+  documentContents: lambda { puts "hi" }
+  selections:
+    - anchor: { line: 0, character: 6 }
+      active: { line: 0, character: 6 }
+  marks: {}
+finalState:
+  documentContents: ""
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        {
+          type: containingScope,
+          scopeType: anonymousFunction,
+          includeSiblings: false,
+        },
+      isImplicit: false,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/ruby/changeList.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/ruby/changeList.yml
new file mode 100644
index 0000000000..c2c35005d9
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/ruby/changeList.yml
@@ -0,0 +1,33 @@
+languageId: ruby
+command:
+  version: 1
+  spokenForm: change list
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier:
+        { type: containingScope, scopeType: list, includeSiblings: false }
+initialState:
+  documentContents: a = [1,2,3]
+  selections:
+    - anchor: { line: 0, character: 10 }
+      active: { line: 0, character: 10 }
+  marks: {}
+finalState:
+  documentContents: "a = "
+  selections:
+    - anchor: { line: 0, character: 4 }
+      active: { line: 0, character: 4 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        { type: containingScope, scopeType: list, includeSiblings: false },
+      isImplicit: false,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/ruby/changeList2.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/ruby/changeList2.yml
new file mode 100644
index 0000000000..cec7916736
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/ruby/changeList2.yml
@@ -0,0 +1,33 @@
+languageId: ruby
+command:
+  version: 1
+  spokenForm: change list
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier:
+        { type: containingScope, scopeType: list, includeSiblings: false }
+initialState:
+  documentContents: a = %w(1, 2, 3)
+  selections:
+    - anchor: { line: 0, character: 8 }
+      active: { line: 0, character: 8 }
+  marks: {}
+finalState:
+  documentContents: "a = "
+  selections:
+    - anchor: { line: 0, character: 4 }
+      active: { line: 0, character: 4 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        { type: containingScope, scopeType: list, includeSiblings: false },
+      isImplicit: false,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/ruby/changeList3.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/ruby/changeList3.yml
new file mode 100644
index 0000000000..a881369cad
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/ruby/changeList3.yml
@@ -0,0 +1,33 @@
+languageId: ruby
+command:
+  version: 1
+  spokenForm: change list
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier:
+        { type: containingScope, scopeType: list, includeSiblings: false }
+initialState:
+  documentContents: a = %i(1, 2, 3)
+  selections:
+    - anchor: { line: 0, character: 8 }
+      active: { line: 0, character: 8 }
+  marks: {}
+finalState:
+  documentContents: "a = "
+  selections:
+    - anchor: { line: 0, character: 4 }
+      active: { line: 0, character: 4 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        { type: containingScope, scopeType: list, includeSiblings: false },
+      isImplicit: false,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/ruby/changeMap.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/ruby/changeMap.yml
new file mode 100644
index 0000000000..19b21e53ad
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/ruby/changeMap.yml
@@ -0,0 +1,33 @@
+languageId: ruby
+command:
+  version: 1
+  spokenForm: change map
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier:
+        { type: containingScope, scopeType: map, includeSiblings: false }
+initialState:
+  documentContents: h = {"1" => "one"}
+  selections:
+    - anchor: { line: 0, character: 11 }
+      active: { line: 0, character: 11 }
+  marks: {}
+finalState:
+  documentContents: "h = "
+  selections:
+    - anchor: { line: 0, character: 4 }
+      active: { line: 0, character: 4 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        { type: containingScope, scopeType: map, includeSiblings: false },
+      isImplicit: false,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/ruby/changeName.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/ruby/changeName.yml
new file mode 100644
index 0000000000..82c11a8501
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/ruby/changeName.yml
@@ -0,0 +1,39 @@
+languageId: ruby
+command:
+  version: 1
+  spokenForm: change name
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier:
+        { type: containingScope, scopeType: name, includeSiblings: false }
+initialState:
+  documentContents: |-
+    def hello
+
+    end
+  selections:
+    - anchor: { line: 1, character: 0 }
+      active: { line: 1, character: 0 }
+  marks: {}
+finalState:
+  documentContents: |-
+    def
+
+    end
+  selections:
+    - anchor: { line: 0, character: 4 }
+      active: { line: 0, character: 4 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        { type: containingScope, scopeType: name, includeSiblings: false },
+      isImplicit: false,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/ruby/changeName2.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/ruby/changeName2.yml
new file mode 100644
index 0000000000..be4d7c4c55
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/ruby/changeName2.yml
@@ -0,0 +1,39 @@
+languageId: ruby
+command:
+  version: 1
+  spokenForm: change name
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier:
+        { type: containingScope, scopeType: name, includeSiblings: false }
+initialState:
+  documentContents: |-
+    class Hello
+
+    end
+  selections:
+    - anchor: { line: 1, character: 0 }
+      active: { line: 1, character: 0 }
+  marks: {}
+finalState:
+  documentContents: |-
+    class
+
+    end
+  selections:
+    - anchor: { line: 0, character: 6 }
+      active: { line: 0, character: 6 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        { type: containingScope, scopeType: name, includeSiblings: false },
+      isImplicit: false,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/ruby/changeName3.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/ruby/changeName3.yml
new file mode 100644
index 0000000000..dbf313d151
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/ruby/changeName3.yml
@@ -0,0 +1,36 @@
+languageId: ruby
+command:
+  spokenForm: change name
+  version: 2
+  targets:
+    - type: primitive
+      modifiers:
+        - type: containingScope
+          scopeType: { type: name }
+  usePrePhraseSnapshot: true
+  action: { name: clearAndSetSelection }
+initialState:
+  documentContents: |-
+    def self.hello_world
+      puts "hi"
+    end
+  selections:
+    - anchor: { line: 1, character: 2 }
+      active: { line: 1, character: 2 }
+  marks: {}
+finalState:
+  documentContents: |-
+    def self.
+      puts "hi"
+    end
+  selections:
+    - anchor: { line: 0, character: 9 }
+      active: { line: 0, character: 9 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      modifiers: [{ type: containingScope, scopeType: { type: name } }],
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/ruby/changeNameThis.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/ruby/changeNameThis.yml
new file mode 100644
index 0000000000..1eb6b19564
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/ruby/changeNameThis.yml
@@ -0,0 +1,34 @@
+languageId: ruby
+command:
+  version: 1
+  spokenForm: change name this
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier:
+        { type: containingScope, scopeType: name, includeSiblings: false }
+      mark: { type: cursor }
+initialState:
+  documentContents: a = "hello"
+  selections:
+    - anchor: { line: 0, character: 8 }
+      active: { line: 0, character: 8 }
+  marks: {}
+finalState:
+  documentContents: ' = "hello"'
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        { type: containingScope, scopeType: name, includeSiblings: false },
+      isImplicit: false,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/ruby/changeRegex.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/ruby/changeRegex.yml
new file mode 100644
index 0000000000..06e774ed5b
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/ruby/changeRegex.yml
@@ -0,0 +1,41 @@
+languageId: ruby
+command:
+  version: 1
+  spokenForm: change regex
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier:
+        {
+          type: containingScope,
+          scopeType: regularExpression,
+          includeSiblings: false,
+        }
+initialState:
+  documentContents: a = /.*/
+  selections:
+    - anchor: { line: 0, character: 7 }
+      active: { line: 0, character: 7 }
+  marks: {}
+finalState:
+  documentContents: "a = "
+  selections:
+    - anchor: { line: 0, character: 4 }
+      active: { line: 0, character: 4 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        {
+          type: containingScope,
+          scopeType: regularExpression,
+          includeSiblings: false,
+        },
+      isImplicit: false,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/ruby/changeRound.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/ruby/changeRound.yml
new file mode 100644
index 0000000000..77267c2844
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/ruby/changeRound.yml
@@ -0,0 +1,31 @@
+languageId: ruby
+command:
+  version: 1
+  spokenForm: change round
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier: { type: surroundingPair, delimiter: parentheses }
+initialState:
+  documentContents: '"hello (world)"'
+  selections:
+    - anchor: { line: 0, character: 11 }
+      active: { line: 0, character: 11 }
+  marks: {}
+finalState:
+  documentContents: '"hello "'
+  selections:
+    - anchor: { line: 0, character: 7 }
+      active: { line: 0, character: 7 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier: { type: surroundingPair, delimiter: parentheses },
+      isImplicit: false,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/ruby/changeRound2.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/ruby/changeRound2.yml
new file mode 100644
index 0000000000..b53db57a96
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/ruby/changeRound2.yml
@@ -0,0 +1,37 @@
+languageId: ruby
+command:
+  version: 1
+  spokenForm: change round
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier: { type: surroundingPair, delimiter: parentheses }
+initialState:
+  documentContents: |
+    <<-HI
+        ok (what)
+    HI
+  selections:
+    - anchor: { line: 1, character: 10 }
+      active: { line: 1, character: 10 }
+  marks: {}
+finalState:
+  documentContents: |
+    <<-HI
+        ok
+    HI
+  selections:
+    - anchor: { line: 1, character: 7 }
+      active: { line: 1, character: 7 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier: { type: surroundingPair, delimiter: parentheses },
+      isImplicit: false,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/ruby/changeState.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/ruby/changeState.yml
new file mode 100644
index 0000000000..101c47476e
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/ruby/changeState.yml
@@ -0,0 +1,36 @@
+languageId: ruby
+command:
+  version: 1
+  spokenForm: change state
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier:
+        { type: containingScope, scopeType: statement, includeSiblings: false }
+initialState:
+  documentContents: |-
+    if true
+
+    end
+  selections:
+    - anchor: { line: 1, character: 0 }
+      active: { line: 1, character: 0 }
+  marks: {}
+finalState:
+  documentContents: ""
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        { type: containingScope, scopeType: statement, includeSiblings: false },
+      isImplicit: false,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/ruby/changeState2.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/ruby/changeState2.yml
new file mode 100644
index 0000000000..c0c1b55261
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/ruby/changeState2.yml
@@ -0,0 +1,33 @@
+languageId: ruby
+command:
+  version: 1
+  spokenForm: change state
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier:
+        { type: containingScope, scopeType: statement, includeSiblings: false }
+initialState:
+  documentContents: str = "hello world"
+  selections:
+    - anchor: { line: 0, character: 18 }
+      active: { line: 0, character: 18 }
+  marks: {}
+finalState:
+  documentContents: ""
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        { type: containingScope, scopeType: statement, includeSiblings: false },
+      isImplicit: false,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/ruby/changeState3.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/ruby/changeState3.yml
new file mode 100644
index 0000000000..e2bc9bf7ba
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/ruby/changeState3.yml
@@ -0,0 +1,39 @@
+languageId: ruby
+command:
+  version: 1
+  spokenForm: change state
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier:
+        { type: containingScope, scopeType: statement, includeSiblings: false }
+initialState:
+  documentContents: |-
+    while true  do
+      puts "hi"
+    end
+  selections:
+    - anchor: { line: 1, character: 5 }
+      active: { line: 1, character: 5 }
+  marks: {}
+finalState:
+  documentContents: |-
+    while true  do
+
+    end
+  selections:
+    - anchor: { line: 1, character: 2 }
+      active: { line: 1, character: 2 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        { type: containingScope, scopeType: statement, includeSiblings: false },
+      isImplicit: false,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/ruby/changeState4.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/ruby/changeState4.yml
new file mode 100644
index 0000000000..1242d41be7
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/ruby/changeState4.yml
@@ -0,0 +1,39 @@
+languageId: ruby
+command:
+  version: 1
+  spokenForm: change state
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier:
+        { type: containingScope, scopeType: statement, includeSiblings: false }
+initialState:
+  documentContents: |-
+    class << self
+      a = 10
+    end
+  selections:
+    - anchor: { line: 1, character: 7 }
+      active: { line: 1, character: 7 }
+  marks: {}
+finalState:
+  documentContents: |-
+    class << self
+
+    end
+  selections:
+    - anchor: { line: 1, character: 2 }
+      active: { line: 1, character: 2 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        { type: containingScope, scopeType: statement, includeSiblings: false },
+      isImplicit: false,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/ruby/changeState5.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/ruby/changeState5.yml
new file mode 100644
index 0000000000..9380cab86a
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/ruby/changeState5.yml
@@ -0,0 +1,39 @@
+languageId: ruby
+command:
+  version: 1
+  spokenForm: change state
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier:
+        { type: containingScope, scopeType: statement, includeSiblings: false }
+initialState:
+  documentContents: |-
+    def foo.method2
+      a = 10
+    end
+  selections:
+    - anchor: { line: 1, character: 5 }
+      active: { line: 1, character: 5 }
+  marks: {}
+finalState:
+  documentContents: |-
+    def foo.method2
+
+    end
+  selections:
+    - anchor: { line: 1, character: 2 }
+      active: { line: 1, character: 2 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        { type: containingScope, scopeType: statement, includeSiblings: false },
+      isImplicit: false,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/ruby/changeString.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/ruby/changeString.yml
new file mode 100644
index 0000000000..6bc2418c45
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/ruby/changeString.yml
@@ -0,0 +1,31 @@
+languageId: ruby
+command:
+  version: 1
+  spokenForm: change string
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier: { type: surroundingPair, delimiter: string }
+initialState:
+  documentContents: '"Hello World"'
+  selections:
+    - anchor: { line: 0, character: 13 }
+      active: { line: 0, character: 13 }
+  marks: {}
+finalState:
+  documentContents: ""
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier: { type: surroundingPair, delimiter: string },
+      isImplicit: false,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/ruby/changeString2.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/ruby/changeString2.yml
new file mode 100644
index 0000000000..48a6b1cf8d
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/ruby/changeString2.yml
@@ -0,0 +1,34 @@
+languageId: ruby
+command:
+  version: 1
+  spokenForm: change string
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier: { type: surroundingPair, delimiter: string }
+initialState:
+  documentContents: |-
+    a = %Q(Multi
+    Line
+    String)
+  selections:
+    - anchor: { line: 1, character: 4 }
+      active: { line: 1, character: 4 }
+  marks: {}
+finalState:
+  documentContents: "a = "
+  selections:
+    - anchor: { line: 0, character: 4 }
+      active: { line: 0, character: 4 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier: { type: surroundingPair, delimiter: string },
+      isImplicit: false,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/ruby/changeValue.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/ruby/changeValue.yml
new file mode 100644
index 0000000000..c8163d4b09
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/ruby/changeValue.yml
@@ -0,0 +1,39 @@
+languageId: ruby
+command:
+  version: 1
+  spokenForm: change value
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier:
+        { type: containingScope, scopeType: value, includeSiblings: false }
+initialState:
+  documentContents: |
+    def a
+        return 100
+    end
+  selections:
+    - anchor: { line: 1, character: 6 }
+      active: { line: 1, character: 6 }
+  marks: {}
+finalState:
+  documentContents: |
+    def a
+        return
+    end
+  selections:
+    - anchor: { line: 1, character: 11 }
+      active: { line: 1, character: 11 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        { type: containingScope, scopeType: value, includeSiblings: false },
+      isImplicit: false,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/ruby/chuckArg.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/ruby/chuckArg.yml
new file mode 100644
index 0000000000..bbed71cfaa
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/ruby/chuckArg.yml
@@ -0,0 +1,47 @@
+languageId: ruby
+command:
+  version: 1
+  spokenForm: chuck arg
+  action: remove
+  targets:
+    - type: primitive
+      modifier:
+        {
+          type: containingScope,
+          scopeType: argumentOrParameter,
+          includeSiblings: false,
+        }
+initialState:
+  documentContents: |-
+    def hello_world(name)
+        puts "hi #{name)"
+    end
+  selections:
+    - anchor: { line: 0, character: 19 }
+      active: { line: 0, character: 19 }
+  marks: {}
+finalState:
+  documentContents: |-
+    def hello_world()
+        puts "hi #{name)"
+    end
+  selections:
+    - anchor: { line: 0, character: 16 }
+      active: { line: 0, character: 16 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: outside,
+      modifier:
+        {
+          type: containingScope,
+          scopeType: argumentOrParameter,
+          includeSiblings: false,
+        },
+      isImplicit: false,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/ruby/chuckArg2.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/ruby/chuckArg2.yml
new file mode 100644
index 0000000000..c6e41d6776
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/ruby/chuckArg2.yml
@@ -0,0 +1,43 @@
+languageId: ruby
+command:
+  version: 1
+  spokenForm: chuck arg
+  action: remove
+  targets:
+    - type: primitive
+      modifier:
+        {
+          type: containingScope,
+          scopeType: argumentOrParameter,
+          includeSiblings: false,
+        }
+initialState:
+  documentContents: |
+    [1, 2, 3].each_with_the_next { |n, i| }
+  selections:
+    - anchor: { line: 0, character: 33 }
+      active: { line: 0, character: 33 }
+  marks: {}
+finalState:
+  documentContents: |
+    [1, 2, 3].each_with_the_next { |i| }
+  selections:
+    - anchor: { line: 0, character: 32 }
+      active: { line: 0, character: 32 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: outside,
+      modifier:
+        {
+          type: containingScope,
+          scopeType: argumentOrParameter,
+          includeSiblings: false,
+        },
+      isImplicit: false,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/ruby/chuckArg3.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/ruby/chuckArg3.yml
new file mode 100644
index 0000000000..97163b3940
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/ruby/chuckArg3.yml
@@ -0,0 +1,43 @@
+languageId: ruby
+command:
+  version: 1
+  spokenForm: chuck arg
+  action: remove
+  targets:
+    - type: primitive
+      modifier:
+        {
+          type: containingScope,
+          scopeType: argumentOrParameter,
+          includeSiblings: false,
+        }
+initialState:
+  documentContents: |
+    [1, 2, 3].each_with_the_next { |n, i| }
+  selections:
+    - anchor: { line: 0, character: 35 }
+      active: { line: 0, character: 35 }
+  marks: {}
+finalState:
+  documentContents: |
+    [1, 2, 3].each_with_the_next { |n, | }
+  selections:
+    - anchor: { line: 0, character: 35 }
+      active: { line: 0, character: 35 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: outside,
+      modifier:
+        {
+          type: containingScope,
+          scopeType: argumentOrParameter,
+          includeSiblings: false,
+        },
+      isImplicit: false,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/ruby/chuckArg4.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/ruby/chuckArg4.yml
new file mode 100644
index 0000000000..22c7d1b517
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/ruby/chuckArg4.yml
@@ -0,0 +1,37 @@
+languageId: ruby
+command:
+  spokenForm: chuck arg
+  version: 2
+  targets:
+    - type: primitive
+      modifiers:
+        - type: containingScope
+          scopeType: { type: argumentOrParameter }
+  usePrePhraseSnapshot: true
+  action: { name: remove }
+initialState:
+  documentContents: |-
+    def self.hello(name)
+
+    end
+  selections:
+    - anchor: { line: 0, character: 15 }
+      active: { line: 0, character: 15 }
+  marks: {}
+finalState:
+  documentContents: |-
+    def self.hello()
+
+    end
+  selections:
+    - anchor: { line: 0, character: 15 }
+      active: { line: 0, character: 15 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      modifiers:
+        [{ type: containingScope, scopeType: { type: argumentOrParameter } }],
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/ruby/chuckEveryArg.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/ruby/chuckEveryArg.yml
new file mode 100644
index 0000000000..c5183bbbd4
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/ruby/chuckEveryArg.yml
@@ -0,0 +1,47 @@
+languageId: ruby
+command:
+  version: 1
+  spokenForm: chuck every arg
+  action: remove
+  targets:
+    - type: primitive
+      modifier:
+        {
+          type: containingScope,
+          scopeType: argumentOrParameter,
+          includeSiblings: true,
+        }
+initialState:
+  documentContents: |-
+    def hello_world(name, name2)
+        puts "hi #{name} and #{name2}"
+    end
+  selections:
+    - anchor: { line: 0, character: 20 }
+      active: { line: 0, character: 20 }
+  marks: {}
+finalState:
+  documentContents: |-
+    def hello_world()
+        puts "hi #{name} and #{name2}"
+    end
+  selections:
+    - anchor: { line: 0, character: 16 }
+      active: { line: 0, character: 16 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: outside,
+      modifier:
+        {
+          type: containingScope,
+          scopeType: argumentOrParameter,
+          includeSiblings: true,
+        },
+      isImplicit: false,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/ruby/chuckEveryArg2.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/ruby/chuckEveryArg2.yml
new file mode 100644
index 0000000000..dfdcce7c31
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/ruby/chuckEveryArg2.yml
@@ -0,0 +1,43 @@
+languageId: ruby
+command:
+  version: 1
+  spokenForm: chuck every arg
+  action: remove
+  targets:
+    - type: primitive
+      modifier:
+        {
+          type: containingScope,
+          scopeType: argumentOrParameter,
+          includeSiblings: true,
+        }
+initialState:
+  documentContents: |
+    [1, 2, 3].each_with_the_next { |n, i| }
+  selections:
+    - anchor: { line: 0, character: 34 }
+      active: { line: 0, character: 34 }
+  marks: {}
+finalState:
+  documentContents: |
+    [1, 2, 3].each_with_the_next { || }
+  selections:
+    - anchor: { line: 0, character: 32 }
+      active: { line: 0, character: 32 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: outside,
+      modifier:
+        {
+          type: containingScope,
+          scopeType: argumentOrParameter,
+          includeSiblings: true,
+        },
+      isImplicit: false,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/ruby/chuckEveryItem.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/ruby/chuckEveryItem.yml
new file mode 100644
index 0000000000..481a8a153e
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/ruby/chuckEveryItem.yml
@@ -0,0 +1,43 @@
+languageId: ruby
+command:
+  version: 1
+  spokenForm: chuck every item
+  action: remove
+  targets:
+    - type: primitive
+      modifier:
+        {
+          type: containingScope,
+          scopeType: collectionItem,
+          includeSiblings: true,
+        }
+initialState:
+  documentContents: |
+    [1, 2, 3]
+  selections:
+    - anchor: { line: 0, character: 7 }
+      active: { line: 0, character: 7 }
+  marks: {}
+finalState:
+  documentContents: |
+    []
+  selections:
+    - anchor: { line: 0, character: 1 }
+      active: { line: 0, character: 1 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: outside,
+      modifier:
+        {
+          type: containingScope,
+          scopeType: collectionItem,
+          includeSiblings: true,
+        },
+      isImplicit: false,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/ruby/chuckItem.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/ruby/chuckItem.yml
new file mode 100644
index 0000000000..c746b6ff81
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/ruby/chuckItem.yml
@@ -0,0 +1,43 @@
+languageId: ruby
+command:
+  version: 1
+  spokenForm: chuck item
+  action: remove
+  targets:
+    - type: primitive
+      modifier:
+        {
+          type: containingScope,
+          scopeType: collectionItem,
+          includeSiblings: false,
+        }
+initialState:
+  documentContents: |
+    [1, 2, 3]
+  selections:
+    - anchor: { line: 0, character: 5 }
+      active: { line: 0, character: 5 }
+  marks: {}
+finalState:
+  documentContents: |
+    [1, 3]
+  selections:
+    - anchor: { line: 0, character: 4 }
+      active: { line: 0, character: 4 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: outside,
+      modifier:
+        {
+          type: containingScope,
+          scopeType: collectionItem,
+          includeSiblings: false,
+        },
+      isImplicit: false,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/ruby/chuckItem2.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/ruby/chuckItem2.yml
new file mode 100644
index 0000000000..da9216cf90
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/ruby/chuckItem2.yml
@@ -0,0 +1,43 @@
+languageId: ruby
+command:
+  version: 1
+  spokenForm: chuck item
+  action: remove
+  targets:
+    - type: primitive
+      modifier:
+        {
+          type: containingScope,
+          scopeType: collectionItem,
+          includeSiblings: false,
+        }
+initialState:
+  documentContents: |
+    [1, 2, 3]
+  selections:
+    - anchor: { line: 0, character: 7 }
+      active: { line: 0, character: 7 }
+  marks: {}
+finalState:
+  documentContents: |
+    [1, 2]
+  selections:
+    - anchor: { line: 0, character: 5 }
+      active: { line: 0, character: 5 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: outside,
+      modifier:
+        {
+          type: containingScope,
+          scopeType: collectionItem,
+          includeSiblings: false,
+        },
+      isImplicit: false,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/ruby/chuckItem3.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/ruby/chuckItem3.yml
new file mode 100644
index 0000000000..b4bb94b78e
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/ruby/chuckItem3.yml
@@ -0,0 +1,43 @@
+languageId: ruby
+command:
+  version: 1
+  spokenForm: chuck item
+  action: remove
+  targets:
+    - type: primitive
+      modifier:
+        {
+          type: containingScope,
+          scopeType: collectionItem,
+          includeSiblings: false,
+        }
+initialState:
+  documentContents: |
+    %w(hello world)
+  selections:
+    - anchor: { line: 0, character: 14 }
+      active: { line: 0, character: 14 }
+  marks: {}
+finalState:
+  documentContents: |
+    %w(hello)
+  selections:
+    - anchor: { line: 0, character: 8 }
+      active: { line: 0, character: 8 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: outside,
+      modifier:
+        {
+          type: containingScope,
+          scopeType: collectionItem,
+          includeSiblings: false,
+        },
+      isImplicit: false,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/ruby/chuckItem4.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/ruby/chuckItem4.yml
new file mode 100644
index 0000000000..5e514b60f9
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/ruby/chuckItem4.yml
@@ -0,0 +1,43 @@
+languageId: ruby
+command:
+  version: 1
+  spokenForm: chuck item
+  action: remove
+  targets:
+    - type: primitive
+      modifier:
+        {
+          type: containingScope,
+          scopeType: collectionItem,
+          includeSiblings: false,
+        }
+initialState:
+  documentContents: |
+    %w(hello world)
+  selections:
+    - anchor: { line: 0, character: 7 }
+      active: { line: 0, character: 7 }
+  marks: {}
+finalState:
+  documentContents: |
+    %w(world)
+  selections:
+    - anchor: { line: 0, character: 3 }
+      active: { line: 0, character: 3 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: outside,
+      modifier:
+        {
+          type: containingScope,
+          scopeType: collectionItem,
+          includeSiblings: false,
+        },
+      isImplicit: false,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/ruby/chuckItem5.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/ruby/chuckItem5.yml
new file mode 100644
index 0000000000..fd9b00d430
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/ruby/chuckItem5.yml
@@ -0,0 +1,43 @@
+languageId: ruby
+command:
+  version: 1
+  spokenForm: chuck item
+  action: remove
+  targets:
+    - type: primitive
+      modifier:
+        {
+          type: containingScope,
+          scopeType: collectionItem,
+          includeSiblings: false,
+        }
+initialState:
+  documentContents: |
+    %i(hello world)
+  selections:
+    - anchor: { line: 0, character: 4 }
+      active: { line: 0, character: 4 }
+  marks: {}
+finalState:
+  documentContents: |
+    %i(world)
+  selections:
+    - anchor: { line: 0, character: 3 }
+      active: { line: 0, character: 3 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: outside,
+      modifier:
+        {
+          type: containingScope,
+          scopeType: collectionItem,
+          includeSiblings: false,
+        },
+      isImplicit: false,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/ruby/chuckItem6.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/ruby/chuckItem6.yml
new file mode 100644
index 0000000000..a015ba882f
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/ruby/chuckItem6.yml
@@ -0,0 +1,43 @@
+languageId: ruby
+command:
+  version: 1
+  spokenForm: chuck item
+  action: remove
+  targets:
+    - type: primitive
+      modifier:
+        {
+          type: containingScope,
+          scopeType: collectionItem,
+          includeSiblings: false,
+        }
+initialState:
+  documentContents: |
+    %i(hello world)
+  selections:
+    - anchor: { line: 0, character: 12 }
+      active: { line: 0, character: 12 }
+  marks: {}
+finalState:
+  documentContents: |
+    %i(hello)
+  selections:
+    - anchor: { line: 0, character: 8 }
+      active: { line: 0, character: 8 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: outside,
+      modifier:
+        {
+          type: containingScope,
+          scopeType: collectionItem,
+          includeSiblings: false,
+        },
+      isImplicit: false,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/ruby/chuckItem7.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/ruby/chuckItem7.yml
new file mode 100644
index 0000000000..278ed8d501
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/ruby/chuckItem7.yml
@@ -0,0 +1,43 @@
+languageId: ruby
+command:
+  version: 1
+  spokenForm: chuck item
+  action: remove
+  targets:
+    - type: primitive
+      modifier:
+        {
+          type: containingScope,
+          scopeType: collectionItem,
+          includeSiblings: false,
+        }
+initialState:
+  documentContents: |
+    { i: 10, z: 99}
+  selections:
+    - anchor: { line: 0, character: 13 }
+      active: { line: 0, character: 13 }
+  marks: {}
+finalState:
+  documentContents: |
+    { i: 10}
+  selections:
+    - anchor: { line: 0, character: 7 }
+      active: { line: 0, character: 7 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: outside,
+      modifier:
+        {
+          type: containingScope,
+          scopeType: collectionItem,
+          includeSiblings: false,
+        },
+      isImplicit: false,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/ruby/chuckNameThis.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/ruby/chuckNameThis.yml
new file mode 100644
index 0000000000..8c7283bd4a
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/ruby/chuckNameThis.yml
@@ -0,0 +1,34 @@
+languageId: ruby
+command:
+  version: 1
+  spokenForm: chuck name this
+  action: remove
+  targets:
+    - type: primitive
+      modifier:
+        { type: containingScope, scopeType: name, includeSiblings: false }
+      mark: { type: cursor }
+initialState:
+  documentContents: a += 1
+  selections:
+    - anchor: { line: 0, character: 5 }
+      active: { line: 0, character: 5 }
+  marks: {}
+finalState:
+  documentContents: += 1
+  selections:
+    - anchor: { line: 0, character: 3 }
+      active: { line: 0, character: 3 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: outside,
+      modifier:
+        { type: containingScope, scopeType: name, includeSiblings: false },
+      isImplicit: false,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/ruby/chuckNameThis2.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/ruby/chuckNameThis2.yml
new file mode 100644
index 0000000000..f61424ba1b
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/ruby/chuckNameThis2.yml
@@ -0,0 +1,34 @@
+languageId: ruby
+command:
+  version: 1
+  spokenForm: chuck name this
+  action: remove
+  targets:
+    - type: primitive
+      modifier:
+        { type: containingScope, scopeType: name, includeSiblings: false }
+      mark: { type: cursor }
+initialState:
+  documentContents: a = 1
+  selections:
+    - anchor: { line: 0, character: 4 }
+      active: { line: 0, character: 4 }
+  marks: {}
+finalState:
+  documentContents: "= 1"
+  selections:
+    - anchor: { line: 0, character: 2 }
+      active: { line: 0, character: 2 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: outside,
+      modifier:
+        { type: containingScope, scopeType: name, includeSiblings: false },
+      isImplicit: false,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/ruby/chuckState.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/ruby/chuckState.yml
new file mode 100644
index 0000000000..10cb00b5b3
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/ruby/chuckState.yml
@@ -0,0 +1,39 @@
+languageId: ruby
+command:
+  version: 1
+  spokenForm: chuck state
+  action: remove
+  targets:
+    - type: primitive
+      modifier:
+        { type: containingScope, scopeType: statement, includeSiblings: false }
+initialState:
+  documentContents: |-
+    if true
+      a = 1
+    end
+  selections:
+    - anchor: { line: 1, character: 6 }
+      active: { line: 1, character: 6 }
+  marks: {}
+finalState:
+  documentContents: |-
+    if true
+
+    end
+  selections:
+    - anchor: { line: 1, character: 0 }
+      active: { line: 1, character: 0 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: outside,
+      modifier:
+        { type: containingScope, scopeType: statement, includeSiblings: false },
+      isImplicit: false,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/ruby/chuckState10.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/ruby/chuckState10.yml
new file mode 100644
index 0000000000..51959867f3
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/ruby/chuckState10.yml
@@ -0,0 +1,43 @@
+languageId: ruby
+command:
+  version: 1
+  spokenForm: chuck state
+  action: remove
+  targets:
+    - type: primitive
+      modifier:
+        { type: containingScope, scopeType: statement, includeSiblings: false }
+initialState:
+  documentContents: |-
+    begin
+      a = 10
+    ensure
+      a = 10
+    end
+  selections:
+    - anchor: { line: 3, character: 6 }
+      active: { line: 3, character: 6 }
+  marks: {}
+finalState:
+  documentContents: |-
+    begin
+      a = 10
+    ensure
+
+    end
+  selections:
+    - anchor: { line: 3, character: 0 }
+      active: { line: 3, character: 0 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: outside,
+      modifier:
+        { type: containingScope, scopeType: statement, includeSiblings: false },
+      isImplicit: false,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/ruby/chuckState11.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/ruby/chuckState11.yml
new file mode 100644
index 0000000000..099d4e2bb2
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/ruby/chuckState11.yml
@@ -0,0 +1,47 @@
+languageId: ruby
+command:
+  version: 1
+  spokenForm: chuck state
+  action: remove
+  targets:
+    - type: primitive
+      modifier:
+        { type: containingScope, scopeType: statement, includeSiblings: false }
+initialState:
+  documentContents: |-
+    begin
+      a = 10
+    else
+      a = 10
+    ensure
+      a = 10
+    end
+  selections:
+    - anchor: { line: 3, character: 6 }
+      active: { line: 3, character: 6 }
+  marks: {}
+finalState:
+  documentContents: |-
+    begin
+      a = 10
+    else
+
+    ensure
+      a = 10
+    end
+  selections:
+    - anchor: { line: 3, character: 0 }
+      active: { line: 3, character: 0 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: outside,
+      modifier:
+        { type: containingScope, scopeType: statement, includeSiblings: false },
+      isImplicit: false,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/ruby/chuckState2.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/ruby/chuckState2.yml
new file mode 100644
index 0000000000..f213e398df
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/ruby/chuckState2.yml
@@ -0,0 +1,39 @@
+languageId: ruby
+command:
+  version: 1
+  spokenForm: chuck state
+  action: remove
+  targets:
+    - type: primitive
+      modifier:
+        { type: containingScope, scopeType: statement, includeSiblings: false }
+initialState:
+  documentContents: |-
+    while true  do
+      a = 1
+    end
+  selections:
+    - anchor: { line: 1, character: 6 }
+      active: { line: 1, character: 6 }
+  marks: {}
+finalState:
+  documentContents: |-
+    while true  do
+
+    end
+  selections:
+    - anchor: { line: 1, character: 0 }
+      active: { line: 1, character: 0 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: outside,
+      modifier:
+        { type: containingScope, scopeType: statement, includeSiblings: false },
+      isImplicit: false,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/ruby/chuckState3.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/ruby/chuckState3.yml
new file mode 100644
index 0000000000..ed4dffde82
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/ruby/chuckState3.yml
@@ -0,0 +1,39 @@
+languageId: ruby
+command:
+  version: 1
+  spokenForm: chuck state
+  action: remove
+  targets:
+    - type: primitive
+      modifier:
+        { type: containingScope, scopeType: statement, includeSiblings: false }
+initialState:
+  documentContents: |-
+    [].each do |i|
+      puts i
+    end
+  selections:
+    - anchor: { line: 1, character: 7 }
+      active: { line: 1, character: 7 }
+  marks: {}
+finalState:
+  documentContents: |-
+    [].each do |i|
+
+    end
+  selections:
+    - anchor: { line: 1, character: 0 }
+      active: { line: 1, character: 0 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: outside,
+      modifier:
+        { type: containingScope, scopeType: statement, includeSiblings: false },
+      isImplicit: false,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/ruby/chuckState4.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/ruby/chuckState4.yml
new file mode 100644
index 0000000000..3f4151813d
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/ruby/chuckState4.yml
@@ -0,0 +1,39 @@
+languageId: ruby
+command:
+  version: 1
+  spokenForm: chuck state
+  action: remove
+  targets:
+    - type: primitive
+      modifier:
+        { type: containingScope, scopeType: statement, includeSiblings: false }
+initialState:
+  documentContents: |-
+    [].each { |i|
+      puts i
+    }
+  selections:
+    - anchor: { line: 1, character: 2 }
+      active: { line: 1, character: 2 }
+  marks: {}
+finalState:
+  documentContents: |-
+    [].each { |i|
+
+    }
+  selections:
+    - anchor: { line: 1, character: 0 }
+      active: { line: 1, character: 0 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: outside,
+      modifier:
+        { type: containingScope, scopeType: statement, includeSiblings: false },
+      isImplicit: false,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/ruby/chuckState5.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/ruby/chuckState5.yml
new file mode 100644
index 0000000000..21ba1844fb
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/ruby/chuckState5.yml
@@ -0,0 +1,39 @@
+languageId: ruby
+command:
+  version: 1
+  spokenForm: chuck state
+  action: remove
+  targets:
+    - type: primitive
+      modifier:
+        { type: containingScope, scopeType: statement, includeSiblings: false }
+initialState:
+  documentContents: |-
+    begin
+      puts("hi")
+    end until true
+  selections:
+    - anchor: { line: 1, character: 2 }
+      active: { line: 1, character: 2 }
+  marks: {}
+finalState:
+  documentContents: |-
+    begin
+
+    end until true
+  selections:
+    - anchor: { line: 1, character: 0 }
+      active: { line: 1, character: 0 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: outside,
+      modifier:
+        { type: containingScope, scopeType: statement, includeSiblings: false },
+      isImplicit: false,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/ruby/chuckState6.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/ruby/chuckState6.yml
new file mode 100644
index 0000000000..37af57b204
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/ruby/chuckState6.yml
@@ -0,0 +1,36 @@
+languageId: ruby
+command:
+  version: 1
+  spokenForm: chuck state
+  action: remove
+  targets:
+    - type: primitive
+      modifier:
+        { type: containingScope, scopeType: statement, includeSiblings: false }
+initialState:
+  documentContents: |-
+    begin
+      puts("hi")
+    end until true
+  selections:
+    - anchor: { line: 2, character: 5 }
+      active: { line: 2, character: 5 }
+  marks: {}
+finalState:
+  documentContents: ""
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: outside,
+      modifier:
+        { type: containingScope, scopeType: statement, includeSiblings: false },
+      isImplicit: false,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/ruby/chuckState7.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/ruby/chuckState7.yml
new file mode 100644
index 0000000000..5c6431ecbe
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/ruby/chuckState7.yml
@@ -0,0 +1,45 @@
+languageId: ruby
+command:
+  version: 1
+  spokenForm: chuck state
+  action: remove
+  targets:
+    - type: primitive
+      modifier:
+        { type: containingScope, scopeType: statement, includeSiblings: false }
+initialState:
+  documentContents: |-
+    case abc
+    when true
+      a = 0
+    else
+      a = 10
+    end
+  selections:
+    - anchor: { line: 2, character: 4 }
+      active: { line: 2, character: 4 }
+  marks: {}
+finalState:
+  documentContents: |-
+    case abc
+    when true
+
+    else
+      a = 10
+    end
+  selections:
+    - anchor: { line: 2, character: 0 }
+      active: { line: 2, character: 0 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: outside,
+      modifier:
+        { type: containingScope, scopeType: statement, includeSiblings: false },
+      isImplicit: false,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/ruby/chuckState8.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/ruby/chuckState8.yml
new file mode 100644
index 0000000000..fb3c2b74f0
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/ruby/chuckState8.yml
@@ -0,0 +1,45 @@
+languageId: ruby
+command:
+  version: 1
+  spokenForm: chuck state
+  action: remove
+  targets:
+    - type: primitive
+      modifier:
+        { type: containingScope, scopeType: statement, includeSiblings: false }
+initialState:
+  documentContents: |-
+    case abc
+    when true
+      a = 0
+    else
+      a = 10
+    end
+  selections:
+    - anchor: { line: 4, character: 4 }
+      active: { line: 4, character: 4 }
+  marks: {}
+finalState:
+  documentContents: |-
+    case abc
+    when true
+      a = 0
+    else
+
+    end
+  selections:
+    - anchor: { line: 4, character: 0 }
+      active: { line: 4, character: 0 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: outside,
+      modifier:
+        { type: containingScope, scopeType: statement, includeSiblings: false },
+      isImplicit: false,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/ruby/chuckState9.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/ruby/chuckState9.yml
new file mode 100644
index 0000000000..91e55eba95
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/ruby/chuckState9.yml
@@ -0,0 +1,43 @@
+languageId: ruby
+command:
+  version: 1
+  spokenForm: chuck state
+  action: remove
+  targets:
+    - type: primitive
+      modifier:
+        { type: containingScope, scopeType: statement, includeSiblings: false }
+initialState:
+  documentContents: |-
+    begin
+      a = 10
+    ensure
+      a = 10
+    end
+  selections:
+    - anchor: { line: 1, character: 5 }
+      active: { line: 1, character: 5 }
+  marks: {}
+finalState:
+  documentContents: |-
+    begin
+
+    ensure
+      a = 10
+    end
+  selections:
+    - anchor: { line: 1, character: 0 }
+      active: { line: 1, character: 0 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: outside,
+      modifier:
+        { type: containingScope, scopeType: statement, includeSiblings: false },
+      isImplicit: false,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/ruby/chuckValue.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/ruby/chuckValue.yml
new file mode 100644
index 0000000000..6678ddf973
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/ruby/chuckValue.yml
@@ -0,0 +1,33 @@
+languageId: ruby
+command:
+  version: 1
+  spokenForm: chuck value
+  action: remove
+  targets:
+    - type: primitive
+      modifier:
+        { type: containingScope, scopeType: value, includeSiblings: false }
+initialState:
+  documentContents: '{ hi: "world" }'
+  selections:
+    - anchor: { line: 0, character: 7 }
+      active: { line: 0, character: 7 }
+  marks: {}
+finalState:
+  documentContents: "{ hi }"
+  selections:
+    - anchor: { line: 0, character: 4 }
+      active: { line: 0, character: 4 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: outside,
+      modifier:
+        { type: containingScope, scopeType: value, includeSiblings: false },
+      isImplicit: false,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/ruby/chuckValue2.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/ruby/chuckValue2.yml
new file mode 100644
index 0000000000..c4ff436813
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/ruby/chuckValue2.yml
@@ -0,0 +1,33 @@
+languageId: ruby
+command:
+  version: 1
+  spokenForm: chuck value
+  action: remove
+  targets:
+    - type: primitive
+      modifier:
+        { type: containingScope, scopeType: value, includeSiblings: false }
+initialState:
+  documentContents: '{ hi => "world" }'
+  selections:
+    - anchor: { line: 0, character: 9 }
+      active: { line: 0, character: 9 }
+  marks: {}
+finalState:
+  documentContents: "{ hi }"
+  selections:
+    - anchor: { line: 0, character: 4 }
+      active: { line: 0, character: 4 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: outside,
+      modifier:
+        { type: containingScope, scopeType: value, includeSiblings: false },
+      isImplicit: false,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/ruby/chuckValue3.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/ruby/chuckValue3.yml
new file mode 100644
index 0000000000..0722be506d
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/ruby/chuckValue3.yml
@@ -0,0 +1,33 @@
+languageId: ruby
+command:
+  version: 1
+  spokenForm: chuck value
+  action: remove
+  targets:
+    - type: primitive
+      modifier:
+        { type: containingScope, scopeType: value, includeSiblings: false }
+initialState:
+  documentContents: '{ "hi": "world" }'
+  selections:
+    - anchor: { line: 0, character: 8 }
+      active: { line: 0, character: 8 }
+  marks: {}
+finalState:
+  documentContents: '{ "hi" }'
+  selections:
+    - anchor: { line: 0, character: 6 }
+      active: { line: 0, character: 6 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: outside,
+      modifier:
+        { type: containingScope, scopeType: value, includeSiblings: false },
+      isImplicit: false,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/ruby/chuckValue5.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/ruby/chuckValue5.yml
new file mode 100644
index 0000000000..6c4629210f
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/ruby/chuckValue5.yml
@@ -0,0 +1,33 @@
+languageId: ruby
+command:
+  version: 1
+  spokenForm: chuck value
+  action: remove
+  targets:
+    - type: primitive
+      modifier:
+        { type: containingScope, scopeType: value, includeSiblings: false }
+initialState:
+  documentContents: a = 10
+  selections:
+    - anchor: { line: 0, character: 5 }
+      active: { line: 0, character: 5 }
+  marks: {}
+finalState:
+  documentContents: a
+  selections:
+    - anchor: { line: 0, character: 1 }
+      active: { line: 0, character: 1 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: outside,
+      modifier:
+        { type: containingScope, scopeType: value, includeSiblings: false },
+      isImplicit: false,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/ruby/chuckValue6.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/ruby/chuckValue6.yml
new file mode 100644
index 0000000000..d6859e5200
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/ruby/chuckValue6.yml
@@ -0,0 +1,33 @@
+languageId: ruby
+command:
+  version: 1
+  spokenForm: chuck value
+  action: remove
+  targets:
+    - type: primitive
+      modifier:
+        { type: containingScope, scopeType: value, includeSiblings: false }
+initialState:
+  documentContents: a += 1
+  selections:
+    - anchor: { line: 0, character: 5 }
+      active: { line: 0, character: 5 }
+  marks: {}
+finalState:
+  documentContents: a
+  selections:
+    - anchor: { line: 0, character: 1 }
+      active: { line: 0, character: 1 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: outside,
+      modifier:
+        { type: containingScope, scopeType: value, includeSiblings: false },
+      isImplicit: false,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/ruby/clearState.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/ruby/clearState.yml
new file mode 100644
index 0000000000..3949386ecd
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/ruby/clearState.yml
@@ -0,0 +1,33 @@
+languageId: ruby
+command:
+  version: 1
+  spokenForm: clear state
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier:
+        { type: containingScope, scopeType: statement, includeSiblings: false }
+initialState:
+  documentContents: foo = bar("bongo")
+  selections:
+    - anchor: { line: 0, character: 13 }
+      active: { line: 0, character: 13 }
+  marks: {}
+finalState:
+  documentContents: ""
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        { type: containingScope, scopeType: statement, includeSiblings: false },
+      isImplicit: false,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/ruby/clearState2.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/ruby/clearState2.yml
new file mode 100644
index 0000000000..ac303e6dc0
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/ruby/clearState2.yml
@@ -0,0 +1,33 @@
+languageId: ruby
+command:
+  version: 1
+  spokenForm: clear state
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier:
+        { type: containingScope, scopeType: statement, includeSiblings: false }
+initialState:
+  documentContents: bar("bongo")
+  selections:
+    - anchor: { line: 0, character: 7 }
+      active: { line: 0, character: 7 }
+  marks: {}
+finalState:
+  documentContents: ""
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        { type: containingScope, scopeType: statement, includeSiblings: false },
+      isImplicit: false,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/rust/changeArgAir.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/rust/changeArgAir.yml
new file mode 100644
index 0000000000..7e857ee84f
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/rust/changeArgAir.yml
@@ -0,0 +1,37 @@
+languageId: rust
+command:
+  spokenForm: change arg air
+  version: 2
+  targets:
+    - type: primitive
+      mark: { type: decoratedSymbol, symbolColor: default, character: a }
+      modifiers:
+        - type: containingScope
+          scopeType: { type: argumentOrParameter }
+  usePrePhraseSnapshot: true
+  action: { name: clearAndSetSelection }
+initialState:
+  documentContents: |
+    fn foo(x: &'a mut u32) -> &'static mut u16 {}
+  selections:
+    - anchor: { line: 0, character: 45 }
+      active: { line: 0, character: 45 }
+  marks:
+    default.a:
+      start: { line: 0, character: 12 }
+      end: { line: 0, character: 13 }
+finalState:
+  documentContents: |
+    fn foo() -> &'static mut u16 {}
+  selections:
+    - anchor: { line: 0, character: 7 }
+      active: { line: 0, character: 7 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: decoratedSymbol, symbolColor: default, character: a },
+      modifiers:
+        [{ type: containingScope, scopeType: { type: argumentOrParameter } }],
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/rust/changeArgBlueAir.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/rust/changeArgBlueAir.yml
new file mode 100644
index 0000000000..17efc30476
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/rust/changeArgBlueAir.yml
@@ -0,0 +1,37 @@
+languageId: rust
+command:
+  spokenForm: change arg blue air
+  version: 2
+  targets:
+    - type: primitive
+      mark: { type: decoratedSymbol, symbolColor: blue, character: a }
+      modifiers:
+        - type: containingScope
+          scopeType: { type: argumentOrParameter }
+  usePrePhraseSnapshot: true
+  action: { name: clearAndSetSelection }
+initialState:
+  documentContents: |
+    struct S<'a, 'b: 'a, T>;
+  selections:
+    - anchor: { line: 1, character: 0 }
+      active: { line: 1, character: 0 }
+  marks:
+    blue.a:
+      start: { line: 0, character: 18 }
+      end: { line: 0, character: 19 }
+finalState:
+  documentContents: |
+    struct S<'a, , T>;
+  selections:
+    - anchor: { line: 0, character: 13 }
+      active: { line: 0, character: 13 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: decoratedSymbol, symbolColor: blue, character: a },
+      modifiers:
+        [{ type: containingScope, scopeType: { type: argumentOrParameter } }],
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/rust/changeArgEight.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/rust/changeArgEight.yml
new file mode 100644
index 0000000000..8fa25ab49f
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/rust/changeArgEight.yml
@@ -0,0 +1,41 @@
+languageId: rust
+command:
+  spokenForm: change arg eight
+  version: 2
+  targets:
+    - type: primitive
+      mark: { type: decoratedSymbol, symbolColor: default, character: "8" }
+      modifiers:
+        - type: containingScope
+          scopeType: { type: argumentOrParameter }
+  usePrePhraseSnapshot: true
+  action: { name: clearAndSetSelection }
+initialState:
+  documentContents: |
+    enum E {
+        C(u8, u16, u32),
+    }
+  selections:
+    - anchor: { line: 3, character: 0 }
+      active: { line: 3, character: 0 }
+  marks:
+    default.8:
+      start: { line: 1, character: 6 }
+      end: { line: 1, character: 8 }
+finalState:
+  documentContents: |
+    enum E {
+        C(, u16, u32),
+    }
+  selections:
+    - anchor: { line: 1, character: 6 }
+      active: { line: 1, character: 6 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: decoratedSymbol, symbolColor: default, character: "8" },
+      modifiers:
+        [{ type: containingScope, scopeType: { type: argumentOrParameter } }],
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/rust/changeArgSun.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/rust/changeArgSun.yml
new file mode 100644
index 0000000000..4d9609a929
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/rust/changeArgSun.yml
@@ -0,0 +1,41 @@
+languageId: rust
+command:
+  spokenForm: change arg sun
+  version: 2
+  targets:
+    - type: primitive
+      mark: { type: decoratedSymbol, symbolColor: default, character: s }
+      modifiers:
+        - type: containingScope
+          scopeType: { type: argumentOrParameter }
+  usePrePhraseSnapshot: true
+  action: { name: clearAndSetSelection }
+initialState:
+  documentContents: >-
+    fn some_function<T: Display + Clone, U: Clone + Debug>(t: &T, u: &U) -> i32
+    {
+
+    }
+  selections:
+    - anchor: { line: 1, character: 1 }
+      active: { line: 1, character: 1 }
+  marks:
+    default.s:
+      start: { line: 0, character: 20 }
+      end: { line: 0, character: 27 }
+finalState:
+  documentContents: |-
+    fn some_function<, U: Clone + Debug>(t: &T, u: &U) -> i32 {
+    }
+  selections:
+    - anchor: { line: 0, character: 17 }
+      active: { line: 0, character: 17 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: decoratedSymbol, symbolColor: default, character: s },
+      modifiers:
+        [{ type: containingScope, scopeType: { type: argumentOrParameter } }],
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/rust/changeArgTrap.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/rust/changeArgTrap.yml
new file mode 100644
index 0000000000..1f24dbde19
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/rust/changeArgTrap.yml
@@ -0,0 +1,37 @@
+languageId: rust
+command:
+  spokenForm: change arg trap
+  version: 2
+  targets:
+    - type: primitive
+      mark: { type: decoratedSymbol, symbolColor: default, character: t }
+      modifiers:
+        - type: containingScope
+          scopeType: { type: argumentOrParameter }
+  usePrePhraseSnapshot: true
+  action: { name: clearAndSetSelection }
+initialState:
+  documentContents: |
+    struct S<'a, 'b: 'a, T> {};
+  selections:
+    - anchor: { line: 1, character: 0 }
+      active: { line: 1, character: 0 }
+  marks:
+    default.t:
+      start: { line: 0, character: 21 }
+      end: { line: 0, character: 22 }
+finalState:
+  documentContents: |
+    struct S<'a, 'b: 'a, > {};
+  selections:
+    - anchor: { line: 0, character: 21 }
+      active: { line: 0, character: 21 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: decoratedSymbol, symbolColor: default, character: t },
+      modifiers:
+        [{ type: containingScope, scopeType: { type: argumentOrParameter } }],
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/rust/changeArgTrapAndBlueTrap.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/rust/changeArgTrapAndBlueTrap.yml
new file mode 100644
index 0000000000..2423d00985
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/rust/changeArgTrapAndBlueTrap.yml
@@ -0,0 +1,68 @@
+languageId: rust
+command:
+  spokenForm: change arg trap and blue trap
+  version: 2
+  targets:
+    - type: list
+      elements:
+        - type: primitive
+          mark: { type: decoratedSymbol, symbolColor: default, character: t }
+          modifiers:
+            - type: containingScope
+              scopeType: { type: argumentOrParameter }
+        - type: primitive
+          mark: { type: decoratedSymbol, symbolColor: blue, character: t }
+  usePrePhraseSnapshot: true
+  action: { name: clearAndSetSelection }
+initialState:
+  documentContents: |
+    enum Maybe<T> {
+        Just(T),
+        Nothing,
+    }
+  selections:
+    - anchor: { line: 4, character: 0 }
+      active: { line: 4, character: 0 }
+  marks:
+    default.t:
+      start: { line: 1, character: 9 }
+      end: { line: 1, character: 10 }
+    blue.t:
+      start: { line: 0, character: 11 }
+      end: { line: 0, character: 12 }
+finalState:
+  documentContents: |
+    enum Maybe<> {
+        Just(),
+        Nothing,
+    }
+  selections:
+    - anchor: { line: 0, character: 11 }
+      active: { line: 0, character: 11 }
+    - anchor: { line: 1, character: 9 }
+      active: { line: 1, character: 9 }
+fullTargets:
+  [
+    {
+      type: list,
+      elements:
+        [
+          {
+            type: primitive,
+            mark: { type: decoratedSymbol, symbolColor: default, character: t },
+            modifiers:
+              [
+                &ref_0 {
+                  type: containingScope,
+                  scopeType: { type: argumentOrParameter },
+                },
+              ],
+          },
+          {
+            type: primitive,
+            mark: { type: decoratedSymbol, symbolColor: blue, character: t },
+            modifiers: [*ref_0],
+          },
+        ],
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/rust/changeCallSun.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/rust/changeCallSun.yml
new file mode 100644
index 0000000000..dcb4da3da9
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/rust/changeCallSun.yml
@@ -0,0 +1,37 @@
+languageId: rust
+command:
+  spokenForm: change call sun
+  version: 2
+  targets:
+    - type: primitive
+      mark: { type: decoratedSymbol, symbolColor: default, character: s }
+      modifiers:
+        - type: containingScope
+          scopeType: { type: functionCall }
+  usePrePhraseSnapshot: true
+  action: { name: clearAndSetSelection }
+initialState:
+  documentContents: |-
+    let user = User {
+        name: ""
+    }
+  selections:
+    - anchor: { line: 2, character: 1 }
+      active: { line: 2, character: 1 }
+  marks:
+    default.s:
+      start: { line: 0, character: 11 }
+      end: { line: 0, character: 15 }
+finalState:
+  documentContents: "let user = "
+  selections:
+    - anchor: { line: 0, character: 11 }
+      active: { line: 0, character: 11 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: decoratedSymbol, symbolColor: default, character: s },
+      modifiers: [{ type: containingScope, scopeType: { type: functionCall } }],
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/rust/changeClass.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/rust/changeClass.yml
new file mode 100644
index 0000000000..8f622aeeaf
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/rust/changeClass.yml
@@ -0,0 +1,36 @@
+languageId: rust
+command:
+  version: 1
+  spokenForm: change class
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier:
+        { type: containingScope, scopeType: class, includeSiblings: false }
+initialState:
+  documentContents: |-
+    struct Point<T> {
+        a: T
+    }
+  selections:
+    - anchor: { line: 0, character: 1 }
+      active: { line: 0, character: 1 }
+  marks: {}
+finalState:
+  documentContents: ""
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        { type: containingScope, scopeType: class, includeSiblings: false },
+      isImplicit: false,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/rust/changeClassName.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/rust/changeClassName.yml
new file mode 100644
index 0000000000..dc9df03b51
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/rust/changeClassName.yml
@@ -0,0 +1,30 @@
+languageId: rust
+command:
+  spokenForm: change class name
+  version: 2
+  targets:
+    - type: primitive
+      modifiers:
+        - type: containingScope
+          scopeType: { type: className }
+  usePrePhraseSnapshot: true
+  action: { name: clearAndSetSelection }
+initialState:
+  documentContents: struct Some {}
+  selections:
+    - anchor: { line: 0, character: 13 }
+      active: { line: 0, character: 13 }
+  marks: {}
+finalState:
+  documentContents: struct  {}
+  selections:
+    - anchor: { line: 0, character: 7 }
+      active: { line: 0, character: 7 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      modifiers: [{ type: containingScope, scopeType: { type: className } }],
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/rust/changeFunkName.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/rust/changeFunkName.yml
new file mode 100644
index 0000000000..9c81fa5113
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/rust/changeFunkName.yml
@@ -0,0 +1,30 @@
+languageId: rust
+command:
+  spokenForm: change funk name
+  version: 2
+  targets:
+    - type: primitive
+      modifiers:
+        - type: containingScope
+          scopeType: { type: functionName }
+  usePrePhraseSnapshot: true
+  action: { name: clearAndSetSelection }
+initialState:
+  documentContents: fn main() {}
+  selections:
+    - anchor: { line: 0, character: 11 }
+      active: { line: 0, character: 11 }
+  marks: {}
+finalState:
+  documentContents: fn () {}
+  selections:
+    - anchor: { line: 0, character: 3 }
+      active: { line: 0, character: 3 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      modifiers: [{ type: containingScope, scopeType: { type: functionName } }],
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/rust/changeItemAir2.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/rust/changeItemAir2.yml
new file mode 100644
index 0000000000..cf7348539a
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/rust/changeItemAir2.yml
@@ -0,0 +1,37 @@
+languageId: rust
+command:
+  spokenForm: change item air
+  version: 3
+  targets:
+    - type: primitive
+      modifiers:
+        - type: containingScope
+          scopeType: { type: collectionItem }
+      mark: { type: decoratedSymbol, symbolColor: default, character: a }
+  usePrePhraseSnapshot: true
+  action: { name: clearAndSetSelection }
+initialState:
+  documentContents: |
+    type T = (&'static str, &'static str);
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+  marks:
+    default.a:
+      start: { line: 0, character: 12 }
+      end: { line: 0, character: 18 }
+finalState:
+  documentContents: |
+    type T = (, &'static str);
+  selections:
+    - anchor: { line: 0, character: 10 }
+      active: { line: 0, character: 10 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: decoratedSymbol, symbolColor: default, character: a },
+      modifiers:
+        [{ type: containingScope, scopeType: { type: collectionItem } }],
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/rust/changeItemNear.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/rust/changeItemNear.yml
new file mode 100644
index 0000000000..62300c3fab
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/rust/changeItemNear.yml
@@ -0,0 +1,37 @@
+languageId: rust
+command:
+  spokenForm: change item near
+  version: 2
+  targets:
+    - type: primitive
+      mark: { type: decoratedSymbol, symbolColor: default, character: "n" }
+      modifiers:
+        - type: containingScope
+          scopeType: { type: collectionItem }
+  usePrePhraseSnapshot: true
+  action: { name: clearAndSetSelection }
+initialState:
+  documentContents: |
+    let x = [None, Some(1)];
+  selections:
+    - anchor: { line: 0, character: 24 }
+      active: { line: 0, character: 24 }
+  marks:
+    default.n:
+      start: { line: 0, character: 9 }
+      end: { line: 0, character: 13 }
+finalState:
+  documentContents: |
+    let x = [, Some(1)];
+  selections:
+    - anchor: { line: 0, character: 9 }
+      active: { line: 0, character: 9 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: decoratedSymbol, symbolColor: default, character: "n" },
+      modifiers:
+        [{ type: containingScope, scopeType: { type: collectionItem } }],
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/rust/changeItemOne.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/rust/changeItemOne.yml
new file mode 100644
index 0000000000..cf6d0babda
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/rust/changeItemOne.yml
@@ -0,0 +1,37 @@
+languageId: rust
+command:
+  spokenForm: change item one
+  version: 2
+  targets:
+    - type: primitive
+      mark: { type: decoratedSymbol, symbolColor: default, character: "1" }
+      modifiers:
+        - type: containingScope
+          scopeType: { type: collectionItem }
+  usePrePhraseSnapshot: true
+  action: { name: clearAndSetSelection }
+initialState:
+  documentContents: |
+    let x = [None, Some(1)];
+  selections:
+    - anchor: { line: 0, character: 24 }
+      active: { line: 0, character: 24 }
+  marks:
+    default.1:
+      start: { line: 0, character: 20 }
+      end: { line: 0, character: 21 }
+finalState:
+  documentContents: |
+    let x = [None, ];
+  selections:
+    - anchor: { line: 0, character: 15 }
+      active: { line: 0, character: 15 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: decoratedSymbol, symbolColor: default, character: "1" },
+      modifiers:
+        [{ type: containingScope, scopeType: { type: collectionItem } }],
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/rust/changeKeyDrum.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/rust/changeKeyDrum.yml
new file mode 100644
index 0000000000..417ec94b07
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/rust/changeKeyDrum.yml
@@ -0,0 +1,39 @@
+languageId: rust
+command:
+  spokenForm: change key drum
+  version: 2
+  targets:
+    - type: primitive
+      mark: { type: decoratedSymbol, symbolColor: default, character: d }
+      modifiers:
+        - type: containingScope
+          scopeType: { type: collectionKey }
+  usePrePhraseSnapshot: true
+  action: { name: clearAndSetSelection }
+initialState:
+  documentContents: |
+    if let User { first_name: "John", last_name: "Doe" } = user {
+    }
+  selections:
+    - anchor: { line: 2, character: 0 }
+      active: { line: 2, character: 0 }
+  marks:
+    default.d:
+      start: { line: 0, character: 46 }
+      end: { line: 0, character: 49 }
+finalState:
+  documentContents: |
+    if let User { first_name: "John", : "Doe" } = user {
+    }
+  selections:
+    - anchor: { line: 0, character: 34 }
+      active: { line: 0, character: 34 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: decoratedSymbol, symbolColor: default, character: d },
+      modifiers:
+        [{ type: containingScope, scopeType: { type: collectionKey } }],
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/rust/changeKeyJury.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/rust/changeKeyJury.yml
new file mode 100644
index 0000000000..47d5f827c3
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/rust/changeKeyJury.yml
@@ -0,0 +1,39 @@
+languageId: rust
+command:
+  spokenForm: change key jury
+  version: 2
+  targets:
+    - type: primitive
+      mark: { type: decoratedSymbol, symbolColor: default, character: j }
+      modifiers:
+        - type: containingScope
+          scopeType: { type: collectionKey }
+  usePrePhraseSnapshot: true
+  action: { name: clearAndSetSelection }
+initialState:
+  documentContents: |
+    if let User { first_name: "John", last_name: "Doe" } = user {
+    }
+  selections:
+    - anchor: { line: 2, character: 0 }
+      active: { line: 2, character: 0 }
+  marks:
+    default.j:
+      start: { line: 0, character: 27 }
+      end: { line: 0, character: 31 }
+finalState:
+  documentContents: |
+    if let User { : "John", last_name: "Doe" } = user {
+    }
+  selections:
+    - anchor: { line: 0, character: 14 }
+      active: { line: 0, character: 14 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: decoratedSymbol, symbolColor: default, character: j },
+      modifiers:
+        [{ type: containingScope, scopeType: { type: collectionKey } }],
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/rust/changeLambda.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/rust/changeLambda.yml
new file mode 100644
index 0000000000..a40326b731
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/rust/changeLambda.yml
@@ -0,0 +1,46 @@
+languageId: rust
+command:
+  version: 1
+  spokenForm: change lambda
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier:
+        {
+          type: containingScope,
+          scopeType: anonymousFunction,
+          includeSiblings: false,
+        }
+initialState:
+  documentContents: |-
+    let expensive_closure = |num| {
+        println!("calculating slowly...");
+        thread::sleep(Duration::from_secs(2));
+        num
+    };
+  selections:
+    - anchor: { line: 2, character: 7 }
+      active: { line: 2, character: 7 }
+  marks: {}
+finalState:
+  documentContents: let expensive_closure = ;
+  selections:
+    - anchor: { line: 0, character: 24 }
+      active: { line: 0, character: 24 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        {
+          type: containingScope,
+          scopeType: anonymousFunction,
+          includeSiblings: false,
+        },
+      isImplicit: false,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/rust/changeName.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/rust/changeName.yml
new file mode 100644
index 0000000000..3bc6d29372
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/rust/changeName.yml
@@ -0,0 +1,36 @@
+languageId: rust
+command:
+  spokenForm: change name
+  version: 2
+  targets:
+    - type: primitive
+      modifiers:
+        - type: containingScope
+          scopeType: { type: name }
+  usePrePhraseSnapshot: true
+  action: { name: clearAndSetSelection }
+initialState:
+  documentContents: |
+    fn main() -> Result<(), Error> {
+
+    }
+  selections:
+    - anchor: { line: 1, character: 4 }
+      active: { line: 1, character: 4 }
+  marks: {}
+finalState:
+  documentContents: |
+    fn () -> Result<(), Error> {
+
+    }
+  selections:
+    - anchor: { line: 0, character: 3 }
+      active: { line: 0, character: 3 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      modifiers: [{ type: containingScope, scopeType: { type: name } }],
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/rust/changeName2.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/rust/changeName2.yml
new file mode 100644
index 0000000000..87df1623de
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/rust/changeName2.yml
@@ -0,0 +1,44 @@
+languageId: rust
+command:
+  spokenForm: change name
+  version: 2
+  targets:
+    - type: primitive
+      modifiers:
+        - type: containingScope
+          scopeType: { type: name }
+  usePrePhraseSnapshot: true
+  action: { name: clearAndSetSelection }
+initialState:
+  documentContents: |
+    struct S {
+        v: u32,
+    }
+
+    fn main() {
+        let S { v } = S { v: 32 };
+    }
+  selections:
+    - anchor: { line: 5, character: 18 }
+      active: { line: 5, character: 18 }
+  marks: {}
+finalState:
+  documentContents: |
+    struct S {
+        v: u32,
+    }
+
+    fn main() {
+        let  = S { v: 32 };
+    }
+  selections:
+    - anchor: { line: 5, character: 8 }
+      active: { line: 5, character: 8 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      modifiers: [{ type: containingScope, scopeType: { type: name } }],
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/rust/changeNameDrum.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/rust/changeNameDrum.yml
new file mode 100644
index 0000000000..8260409d26
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/rust/changeNameDrum.yml
@@ -0,0 +1,42 @@
+languageId: rust
+command:
+  spokenForm: change name drum
+  version: 2
+  targets:
+    - type: primitive
+      mark: { type: decoratedSymbol, symbolColor: default, character: d }
+      modifiers:
+        - type: containingScope
+          scopeType: { type: name }
+  usePrePhraseSnapshot: true
+  action: { name: clearAndSetSelection }
+initialState:
+  documentContents: |
+    fn some_function<T, U>(t: &T, u: &U) -> i32
+        where T: Display + Clone,
+              U: Clone + Debug
+    {}
+  selections:
+    - anchor: { line: 4, character: 0 }
+      active: { line: 4, character: 0 }
+  marks:
+    default.d:
+      start: { line: 1, character: 13 }
+      end: { line: 1, character: 20 }
+finalState:
+  documentContents: |
+    fn some_function<T, U>(t: &T, u: &U) -> i32
+        where : Display + Clone,
+              U: Clone + Debug
+    {}
+  selections:
+    - anchor: { line: 1, character: 10 }
+      active: { line: 1, character: 10 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: decoratedSymbol, symbolColor: default, character: d },
+      modifiers: [{ type: containingScope, scopeType: { type: name } }],
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/rust/changeNameDrum2.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/rust/changeNameDrum2.yml
new file mode 100644
index 0000000000..2dd141f656
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/rust/changeNameDrum2.yml
@@ -0,0 +1,42 @@
+languageId: rust
+command:
+  spokenForm: change name drum
+  version: 2
+  targets:
+    - type: primitive
+      mark: { type: decoratedSymbol, symbolColor: default, character: d }
+      modifiers:
+        - type: containingScope
+          scopeType: { type: name }
+  usePrePhraseSnapshot: true
+  action: { name: clearAndSetSelection }
+initialState:
+  documentContents: |
+    let user = User {
+        first_name: "John",
+        last_name: "Doe",
+    };
+  selections:
+    - anchor: { line: 3, character: 2 }
+      active: { line: 3, character: 2 }
+  marks:
+    default.d:
+      start: { line: 2, character: 16 }
+      end: { line: 2, character: 19 }
+finalState:
+  documentContents: |
+    let user = User {
+        first_name: "John",
+        : "Doe",
+    };
+  selections:
+    - anchor: { line: 2, character: 4 }
+      active: { line: 2, character: 4 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: decoratedSymbol, symbolColor: default, character: d },
+      modifiers: [{ type: containingScope, scopeType: { type: name } }],
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/rust/changeNameDrum3.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/rust/changeNameDrum3.yml
new file mode 100644
index 0000000000..26bf14474d
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/rust/changeNameDrum3.yml
@@ -0,0 +1,40 @@
+languageId: rust
+command:
+  spokenForm: change name drum
+  version: 2
+  targets:
+    - type: primitive
+      mark: { type: decoratedSymbol, symbolColor: default, character: d }
+      modifiers:
+        - type: containingScope
+          scopeType: { type: name }
+  usePrePhraseSnapshot: true
+  action: { name: clearAndSetSelection }
+initialState:
+  documentContents: |
+    match user {
+        User { first_name: "John", last_name: "Doe" } => {},
+    }
+  selections:
+    - anchor: { line: 3, character: 0 }
+      active: { line: 3, character: 0 }
+  marks:
+    default.d:
+      start: { line: 1, character: 43 }
+      end: { line: 1, character: 46 }
+finalState:
+  documentContents: |
+    match user {
+        User { first_name: "John", : "Doe" } => {},
+    }
+  selections:
+    - anchor: { line: 1, character: 31 }
+      active: { line: 1, character: 31 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: decoratedSymbol, symbolColor: default, character: d },
+      modifiers: [{ type: containingScope, scopeType: { type: name } }],
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/rust/changeNameEach.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/rust/changeNameEach.yml
new file mode 100644
index 0000000000..8ed459deb9
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/rust/changeNameEach.yml
@@ -0,0 +1,42 @@
+languageId: rust
+command:
+  spokenForm: change name each
+  version: 2
+  targets:
+    - type: primitive
+      mark: { type: decoratedSymbol, symbolColor: default, character: e }
+      modifiers:
+        - type: containingScope
+          scopeType: { type: name }
+  usePrePhraseSnapshot: true
+  action: { name: clearAndSetSelection }
+initialState:
+  documentContents: |
+    enum IpAddr {
+        V4(u8, u8, u8, u8),
+        V6(String),
+    }
+  selections:
+    - anchor: { line: 4, character: 0 }
+      active: { line: 4, character: 0 }
+  marks:
+    default.e:
+      start: { line: 0, character: 0 }
+      end: { line: 0, character: 4 }
+finalState:
+  documentContents: |
+    enum  {
+        V4(u8, u8, u8, u8),
+        V6(String),
+    }
+  selections:
+    - anchor: { line: 0, character: 5 }
+      active: { line: 0, character: 5 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: decoratedSymbol, symbolColor: default, character: e },
+      modifiers: [{ type: containingScope, scopeType: { type: name } }],
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/rust/changeNameFine.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/rust/changeNameFine.yml
new file mode 100644
index 0000000000..977317aab8
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/rust/changeNameFine.yml
@@ -0,0 +1,34 @@
+languageId: rust
+command:
+  spokenForm: change name fine
+  version: 2
+  targets:
+    - type: primitive
+      mark: { type: decoratedSymbol, symbolColor: default, character: f }
+      modifiers:
+        - type: containingScope
+          scopeType: { type: name }
+  usePrePhraseSnapshot: true
+  action: { name: clearAndSetSelection }
+initialState:
+  documentContents: fn main() {}
+  selections:
+    - anchor: { line: 0, character: 11 }
+      active: { line: 0, character: 11 }
+  marks:
+    default.f:
+      start: { line: 0, character: 0 }
+      end: { line: 0, character: 2 }
+finalState:
+  documentContents: fn () {}
+  selections:
+    - anchor: { line: 0, character: 3 }
+      active: { line: 0, character: 3 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: decoratedSymbol, symbolColor: default, character: f },
+      modifiers: [{ type: containingScope, scopeType: { type: name } }],
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/rust/changeNameFine2.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/rust/changeNameFine2.yml
new file mode 100644
index 0000000000..263ad6ed32
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/rust/changeNameFine2.yml
@@ -0,0 +1,38 @@
+languageId: rust
+command:
+  spokenForm: change name fine
+  version: 2
+  targets:
+    - type: primitive
+      mark: { type: decoratedSymbol, symbolColor: default, character: f }
+      modifiers:
+        - type: containingScope
+          scopeType: { type: name }
+  usePrePhraseSnapshot: true
+  action: { name: clearAndSetSelection }
+initialState:
+  documentContents: |
+    #[cfg_attr(feature = "serde")]
+    struct Test
+  selections:
+    - anchor: { line: 2, character: 0 }
+      active: { line: 2, character: 0 }
+  marks:
+    default.f:
+      start: { line: 0, character: 11 }
+      end: { line: 0, character: 18 }
+finalState:
+  documentContents: |
+    #[cfg_attr( = "serde")]
+    struct Test
+  selections:
+    - anchor: { line: 0, character: 11 }
+      active: { line: 0, character: 11 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: decoratedSymbol, symbolColor: default, character: f },
+      modifiers: [{ type: containingScope, scopeType: { type: name } }],
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/rust/changeNameJury.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/rust/changeNameJury.yml
new file mode 100644
index 0000000000..8c5ae8dc26
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/rust/changeNameJury.yml
@@ -0,0 +1,40 @@
+languageId: rust
+command:
+  spokenForm: change name jury
+  version: 2
+  targets:
+    - type: primitive
+      mark: { type: decoratedSymbol, symbolColor: default, character: j }
+      modifiers:
+        - type: containingScope
+          scopeType: { type: name }
+  usePrePhraseSnapshot: true
+  action: { name: clearAndSetSelection }
+initialState:
+  documentContents: |
+    match user {
+        User { first_name: "John", last_name: "Doe" } => {},
+    }
+  selections:
+    - anchor: { line: 3, character: 0 }
+      active: { line: 3, character: 0 }
+  marks:
+    default.j:
+      start: { line: 1, character: 24 }
+      end: { line: 1, character: 28 }
+finalState:
+  documentContents: |
+    match user {
+        User { : "John", last_name: "Doe" } => {},
+    }
+  selections:
+    - anchor: { line: 1, character: 11 }
+      active: { line: 1, character: 11 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: decoratedSymbol, symbolColor: default, character: j },
+      modifiers: [{ type: containingScope, scopeType: { type: name } }],
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/rust/changeNameLook.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/rust/changeNameLook.yml
new file mode 100644
index 0000000000..67018024f6
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/rust/changeNameLook.yml
@@ -0,0 +1,40 @@
+languageId: rust
+command:
+  spokenForm: change name look
+  version: 2
+  targets:
+    - type: primitive
+      mark: { type: decoratedSymbol, symbolColor: default, character: l }
+      modifiers:
+        - type: containingScope
+          scopeType: { type: name }
+  usePrePhraseSnapshot: true
+  action: { name: clearAndSetSelection }
+initialState:
+  documentContents: |
+    match user {
+        User { first_name: "John", last_name: "Doe" } => {},
+    }
+  selections:
+    - anchor: { line: 3, character: 0 }
+      active: { line: 3, character: 0 }
+  marks:
+    default.l:
+      start: { line: 1, character: 31 }
+      end: { line: 1, character: 40 }
+finalState:
+  documentContents: |
+    match user {
+        User { first_name: "John", : "Doe" } => {},
+    }
+  selections:
+    - anchor: { line: 1, character: 31 }
+      active: { line: 1, character: 31 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: decoratedSymbol, symbolColor: default, character: l },
+      modifiers: [{ type: containingScope, scopeType: { type: name } }],
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/rust/changeNameNear.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/rust/changeNameNear.yml
new file mode 100644
index 0000000000..71ff31207d
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/rust/changeNameNear.yml
@@ -0,0 +1,42 @@
+languageId: rust
+command:
+  spokenForm: change name near
+  version: 2
+  targets:
+    - type: primitive
+      mark: { type: decoratedSymbol, symbolColor: default, character: "n" }
+      modifiers:
+        - type: containingScope
+          scopeType: { type: name }
+  usePrePhraseSnapshot: true
+  action: { name: clearAndSetSelection }
+initialState:
+  documentContents: |
+    enum Maybe<T> {
+        Just(T),
+        Nothing,
+    }
+  selections:
+    - anchor: { line: 4, character: 0 }
+      active: { line: 4, character: 0 }
+  marks:
+    default.n:
+      start: { line: 0, character: 0 }
+      end: { line: 0, character: 4 }
+finalState:
+  documentContents: |
+    enum <T> {
+        Just(T),
+        Nothing,
+    }
+  selections:
+    - anchor: { line: 0, character: 5 }
+      active: { line: 0, character: 5 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: decoratedSymbol, symbolColor: default, character: "n" },
+      modifiers: [{ type: containingScope, scopeType: { type: name } }],
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/rust/changeNameOdd.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/rust/changeNameOdd.yml
new file mode 100644
index 0000000000..6f71d15979
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/rust/changeNameOdd.yml
@@ -0,0 +1,36 @@
+languageId: rust
+command:
+  spokenForm: change name odd
+  version: 2
+  targets:
+    - type: primitive
+      mark: { type: decoratedSymbol, symbolColor: default, character: o }
+      modifiers:
+        - type: containingScope
+          scopeType: { type: name }
+  usePrePhraseSnapshot: true
+  action: { name: clearAndSetSelection }
+initialState:
+  documentContents: |
+    const SOME: usize = 0;
+  selections:
+    - anchor: { line: 1, character: 0 }
+      active: { line: 1, character: 0 }
+  marks:
+    default.o:
+      start: { line: 0, character: 6 }
+      end: { line: 0, character: 10 }
+finalState:
+  documentContents: |
+    const : usize = 0;
+  selections:
+    - anchor: { line: 0, character: 6 }
+      active: { line: 0, character: 6 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: decoratedSymbol, symbolColor: default, character: o },
+      modifiers: [{ type: containingScope, scopeType: { type: name } }],
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/rust/changeNameOdd2.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/rust/changeNameOdd2.yml
new file mode 100644
index 0000000000..4f742c5880
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/rust/changeNameOdd2.yml
@@ -0,0 +1,34 @@
+languageId: rust
+command:
+  spokenForm: change name odd
+  version: 2
+  targets:
+    - type: primitive
+      mark: { type: decoratedSymbol, symbolColor: default, character: o }
+      modifiers:
+        - type: containingScope
+          scopeType: { type: name }
+  usePrePhraseSnapshot: true
+  action: { name: clearAndSetSelection }
+initialState:
+  documentContents: struct Some {}
+  selections:
+    - anchor: { line: 0, character: 13 }
+      active: { line: 0, character: 13 }
+  marks:
+    default.o:
+      start: { line: 0, character: 7 }
+      end: { line: 0, character: 11 }
+finalState:
+  documentContents: struct  {}
+  selections:
+    - anchor: { line: 0, character: 7 }
+      active: { line: 0, character: 7 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: decoratedSymbol, symbolColor: default, character: o },
+      modifiers: [{ type: containingScope, scopeType: { type: name } }],
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/rust/changeNameOdd3.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/rust/changeNameOdd3.yml
new file mode 100644
index 0000000000..50ba03d2a2
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/rust/changeNameOdd3.yml
@@ -0,0 +1,42 @@
+languageId: rust
+command:
+  spokenForm: change name odd
+  version: 2
+  targets:
+    - type: primitive
+      mark: { type: decoratedSymbol, symbolColor: default, character: o }
+      modifiers:
+        - type: containingScope
+          scopeType: { type: name }
+  usePrePhraseSnapshot: true
+  action: { name: clearAndSetSelection }
+initialState:
+  documentContents: |
+    enum Maybe<T> {
+        Just(T),
+        Nothing,
+    }
+  selections:
+    - anchor: { line: 4, character: 0 }
+      active: { line: 4, character: 0 }
+  marks:
+    default.o:
+      start: { line: 2, character: 4 }
+      end: { line: 2, character: 11 }
+finalState:
+  documentContents: |
+    enum Maybe<T> {
+        Just(T),
+        ,
+    }
+  selections:
+    - anchor: { line: 2, character: 4 }
+      active: { line: 2, character: 4 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: decoratedSymbol, symbolColor: default, character: o },
+      modifiers: [{ type: containingScope, scopeType: { type: name } }],
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/rust/changeNameSun.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/rust/changeNameSun.yml
new file mode 100644
index 0000000000..bcc38c1afd
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/rust/changeNameSun.yml
@@ -0,0 +1,34 @@
+languageId: rust
+command:
+  spokenForm: change name sun
+  version: 2
+  targets:
+    - type: primitive
+      mark: { type: decoratedSymbol, symbolColor: default, character: s }
+      modifiers:
+        - type: containingScope
+          scopeType: { type: name }
+  usePrePhraseSnapshot: true
+  action: { name: clearAndSetSelection }
+initialState:
+  documentContents: enum Some {}
+  selections:
+    - anchor: { line: 0, character: 12 }
+      active: { line: 0, character: 12 }
+  marks:
+    default.s:
+      start: { line: 0, character: 5 }
+      end: { line: 0, character: 9 }
+finalState:
+  documentContents: enum  {}
+  selections:
+    - anchor: { line: 0, character: 5 }
+      active: { line: 0, character: 5 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: decoratedSymbol, symbolColor: default, character: s },
+      modifiers: [{ type: containingScope, scopeType: { type: name } }],
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/rust/changeNameSun2.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/rust/changeNameSun2.yml
new file mode 100644
index 0000000000..27250a3849
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/rust/changeNameSun2.yml
@@ -0,0 +1,40 @@
+languageId: rust
+command:
+  spokenForm: change name sun
+  version: 2
+  targets:
+    - type: primitive
+      mark: { type: decoratedSymbol, symbolColor: default, character: s }
+      modifiers:
+        - type: containingScope
+          scopeType: { type: name }
+  usePrePhraseSnapshot: true
+  action: { name: clearAndSetSelection }
+initialState:
+  documentContents: >
+    fn some_function<T: Display + Clone, U: Clone + Debug>(t: &T, u: &U) -> i32
+    {
+
+    }
+  selections:
+    - anchor: { line: 2, character: 0 }
+      active: { line: 2, character: 0 }
+  marks:
+    default.s:
+      start: { line: 0, character: 20 }
+      end: { line: 0, character: 27 }
+finalState:
+  documentContents: |
+    fn some_function<: Display + Clone, U: Clone + Debug>(t: &T, u: &U) -> i32 {
+    }
+  selections:
+    - anchor: { line: 0, character: 17 }
+      active: { line: 0, character: 17 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: decoratedSymbol, symbolColor: default, character: s },
+      modifiers: [{ type: containingScope, scopeType: { type: name } }],
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/rust/changeNameTrap.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/rust/changeNameTrap.yml
new file mode 100644
index 0000000000..f8861d9cdc
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/rust/changeNameTrap.yml
@@ -0,0 +1,42 @@
+languageId: rust
+command:
+  spokenForm: change name trap
+  version: 2
+  targets:
+    - type: primitive
+      mark: { type: decoratedSymbol, symbolColor: default, character: t }
+      modifiers:
+        - type: containingScope
+          scopeType: { type: name }
+  usePrePhraseSnapshot: true
+  action: { name: clearAndSetSelection }
+initialState:
+  documentContents: |
+    enum Maybe<T> {
+        Just(T),
+        Nothing,
+    }
+  selections:
+    - anchor: { line: 4, character: 0 }
+      active: { line: 4, character: 0 }
+  marks:
+    default.t:
+      start: { line: 1, character: 9 }
+      end: { line: 1, character: 10 }
+finalState:
+  documentContents: |
+    enum Maybe<T> {
+        (T),
+        Nothing,
+    }
+  selections:
+    - anchor: { line: 1, character: 4 }
+      active: { line: 1, character: 4 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: decoratedSymbol, symbolColor: default, character: t },
+      modifiers: [{ type: containingScope, scopeType: { type: name } }],
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/rust/changeRound.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/rust/changeRound.yml
new file mode 100644
index 0000000000..001e51a615
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/rust/changeRound.yml
@@ -0,0 +1,38 @@
+languageId: rust
+command:
+  spokenForm: change round
+  version: 2
+  targets:
+    - type: primitive
+      modifiers:
+        - type: containingScope
+          scopeType: { type: surroundingPair, delimiter: parentheses }
+  usePrePhraseSnapshot: true
+  action: { name: clearAndSetSelection }
+initialState:
+  documentContents: |
+    "hello (there)";
+  selections:
+    - anchor: { line: 0, character: 8 }
+      active: { line: 0, character: 8 }
+  marks: {}
+finalState:
+  documentContents: |
+    "hello ";
+  selections:
+    - anchor: { line: 0, character: 7 }
+      active: { line: 0, character: 7 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      modifiers:
+        [
+          {
+            type: containingScope,
+            scopeType: { type: surroundingPair, delimiter: parentheses },
+          },
+        ],
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/rust/changeState.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/rust/changeState.yml
new file mode 100644
index 0000000000..b8ead744a3
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/rust/changeState.yml
@@ -0,0 +1,38 @@
+languageId: rust
+command:
+  version: 1
+  spokenForm: change state
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier:
+        { type: containingScope, scopeType: statement, includeSiblings: false }
+initialState:
+  documentContents: |-
+    let expensive_closure = |num| {
+        println!("calculating slowly...");
+        thread::sleep(Duration::from_secs(2));
+        num
+    };
+  selections:
+    - anchor: { line: 0, character: 2 }
+      active: { line: 0, character: 2 }
+  marks: {}
+finalState:
+  documentContents: ""
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        { type: containingScope, scopeType: statement, includeSiblings: false },
+      isImplicit: false,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/rust/changeState2.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/rust/changeState2.yml
new file mode 100644
index 0000000000..144ae88c56
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/rust/changeState2.yml
@@ -0,0 +1,40 @@
+languageId: rust
+command:
+  spokenForm: change state
+  version: 2
+  targets:
+    - type: primitive
+      modifiers:
+        - type: containingScope
+          scopeType: { type: statement }
+  usePrePhraseSnapshot: true
+  action: { name: clearAndSetSelection }
+initialState:
+  documentContents: |
+    let expensive_closure = |num| {
+        println!("calculating slowly...");
+        thread::sleep(Duration::from_secs(2));
+        num
+    };
+  selections:
+    - anchor: { line: 1, character: 15 }
+      active: { line: 1, character: 15 }
+  marks: {}
+finalState:
+  documentContents: |
+    let expensive_closure = |num| {
+
+        thread::sleep(Duration::from_secs(2));
+        num
+    };
+  selections:
+    - anchor: { line: 1, character: 4 }
+      active: { line: 1, character: 4 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      modifiers: [{ type: containingScope, scopeType: { type: statement } }],
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/rust/changeState3.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/rust/changeState3.yml
new file mode 100644
index 0000000000..043c3a1396
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/rust/changeState3.yml
@@ -0,0 +1,32 @@
+languageId: rust
+command:
+  spokenForm: change state
+  version: 2
+  targets:
+    - type: primitive
+      modifiers:
+        - type: containingScope
+          scopeType: { type: statement }
+  usePrePhraseSnapshot: true
+  action: { name: clearAndSetSelection }
+initialState:
+  documentContents: |
+    let x = vec![1, 2, 3];
+  selections:
+    - anchor: { line: 0, character: 10 }
+      active: { line: 0, character: 10 }
+  marks: {}
+finalState:
+  documentContents: |+
+
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      modifiers: [{ type: containingScope, scopeType: { type: statement } }],
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/rust/changeSubject.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/rust/changeSubject.yml
new file mode 100644
index 0000000000..acada14831
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/rust/changeSubject.yml
@@ -0,0 +1,44 @@
+languageId: rust
+command:
+  spokenForm: change subject
+  version: 2
+  targets:
+    - type: primitive
+      modifiers:
+        - type: containingScope
+          scopeType: { type: switchStatementSubject }
+  usePrePhraseSnapshot: true
+  action: { name: clearAndSetSelection }
+initialState:
+  documentContents: |
+    match user {
+        User { first_name: "John" } => {},
+        User { first_name } if first_name.starts_with("P") => {}
+    }
+  selections:
+    - anchor: { line: 2, character: 27 }
+      active: { line: 2, character: 54 }
+  marks: {}
+finalState:
+  documentContents: |
+    match  {
+        User { first_name: "John" } => {},
+        User { first_name } if first_name.starts_with("P") => {}
+    }
+  selections:
+    - anchor: { line: 0, character: 6 }
+      active: { line: 0, character: 6 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      modifiers:
+        [
+          {
+            type: containingScope,
+            scopeType: { type: switchStatementSubject },
+          },
+        ],
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/rust/changeTypeAir.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/rust/changeTypeAir.yml
new file mode 100644
index 0000000000..56d2e63e83
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/rust/changeTypeAir.yml
@@ -0,0 +1,38 @@
+languageId: rust
+command:
+  spokenForm: change type air
+  version: 2
+  targets:
+    - type: primitive
+      mark: { type: decoratedSymbol, symbolColor: default, character: a }
+      modifiers:
+        - type: containingScope
+          scopeType: { type: type }
+  usePrePhraseSnapshot: true
+  action: { name: clearAndSetSelection }
+initialState:
+  documentContents: |
+    impl Trait for Result<Option<u32>, Box<dyn std::error::Error>> {
+
+    }
+  selections:
+    - anchor: { line: 2, character: 1 }
+      active: { line: 2, character: 1 }
+  marks:
+    default.a:
+      start: { line: 0, character: 5 }
+      end: { line: 0, character: 10 }
+finalState:
+  documentContents: |+
+
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: decoratedSymbol, symbolColor: default, character: a },
+      modifiers: [{ type: containingScope, scopeType: { type: type } }],
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/rust/changeTypeEach.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/rust/changeTypeEach.yml
new file mode 100644
index 0000000000..954c0359fe
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/rust/changeTypeEach.yml
@@ -0,0 +1,36 @@
+languageId: rust
+command:
+  spokenForm: change type each
+  version: 2
+  targets:
+    - type: primitive
+      mark: { type: decoratedSymbol, symbolColor: default, character: e }
+      modifiers:
+        - type: containingScope
+          scopeType: { type: type }
+  usePrePhraseSnapshot: true
+  action: { name: clearAndSetSelection }
+initialState:
+  documentContents: |
+    struct User {}
+  selections:
+    - anchor: { line: 0, character: 14 }
+      active: { line: 0, character: 14 }
+  marks:
+    default.e:
+      start: { line: 0, character: 7 }
+      end: { line: 0, character: 11 }
+finalState:
+  documentContents: |+
+
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: decoratedSymbol, symbolColor: default, character: e },
+      modifiers: [{ type: containingScope, scopeType: { type: type } }],
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/rust/changeTypeLook.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/rust/changeTypeLook.yml
new file mode 100644
index 0000000000..7faf1455ed
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/rust/changeTypeLook.yml
@@ -0,0 +1,40 @@
+languageId: rust
+command:
+  spokenForm: change type look
+  version: 2
+  targets:
+    - type: primitive
+      mark: { type: decoratedSymbol, symbolColor: default, character: l }
+      modifiers:
+        - type: containingScope
+          scopeType: { type: type }
+  usePrePhraseSnapshot: true
+  action: { name: clearAndSetSelection }
+initialState:
+  documentContents: |
+    impl Trait for Result<Option<u32>, Box<dyn std::error::Error>> {
+
+    }
+  selections:
+    - anchor: { line: 2, character: 1 }
+      active: { line: 2, character: 1 }
+  marks:
+    default.l:
+      start: { line: 0, character: 15 }
+      end: { line: 0, character: 21 }
+finalState:
+  documentContents: |
+    impl Trait for  {
+
+    }
+  selections:
+    - anchor: { line: 0, character: 15 }
+      active: { line: 0, character: 15 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: decoratedSymbol, symbolColor: default, character: l },
+      modifiers: [{ type: containingScope, scopeType: { type: type } }],
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/rust/changeTypeOdd.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/rust/changeTypeOdd.yml
new file mode 100644
index 0000000000..3281ec92bf
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/rust/changeTypeOdd.yml
@@ -0,0 +1,40 @@
+languageId: rust
+command:
+  spokenForm: change type odd
+  version: 2
+  targets:
+    - type: primitive
+      mark: { type: decoratedSymbol, symbolColor: default, character: o }
+      modifiers:
+        - type: containingScope
+          scopeType: { type: type }
+  usePrePhraseSnapshot: true
+  action: { name: clearAndSetSelection }
+initialState:
+  documentContents: |
+    struct S {
+        n: Option<u64>,
+    }
+  selections:
+    - anchor: { line: 3, character: 0 }
+      active: { line: 3, character: 0 }
+  marks:
+    default.o:
+      start: { line: 1, character: 7 }
+      end: { line: 1, character: 13 }
+finalState:
+  documentContents: |
+    struct S {
+        n: ,
+    }
+  selections:
+    - anchor: { line: 1, character: 7 }
+      active: { line: 1, character: 7 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: decoratedSymbol, symbolColor: default, character: o },
+      modifiers: [{ type: containingScope, scopeType: { type: type } }],
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/rust/changeTypePlex.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/rust/changeTypePlex.yml
new file mode 100644
index 0000000000..371b1d5110
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/rust/changeTypePlex.yml
@@ -0,0 +1,34 @@
+languageId: rust
+command:
+  spokenForm: change type plex
+  version: 2
+  targets:
+    - type: primitive
+      mark: { type: decoratedSymbol, symbolColor: default, character: x }
+      modifiers:
+        - type: containingScope
+          scopeType: { type: type }
+  usePrePhraseSnapshot: true
+  action: { name: clearAndSetSelection }
+initialState:
+  documentContents: "let x: u32 = 1;"
+  selections:
+    - anchor: { line: 0, character: 15 }
+      active: { line: 0, character: 15 }
+  marks:
+    default.x:
+      start: { line: 0, character: 4 }
+      end: { line: 0, character: 5 }
+finalState:
+  documentContents: "let x:  = 1;"
+  selections:
+    - anchor: { line: 0, character: 7 }
+      active: { line: 0, character: 7 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: decoratedSymbol, symbolColor: default, character: x },
+      modifiers: [{ type: containingScope, scopeType: { type: type } }],
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/rust/changeTypePlex2.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/rust/changeTypePlex2.yml
new file mode 100644
index 0000000000..5ee55c68c7
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/rust/changeTypePlex2.yml
@@ -0,0 +1,36 @@
+languageId: rust
+command:
+  spokenForm: change type plex
+  version: 2
+  targets:
+    - type: primitive
+      mark: { type: decoratedSymbol, symbolColor: default, character: x }
+      modifiers:
+        - type: containingScope
+          scopeType: { type: type }
+  usePrePhraseSnapshot: true
+  action: { name: clearAndSetSelection }
+initialState:
+  documentContents: |
+    const X: [u8; 2] = [0, 0];
+  selections:
+    - anchor: { line: 1, character: 0 }
+      active: { line: 1, character: 0 }
+  marks:
+    default.x:
+      start: { line: 0, character: 6 }
+      end: { line: 0, character: 7 }
+finalState:
+  documentContents: |
+    const X:  = [0, 0];
+  selections:
+    - anchor: { line: 0, character: 9 }
+      active: { line: 0, character: 9 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: decoratedSymbol, symbolColor: default, character: x },
+      modifiers: [{ type: containingScope, scopeType: { type: type } }],
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/rust/changeTypeSun.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/rust/changeTypeSun.yml
new file mode 100644
index 0000000000..62865a8613
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/rust/changeTypeSun.yml
@@ -0,0 +1,40 @@
+languageId: rust
+command:
+  spokenForm: change type sun
+  version: 2
+  targets:
+    - type: primitive
+      mark: { type: decoratedSymbol, symbolColor: default, character: s }
+      modifiers:
+        - type: containingScope
+          scopeType: { type: type }
+  usePrePhraseSnapshot: true
+  action: { name: clearAndSetSelection }
+initialState:
+  documentContents: |
+    fn main() -> Result<(), Error> {
+
+    }
+  selections:
+    - anchor: { line: 2, character: 1 }
+      active: { line: 2, character: 1 }
+  marks:
+    default.s:
+      start: { line: 0, character: 13 }
+      end: { line: 0, character: 19 }
+finalState:
+  documentContents: |
+    fn main() ->  {
+
+    }
+  selections:
+    - anchor: { line: 0, character: 13 }
+      active: { line: 0, character: 13 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: decoratedSymbol, symbolColor: default, character: s },
+      modifiers: [{ type: containingScope, scopeType: { type: type } }],
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/rust/changeTypeSun2.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/rust/changeTypeSun2.yml
new file mode 100644
index 0000000000..b57da61473
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/rust/changeTypeSun2.yml
@@ -0,0 +1,36 @@
+languageId: rust
+command:
+  spokenForm: change type sun
+  version: 2
+  targets:
+    - type: primitive
+      mark: { type: decoratedSymbol, symbolColor: default, character: s }
+      modifiers:
+        - type: containingScope
+          scopeType: { type: type }
+  usePrePhraseSnapshot: true
+  action: { name: clearAndSetSelection }
+initialState:
+  documentContents: |
+    fn foo(x: &'a mut u32) -> &'static mut u16 {}
+  selections:
+    - anchor: { line: 0, character: 45 }
+      active: { line: 0, character: 45 }
+  marks:
+    default.s:
+      start: { line: 0, character: 28 }
+      end: { line: 0, character: 34 }
+finalState:
+  documentContents: |
+    fn foo(x: &'a mut u32) ->  {}
+  selections:
+    - anchor: { line: 0, character: 26 }
+      active: { line: 0, character: 26 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: decoratedSymbol, symbolColor: default, character: s },
+      modifiers: [{ type: containingScope, scopeType: { type: type } }],
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/rust/changeTypeTrap.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/rust/changeTypeTrap.yml
new file mode 100644
index 0000000000..28db21bf6d
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/rust/changeTypeTrap.yml
@@ -0,0 +1,40 @@
+languageId: rust
+command:
+  spokenForm: change type trap
+  version: 2
+  targets:
+    - type: primitive
+      mark: { type: decoratedSymbol, symbolColor: default, character: t }
+      modifiers:
+        - type: containingScope
+          scopeType: { type: type }
+  usePrePhraseSnapshot: true
+  action: { name: clearAndSetSelection }
+initialState:
+  documentContents: >
+    fn some_function<T: Display + Clone, U: Clone + Debug>(t: &T, u: &U) -> i32
+    {
+
+    }
+  selections:
+    - anchor: { line: 2, character: 0 }
+      active: { line: 2, character: 0 }
+  marks:
+    default.t:
+      start: { line: 0, character: 17 }
+      end: { line: 0, character: 18 }
+finalState:
+  documentContents: |
+    fn some_function<T: , U: Clone + Debug>(t: &T, u: &U) -> i32 {
+    }
+  selections:
+    - anchor: { line: 0, character: 20 }
+      active: { line: 0, character: 20 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: decoratedSymbol, symbolColor: default, character: t },
+      modifiers: [{ type: containingScope, scopeType: { type: type } }],
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/rust/changeTypeTrap3.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/rust/changeTypeTrap3.yml
new file mode 100644
index 0000000000..ec0b464d70
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/rust/changeTypeTrap3.yml
@@ -0,0 +1,42 @@
+languageId: rust
+command:
+  spokenForm: change type trap
+  version: 2
+  targets:
+    - type: primitive
+      mark: { type: decoratedSymbol, symbolColor: default, character: t }
+      modifiers:
+        - type: containingScope
+          scopeType: { type: type }
+  usePrePhraseSnapshot: true
+  action: { name: clearAndSetSelection }
+initialState:
+  documentContents: |
+    fn some_function<T, U>(t: &T, u: &U) -> i32
+        where T: Display + Clone,
+              U: Clone + Debug
+    {}
+  selections:
+    - anchor: { line: 4, character: 0 }
+      active: { line: 4, character: 0 }
+  marks:
+    default.t:
+      start: { line: 1, character: 10 }
+      end: { line: 1, character: 11 }
+finalState:
+  documentContents: |
+    fn some_function<T, U>(t: &T, u: &U) -> i32
+        where T: ,
+              U: Clone + Debug
+    {}
+  selections:
+    - anchor: { line: 1, character: 13 }
+      active: { line: 1, character: 13 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: decoratedSymbol, symbolColor: default, character: t },
+      modifiers: [{ type: containingScope, scopeType: { type: type } }],
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/rust/changeTypeUrge.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/rust/changeTypeUrge.yml
new file mode 100644
index 0000000000..f27046c289
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/rust/changeTypeUrge.yml
@@ -0,0 +1,36 @@
+languageId: rust
+command:
+  spokenForm: change type urge
+  version: 2
+  targets:
+    - type: primitive
+      mark: { type: decoratedSymbol, symbolColor: default, character: u }
+      modifiers:
+        - type: containingScope
+          scopeType: { type: type }
+  usePrePhraseSnapshot: true
+  action: { name: clearAndSetSelection }
+initialState:
+  documentContents: |
+    const X: [u8; 2] = [0, 0];
+  selections:
+    - anchor: { line: 1, character: 0 }
+      active: { line: 1, character: 0 }
+  marks:
+    default.u:
+      start: { line: 0, character: 10 }
+      end: { line: 0, character: 12 }
+finalState:
+  documentContents: |
+    const X: [; 2] = [0, 0];
+  selections:
+    - anchor: { line: 0, character: 10 }
+      active: { line: 0, character: 10 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: decoratedSymbol, symbolColor: default, character: u },
+      modifiers: [{ type: containingScope, scopeType: { type: type } }],
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/rust/changeValueCap.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/rust/changeValueCap.yml
new file mode 100644
index 0000000000..778d9ed467
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/rust/changeValueCap.yml
@@ -0,0 +1,36 @@
+languageId: rust
+command:
+  spokenForm: change value cap
+  version: 2
+  targets:
+    - type: primitive
+      mark: { type: decoratedSymbol, symbolColor: default, character: c }
+      modifiers:
+        - type: containingScope
+          scopeType: { type: value }
+  usePrePhraseSnapshot: true
+  action: { name: clearAndSetSelection }
+initialState:
+  documentContents: |
+    const X: [Option<u8>; 2] = [None, None];
+  selections:
+    - anchor: { line: 1, character: 0 }
+      active: { line: 1, character: 0 }
+  marks:
+    default.c:
+      start: { line: 0, character: 0 }
+      end: { line: 0, character: 5 }
+finalState:
+  documentContents: |
+    const X: [Option<u8>; 2] = ;
+  selections:
+    - anchor: { line: 0, character: 27 }
+      active: { line: 0, character: 27 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: decoratedSymbol, symbolColor: default, character: c },
+      modifiers: [{ type: containingScope, scopeType: { type: value } }],
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/rust/changeValueEach.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/rust/changeValueEach.yml
new file mode 100644
index 0000000000..c85d26fe60
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/rust/changeValueEach.yml
@@ -0,0 +1,38 @@
+languageId: rust
+command:
+  spokenForm: change value each
+  version: 2
+  targets:
+    - type: primitive
+      mark: { type: decoratedSymbol, symbolColor: default, character: e }
+      modifiers:
+        - type: containingScope
+          scopeType: { type: value }
+  usePrePhraseSnapshot: true
+  action: { name: clearAndSetSelection }
+initialState:
+  documentContents: |
+    #[cfg_attr(feature = "serde")]
+    struct Test
+  selections:
+    - anchor: { line: 2, character: 0 }
+      active: { line: 2, character: 0 }
+  marks:
+    default.e:
+      start: { line: 0, character: 22 }
+      end: { line: 0, character: 27 }
+finalState:
+  documentContents: |
+    #[cfg_attr(feature = )]
+    struct Test
+  selections:
+    - anchor: { line: 0, character: 21 }
+      active: { line: 0, character: 21 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: decoratedSymbol, symbolColor: default, character: e },
+      modifiers: [{ type: containingScope, scopeType: { type: value } }],
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/rust/changeValueFine.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/rust/changeValueFine.yml
new file mode 100644
index 0000000000..d255c8f5ec
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/rust/changeValueFine.yml
@@ -0,0 +1,42 @@
+languageId: rust
+command:
+  spokenForm: change value fine
+  version: 2
+  targets:
+    - type: primitive
+      mark: { type: decoratedSymbol, symbolColor: default, character: f }
+      modifiers:
+        - type: containingScope
+          scopeType: { type: value }
+  usePrePhraseSnapshot: true
+  action: { name: clearAndSetSelection }
+initialState:
+  documentContents: |
+    let user = User {
+        first_name: "John",
+        last_name: "Doe",
+    };
+  selections:
+    - anchor: { line: 3, character: 2 }
+      active: { line: 3, character: 2 }
+  marks:
+    default.f:
+      start: { line: 1, character: 4 }
+      end: { line: 1, character: 14 }
+finalState:
+  documentContents: |
+    let user = User {
+        first_name: ,
+        last_name: "Doe",
+    };
+  selections:
+    - anchor: { line: 1, character: 16 }
+      active: { line: 1, character: 16 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: decoratedSymbol, symbolColor: default, character: f },
+      modifiers: [{ type: containingScope, scopeType: { type: value } }],
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/rust/changeValueFine2.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/rust/changeValueFine2.yml
new file mode 100644
index 0000000000..472edbd347
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/rust/changeValueFine2.yml
@@ -0,0 +1,40 @@
+languageId: rust
+command:
+  spokenForm: change value fine
+  version: 2
+  targets:
+    - type: primitive
+      mark: { type: decoratedSymbol, symbolColor: default, character: f }
+      modifiers:
+        - type: containingScope
+          scopeType: { type: value }
+  usePrePhraseSnapshot: true
+  action: { name: clearAndSetSelection }
+initialState:
+  documentContents: |
+    match user {
+        User { first_name: "John", last_name: "Doe" } => {},
+    }
+  selections:
+    - anchor: { line: 3, character: 0 }
+      active: { line: 3, character: 0 }
+  marks:
+    default.f:
+      start: { line: 1, character: 11 }
+      end: { line: 1, character: 21 }
+finalState:
+  documentContents: |
+    match user {
+        User { first_name: , last_name: "Doe" } => {},
+    }
+  selections:
+    - anchor: { line: 1, character: 23 }
+      active: { line: 1, character: 23 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: decoratedSymbol, symbolColor: default, character: f },
+      modifiers: [{ type: containingScope, scopeType: { type: value } }],
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/rust/changeValueLook.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/rust/changeValueLook.yml
new file mode 100644
index 0000000000..4df4bc6557
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/rust/changeValueLook.yml
@@ -0,0 +1,40 @@
+languageId: rust
+command:
+  spokenForm: change value look
+  version: 2
+  targets:
+    - type: primitive
+      mark: { type: decoratedSymbol, symbolColor: default, character: l }
+      modifiers:
+        - type: containingScope
+          scopeType: { type: value }
+  usePrePhraseSnapshot: true
+  action: { name: clearAndSetSelection }
+initialState:
+  documentContents: |
+    match user {
+        User { first_name: "John", last_name: "Doe" } => {},
+    }
+  selections:
+    - anchor: { line: 3, character: 0 }
+      active: { line: 3, character: 0 }
+  marks:
+    default.l:
+      start: { line: 1, character: 31 }
+      end: { line: 1, character: 40 }
+finalState:
+  documentContents: |
+    match user {
+        User { first_name: "John", last_name:  } => {},
+    }
+  selections:
+    - anchor: { line: 1, character: 42 }
+      active: { line: 1, character: 42 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: decoratedSymbol, symbolColor: default, character: l },
+      modifiers: [{ type: containingScope, scopeType: { type: value } }],
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/rust/changeValueNear.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/rust/changeValueNear.yml
new file mode 100644
index 0000000000..a21a642978
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/rust/changeValueNear.yml
@@ -0,0 +1,36 @@
+languageId: rust
+command:
+  spokenForm: change value near
+  version: 2
+  targets:
+    - type: primitive
+      mark: { type: decoratedSymbol, symbolColor: default, character: "n" }
+      modifiers:
+        - type: containingScope
+          scopeType: { type: value }
+  usePrePhraseSnapshot: true
+  action: { name: clearAndSetSelection }
+initialState:
+  documentContents: |
+    let x = [None, Some(1)];
+  selections:
+    - anchor: { line: 0, character: 24 }
+      active: { line: 0, character: 24 }
+  marks:
+    default.n:
+      start: { line: 0, character: 9 }
+      end: { line: 0, character: 13 }
+finalState:
+  documentContents: |
+    let x = ;
+  selections:
+    - anchor: { line: 0, character: 8 }
+      active: { line: 0, character: 8 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: decoratedSymbol, symbolColor: default, character: "n" },
+      modifiers: [{ type: containingScope, scopeType: { type: value } }],
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/rust/changeValueZero.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/rust/changeValueZero.yml
new file mode 100644
index 0000000000..3dca28e978
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/rust/changeValueZero.yml
@@ -0,0 +1,36 @@
+languageId: rust
+command:
+  spokenForm: change value zero
+  version: 2
+  targets:
+    - type: primitive
+      mark: { type: decoratedSymbol, symbolColor: default, character: "0" }
+      modifiers:
+        - type: containingScope
+          scopeType: { type: value }
+  usePrePhraseSnapshot: true
+  action: { name: clearAndSetSelection }
+initialState:
+  documentContents: |
+    let x: u32 = 0;
+  selections:
+    - anchor: { line: 0, character: 15 }
+      active: { line: 0, character: 15 }
+  marks:
+    default.0:
+      start: { line: 0, character: 13 }
+      end: { line: 0, character: 14 }
+finalState:
+  documentContents: |
+    let x: u32 = ;
+  selections:
+    - anchor: { line: 0, character: 13 }
+      active: { line: 0, character: 13 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: decoratedSymbol, symbolColor: default, character: "0" },
+      modifiers: [{ type: containingScope, scopeType: { type: value } }],
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/rust/chuckArg.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/rust/chuckArg.yml
new file mode 100644
index 0000000000..dde2832747
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/rust/chuckArg.yml
@@ -0,0 +1,47 @@
+languageId: rust
+command:
+  version: 0
+  spokenForm: chuck arg
+  action: remove
+  targets:
+    - type: primitive
+      modifier:
+        {
+          type: containingScope,
+          scopeType: argumentOrParameter,
+          includeSiblings: false,
+        }
+initialState:
+  documentContents: |-
+    fn add(x: i32, y: i32) -> {
+        add(x, 30);
+    }
+  selections:
+    - anchor: { line: 0, character: 11 }
+      active: { line: 0, character: 11 }
+  marks: {}
+finalState:
+  documentContents: |-
+    fn add(y: i32) -> {
+        add(x, 30);
+    }
+  selections:
+    - anchor: { line: 0, character: 7 }
+      active: { line: 0, character: 7 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: outside,
+      modifier:
+        {
+          type: containingScope,
+          scopeType: argumentOrParameter,
+          includeSiblings: false,
+        },
+      isImplicit: false,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/rust/chuckArg2.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/rust/chuckArg2.yml
new file mode 100644
index 0000000000..3ebdcc4db1
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/rust/chuckArg2.yml
@@ -0,0 +1,47 @@
+languageId: rust
+command:
+  version: 0
+  spokenForm: chuck arg
+  action: remove
+  targets:
+    - type: primitive
+      modifier:
+        {
+          type: containingScope,
+          scopeType: argumentOrParameter,
+          includeSiblings: false,
+        }
+initialState:
+  documentContents: |-
+    fn add(x: i32, y: i32) -> {
+        add(x, 30);
+    }
+  selections:
+    - anchor: { line: 1, character: 9 }
+      active: { line: 1, character: 9 }
+  marks: {}
+finalState:
+  documentContents: |-
+    fn add(x: i32, y: i32) -> {
+        add(30);
+    }
+  selections:
+    - anchor: { line: 1, character: 8 }
+      active: { line: 1, character: 8 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: outside,
+      modifier:
+        {
+          type: containingScope,
+          scopeType: argumentOrParameter,
+          includeSiblings: false,
+        },
+      isImplicit: false,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/rust/chuckArgAir.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/rust/chuckArgAir.yml
new file mode 100644
index 0000000000..e8fc93329b
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/rust/chuckArgAir.yml
@@ -0,0 +1,37 @@
+languageId: rust
+command:
+  spokenForm: chuck arg air
+  version: 2
+  targets:
+    - type: primitive
+      mark: { type: decoratedSymbol, symbolColor: default, character: a }
+      modifiers:
+        - type: containingScope
+          scopeType: { type: argumentOrParameter }
+  usePrePhraseSnapshot: true
+  action: { name: remove }
+initialState:
+  documentContents: |
+    struct S<'a, 'b: 'a, T>;
+  selections:
+    - anchor: { line: 1, character: 0 }
+      active: { line: 1, character: 0 }
+  marks:
+    default.a:
+      start: { line: 0, character: 10 }
+      end: { line: 0, character: 11 }
+finalState:
+  documentContents: |
+    struct S<'b: 'a, T>;
+  selections:
+    - anchor: { line: 1, character: 0 }
+      active: { line: 1, character: 0 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: decoratedSymbol, symbolColor: default, character: a },
+      modifiers:
+        [{ type: containingScope, scopeType: { type: argumentOrParameter } }],
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/rust/chuckArgBlueAir.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/rust/chuckArgBlueAir.yml
new file mode 100644
index 0000000000..fe0f64c4e9
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/rust/chuckArgBlueAir.yml
@@ -0,0 +1,37 @@
+languageId: rust
+command:
+  spokenForm: chuck arg blue air
+  version: 2
+  targets:
+    - type: primitive
+      mark: { type: decoratedSymbol, symbolColor: blue, character: a }
+      modifiers:
+        - type: containingScope
+          scopeType: { type: argumentOrParameter }
+  usePrePhraseSnapshot: true
+  action: { name: remove }
+initialState:
+  documentContents: |
+    struct S<'a, 'b: 'a, T>;
+  selections:
+    - anchor: { line: 1, character: 0 }
+      active: { line: 1, character: 0 }
+  marks:
+    blue.a:
+      start: { line: 0, character: 18 }
+      end: { line: 0, character: 19 }
+finalState:
+  documentContents: |
+    struct S<'a, T>;
+  selections:
+    - anchor: { line: 1, character: 0 }
+      active: { line: 1, character: 0 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: decoratedSymbol, symbolColor: blue, character: a },
+      modifiers:
+        [{ type: containingScope, scopeType: { type: argumentOrParameter } }],
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/rust/chuckArgDrum.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/rust/chuckArgDrum.yml
new file mode 100644
index 0000000000..32bb71face
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/rust/chuckArgDrum.yml
@@ -0,0 +1,39 @@
+languageId: rust
+command:
+  spokenForm: chuck arg drum
+  version: 2
+  targets:
+    - type: primitive
+      mark: { type: decoratedSymbol, symbolColor: default, character: d }
+      modifiers:
+        - type: containingScope
+          scopeType: { type: argumentOrParameter }
+  usePrePhraseSnapshot: true
+  action: { name: remove }
+initialState:
+  documentContents: |
+    #[derive(Debug)]
+    sturct S {}
+  selections:
+    - anchor: { line: 2, character: 0 }
+      active: { line: 2, character: 0 }
+  marks:
+    default.d:
+      start: { line: 0, character: 9 }
+      end: { line: 0, character: 14 }
+finalState:
+  documentContents: |
+    #[derive()]
+    sturct S {}
+  selections:
+    - anchor: { line: 2, character: 0 }
+      active: { line: 2, character: 0 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: decoratedSymbol, symbolColor: default, character: d },
+      modifiers:
+        [{ type: containingScope, scopeType: { type: argumentOrParameter } }],
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/rust/chuckArgEight2.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/rust/chuckArgEight2.yml
new file mode 100644
index 0000000000..5894ae898b
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/rust/chuckArgEight2.yml
@@ -0,0 +1,41 @@
+languageId: rust
+command:
+  spokenForm: chuck arg eight
+  version: 2
+  targets:
+    - type: primitive
+      mark: { type: decoratedSymbol, symbolColor: default, character: "8" }
+      modifiers:
+        - type: containingScope
+          scopeType: { type: argumentOrParameter }
+  usePrePhraseSnapshot: true
+  action: { name: remove }
+initialState:
+  documentContents: |
+    enum E {
+        C(u8, u16, u32),
+    }
+  selections:
+    - anchor: { line: 3, character: 0 }
+      active: { line: 3, character: 0 }
+  marks:
+    default.8:
+      start: { line: 1, character: 6 }
+      end: { line: 1, character: 8 }
+finalState:
+  documentContents: |
+    enum E {
+        C(u16, u32),
+    }
+  selections:
+    - anchor: { line: 3, character: 0 }
+      active: { line: 3, character: 0 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: decoratedSymbol, symbolColor: default, character: "8" },
+      modifiers:
+        [{ type: containingScope, scopeType: { type: argumentOrParameter } }],
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/rust/chuckArgOne.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/rust/chuckArgOne.yml
new file mode 100644
index 0000000000..f448932968
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/rust/chuckArgOne.yml
@@ -0,0 +1,41 @@
+languageId: rust
+command:
+  spokenForm: chuck arg one
+  version: 2
+  targets:
+    - type: primitive
+      mark: { type: decoratedSymbol, symbolColor: default, character: "1" }
+      modifiers:
+        - type: containingScope
+          scopeType: { type: argumentOrParameter }
+  usePrePhraseSnapshot: true
+  action: { name: remove }
+initialState:
+  documentContents: |
+    enum E {
+        C(u8, u16, u32),
+    }
+  selections:
+    - anchor: { line: 3, character: 0 }
+      active: { line: 3, character: 0 }
+  marks:
+    default.1:
+      start: { line: 1, character: 10 }
+      end: { line: 1, character: 13 }
+finalState:
+  documentContents: |
+    enum E {
+        C(u8, u32),
+    }
+  selections:
+    - anchor: { line: 3, character: 0 }
+      active: { line: 3, character: 0 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: decoratedSymbol, symbolColor: default, character: "1" },
+      modifiers:
+        [{ type: containingScope, scopeType: { type: argumentOrParameter } }],
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/rust/chuckArgSun.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/rust/chuckArgSun.yml
new file mode 100644
index 0000000000..b3e14aeceb
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/rust/chuckArgSun.yml
@@ -0,0 +1,37 @@
+languageId: rust
+command:
+  spokenForm: chuck arg sun
+  version: 2
+  targets:
+    - type: primitive
+      mark: { type: decoratedSymbol, symbolColor: default, character: s }
+      modifiers:
+        - type: containingScope
+          scopeType: { type: argumentOrParameter }
+  usePrePhraseSnapshot: true
+  action: { name: remove }
+initialState:
+  documentContents: |
+    fn method(&mut self) {}
+  selections:
+    - anchor: { line: 1, character: 0 }
+      active: { line: 1, character: 0 }
+  marks:
+    default.s:
+      start: { line: 0, character: 15 }
+      end: { line: 0, character: 19 }
+finalState:
+  documentContents: |
+    fn method() {}
+  selections:
+    - anchor: { line: 1, character: 0 }
+      active: { line: 1, character: 0 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: decoratedSymbol, symbolColor: default, character: s },
+      modifiers:
+        [{ type: containingScope, scopeType: { type: argumentOrParameter } }],
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/rust/chuckArgSun2.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/rust/chuckArgSun2.yml
new file mode 100644
index 0000000000..55aa14cecc
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/rust/chuckArgSun2.yml
@@ -0,0 +1,41 @@
+languageId: rust
+command:
+  spokenForm: chuck arg sun
+  version: 2
+  targets:
+    - type: primitive
+      mark: { type: decoratedSymbol, symbolColor: default, character: s }
+      modifiers:
+        - type: containingScope
+          scopeType: { type: argumentOrParameter }
+  usePrePhraseSnapshot: true
+  action: { name: remove }
+initialState:
+  documentContents: >-
+    fn some_function<T: Display + Clone, U: Clone + Debug>(t: &T, u: &U) -> i32
+    {
+
+    }
+  selections:
+    - anchor: { line: 1, character: 1 }
+      active: { line: 1, character: 1 }
+  marks:
+    default.s:
+      start: { line: 0, character: 20 }
+      end: { line: 0, character: 27 }
+finalState:
+  documentContents: |-
+    fn some_function<U: Clone + Debug>(t: &T, u: &U) -> i32 {
+    }
+  selections:
+    - anchor: { line: 1, character: 1 }
+      active: { line: 1, character: 1 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: decoratedSymbol, symbolColor: default, character: s },
+      modifiers:
+        [{ type: containingScope, scopeType: { type: argumentOrParameter } }],
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/rust/chuckArgThree.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/rust/chuckArgThree.yml
new file mode 100644
index 0000000000..4eb13d049f
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/rust/chuckArgThree.yml
@@ -0,0 +1,41 @@
+languageId: rust
+command:
+  spokenForm: chuck arg three
+  version: 2
+  targets:
+    - type: primitive
+      mark: { type: decoratedSymbol, symbolColor: default, character: "3" }
+      modifiers:
+        - type: containingScope
+          scopeType: { type: argumentOrParameter }
+  usePrePhraseSnapshot: true
+  action: { name: remove }
+initialState:
+  documentContents: |
+    enum E {
+        C(u8, u16, u32),
+    }
+  selections:
+    - anchor: { line: 3, character: 0 }
+      active: { line: 3, character: 0 }
+  marks:
+    default.3:
+      start: { line: 1, character: 15 }
+      end: { line: 1, character: 18 }
+finalState:
+  documentContents: |
+    enum E {
+        C(u8, u16),
+    }
+  selections:
+    - anchor: { line: 3, character: 0 }
+      active: { line: 3, character: 0 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: decoratedSymbol, symbolColor: default, character: "3" },
+      modifiers:
+        [{ type: containingScope, scopeType: { type: argumentOrParameter } }],
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/rust/chuckArgTrap.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/rust/chuckArgTrap.yml
new file mode 100644
index 0000000000..f6015a0c02
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/rust/chuckArgTrap.yml
@@ -0,0 +1,37 @@
+languageId: rust
+command:
+  spokenForm: chuck arg trap
+  version: 2
+  targets:
+    - type: primitive
+      mark: { type: decoratedSymbol, symbolColor: default, character: t }
+      modifiers:
+        - type: containingScope
+          scopeType: { type: argumentOrParameter }
+  usePrePhraseSnapshot: true
+  action: { name: remove }
+initialState:
+  documentContents: |
+    struct S<'a, 'b: 'a, T> {};
+  selections:
+    - anchor: { line: 1, character: 0 }
+      active: { line: 1, character: 0 }
+  marks:
+    default.t:
+      start: { line: 0, character: 21 }
+      end: { line: 0, character: 22 }
+finalState:
+  documentContents: |
+    struct S<'a, 'b: 'a> {};
+  selections:
+    - anchor: { line: 1, character: 0 }
+      active: { line: 1, character: 0 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: decoratedSymbol, symbolColor: default, character: t },
+      modifiers:
+        [{ type: containingScope, scopeType: { type: argumentOrParameter } }],
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/rust/chuckArgTrap2.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/rust/chuckArgTrap2.yml
new file mode 100644
index 0000000000..9d947bb35f
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/rust/chuckArgTrap2.yml
@@ -0,0 +1,43 @@
+languageId: rust
+command:
+  spokenForm: chuck arg trap
+  version: 2
+  targets:
+    - type: primitive
+      mark: { type: decoratedSymbol, symbolColor: default, character: t }
+      modifiers:
+        - type: containingScope
+          scopeType: { type: argumentOrParameter }
+  usePrePhraseSnapshot: true
+  action: { name: remove }
+initialState:
+  documentContents: |
+    enum Maybe<T> {
+        Just(T),
+        Nothing,
+    }
+  selections:
+    - anchor: { line: 4, character: 0 }
+      active: { line: 4, character: 0 }
+  marks:
+    default.t:
+      start: { line: 1, character: 9 }
+      end: { line: 1, character: 10 }
+finalState:
+  documentContents: |
+    enum Maybe<T> {
+        Just(),
+        Nothing,
+    }
+  selections:
+    - anchor: { line: 4, character: 0 }
+      active: { line: 4, character: 0 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: decoratedSymbol, symbolColor: default, character: t },
+      modifiers:
+        [{ type: containingScope, scopeType: { type: argumentOrParameter } }],
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/rust/chuckAttributeDrum.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/rust/chuckAttributeDrum.yml
new file mode 100644
index 0000000000..ac3725eb12
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/rust/chuckAttributeDrum.yml
@@ -0,0 +1,37 @@
+languageId: rust
+command:
+  spokenForm: chuck attribute drum
+  version: 2
+  targets:
+    - type: primitive
+      mark: { type: decoratedSymbol, symbolColor: default, character: d }
+      modifiers:
+        - type: containingScope
+          scopeType: { type: attribute }
+  usePrePhraseSnapshot: true
+  action: { name: remove }
+initialState:
+  documentContents: |
+    #[derive(Debug)]
+    struct S {}
+  selections:
+    - anchor: { line: 1, character: 11 }
+      active: { line: 1, character: 11 }
+  marks:
+    default.d:
+      start: { line: 0, character: 2 }
+      end: { line: 0, character: 8 }
+finalState:
+  documentContents: |
+    struct S {}
+  selections:
+    - anchor: { line: 0, character: 11 }
+      active: { line: 0, character: 11 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: decoratedSymbol, symbolColor: default, character: d },
+      modifiers: [{ type: containingScope, scopeType: { type: attribute } }],
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/rust/chuckAttributeMade.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/rust/chuckAttributeMade.yml
new file mode 100644
index 0000000000..dbb683af02
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/rust/chuckAttributeMade.yml
@@ -0,0 +1,34 @@
+languageId: rust
+command:
+  spokenForm: chuck attribute made
+  version: 2
+  targets:
+    - type: primitive
+      mark: { type: decoratedSymbol, symbolColor: default, character: m }
+      modifiers:
+        - type: containingScope
+          scopeType: { type: attribute }
+  usePrePhraseSnapshot: true
+  action: { name: remove }
+initialState:
+  documentContents: "fn foo(x: &mut u32) {}"
+  selections:
+    - anchor: { line: 0, character: 21 }
+      active: { line: 0, character: 21 }
+  marks:
+    default.m:
+      start: { line: 0, character: 11 }
+      end: { line: 0, character: 14 }
+finalState:
+  documentContents: "fn foo(x: &u32) {}"
+  selections:
+    - anchor: { line: 0, character: 17 }
+      active: { line: 0, character: 17 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: decoratedSymbol, symbolColor: default, character: m },
+      modifiers: [{ type: containingScope, scopeType: { type: attribute } }],
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/rust/chuckAttributeMade2.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/rust/chuckAttributeMade2.yml
new file mode 100644
index 0000000000..ea2306e722
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/rust/chuckAttributeMade2.yml
@@ -0,0 +1,42 @@
+languageId: rust
+command:
+  spokenForm: chuck attribute made
+  version: 2
+  targets:
+    - type: primitive
+      mark: { type: decoratedSymbol, symbolColor: default, character: m }
+      modifiers:
+        - type: containingScope
+          scopeType: { type: attribute }
+  usePrePhraseSnapshot: true
+  action: { name: remove }
+initialState:
+  documentContents: |-
+    fn f() {
+        let x = vec![];
+        let y = &mut x;
+    }
+  selections:
+    - anchor: { line: 2, character: 19 }
+      active: { line: 2, character: 19 }
+  marks:
+    default.m:
+      start: { line: 2, character: 13 }
+      end: { line: 2, character: 16 }
+finalState:
+  documentContents: |-
+    fn f() {
+        let x = vec![];
+        let y = &x;
+    }
+  selections:
+    - anchor: { line: 2, character: 15 }
+      active: { line: 2, character: 15 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: decoratedSymbol, symbolColor: default, character: m },
+      modifiers: [{ type: containingScope, scopeType: { type: attribute } }],
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/rust/chuckCall.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/rust/chuckCall.yml
new file mode 100644
index 0000000000..2260867051
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/rust/chuckCall.yml
@@ -0,0 +1,41 @@
+languageId: rust
+command:
+  version: 1
+  spokenForm: chuck call
+  action: remove
+  targets:
+    - type: primitive
+      modifier:
+        {
+          type: containingScope,
+          scopeType: functionCall,
+          includeSiblings: false,
+        }
+initialState:
+  documentContents: println!("hello world")
+  selections:
+    - anchor: { line: 0, character: 5 }
+      active: { line: 0, character: 5 }
+  marks: {}
+finalState:
+  documentContents: ""
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: outside,
+      modifier:
+        {
+          type: containingScope,
+          scopeType: functionCall,
+          includeSiblings: false,
+        },
+      isImplicit: false,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/rust/chuckCall2.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/rust/chuckCall2.yml
new file mode 100644
index 0000000000..ad5cbac88a
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/rust/chuckCall2.yml
@@ -0,0 +1,41 @@
+languageId: rust
+command:
+  version: 1
+  spokenForm: chuck call
+  action: remove
+  targets:
+    - type: primitive
+      modifier:
+        {
+          type: containingScope,
+          scopeType: functionCall,
+          includeSiblings: false,
+        }
+initialState:
+  documentContents: something(1)
+  selections:
+    - anchor: { line: 0, character: 4 }
+      active: { line: 0, character: 4 }
+  marks: {}
+finalState:
+  documentContents: ""
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: outside,
+      modifier:
+        {
+          type: containingScope,
+          scopeType: functionCall,
+          includeSiblings: false,
+        },
+      isImplicit: false,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/rust/chuckCallNear.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/rust/chuckCallNear.yml
new file mode 100644
index 0000000000..cb5d5a82d8
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/rust/chuckCallNear.yml
@@ -0,0 +1,36 @@
+languageId: rust
+command:
+  spokenForm: chuck call near
+  version: 2
+  targets:
+    - type: primitive
+      mark: { type: decoratedSymbol, symbolColor: default, character: "n" }
+      modifiers:
+        - type: containingScope
+          scopeType: { type: functionCall }
+  usePrePhraseSnapshot: true
+  action: { name: remove }
+initialState:
+  documentContents: |
+    let user = User::new();
+  selections:
+    - anchor: { line: 1, character: 0 }
+      active: { line: 1, character: 0 }
+  marks:
+    default.n:
+      start: { line: 0, character: 17 }
+      end: { line: 0, character: 20 }
+finalState:
+  documentContents: |
+    let user =;
+  selections:
+    - anchor: { line: 1, character: 0 }
+      active: { line: 1, character: 0 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: decoratedSymbol, symbolColor: default, character: "n" },
+      modifiers: [{ type: containingScope, scopeType: { type: functionCall } }],
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/rust/chuckClassName.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/rust/chuckClassName.yml
new file mode 100644
index 0000000000..3ebac22233
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/rust/chuckClassName.yml
@@ -0,0 +1,30 @@
+languageId: rust
+command:
+  spokenForm: chuck class name
+  version: 2
+  targets:
+    - type: primitive
+      modifiers:
+        - type: containingScope
+          scopeType: { type: className }
+  usePrePhraseSnapshot: true
+  action: { name: remove }
+initialState:
+  documentContents: struct Some {}
+  selections:
+    - anchor: { line: 0, character: 13 }
+      active: { line: 0, character: 13 }
+  marks: {}
+finalState:
+  documentContents: struct {}
+  selections:
+    - anchor: { line: 0, character: 8 }
+      active: { line: 0, character: 8 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      modifiers: [{ type: containingScope, scopeType: { type: className } }],
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/rust/chuckComment.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/rust/chuckComment.yml
new file mode 100644
index 0000000000..c830369f72
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/rust/chuckComment.yml
@@ -0,0 +1,33 @@
+languageId: rust
+command:
+  version: 1
+  spokenForm: chuck comment
+  action: remove
+  targets:
+    - type: primitive
+      modifier:
+        { type: containingScope, scopeType: comment, includeSiblings: false }
+initialState:
+  documentContents: // a comment
+  selections:
+    - anchor: { line: 0, character: 11 }
+      active: { line: 0, character: 11 }
+  marks: {}
+finalState:
+  documentContents: ""
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: outside,
+      modifier:
+        { type: containingScope, scopeType: comment, includeSiblings: false },
+      isImplicit: false,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/rust/chuckComment2.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/rust/chuckComment2.yml
new file mode 100644
index 0000000000..63458ed61f
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/rust/chuckComment2.yml
@@ -0,0 +1,38 @@
+languageId: rust
+command:
+  version: 1
+  spokenForm: chuck comment
+  action: remove
+  targets:
+    - type: primitive
+      modifier:
+        { type: containingScope, scopeType: comment, includeSiblings: false }
+initialState:
+  documentContents: |-
+    /*
+    multi
+    line
+    commment
+    */
+  selections:
+    - anchor: { line: 3, character: 7 }
+      active: { line: 3, character: 7 }
+  marks: {}
+finalState:
+  documentContents: ""
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: outside,
+      modifier:
+        { type: containingScope, scopeType: comment, includeSiblings: false },
+      isImplicit: false,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/rust/chuckCondition.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/rust/chuckCondition.yml
new file mode 100644
index 0000000000..4146a59fb9
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/rust/chuckCondition.yml
@@ -0,0 +1,38 @@
+languageId: rust
+command:
+  spokenForm: chuck condition
+  version: 2
+  targets:
+    - type: primitive
+      modifiers:
+        - type: containingScope
+          scopeType: { type: condition }
+  usePrePhraseSnapshot: true
+  action: { name: remove }
+initialState:
+  documentContents: |
+    match user {
+        User { first_name: "John" } => {},
+        User { first_name } if first_name.starts_with("P") => {}
+    }
+  selections:
+    - anchor: { line: 2, character: 27 }
+      active: { line: 2, character: 54 }
+  marks: {}
+finalState:
+  documentContents: |
+    match user {
+        User { first_name: "John" } => {},
+        User { first_name } => {}
+    }
+  selections:
+    - anchor: { line: 2, character: 23 }
+      active: { line: 2, character: 23 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      modifiers: [{ type: containingScope, scopeType: { type: ifStatement } }],
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/rust/chuckFunkMade.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/rust/chuckFunkMade.yml
new file mode 100644
index 0000000000..0c5f6ca95e
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/rust/chuckFunkMade.yml
@@ -0,0 +1,49 @@
+languageId: rust
+command:
+  version: 1
+  spokenForm: chuck funk made
+  action: remove
+  targets:
+    - type: primitive
+      modifier:
+        {
+          type: containingScope,
+          scopeType: namedFunction,
+          includeSiblings: false,
+        }
+      mark: { type: decoratedSymbol, symbolColor: default, character: m }
+initialState:
+  documentContents: |
+    fn main() {
+        println!("Hello, world!");
+    }
+  selections:
+    - anchor: { line: 3, character: 0 }
+      active: { line: 3, character: 0 }
+  marks:
+    default.m:
+      start: { line: 0, character: 3 }
+      end: { line: 0, character: 7 }
+finalState:
+  documentContents: |+
+
+  selections:
+    - anchor: { line: 1, character: 0 }
+      active: { line: 1, character: 0 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: decoratedSymbol, symbolColor: default, character: m },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: outside,
+      modifier:
+        {
+          type: containingScope,
+          scopeType: namedFunction,
+          includeSiblings: false,
+        },
+      isImplicit: false,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/rust/chuckFunkNameFine.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/rust/chuckFunkNameFine.yml
new file mode 100644
index 0000000000..9dfbdc271e
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/rust/chuckFunkNameFine.yml
@@ -0,0 +1,51 @@
+languageId: rust
+command:
+  version: 1
+  spokenForm: chuck funk name fine
+  action: remove
+  targets:
+    - type: primitive
+      modifier:
+        {
+          type: containingScope,
+          scopeType: functionName,
+          includeSiblings: false,
+        }
+      mark: { type: decoratedSymbol, symbolColor: default, character: f }
+initialState:
+  documentContents: |-
+    fn main() {
+        println!("Hello, world!");
+    }
+  selections:
+    - anchor: { line: 2, character: 1 }
+      active: { line: 2, character: 1 }
+  marks:
+    default.f:
+      start: { line: 0, character: 0 }
+      end: { line: 0, character: 2 }
+finalState:
+  documentContents: |-
+    fn() {
+        println!("Hello, world!");
+    }
+  selections:
+    - anchor: { line: 2, character: 1 }
+      active: { line: 2, character: 1 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: decoratedSymbol, symbolColor: default, character: f },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: outside,
+      modifier:
+        {
+          type: containingScope,
+          scopeType: functionName,
+          includeSiblings: false,
+        },
+      isImplicit: false,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/rust/chuckItemOne.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/rust/chuckItemOne.yml
new file mode 100644
index 0000000000..545e2574e5
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/rust/chuckItemOne.yml
@@ -0,0 +1,37 @@
+languageId: rust
+command:
+  spokenForm: chuck item one
+  version: 2
+  targets:
+    - type: primitive
+      mark: { type: decoratedSymbol, symbolColor: default, character: "1" }
+      modifiers:
+        - type: containingScope
+          scopeType: { type: collectionItem }
+  usePrePhraseSnapshot: true
+  action: { name: remove }
+initialState:
+  documentContents: |
+    let x = [1, 2];
+  selections:
+    - anchor: { line: 0, character: 10 }
+      active: { line: 0, character: 10 }
+  marks:
+    default.1:
+      start: { line: 0, character: 9 }
+      end: { line: 0, character: 10 }
+finalState:
+  documentContents: |
+    let x = [2];
+  selections:
+    - anchor: { line: 0, character: 9 }
+      active: { line: 0, character: 9 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: decoratedSymbol, symbolColor: default, character: "1" },
+      modifiers:
+        [{ type: containingScope, scopeType: { type: collectionItem } }],
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/rust/chuckItemOne2.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/rust/chuckItemOne2.yml
new file mode 100644
index 0000000000..d1bd55225b
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/rust/chuckItemOne2.yml
@@ -0,0 +1,37 @@
+languageId: rust
+command:
+  spokenForm: chuck item one
+  version: 2
+  targets:
+    - type: primitive
+      mark: { type: decoratedSymbol, symbolColor: default, character: "1" }
+      modifiers:
+        - type: containingScope
+          scopeType: { type: collectionItem }
+  usePrePhraseSnapshot: true
+  action: { name: remove }
+initialState:
+  documentContents: |
+    let x = [1];
+  selections:
+    - anchor: { line: 0, character: 10 }
+      active: { line: 0, character: 10 }
+  marks:
+    default.1:
+      start: { line: 0, character: 9 }
+      end: { line: 0, character: 10 }
+finalState:
+  documentContents: |
+    let x = [];
+  selections:
+    - anchor: { line: 0, character: 9 }
+      active: { line: 0, character: 9 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: decoratedSymbol, symbolColor: default, character: "1" },
+      modifiers:
+        [{ type: containingScope, scopeType: { type: collectionItem } }],
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/rust/chuckItemSit2.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/rust/chuckItemSit2.yml
new file mode 100644
index 0000000000..2a8c93184c
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/rust/chuckItemSit2.yml
@@ -0,0 +1,37 @@
+languageId: rust
+command:
+  spokenForm: chuck item sit
+  version: 3
+  targets:
+    - type: primitive
+      modifiers:
+        - type: containingScope
+          scopeType: { type: collectionItem }
+      mark: { type: decoratedSymbol, symbolColor: default, character: i }
+  usePrePhraseSnapshot: true
+  action: { name: remove }
+initialState:
+  documentContents: |
+    type T = (&'static str, &'static str);
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+  marks:
+    default.i:
+      start: { line: 0, character: 26 }
+      end: { line: 0, character: 32 }
+finalState:
+  documentContents: |
+    type T = (&'static str);
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: decoratedSymbol, symbolColor: default, character: i },
+      modifiers:
+        [{ type: containingScope, scopeType: { type: collectionItem } }],
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/rust/chuckItemTwo.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/rust/chuckItemTwo.yml
new file mode 100644
index 0000000000..85b283a63b
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/rust/chuckItemTwo.yml
@@ -0,0 +1,37 @@
+languageId: rust
+command:
+  spokenForm: chuck item two
+  version: 2
+  targets:
+    - type: primitive
+      mark: { type: decoratedSymbol, symbolColor: default, character: "2" }
+      modifiers:
+        - type: containingScope
+          scopeType: { type: collectionItem }
+  usePrePhraseSnapshot: true
+  action: { name: remove }
+initialState:
+  documentContents: |
+    let x = [1, 2];
+  selections:
+    - anchor: { line: 0, character: 10 }
+      active: { line: 0, character: 10 }
+  marks:
+    default.2:
+      start: { line: 0, character: 12 }
+      end: { line: 0, character: 13 }
+finalState:
+  documentContents: |
+    let x = [1];
+  selections:
+    - anchor: { line: 0, character: 10 }
+      active: { line: 0, character: 10 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: decoratedSymbol, symbolColor: default, character: "2" },
+      modifiers:
+        [{ type: containingScope, scopeType: { type: collectionItem } }],
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/rust/chuckItemVest.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/rust/chuckItemVest.yml
new file mode 100644
index 0000000000..28c8852321
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/rust/chuckItemVest.yml
@@ -0,0 +1,42 @@
+languageId: rust
+command:
+  spokenForm: chuck item vest
+  version: 2
+  targets:
+    - type: primitive
+      mark: { type: decoratedSymbol, symbolColor: default, character: v }
+      modifiers:
+        - type: containingScope
+          scopeType: { type: collectionItem }
+  usePrePhraseSnapshot: true
+  action: { name: remove }
+initialState:
+  documentContents: |
+    enum IpAddr {
+        V4(u8, u8, u8, u8),
+        V6(String),
+    }
+  selections:
+    - anchor: { line: 4, character: 0 }
+      active: { line: 4, character: 0 }
+  marks:
+    default.v:
+      start: { line: 1, character: 4 }
+      end: { line: 1, character: 6 }
+finalState:
+  documentContents: |
+    enum IpAddr {
+        V6(String),
+    }
+  selections:
+    - anchor: { line: 3, character: 0 }
+      active: { line: 3, character: 0 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: decoratedSymbol, symbolColor: default, character: v },
+      modifiers:
+        [{ type: containingScope, scopeType: { type: collectionItem } }],
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/rust/chuckKeyAir.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/rust/chuckKeyAir.yml
new file mode 100644
index 0000000000..c0e45374b9
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/rust/chuckKeyAir.yml
@@ -0,0 +1,43 @@
+languageId: rust
+command:
+  spokenForm: chuck key air
+  version: 2
+  targets:
+    - type: primitive
+      mark: { type: decoratedSymbol, symbolColor: default, character: a }
+      modifiers:
+        - type: containingScope
+          scopeType: { type: collectionKey }
+  usePrePhraseSnapshot: true
+  action: { name: remove }
+initialState:
+  documentContents: |
+    let user = User {
+        first_name: "John",
+        last_name: last_name,
+    }
+  selections:
+    - anchor: { line: 4, character: 0 }
+      active: { line: 4, character: 0 }
+  marks:
+    default.a:
+      start: { line: 2, character: 15 }
+      end: { line: 2, character: 24 }
+finalState:
+  documentContents: |
+    let user = User {
+        first_name: "John",
+        last_name,
+    }
+  selections:
+    - anchor: { line: 4, character: 0 }
+      active: { line: 4, character: 0 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: decoratedSymbol, symbolColor: default, character: a },
+      modifiers:
+        [{ type: containingScope, scopeType: { type: collectionKey } }],
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/rust/chuckKeyLook.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/rust/chuckKeyLook.yml
new file mode 100644
index 0000000000..16cee8cc7a
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/rust/chuckKeyLook.yml
@@ -0,0 +1,43 @@
+languageId: rust
+command:
+  spokenForm: chuck key look
+  version: 2
+  targets:
+    - type: primitive
+      mark: { type: decoratedSymbol, symbolColor: default, character: l }
+      modifiers:
+        - type: containingScope
+          scopeType: { type: collectionKey }
+  usePrePhraseSnapshot: true
+  action: { name: remove }
+initialState:
+  documentContents: |
+    let user = User {
+        first_name: "John",
+        last_name: last_name,
+    }
+  selections:
+    - anchor: { line: 4, character: 0 }
+      active: { line: 4, character: 0 }
+  marks:
+    default.l:
+      start: { line: 2, character: 4 }
+      end: { line: 2, character: 13 }
+finalState:
+  documentContents: |
+    let user = User {
+        first_name: "John",
+        last_name,
+    }
+  selections:
+    - anchor: { line: 4, character: 0 }
+      active: { line: 4, character: 0 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: decoratedSymbol, symbolColor: default, character: l },
+      modifiers:
+        [{ type: containingScope, scopeType: { type: collectionKey } }],
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/rust/chuckListOne.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/rust/chuckListOne.yml
new file mode 100644
index 0000000000..fa370eebbb
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/rust/chuckListOne.yml
@@ -0,0 +1,37 @@
+languageId: rust
+command:
+  version: 1
+  spokenForm: chuck list one
+  action: remove
+  targets:
+    - type: primitive
+      modifier:
+        { type: containingScope, scopeType: list, includeSiblings: false }
+      mark: { type: decoratedSymbol, symbolColor: default, character: "1" }
+initialState:
+  documentContents: let x = [1, 2, 3];
+  selections:
+    - anchor: { line: 0, character: 18 }
+      active: { line: 0, character: 18 }
+  marks:
+    default.1:
+      start: { line: 0, character: 9 }
+      end: { line: 0, character: 10 }
+finalState:
+  documentContents: let x =;
+  selections:
+    - anchor: { line: 0, character: 8 }
+      active: { line: 0, character: 8 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: decoratedSymbol, symbolColor: default, character: "1" },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: outside,
+      modifier:
+        { type: containingScope, scopeType: list, includeSiblings: false },
+      isImplicit: false,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/rust/chuckName.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/rust/chuckName.yml
new file mode 100644
index 0000000000..edcb2b464b
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/rust/chuckName.yml
@@ -0,0 +1,33 @@
+languageId: rust
+command:
+  version: 1
+  spokenForm: chuck name
+  action: remove
+  targets:
+    - type: primitive
+      modifier:
+        { type: containingScope, scopeType: name, includeSiblings: false }
+initialState:
+  documentContents: "let mut array: [i32; 3] = [0; 3];"
+  selections:
+    - anchor: { line: 0, character: 5 }
+      active: { line: 0, character: 5 }
+  marks: {}
+finalState:
+  documentContents: "let mut: [i32; 3] = [0; 3];"
+  selections:
+    - anchor: { line: 0, character: 5 }
+      active: { line: 0, character: 5 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: outside,
+      modifier:
+        { type: containingScope, scopeType: name, includeSiblings: false },
+      isImplicit: false,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/rust/chuckName2.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/rust/chuckName2.yml
new file mode 100644
index 0000000000..e0a2296415
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/rust/chuckName2.yml
@@ -0,0 +1,36 @@
+languageId: rust
+command:
+  spokenForm: chuck name
+  version: 2
+  targets:
+    - type: primitive
+      modifiers:
+        - type: containingScope
+          scopeType: { type: name }
+  usePrePhraseSnapshot: true
+  action: { name: remove }
+initialState:
+  documentContents: |
+    fn main() -> Result<(), Error> {
+
+    }
+  selections:
+    - anchor: { line: 1, character: 4 }
+      active: { line: 1, character: 4 }
+  marks: {}
+finalState:
+  documentContents: |
+    fn() -> Result<(), Error> {
+
+    }
+  selections:
+    - anchor: { line: 1, character: 4 }
+      active: { line: 1, character: 4 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      modifiers: [{ type: containingScope, scopeType: { type: name } }],
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/rust/chuckNameFine.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/rust/chuckNameFine.yml
new file mode 100644
index 0000000000..4c0988e912
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/rust/chuckNameFine.yml
@@ -0,0 +1,40 @@
+languageId: rust
+command:
+  spokenForm: chuck name fine
+  version: 2
+  targets:
+    - type: primitive
+      mark: { type: decoratedSymbol, symbolColor: default, character: f }
+      modifiers:
+        - type: containingScope
+          scopeType: { type: name }
+  usePrePhraseSnapshot: true
+  action: { name: remove }
+initialState:
+  documentContents: |
+    match user {
+        User { first_name: "John", last_name: last_name } => {}
+    }
+  selections:
+    - anchor: { line: 0, character: 10 }
+      active: { line: 0, character: 10 }
+  marks:
+    default.f:
+      start: { line: 1, character: 11 }
+      end: { line: 1, character: 21 }
+finalState:
+  documentContents: |
+    match user {
+        User { "John", last_name: last_name } => {}
+    }
+  selections:
+    - anchor: { line: 0, character: 10 }
+      active: { line: 0, character: 10 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: decoratedSymbol, symbolColor: default, character: f },
+      modifiers: [{ type: containingScope, scopeType: { type: name } }],
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/rust/chuckNameJury.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/rust/chuckNameJury.yml
new file mode 100644
index 0000000000..fdbacc7e53
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/rust/chuckNameJury.yml
@@ -0,0 +1,40 @@
+languageId: rust
+command:
+  spokenForm: chuck name jury
+  version: 2
+  targets:
+    - type: primitive
+      mark: { type: decoratedSymbol, symbolColor: default, character: j }
+      modifiers:
+        - type: containingScope
+          scopeType: { type: name }
+  usePrePhraseSnapshot: true
+  action: { name: remove }
+initialState:
+  documentContents: |
+    match user {
+        User { first_name: "John", last_name: last_name } => {}
+    }
+  selections:
+    - anchor: { line: 0, character: 10 }
+      active: { line: 0, character: 10 }
+  marks:
+    default.j:
+      start: { line: 1, character: 24 }
+      end: { line: 1, character: 28 }
+finalState:
+  documentContents: |
+    match user {
+        User { "John", last_name: last_name } => {}
+    }
+  selections:
+    - anchor: { line: 0, character: 10 }
+      active: { line: 0, character: 10 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: decoratedSymbol, symbolColor: default, character: j },
+      modifiers: [{ type: containingScope, scopeType: { type: name } }],
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/rust/chuckState.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/rust/chuckState.yml
new file mode 100644
index 0000000000..ba68de17fc
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/rust/chuckState.yml
@@ -0,0 +1,32 @@
+languageId: rust
+command:
+  spokenForm: chuck state
+  version: 2
+  targets:
+    - type: primitive
+      modifiers:
+        - type: containingScope
+          scopeType: { type: statement }
+  usePrePhraseSnapshot: true
+  action: { name: remove }
+initialState:
+  documentContents: |
+    let x = vec![1, 2, 3];
+  selections:
+    - anchor: { line: 0, character: 10 }
+      active: { line: 0, character: 10 }
+  marks: {}
+finalState:
+  documentContents: |+
+
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      modifiers: [{ type: containingScope, scopeType: { type: statement } }],
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/rust/chuckString.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/rust/chuckString.yml
new file mode 100644
index 0000000000..f4a9ff2a4b
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/rust/chuckString.yml
@@ -0,0 +1,37 @@
+languageId: rust
+command:
+  version: 1
+  spokenForm: chuck string
+  action: remove
+  targets:
+    - type: primitive
+      modifier: { type: surroundingPair, delimiter: string }
+initialState:
+  documentContents: |-
+    fn main() {
+        println!("Hello, world!");
+    }
+  selections:
+    - anchor: { line: 1, character: 25 }
+      active: { line: 1, character: 25 }
+  marks: {}
+finalState:
+  documentContents: |-
+    fn main() {
+        println!();
+    }
+  selections:
+    - anchor: { line: 1, character: 13 }
+      active: { line: 1, character: 13 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: outside,
+      modifier: { type: surroundingPair, delimiter: string },
+      isImplicit: false,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/rust/chuckTypeAir.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/rust/chuckTypeAir.yml
new file mode 100644
index 0000000000..e79fafe381
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/rust/chuckTypeAir.yml
@@ -0,0 +1,50 @@
+languageId: rust
+command:
+  spokenForm: chuck type air
+  version: 2
+  targets:
+    - type: primitive
+      mark: { type: decoratedSymbol, symbolColor: default, character: a }
+      modifiers:
+        - type: containingScope
+          scopeType: { type: type }
+  usePrePhraseSnapshot: true
+  action: { name: remove }
+initialState:
+  documentContents: |
+    trait T {
+        fn f();
+    }
+
+    impl T for Option<u32> {
+        fn f() {
+            unimplemented!()
+        }
+    }
+  selections:
+    - anchor: { line: 8, character: 0 }
+      active: { line: 8, character: 0 }
+  marks:
+    default.a:
+      start: { line: 0, character: 0 }
+      end: { line: 0, character: 5 }
+finalState:
+  documentContents: |
+
+
+    impl T for Option<u32> {
+        fn f() {
+            unimplemented!()
+        }
+    }
+  selections:
+    - anchor: { line: 6, character: 0 }
+      active: { line: 6, character: 0 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: decoratedSymbol, symbolColor: default, character: a },
+      modifiers: [{ type: containingScope, scopeType: { type: type } }],
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/rust/chuckTypeLook.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/rust/chuckTypeLook.yml
new file mode 100644
index 0000000000..adf9b5ab6b
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/rust/chuckTypeLook.yml
@@ -0,0 +1,55 @@
+languageId: rust
+command:
+  version: 1
+  spokenForm: chuck type look
+  action: remove
+  targets:
+    - type: primitive
+      modifier:
+        { type: containingScope, scopeType: type, includeSiblings: false }
+      mark: { type: decoratedSymbol, symbolColor: default, character: l }
+initialState:
+  documentContents: |
+
+    fn build_user(email: String, username: String) -> User {
+        User {
+            email: email,
+            username: username,
+            active: true,
+            sign_in_count: 1,
+        }
+    }
+  selections:
+    - anchor: { line: 8, character: 1 }
+      active: { line: 8, character: 1 }
+  marks:
+    default.l:
+      start: { line: 1, character: 14 }
+      end: { line: 1, character: 19 }
+finalState:
+  documentContents: |
+
+    fn build_user(email, username: String) -> User {
+        User {
+            email: email,
+            username: username,
+            active: true,
+            sign_in_count: 1,
+        }
+    }
+  selections:
+    - anchor: { line: 8, character: 1 }
+      active: { line: 8, character: 1 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: decoratedSymbol, symbolColor: default, character: l },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: outside,
+      modifier:
+        { type: containingScope, scopeType: type, includeSiblings: false },
+      isImplicit: false,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/rust/chuckTypeMade.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/rust/chuckTypeMade.yml
new file mode 100644
index 0000000000..c122488e1d
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/rust/chuckTypeMade.yml
@@ -0,0 +1,48 @@
+languageId: rust
+command:
+  spokenForm: chuck type made
+  version: 2
+  targets:
+    - type: primitive
+      mark: { type: decoratedSymbol, symbolColor: default, character: m }
+      modifiers:
+        - type: containingScope
+          scopeType: { type: type }
+  usePrePhraseSnapshot: true
+  action: { name: remove }
+initialState:
+  documentContents: |
+    trait T {
+        fn f();
+    }
+
+    impl T for Option<u32> {
+        fn f() {
+            unimplemented!()
+        }
+    }
+  selections:
+    - anchor: { line: 8, character: 0 }
+      active: { line: 8, character: 0 }
+  marks:
+    default.m:
+      start: { line: 4, character: 0 }
+      end: { line: 4, character: 4 }
+finalState:
+  documentContents: |+
+    trait T {
+        fn f();
+    }
+
+
+  selections:
+    - anchor: { line: 4, character: 0 }
+      active: { line: 4, character: 0 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: decoratedSymbol, symbolColor: default, character: m },
+      modifiers: [{ type: containingScope, scopeType: { type: type } }],
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/rust/chuckTypeOdd.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/rust/chuckTypeOdd.yml
new file mode 100644
index 0000000000..a98b2657b1
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/rust/chuckTypeOdd.yml
@@ -0,0 +1,40 @@
+languageId: rust
+command:
+  spokenForm: chuck type odd
+  version: 2
+  targets:
+    - type: primitive
+      mark: { type: decoratedSymbol, symbolColor: default, character: o }
+      modifiers:
+        - type: containingScope
+          scopeType: { type: type }
+  usePrePhraseSnapshot: true
+  action: { name: remove }
+initialState:
+  documentContents: |
+    struct S {
+        n: Option<u64>,
+    }
+  selections:
+    - anchor: { line: 3, character: 0 }
+      active: { line: 3, character: 0 }
+  marks:
+    default.o:
+      start: { line: 1, character: 7 }
+      end: { line: 1, character: 13 }
+finalState:
+  documentContents: |
+    struct S {
+        n,
+    }
+  selections:
+    - anchor: { line: 3, character: 0 }
+      active: { line: 3, character: 0 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: decoratedSymbol, symbolColor: default, character: o },
+      modifiers: [{ type: containingScope, scopeType: { type: type } }],
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/rust/chuckTypeOdd2.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/rust/chuckTypeOdd2.yml
new file mode 100644
index 0000000000..0e48498414
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/rust/chuckTypeOdd2.yml
@@ -0,0 +1,52 @@
+languageId: rust
+command:
+  spokenForm: chuck type odd
+  version: 2
+  targets:
+    - type: primitive
+      mark: { type: decoratedSymbol, symbolColor: default, character: o }
+      modifiers:
+        - type: containingScope
+          scopeType: { type: type }
+  usePrePhraseSnapshot: true
+  action: { name: remove }
+initialState:
+  documentContents: |
+    trait T {
+        fn f();
+    }
+
+    impl T for Option<u32> {
+        fn f() {
+            unimplemented!()
+        }
+    }
+  selections:
+    - anchor: { line: 8, character: 0 }
+      active: { line: 8, character: 0 }
+  marks:
+    default.o:
+      start: { line: 4, character: 11 }
+      end: { line: 4, character: 17 }
+finalState:
+  documentContents: |
+    trait T {
+        fn f();
+    }
+
+    impl T for {
+        fn f() {
+            unimplemented!()
+        }
+    }
+  selections:
+    - anchor: { line: 8, character: 0 }
+      active: { line: 8, character: 0 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: decoratedSymbol, symbolColor: default, character: o },
+      modifiers: [{ type: containingScope, scopeType: { type: type } }],
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/rust/chuckTypePlex.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/rust/chuckTypePlex.yml
new file mode 100644
index 0000000000..ea208b7d83
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/rust/chuckTypePlex.yml
@@ -0,0 +1,34 @@
+languageId: rust
+command:
+  spokenForm: chuck type plex
+  version: 2
+  targets:
+    - type: primitive
+      mark: { type: decoratedSymbol, symbolColor: default, character: x }
+      modifiers:
+        - type: containingScope
+          scopeType: { type: type }
+  usePrePhraseSnapshot: true
+  action: { name: remove }
+initialState:
+  documentContents: "let x: u32 = 1;"
+  selections:
+    - anchor: { line: 0, character: 15 }
+      active: { line: 0, character: 15 }
+  marks:
+    default.x:
+      start: { line: 0, character: 4 }
+      end: { line: 0, character: 5 }
+finalState:
+  documentContents: let x = 1;
+  selections:
+    - anchor: { line: 0, character: 10 }
+      active: { line: 0, character: 10 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: decoratedSymbol, symbolColor: default, character: x },
+      modifiers: [{ type: containingScope, scopeType: { type: type } }],
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/rust/chuckTypePlex2.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/rust/chuckTypePlex2.yml
new file mode 100644
index 0000000000..de76d6560e
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/rust/chuckTypePlex2.yml
@@ -0,0 +1,36 @@
+languageId: rust
+command:
+  spokenForm: chuck type plex
+  version: 2
+  targets:
+    - type: primitive
+      mark: { type: decoratedSymbol, symbolColor: default, character: x }
+      modifiers:
+        - type: containingScope
+          scopeType: { type: type }
+  usePrePhraseSnapshot: true
+  action: { name: remove }
+initialState:
+  documentContents: |
+    const X: [u8; 2] = [0, 0];
+  selections:
+    - anchor: { line: 1, character: 0 }
+      active: { line: 1, character: 0 }
+  marks:
+    default.x:
+      start: { line: 0, character: 6 }
+      end: { line: 0, character: 7 }
+finalState:
+  documentContents: |
+    const X = [0, 0];
+  selections:
+    - anchor: { line: 1, character: 0 }
+      active: { line: 1, character: 0 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: decoratedSymbol, symbolColor: default, character: x },
+      modifiers: [{ type: containingScope, scopeType: { type: type } }],
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/rust/chuckTypeSun.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/rust/chuckTypeSun.yml
new file mode 100644
index 0000000000..122309b1b7
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/rust/chuckTypeSun.yml
@@ -0,0 +1,40 @@
+languageId: rust
+command:
+  spokenForm: chuck type sun
+  version: 2
+  targets:
+    - type: primitive
+      mark: { type: decoratedSymbol, symbolColor: default, character: s }
+      modifiers:
+        - type: containingScope
+          scopeType: { type: type }
+  usePrePhraseSnapshot: true
+  action: { name: remove }
+initialState:
+  documentContents: |
+    fn main() -> Result<(), Error> {
+
+    }
+  selections:
+    - anchor: { line: 2, character: 1 }
+      active: { line: 2, character: 1 }
+  marks:
+    default.s:
+      start: { line: 0, character: 13 }
+      end: { line: 0, character: 19 }
+finalState:
+  documentContents: |
+    fn main() {
+
+    }
+  selections:
+    - anchor: { line: 2, character: 1 }
+      active: { line: 2, character: 1 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: decoratedSymbol, symbolColor: default, character: s },
+      modifiers: [{ type: containingScope, scopeType: { type: type } }],
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/rust/chuckTypeYank.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/rust/chuckTypeYank.yml
new file mode 100644
index 0000000000..0ae049e5ed
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/rust/chuckTypeYank.yml
@@ -0,0 +1,43 @@
+languageId: rust
+command:
+  version: 1
+  spokenForm: chuck type yank
+  action: remove
+  targets:
+    - type: primitive
+      modifier:
+        { type: containingScope, scopeType: type, includeSiblings: false }
+      mark: { type: decoratedSymbol, symbolColor: default, character: "y" }
+initialState:
+  documentContents: |
+    fn main() {
+        let y: f32 = 3.0; // f32
+    }
+  selections:
+    - anchor: { line: 2, character: 1 }
+      active: { line: 2, character: 1 }
+  marks:
+    default.y:
+      start: { line: 1, character: 8 }
+      end: { line: 1, character: 9 }
+finalState:
+  documentContents: |
+    fn main() {
+        let y = 3.0; // f32
+    }
+  selections:
+    - anchor: { line: 2, character: 1 }
+      active: { line: 2, character: 1 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: decoratedSymbol, symbolColor: default, character: "y" },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: outside,
+      modifier:
+        { type: containingScope, scopeType: type, includeSiblings: false },
+      isImplicit: false,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/rust/chuckValueFine.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/rust/chuckValueFine.yml
new file mode 100644
index 0000000000..bbb13c24f8
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/rust/chuckValueFine.yml
@@ -0,0 +1,42 @@
+languageId: rust
+command:
+  spokenForm: chuck value fine
+  version: 2
+  targets:
+    - type: primitive
+      mark: { type: decoratedSymbol, symbolColor: default, character: f }
+      modifiers:
+        - type: containingScope
+          scopeType: { type: value }
+  usePrePhraseSnapshot: true
+  action: { name: remove }
+initialState:
+  documentContents: |
+    let user = User {
+        first_name: "John",
+        last_name: "Doe",
+    };
+  selections:
+    - anchor: { line: 3, character: 2 }
+      active: { line: 3, character: 2 }
+  marks:
+    default.f:
+      start: { line: 1, character: 4 }
+      end: { line: 1, character: 14 }
+finalState:
+  documentContents: |
+    let user = User {
+        first_name,
+        last_name: "Doe",
+    };
+  selections:
+    - anchor: { line: 3, character: 2 }
+      active: { line: 3, character: 2 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: decoratedSymbol, symbolColor: default, character: f },
+      modifiers: [{ type: containingScope, scopeType: { type: value } }],
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/rust/chuckValueNear.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/rust/chuckValueNear.yml
new file mode 100644
index 0000000000..ad3b33b6f9
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/rust/chuckValueNear.yml
@@ -0,0 +1,36 @@
+languageId: rust
+command:
+  spokenForm: chuck value near
+  version: 2
+  targets:
+    - type: primitive
+      mark: { type: decoratedSymbol, symbolColor: default, character: "n" }
+      modifiers:
+        - type: containingScope
+          scopeType: { type: value }
+  usePrePhraseSnapshot: true
+  action: { name: remove }
+initialState:
+  documentContents: |
+    let x = [None, Some(1)];
+  selections:
+    - anchor: { line: 0, character: 24 }
+      active: { line: 0, character: 24 }
+  marks:
+    default.n:
+      start: { line: 0, character: 9 }
+      end: { line: 0, character: 13 }
+finalState:
+  documentContents: |
+    let x;
+  selections:
+    - anchor: { line: 0, character: 6 }
+      active: { line: 0, character: 6 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: decoratedSymbol, symbolColor: default, character: "n" },
+      modifiers: [{ type: containingScope, scopeType: { type: value } }],
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/rust/chuckValueZero.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/rust/chuckValueZero.yml
new file mode 100644
index 0000000000..9b67547f91
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/rust/chuckValueZero.yml
@@ -0,0 +1,36 @@
+languageId: rust
+command:
+  spokenForm: chuck value zero
+  version: 2
+  targets:
+    - type: primitive
+      mark: { type: decoratedSymbol, symbolColor: default, character: "0" }
+      modifiers:
+        - type: containingScope
+          scopeType: { type: value }
+  usePrePhraseSnapshot: true
+  action: { name: remove }
+initialState:
+  documentContents: |
+    let x: u32 = 0;
+  selections:
+    - anchor: { line: 0, character: 15 }
+      active: { line: 0, character: 15 }
+  marks:
+    default.0:
+      start: { line: 0, character: 13 }
+      end: { line: 0, character: 14 }
+finalState:
+  documentContents: |
+    let x: u32;
+  selections:
+    - anchor: { line: 0, character: 11 }
+      active: { line: 0, character: 11 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: decoratedSymbol, symbolColor: default, character: "0" },
+      modifiers: [{ type: containingScope, scopeType: { type: value } }],
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/rust/clearArgue.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/rust/clearArgue.yml
new file mode 100644
index 0000000000..04633fa7ab
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/rust/clearArgue.yml
@@ -0,0 +1,31 @@
+languageId: rust
+command:
+  version: 3
+  spokenForm: clear argue
+  action: { name: clearAndSetSelection }
+  targets:
+    - type: primitive
+      modifiers:
+        - type: containingScope
+          scopeType: { type: argumentOrParameter }
+  usePrePhraseSnapshot: true
+initialState:
+  documentContents: "fn do_something(foo: (u8, u16)) {}"
+  selections:
+    - anchor: { line: 0, character: 22 }
+      active: { line: 0, character: 22 }
+  marks: {}
+finalState:
+  documentContents: fn do_something() {}
+  selections:
+    - anchor: { line: 0, character: 16 }
+      active: { line: 0, character: 16 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      modifiers:
+        [{ type: containingScope, scopeType: { type: argumentOrParameter } }],
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/rust/clearBranch.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/rust/clearBranch.yml
new file mode 100644
index 0000000000..7e3e479b7d
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/rust/clearBranch.yml
@@ -0,0 +1,38 @@
+languageId: rust
+command:
+  spokenForm: clear branch
+  version: 3
+  targets:
+    - type: primitive
+      modifiers:
+        - type: containingScope
+          scopeType: { type: branch }
+  usePrePhraseSnapshot: true
+  action: { name: clearAndSetSelection }
+initialState:
+  documentContents: |-
+    match user {
+        User { first_name: "John" } => {},
+        User { first_name } if first_name.starts_with("P") => {}
+    }
+  selections:
+    - anchor: { line: 1, character: 26 }
+      active: { line: 1, character: 26 }
+  marks: {}
+finalState:
+  documentContents: |-
+    match user {
+
+        User { first_name } if first_name.starts_with("P") => {}
+    }
+  selections:
+    - anchor: { line: 1, character: 4 }
+      active: { line: 1, character: 4 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      modifiers: [{ type: containingScope, scopeType: { type: branch } }],
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/rust/clearBranch2.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/rust/clearBranch2.yml
new file mode 100644
index 0000000000..01ede5bea1
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/rust/clearBranch2.yml
@@ -0,0 +1,38 @@
+languageId: rust
+command:
+  spokenForm: clear branch
+  version: 3
+  targets:
+    - type: primitive
+      modifiers:
+        - type: containingScope
+          scopeType: { type: branch }
+  usePrePhraseSnapshot: true
+  action: { name: clearAndSetSelection }
+initialState:
+  documentContents: |-
+    match user {
+        User { first_name: "John" } => {},
+        User { first_name } if first_name.starts_with("P") => {}
+    }
+  selections:
+    - anchor: { line: 2, character: 30 }
+      active: { line: 2, character: 30 }
+  marks: {}
+finalState:
+  documentContents: |-
+    match user {
+        User { first_name: "John" } => {},
+
+    }
+  selections:
+    - anchor: { line: 2, character: 4 }
+      active: { line: 2, character: 4 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      modifiers: [{ type: containingScope, scopeType: { type: branch } }],
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/rust/clearBranch3.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/rust/clearBranch3.yml
new file mode 100644
index 0000000000..05a01ac65c
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/rust/clearBranch3.yml
@@ -0,0 +1,42 @@
+languageId: rust
+command:
+  version: 3
+  spokenForm: clear branch
+  action: { name: clearAndSetSelection }
+  targets:
+    - type: primitive
+      modifiers:
+        - type: containingScope
+          scopeType: { type: branch }
+  usePrePhraseSnapshot: true
+initialState:
+  documentContents: |-
+    if n < 0 {
+        print!("{} is negative", n);
+    } else if n > 0 {
+        print!("{} is positive", n);
+    } else {
+        print!("{} is zero", n);
+    }
+  selections:
+    - anchor: { line: 1, character: 4 }
+      active: { line: 1, character: 4 }
+  marks: {}
+finalState:
+  documentContents: |2-
+     else if n > 0 {
+        print!("{} is positive", n);
+    } else {
+        print!("{} is zero", n);
+    }
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      modifiers: [{ type: containingScope, scopeType: { type: branch } }],
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/rust/clearBranch4.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/rust/clearBranch4.yml
new file mode 100644
index 0000000000..dde84ed797
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/rust/clearBranch4.yml
@@ -0,0 +1,42 @@
+languageId: rust
+command:
+  version: 3
+  spokenForm: clear branch
+  action: { name: clearAndSetSelection }
+  targets:
+    - type: primitive
+      modifiers:
+        - type: containingScope
+          scopeType: { type: branch }
+  usePrePhraseSnapshot: false
+initialState:
+  documentContents: |-
+    if n < 0 {
+        print!("{} is negative", n);
+    } else if n > 0 {
+        print!("{} is positive", n);
+    } else {
+        print!("{} is zero", n);
+    }
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+  marks: {}
+finalState:
+  documentContents: |2-
+     else if n > 0 {
+        print!("{} is positive", n);
+    } else {
+        print!("{} is zero", n);
+    }
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      modifiers: [{ type: containingScope, scopeType: { type: branch } }],
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/rust/clearBranch5.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/rust/clearBranch5.yml
new file mode 100644
index 0000000000..9ed8ec4767
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/rust/clearBranch5.yml
@@ -0,0 +1,42 @@
+languageId: rust
+command:
+  version: 3
+  spokenForm: clear branch
+  action: { name: clearAndSetSelection }
+  targets:
+    - type: primitive
+      modifiers:
+        - type: containingScope
+          scopeType: { type: branch }
+  usePrePhraseSnapshot: false
+initialState:
+  documentContents: |-
+    if n < 0 {
+        print!("{} is negative", n);
+    } else if n > 0 {
+        print!("{} is positive", n);
+    } else {
+        print!("{} is zero", n);
+    }
+  selections:
+    - anchor: { line: 2, character: 2 }
+      active: { line: 2, character: 2 }
+  marks: {}
+finalState:
+  documentContents: |-
+    if n < 0 {
+        print!("{} is negative", n);
+    } else  else {
+        print!("{} is zero", n);
+    }
+  selections:
+    - anchor: { line: 2, character: 7 }
+      active: { line: 2, character: 7 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      modifiers: [{ type: containingScope, scopeType: { type: branch } }],
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/rust/clearBranch6.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/rust/clearBranch6.yml
new file mode 100644
index 0000000000..9318be87cd
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/rust/clearBranch6.yml
@@ -0,0 +1,42 @@
+languageId: rust
+command:
+  version: 3
+  spokenForm: clear branch
+  action: { name: clearAndSetSelection }
+  targets:
+    - type: primitive
+      modifiers:
+        - type: containingScope
+          scopeType: { type: branch }
+  usePrePhraseSnapshot: false
+initialState:
+  documentContents: |-
+    if n < 0 {
+        print!("{} is negative", n);
+    } else if n > 0 {
+        print!("{} is positive", n);
+    } else {
+        print!("{} is zero", n);
+    }
+  selections:
+    - anchor: { line: 3, character: 4 }
+      active: { line: 3, character: 4 }
+  marks: {}
+finalState:
+  documentContents: |-
+    if n < 0 {
+        print!("{} is negative", n);
+    } else  else {
+        print!("{} is zero", n);
+    }
+  selections:
+    - anchor: { line: 2, character: 7 }
+      active: { line: 2, character: 7 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      modifiers: [{ type: containingScope, scopeType: { type: branch } }],
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/rust/clearBranch7.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/rust/clearBranch7.yml
new file mode 100644
index 0000000000..b18a682d12
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/rust/clearBranch7.yml
@@ -0,0 +1,42 @@
+languageId: rust
+command:
+  version: 3
+  spokenForm: clear branch
+  action: { name: clearAndSetSelection }
+  targets:
+    - type: primitive
+      modifiers:
+        - type: containingScope
+          scopeType: { type: branch }
+  usePrePhraseSnapshot: false
+initialState:
+  documentContents: |-
+    if n < 0 {
+        print!("{} is negative", n);
+    } else if n > 0 {
+        print!("{} is positive", n);
+    } else {
+        print!("{} is zero", n);
+    }
+  selections:
+    - anchor: { line: 5, character: 4 }
+      active: { line: 5, character: 4 }
+  marks: {}
+finalState:
+  documentContents: |-
+    if n < 0 {
+        print!("{} is negative", n);
+    } else if n > 0 {
+        print!("{} is positive", n);
+    }
+  selections:
+    - anchor: { line: 4, character: 2 }
+      active: { line: 4, character: 2 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      modifiers: [{ type: containingScope, scopeType: { type: branch } }],
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/rust/clearBranch8.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/rust/clearBranch8.yml
new file mode 100644
index 0000000000..36ba9e4a0c
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/rust/clearBranch8.yml
@@ -0,0 +1,42 @@
+languageId: rust
+command:
+  version: 3
+  spokenForm: clear branch
+  action: { name: clearAndSetSelection }
+  targets:
+    - type: primitive
+      modifiers:
+        - type: containingScope
+          scopeType: { type: branch }
+  usePrePhraseSnapshot: false
+initialState:
+  documentContents: |-
+    if n < 0 {
+        print!("{} is negative", n);
+    } else if n > 0 {
+        print!("{} is positive", n);
+    } else {
+        print!("{} is zero", n);
+    }
+  selections:
+    - anchor: { line: 4, character: 2 }
+      active: { line: 4, character: 2 }
+  marks: {}
+finalState:
+  documentContents: |-
+    if n < 0 {
+        print!("{} is negative", n);
+    } else if n > 0 {
+        print!("{} is positive", n);
+    }
+  selections:
+    - anchor: { line: 4, character: 2 }
+      active: { line: 4, character: 2 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      modifiers: [{ type: containingScope, scopeType: { type: branch } }],
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/rust/clearCondition.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/rust/clearCondition.yml
new file mode 100644
index 0000000000..bd6091adee
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/rust/clearCondition.yml
@@ -0,0 +1,38 @@
+languageId: rust
+command:
+  spokenForm: clear condition
+  version: 3
+  targets:
+    - type: primitive
+      modifiers:
+        - type: containingScope
+          scopeType: { type: condition }
+  usePrePhraseSnapshot: true
+  action: { name: clearAndSetSelection }
+initialState:
+  documentContents: |-
+    match user {
+      User { first_name: "John" } => {},
+      User { first_name } if first_name.starts_with("P") => {}
+    }
+  selections:
+    - anchor: { line: 2, character: 57 }
+      active: { line: 2, character: 57 }
+  marks: {}
+finalState:
+  documentContents: |-
+    match user {
+      User { first_name: "John" } => {},
+      User { first_name } if  => {}
+    }
+  selections:
+    - anchor: { line: 2, character: 25 }
+      active: { line: 2, character: 25 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      modifiers: [{ type: containingScope, scopeType: { type: condition } }],
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/rust/clearCondition2.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/rust/clearCondition2.yml
new file mode 100644
index 0000000000..ae4ba0503f
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/rust/clearCondition2.yml
@@ -0,0 +1,40 @@
+languageId: rust
+command:
+  version: 3
+  spokenForm: clear condition
+  action: { name: clearAndSetSelection }
+  targets:
+    - type: primitive
+      modifiers:
+        - type: containingScope
+          scopeType: { type: condition }
+  usePrePhraseSnapshot: true
+initialState:
+  documentContents: |-
+    if n < 0 {
+      print!("{} is negative", n);
+    } else if n > 0 {
+      print!("{} is positive", n);
+    }
+  selections:
+    - anchor: { line: 1, character: 2 }
+      active: { line: 1, character: 2 }
+  marks: {}
+finalState:
+  documentContents: |-
+    if  {
+      print!("{} is negative", n);
+    } else if n > 0 {
+      print!("{} is positive", n);
+    }
+  selections:
+    - anchor: { line: 0, character: 3 }
+      active: { line: 0, character: 3 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      modifiers: [{ type: containingScope, scopeType: { type: condition } }],
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/rust/clearCondition3.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/rust/clearCondition3.yml
new file mode 100644
index 0000000000..ae5409a43b
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/rust/clearCondition3.yml
@@ -0,0 +1,40 @@
+languageId: rust
+command:
+  version: 3
+  spokenForm: clear condition
+  action: { name: clearAndSetSelection }
+  targets:
+    - type: primitive
+      modifiers:
+        - type: containingScope
+          scopeType: { type: condition }
+  usePrePhraseSnapshot: false
+initialState:
+  documentContents: |-
+    if n < 0 {
+      print!("{} is negative", n);
+    } else if n > 0 {
+      print!("{} is positive", n);
+    }
+  selections:
+    - anchor: { line: 3, character: 2 }
+      active: { line: 3, character: 2 }
+  marks: {}
+finalState:
+  documentContents: |-
+    if n < 0 {
+      print!("{} is negative", n);
+    } else if  {
+      print!("{} is positive", n);
+    }
+  selections:
+    - anchor: { line: 2, character: 10 }
+      active: { line: 2, character: 10 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      modifiers: [{ type: containingScope, scopeType: { type: condition } }],
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/rust/clearCondition4.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/rust/clearCondition4.yml
new file mode 100644
index 0000000000..a91eadde62
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/rust/clearCondition4.yml
@@ -0,0 +1,40 @@
+languageId: rust
+command:
+  version: 3
+  spokenForm: clear condition
+  action: { name: clearAndSetSelection }
+  targets:
+    - type: primitive
+      modifiers:
+        - type: containingScope
+          scopeType: { type: condition }
+  usePrePhraseSnapshot: false
+initialState:
+  documentContents: |-
+    let foo = if n < 0 {
+      print!("{} is negative", n);
+    } else if n > 0 {
+      print!("{} is positive", n);
+    }
+  selections:
+    - anchor: { line: 1, character: 2 }
+      active: { line: 1, character: 2 }
+  marks: {}
+finalState:
+  documentContents: |-
+    let foo = if  {
+      print!("{} is negative", n);
+    } else if n > 0 {
+      print!("{} is positive", n);
+    }
+  selections:
+    - anchor: { line: 0, character: 13 }
+      active: { line: 0, character: 13 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      modifiers: [{ type: containingScope, scopeType: { type: condition } }],
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/rust/clearCondition5.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/rust/clearCondition5.yml
new file mode 100644
index 0000000000..2432942cf9
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/rust/clearCondition5.yml
@@ -0,0 +1,40 @@
+languageId: rust
+command:
+  version: 3
+  spokenForm: clear condition
+  action: { name: clearAndSetSelection }
+  targets:
+    - type: primitive
+      modifiers:
+        - type: containingScope
+          scopeType: { type: condition }
+  usePrePhraseSnapshot: false
+initialState:
+  documentContents: |-
+    let foo = if n < 0 {
+      print!("{} is negative", n);
+    } else if n > 0 {
+      print!("{} is positive", n);
+    }
+  selections:
+    - anchor: { line: 3, character: 2 }
+      active: { line: 3, character: 2 }
+  marks: {}
+finalState:
+  documentContents: |-
+    let foo = if n < 0 {
+      print!("{} is negative", n);
+    } else if  {
+      print!("{} is positive", n);
+    }
+  selections:
+    - anchor: { line: 2, character: 10 }
+      active: { line: 2, character: 10 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      modifiers: [{ type: containingScope, scopeType: { type: condition } }],
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/rust/clearCondition6.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/rust/clearCondition6.yml
new file mode 100644
index 0000000000..8e91af00b6
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/rust/clearCondition6.yml
@@ -0,0 +1,36 @@
+languageId: rust
+command:
+  version: 3
+  spokenForm: clear condition
+  action: { name: clearAndSetSelection }
+  targets:
+    - type: primitive
+      modifiers:
+        - type: containingScope
+          scopeType: { type: condition }
+  usePrePhraseSnapshot: true
+initialState:
+  documentContents: |-
+    if let Some(i) = number {
+      println!("Matched {:?}!", i);
+    }
+  selections:
+    - anchor: { line: 1, character: 2 }
+      active: { line: 1, character: 2 }
+  marks: {}
+finalState:
+  documentContents: |-
+    if  {
+      println!("Matched {:?}!", i);
+    }
+  selections:
+    - anchor: { line: 0, character: 3 }
+      active: { line: 0, character: 3 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      modifiers: [{ type: containingScope, scopeType: { type: condition } }],
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/rust/clearCondition7.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/rust/clearCondition7.yml
new file mode 100644
index 0000000000..cfe70da982
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/rust/clearCondition7.yml
@@ -0,0 +1,36 @@
+languageId: rust
+command:
+  version: 3
+  spokenForm: clear condition
+  action: { name: clearAndSetSelection }
+  targets:
+    - type: primitive
+      modifiers:
+        - type: containingScope
+          scopeType: { type: condition }
+  usePrePhraseSnapshot: true
+initialState:
+  documentContents: |-
+    while let Some(i) = number {
+      println!("Matched {:?}!", i);
+    }
+  selections:
+    - anchor: { line: 1, character: 2 }
+      active: { line: 1, character: 2 }
+  marks: {}
+finalState:
+  documentContents: |-
+    while  {
+      println!("Matched {:?}!", i);
+    }
+  selections:
+    - anchor: { line: 0, character: 6 }
+      active: { line: 0, character: 6 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      modifiers: [{ type: containingScope, scopeType: { type: condition } }],
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/rust/clearCondition8.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/rust/clearCondition8.yml
new file mode 100644
index 0000000000..d0e84be844
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/rust/clearCondition8.yml
@@ -0,0 +1,36 @@
+languageId: rust
+command:
+  version: 3
+  spokenForm: clear condition
+  action: { name: clearAndSetSelection }
+  targets:
+    - type: primitive
+      modifiers:
+        - type: containingScope
+          scopeType: { type: condition }
+  usePrePhraseSnapshot: true
+initialState:
+  documentContents: |-
+    while n < 101 {
+      n += 1;
+    }
+  selections:
+    - anchor: { line: 1, character: 2 }
+      active: { line: 1, character: 2 }
+  marks: {}
+finalState:
+  documentContents: |-
+    while  {
+      n += 1;
+    }
+  selections:
+    - anchor: { line: 0, character: 6 }
+      active: { line: 0, character: 6 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      modifiers: [{ type: containingScope, scopeType: { type: condition } }],
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/rust/clearName.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/rust/clearName.yml
new file mode 100644
index 0000000000..45fec2b302
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/rust/clearName.yml
@@ -0,0 +1,36 @@
+languageId: rust
+command:
+  spokenForm: clear name
+  version: 3
+  targets:
+    - type: primitive
+      modifiers:
+        - type: containingScope
+          scopeType: { type: name }
+  usePrePhraseSnapshot: true
+  action: { name: clearAndSetSelection }
+initialState:
+  documentContents: |
+    enum Foo {
+        Baz { a: int, b: String }
+    }
+  selections:
+    - anchor: { line: 1, character: 8 }
+      active: { line: 1, character: 8 }
+  marks: {}
+finalState:
+  documentContents: |
+    enum Foo {
+         { a: int, b: String }
+    }
+  selections:
+    - anchor: { line: 1, character: 4 }
+      active: { line: 1, character: 4 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      modifiers: [{ type: containingScope, scopeType: { type: name } }],
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/rust/clearName2.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/rust/clearName2.yml
new file mode 100644
index 0000000000..4a7eb5441f
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/rust/clearName2.yml
@@ -0,0 +1,36 @@
+languageId: rust
+command:
+  spokenForm: clear name
+  version: 3
+  targets:
+    - type: primitive
+      modifiers:
+        - type: containingScope
+          scopeType: { type: name }
+  usePrePhraseSnapshot: false
+  action: { name: clearAndSetSelection }
+initialState:
+  documentContents: |
+    enum Foo {
+        Baz { a: int, b: String }
+    }
+  selections:
+    - anchor: { line: 1, character: 13 }
+      active: { line: 1, character: 13 }
+  marks: {}
+finalState:
+  documentContents: |
+    enum Foo {
+        Baz { : int, b: String }
+    }
+  selections:
+    - anchor: { line: 1, character: 10 }
+      active: { line: 1, character: 10 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      modifiers: [{ type: containingScope, scopeType: { type: name } }],
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/rust/clearState.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/rust/clearState.yml
new file mode 100644
index 0000000000..0c69e0e862
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/rust/clearState.yml
@@ -0,0 +1,36 @@
+languageId: rust
+command:
+  spokenForm: clear state
+  version: 2
+  targets:
+    - type: primitive
+      modifiers:
+        - type: containingScope
+          scopeType: { type: statement }
+  usePrePhraseSnapshot: true
+  action: { name: clearAndSetSelection }
+initialState:
+  documentContents: |-
+    fn foo() {
+        if true { println!("5") } else { println!("6") }
+    }
+  selections:
+    - anchor: { line: 1, character: 23 }
+      active: { line: 1, character: 23 }
+  marks: {}
+finalState:
+  documentContents: |-
+    fn foo() {
+        if true {  } else { println!("6") }
+    }
+  selections:
+    - anchor: { line: 1, character: 14 }
+      active: { line: 1, character: 14 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      modifiers: [{ type: containingScope, scopeType: { type: statement } }],
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/rust/clearState2.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/rust/clearState2.yml
new file mode 100644
index 0000000000..25fb5a46be
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/rust/clearState2.yml
@@ -0,0 +1,36 @@
+languageId: rust
+command:
+  spokenForm: clear state
+  version: 2
+  targets:
+    - type: primitive
+      modifiers:
+        - type: containingScope
+          scopeType: { type: statement }
+  usePrePhraseSnapshot: false
+  action: { name: clearAndSetSelection }
+initialState:
+  documentContents: |-
+    fn foo() {
+        if true { println!("5") } else { println!("6") }
+    }
+  selections:
+    - anchor: { line: 1, character: 7 }
+      active: { line: 1, character: 7 }
+  marks: {}
+finalState:
+  documentContents: |-
+    fn foo() {
+
+    }
+  selections:
+    - anchor: { line: 1, character: 4 }
+      active: { line: 1, character: 4 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      modifiers: [{ type: containingScope, scopeType: { type: statement } }],
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/rust/clearState3.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/rust/clearState3.yml
new file mode 100644
index 0000000000..74b9911055
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/rust/clearState3.yml
@@ -0,0 +1,33 @@
+languageId: rust
+command:
+  spokenForm: clear state
+  version: 2
+  targets:
+    - type: primitive
+      modifiers:
+        - type: containingScope
+          scopeType: { type: statement }
+  usePrePhraseSnapshot: false
+  action: { name: clearAndSetSelection }
+initialState:
+  documentContents: |-
+    fn foo() {
+        if true { println!("5") } else { println!("6") }
+    }
+  selections:
+    - anchor: { line: 0, character: 3 }
+      active: { line: 0, character: 3 }
+  marks: {}
+finalState:
+  documentContents: ""
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      modifiers: [{ type: containingScope, scopeType: { type: statement } }],
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/rust/clearState4.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/rust/clearState4.yml
new file mode 100644
index 0000000000..2229939942
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/rust/clearState4.yml
@@ -0,0 +1,36 @@
+languageId: rust
+command:
+  spokenForm: clear state
+  version: 2
+  targets:
+    - type: primitive
+      modifiers:
+        - type: containingScope
+          scopeType: { type: statement }
+  usePrePhraseSnapshot: false
+  action: { name: clearAndSetSelection }
+initialState:
+  documentContents: |-
+    fn foo() {
+        foo("bar");
+    }
+  selections:
+    - anchor: { line: 1, character: 8 }
+      active: { line: 1, character: 8 }
+  marks: {}
+finalState:
+  documentContents: |-
+    fn foo() {
+
+    }
+  selections:
+    - anchor: { line: 1, character: 4 }
+      active: { line: 1, character: 4 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      modifiers: [{ type: containingScope, scopeType: { type: statement } }],
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/rust/clearValue.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/rust/clearValue.yml
new file mode 100644
index 0000000000..6f20b91870
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/rust/clearValue.yml
@@ -0,0 +1,36 @@
+languageId: rust
+command:
+  spokenForm: clear value
+  version: 2
+  targets:
+    - type: primitive
+      modifiers:
+        - type: containingScope
+          scopeType: { type: value }
+  usePrePhraseSnapshot: true
+  action: { name: clearAndSetSelection }
+initialState:
+  documentContents: |-
+    fn foo() -> i32 {
+        return 3;
+    }
+  selections:
+    - anchor: { line: 1, character: 4 }
+      active: { line: 1, character: 4 }
+  marks: {}
+finalState:
+  documentContents: |-
+    fn foo() -> i32 {
+        return ;
+    }
+  selections:
+    - anchor: { line: 1, character: 11 }
+      active: { line: 1, character: 11 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      modifiers: [{ type: containingScope, scopeType: { type: value } }],
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/rust/clearValue2.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/rust/clearValue2.yml
new file mode 100644
index 0000000000..633a98013c
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/rust/clearValue2.yml
@@ -0,0 +1,36 @@
+languageId: rust
+command:
+  spokenForm: clear value
+  version: 2
+  targets:
+    - type: primitive
+      modifiers:
+        - type: containingScope
+          scopeType: { type: value }
+  usePrePhraseSnapshot: true
+  action: { name: clearAndSetSelection }
+initialState:
+  documentContents: |-
+    fn foo() -> i32 {
+        return 3;
+    }
+  selections:
+    - anchor: { line: 1, character: 11 }
+      active: { line: 1, character: 11 }
+  marks: {}
+finalState:
+  documentContents: |-
+    fn foo() -> i32 {
+        return ;
+    }
+  selections:
+    - anchor: { line: 1, character: 11 }
+      active: { line: 1, character: 11 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      modifiers: [{ type: containingScope, scopeType: { type: value } }],
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/rust/clearValue3.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/rust/clearValue3.yml
new file mode 100644
index 0000000000..618617770a
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/rust/clearValue3.yml
@@ -0,0 +1,38 @@
+languageId: rust
+command:
+  spokenForm: clear value
+  version: 2
+  targets:
+    - type: primitive
+      modifiers:
+        - type: containingScope
+          scopeType: { type: value }
+  usePrePhraseSnapshot: true
+  action: { name: clearAndSetSelection }
+initialState:
+  documentContents: |-
+    fn foo() -> i32 {
+        println!("hello")
+        return 3;
+    }
+  selections:
+    - anchor: { line: 1, character: 13 }
+      active: { line: 1, character: 13 }
+  marks: {}
+finalState:
+  documentContents: |-
+    fn foo() -> i32 {
+        println!("hello")
+        return ;
+    }
+  selections:
+    - anchor: { line: 2, character: 11 }
+      active: { line: 2, character: 11 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      modifiers: [{ type: containingScope, scopeType: { type: value } }],
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/rust/clearValue4.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/rust/clearValue4.yml
new file mode 100644
index 0000000000..e9d3edde20
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/rust/clearValue4.yml
@@ -0,0 +1,36 @@
+languageId: rust
+command:
+  spokenForm: clear value
+  version: 2
+  targets:
+    - type: primitive
+      modifiers:
+        - type: containingScope
+          scopeType: { type: value }
+  usePrePhraseSnapshot: true
+  action: { name: clearAndSetSelection }
+initialState:
+  documentContents: |-
+    fn foo() -> i32 {
+        return 3
+    }
+  selections:
+    - anchor: { line: 1, character: 11 }
+      active: { line: 1, character: 11 }
+  marks: {}
+finalState:
+  documentContents: |-
+    fn foo() -> i32 {
+        return
+    }
+  selections:
+    - anchor: { line: 1, character: 11 }
+      active: { line: 1, character: 11 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      modifiers: [{ type: containingScope, scopeType: { type: value } }],
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/rust/clearValue5.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/rust/clearValue5.yml
new file mode 100644
index 0000000000..b3ba2181ae
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/rust/clearValue5.yml
@@ -0,0 +1,36 @@
+languageId: rust
+command:
+  spokenForm: clear value
+  version: 2
+  targets:
+    - type: primitive
+      modifiers:
+        - type: containingScope
+          scopeType: { type: value }
+  usePrePhraseSnapshot: true
+  action: { name: clearAndSetSelection }
+initialState:
+  documentContents: |-
+    fn foo() -> i32 {
+        return 3
+    }
+  selections:
+    - anchor: { line: 1, character: 4 }
+      active: { line: 1, character: 4 }
+  marks: {}
+finalState:
+  documentContents: |-
+    fn foo() -> i32 {
+        return
+    }
+  selections:
+    - anchor: { line: 1, character: 11 }
+      active: { line: 1, character: 11 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      modifiers: [{ type: containingScope, scopeType: { type: value } }],
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/rust/clearValue6.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/rust/clearValue6.yml
new file mode 100644
index 0000000000..f9fceaee4b
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/rust/clearValue6.yml
@@ -0,0 +1,38 @@
+languageId: rust
+command:
+  spokenForm: clear value
+  version: 2
+  targets:
+    - type: primitive
+      modifiers:
+        - type: containingScope
+          scopeType: { type: value }
+  usePrePhraseSnapshot: true
+  action: { name: clearAndSetSelection }
+initialState:
+  documentContents: |-
+    fn foo() -> i32 {
+        println!("hello")
+        return 3
+    }
+  selections:
+    - anchor: { line: 1, character: 14 }
+      active: { line: 1, character: 14 }
+  marks: {}
+finalState:
+  documentContents: |-
+    fn foo() -> i32 {
+        println!("hello")
+        return
+    }
+  selections:
+    - anchor: { line: 2, character: 11 }
+      active: { line: 2, character: 11 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      modifiers: [{ type: containingScope, scopeType: { type: value } }],
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/rust/clearValue7.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/rust/clearValue7.yml
new file mode 100644
index 0000000000..b0ef311a41
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/rust/clearValue7.yml
@@ -0,0 +1,36 @@
+languageId: rust
+command:
+  spokenForm: clear value
+  version: 2
+  targets:
+    - type: primitive
+      modifiers:
+        - type: containingScope
+          scopeType: { type: value }
+  usePrePhraseSnapshot: true
+  action: { name: clearAndSetSelection }
+initialState:
+  documentContents: |-
+    fn foo() -> i32 {
+        "whatever"
+    }
+  selections:
+    - anchor: { line: 1, character: 5 }
+      active: { line: 1, character: 5 }
+  marks: {}
+finalState:
+  documentContents: |-
+    fn foo() -> i32 {
+
+    }
+  selections:
+    - anchor: { line: 1, character: 4 }
+      active: { line: 1, character: 4 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      modifiers: [{ type: containingScope, scopeType: { type: value } }],
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/rust/clearValue8.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/rust/clearValue8.yml
new file mode 100644
index 0000000000..d24a9322d4
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/rust/clearValue8.yml
@@ -0,0 +1,44 @@
+languageId: rust
+command:
+  spokenForm: clear value
+  version: 2
+  targets:
+    - type: primitive
+      modifiers:
+        - type: containingScope
+          scopeType: { type: value }
+  usePrePhraseSnapshot: true
+  action: { name: clearAndSetSelection }
+initialState:
+  documentContents: |-
+    fn foo() -> i32 {
+        if a > b {
+            println!("hello")
+            return "hello";
+        }
+        "whatever"
+    }
+  selections:
+    - anchor: { line: 2, character: 18 }
+      active: { line: 2, character: 18 }
+  marks: {}
+finalState:
+  documentContents: |-
+    fn foo() -> i32 {
+        if a > b {
+            println!("hello")
+            return ;
+        }
+        "whatever"
+    }
+  selections:
+    - anchor: { line: 3, character: 15 }
+      active: { line: 3, character: 15 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      modifiers: [{ type: containingScope, scopeType: { type: value } }],
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/rust/clearValue9.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/rust/clearValue9.yml
new file mode 100644
index 0000000000..7709365a5f
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/rust/clearValue9.yml
@@ -0,0 +1,42 @@
+languageId: rust
+command:
+  spokenForm: clear value
+  version: 2
+  targets:
+    - type: primitive
+      modifiers:
+        - type: containingScope
+          scopeType: { type: value }
+  usePrePhraseSnapshot: true
+  action: { name: clearAndSetSelection }
+initialState:
+  documentContents: |-
+    fn foo() -> i32 {
+        if a > b {
+            println!("hello")
+        }
+        "whatever"
+    }
+  selections:
+    - anchor: { line: 2, character: 18 }
+      active: { line: 2, character: 18 }
+  marks: {}
+finalState:
+  documentContents: |-
+    fn foo() -> i32 {
+        if a > b {
+            println!("hello")
+        }
+
+    }
+  selections:
+    - anchor: { line: 4, character: 4 }
+      active: { line: 4, character: 4 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      modifiers: [{ type: containingScope, scopeType: { type: value } }],
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/rust/ditchBranch.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/rust/ditchBranch.yml
new file mode 100644
index 0000000000..b2042fc1bf
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/rust/ditchBranch.yml
@@ -0,0 +1,42 @@
+languageId: rust
+command:
+  version: 3
+  spokenForm: ditch branch
+  action: { name: remove }
+  targets:
+    - type: primitive
+      modifiers:
+        - type: containingScope
+          scopeType: { type: branch }
+  usePrePhraseSnapshot: true
+initialState:
+  documentContents: |-
+    if n < 0 {
+        print!("{} is negative", n);
+    } else if n > 0 {
+        print!("{} is positive", n);
+    } else {
+        print!("{} is zero", n);
+    }
+  selections:
+    - anchor: { line: 1, character: 4 }
+      active: { line: 1, character: 4 }
+  marks: {}
+finalState:
+  documentContents: |-
+    if n > 0 {
+        print!("{} is positive", n);
+    } else {
+        print!("{} is zero", n);
+    }
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      modifiers: [{ type: containingScope, scopeType: { type: branch } }],
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/rust/ditchBranch2.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/rust/ditchBranch2.yml
new file mode 100644
index 0000000000..2437704493
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/rust/ditchBranch2.yml
@@ -0,0 +1,42 @@
+languageId: rust
+command:
+  version: 3
+  spokenForm: ditch branch
+  action: { name: remove }
+  targets:
+    - type: primitive
+      modifiers:
+        - type: containingScope
+          scopeType: { type: branch }
+  usePrePhraseSnapshot: false
+initialState:
+  documentContents: |-
+    if n < 0 {
+        print!("{} is negative", n);
+    } else if n > 0 {
+        print!("{} is positive", n);
+    } else {
+        print!("{} is zero", n);
+    }
+  selections:
+    - anchor: { line: 3, character: 4 }
+      active: { line: 3, character: 4 }
+  marks: {}
+finalState:
+  documentContents: |-
+    if n < 0 {
+        print!("{} is negative", n);
+    }  else {
+        print!("{} is zero", n);
+    }
+  selections:
+    - anchor: { line: 2, character: 2 }
+      active: { line: 2, character: 2 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      modifiers: [{ type: containingScope, scopeType: { type: branch } }],
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/rust/ditchBranch3.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/rust/ditchBranch3.yml
new file mode 100644
index 0000000000..97df1e82fa
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/rust/ditchBranch3.yml
@@ -0,0 +1,42 @@
+languageId: rust
+command:
+  version: 3
+  spokenForm: ditch branch
+  action: { name: remove }
+  targets:
+    - type: primitive
+      modifiers:
+        - type: containingScope
+          scopeType: { type: branch }
+  usePrePhraseSnapshot: false
+initialState:
+  documentContents: |-
+    if n < 0 {
+        print!("{} is negative", n);
+    } else if n > 0 {
+        print!("{} is positive", n);
+    } else {
+        print!("{} is zero", n);
+    }
+  selections:
+    - anchor: { line: 5, character: 4 }
+      active: { line: 5, character: 4 }
+  marks: {}
+finalState:
+  documentContents: |-
+    if n < 0 {
+        print!("{} is negative", n);
+    } else if n > 0 {
+        print!("{} is positive", n);
+    }
+  selections:
+    - anchor: { line: 4, character: 1 }
+      active: { line: 4, character: 1 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      modifiers: [{ type: containingScope, scopeType: { type: branch } }],
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/scala/chuckArgFine.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/scala/chuckArgFine.yml
new file mode 100644
index 0000000000..f866a08d6b
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/scala/chuckArgFine.yml
@@ -0,0 +1,47 @@
+languageId: scala
+command:
+  version: 1
+  spokenForm: chuck arg fine
+  action: remove
+  targets:
+    - type: primitive
+      modifier:
+        {
+          type: containingScope,
+          scopeType: argumentOrParameter,
+          includeSiblings: false,
+        }
+      mark: { type: decoratedSymbol, symbolColor: default, character: f }
+initialState:
+  documentContents: |
+    class ExampleClass(foo: Int, bar: Int) {}
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+  marks:
+    default.f:
+      start: { line: 0, character: 19 }
+      end: { line: 0, character: 22 }
+finalState:
+  documentContents: |
+    class ExampleClass(bar: Int) {}
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: decoratedSymbol, symbolColor: default, character: f },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: outside,
+      modifier:
+        {
+          type: containingScope,
+          scopeType: argumentOrParameter,
+          includeSiblings: false,
+        },
+      isImplicit: false,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/scala/chuckArgFine2.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/scala/chuckArgFine2.yml
new file mode 100644
index 0000000000..b05cb3145c
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/scala/chuckArgFine2.yml
@@ -0,0 +1,51 @@
+languageId: scala
+command:
+  version: 1
+  spokenForm: chuck arg fine
+  action: remove
+  targets:
+    - type: primitive
+      modifier:
+        {
+          type: containingScope,
+          scopeType: argumentOrParameter,
+          includeSiblings: false,
+        }
+      mark: { type: decoratedSymbol, symbolColor: default, character: f }
+initialState:
+  documentContents: |
+    class ExampleClass() {
+      def example(foo: Int, bar: Int) = foo + bar
+    }
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+  marks:
+    default.f:
+      start: { line: 1, character: 14 }
+      end: { line: 1, character: 17 }
+finalState:
+  documentContents: |
+    class ExampleClass() {
+      def example(bar: Int) = foo + bar
+    }
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: decoratedSymbol, symbolColor: default, character: f },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: outside,
+      modifier:
+        {
+          type: containingScope,
+          scopeType: argumentOrParameter,
+          includeSiblings: false,
+        },
+      isImplicit: false,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/scala/chuckArgFine3.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/scala/chuckArgFine3.yml
new file mode 100644
index 0000000000..8b2ec3cf82
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/scala/chuckArgFine3.yml
@@ -0,0 +1,51 @@
+languageId: scala
+command:
+  version: 1
+  spokenForm: chuck arg fine
+  action: remove
+  targets:
+    - type: primitive
+      modifier:
+        {
+          type: containingScope,
+          scopeType: argumentOrParameter,
+          includeSiblings: false,
+        }
+      mark: { type: decoratedSymbol, symbolColor: default, character: f }
+initialState:
+  documentContents: |
+    class ExampleClass() {
+      example(foo, bar)
+    }
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+  marks:
+    default.f:
+      start: { line: 1, character: 10 }
+      end: { line: 1, character: 13 }
+finalState:
+  documentContents: |
+    class ExampleClass() {
+      example(bar)
+    }
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: decoratedSymbol, symbolColor: default, character: f },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: outside,
+      modifier:
+        {
+          type: containingScope,
+          scopeType: argumentOrParameter,
+          includeSiblings: false,
+        },
+      isImplicit: false,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/scala/chuckBranchSun.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/scala/chuckBranchSun.yml
new file mode 100644
index 0000000000..2e6b5e2dcc
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/scala/chuckBranchSun.yml
@@ -0,0 +1,46 @@
+languageId: scala
+command:
+  spokenForm: chuck branch sun
+  version: 2
+  targets:
+    - type: primitive
+      mark: { type: decoratedSymbol, symbolColor: default, character: s }
+      modifiers:
+        - type: containingScope
+          scopeType: { type: branch }
+  usePrePhraseSnapshot: true
+  action: { name: remove }
+initialState:
+  documentContents: |
+    def matchTest(x: Int): String = x match {
+      case 0 => "zero"
+      case 1 => "one"
+      case 2 => "two"
+      case _ => "other"
+    }
+  selections:
+    - anchor: { line: 3, character: 2 }
+      active: { line: 4, character: 2 }
+  marks:
+    default.s:
+      start: { line: 2, character: 2 }
+      end: { line: 2, character: 6 }
+finalState:
+  documentContents: |
+    def matchTest(x: Int): String = x match {
+      case 0 => "zero"
+
+      case 2 => "two"
+      case _ => "other"
+    }
+  selections:
+    - anchor: { line: 3, character: 2 }
+      active: { line: 4, character: 2 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: decoratedSymbol, symbolColor: default, character: s },
+      modifiers: [{ type: containingScope, scopeType: { type: branch } }],
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/scala/chuckConditionFine.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/scala/chuckConditionFine.yml
new file mode 100644
index 0000000000..3412a58870
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/scala/chuckConditionFine.yml
@@ -0,0 +1,43 @@
+languageId: scala
+command:
+  version: 1
+  spokenForm: chuck condition fine
+  action: remove
+  targets:
+    - type: primitive
+      modifier:
+        { type: containingScope, scopeType: condition, includeSiblings: false }
+      mark: { type: decoratedSymbol, symbolColor: default, character: f }
+initialState:
+  documentContents: |-
+    class Example() {
+      if (1 + 2 == 3) println("wow")
+    }
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+  marks:
+    default.f:
+      start: { line: 1, character: 2 }
+      end: { line: 1, character: 4 }
+finalState:
+  documentContents: |-
+    class Example() {
+      if () println("wow")
+    }
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: decoratedSymbol, symbolColor: default, character: f },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: outside,
+      modifier:
+        { type: containingScope, scopeType: condition, includeSiblings: false },
+      isImplicit: false,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/scala/chuckTypeBat.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/scala/chuckTypeBat.yml
new file mode 100644
index 0000000000..5c479e0f03
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/scala/chuckTypeBat.yml
@@ -0,0 +1,43 @@
+languageId: scala
+command:
+  version: 1
+  spokenForm: chuck type bat
+  action: remove
+  targets:
+    - type: primitive
+      modifier:
+        { type: containingScope, scopeType: type, includeSiblings: false }
+      mark: { type: decoratedSymbol, symbolColor: default, character: b }
+initialState:
+  documentContents: |-
+    class Example(foo: String) {
+      def str(bar: String): String = foo + bar
+    }
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+  marks:
+    default.b:
+      start: { line: 1, character: 10 }
+      end: { line: 1, character: 13 }
+finalState:
+  documentContents: |-
+    class Example(foo: String) {
+      def str(bar): String = foo + bar
+    }
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: decoratedSymbol, symbolColor: default, character: b },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: outside,
+      modifier:
+        { type: containingScope, scopeType: type, includeSiblings: false },
+      isImplicit: false,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/scala/chuckTypeFine.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/scala/chuckTypeFine.yml
new file mode 100644
index 0000000000..51662555f8
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/scala/chuckTypeFine.yml
@@ -0,0 +1,43 @@
+languageId: scala
+command:
+  version: 1
+  spokenForm: chuck type fine
+  action: remove
+  targets:
+    - type: primitive
+      modifier:
+        { type: containingScope, scopeType: type, includeSiblings: false }
+      mark: { type: decoratedSymbol, symbolColor: default, character: f }
+initialState:
+  documentContents: |-
+    class Example(foo: String) {
+      def str(bar: String): String = foo + bar
+    }
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+  marks:
+    default.f:
+      start: { line: 1, character: 33 }
+      end: { line: 1, character: 36 }
+finalState:
+  documentContents: |-
+    class Example(foo: String) {
+      def str(bar: String) = foo + bar
+    }
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: decoratedSymbol, symbolColor: default, character: f },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: outside,
+      modifier:
+        { type: containingScope, scopeType: type, includeSiblings: false },
+      isImplicit: false,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/scala/chuckTypeFine2.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/scala/chuckTypeFine2.yml
new file mode 100644
index 0000000000..5eb2f3dd37
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/scala/chuckTypeFine2.yml
@@ -0,0 +1,43 @@
+languageId: scala
+command:
+  version: 1
+  spokenForm: chuck type fine
+  action: remove
+  targets:
+    - type: primitive
+      modifier:
+        { type: containingScope, scopeType: type, includeSiblings: false }
+      mark: { type: decoratedSymbol, symbolColor: default, character: f }
+initialState:
+  documentContents: |
+    class TypesAhoy() {
+      def example(foo: List[String]): List[String] = foo
+    }
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+  marks:
+    default.f:
+      start: { line: 1, character: 14 }
+      end: { line: 1, character: 17 }
+finalState:
+  documentContents: |
+    class TypesAhoy() {
+      def example(foo): List[String] = foo
+    }
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: decoratedSymbol, symbolColor: default, character: f },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: outside,
+      modifier:
+        { type: containingScope, scopeType: type, includeSiblings: false },
+      isImplicit: false,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/scala/chuckTypeFine3.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/scala/chuckTypeFine3.yml
new file mode 100644
index 0000000000..ae6f0d9003
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/scala/chuckTypeFine3.yml
@@ -0,0 +1,39 @@
+languageId: scala
+command:
+  version: 1
+  spokenForm: chuck type fine
+  action: remove
+  targets:
+    - type: primitive
+      modifier:
+        { type: containingScope, scopeType: type, includeSiblings: false }
+      mark: { type: decoratedSymbol, symbolColor: default, character: f }
+initialState:
+  documentContents: |
+    class TypesAhoy(foo: String) {}
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+  marks:
+    default.f:
+      start: { line: 0, character: 16 }
+      end: { line: 0, character: 19 }
+finalState:
+  documentContents: |
+    class TypesAhoy(foo) {}
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: decoratedSymbol, symbolColor: default, character: f },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: outside,
+      modifier:
+        { type: containingScope, scopeType: type, includeSiblings: false },
+      isImplicit: false,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/scala/chuckTypeLook.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/scala/chuckTypeLook.yml
new file mode 100644
index 0000000000..eecc5d78e0
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/scala/chuckTypeLook.yml
@@ -0,0 +1,39 @@
+languageId: scala
+command:
+  version: 1
+  spokenForm: chuck type look
+  action: remove
+  targets:
+    - type: primitive
+      modifier:
+        { type: containingScope, scopeType: type, includeSiblings: false }
+      mark: { type: decoratedSymbol, symbolColor: default, character: l }
+initialState:
+  documentContents: |
+    class TypesAhoy(foo: List[String]) {}
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+  marks:
+    default.l:
+      start: { line: 0, character: 21 }
+      end: { line: 0, character: 25 }
+finalState:
+  documentContents: |
+    class TypesAhoy(foo) {}
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: decoratedSymbol, symbolColor: default, character: l },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: outside,
+      modifier:
+        { type: containingScope, scopeType: type, includeSiblings: false },
+      isImplicit: false,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/scala/chuckTypeLook2.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/scala/chuckTypeLook2.yml
new file mode 100644
index 0000000000..af83edddfb
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/scala/chuckTypeLook2.yml
@@ -0,0 +1,43 @@
+languageId: scala
+command:
+  version: 1
+  spokenForm: chuck type look
+  action: remove
+  targets:
+    - type: primitive
+      modifier:
+        { type: containingScope, scopeType: type, includeSiblings: false }
+      mark: { type: decoratedSymbol, symbolColor: default, character: l }
+initialState:
+  documentContents: |
+    class TypesAhoy() {
+      def example(foo: List[String]): List[String] = foo
+    }
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+  marks:
+    default.l:
+      start: { line: 1, character: 19 }
+      end: { line: 1, character: 23 }
+finalState:
+  documentContents: |
+    class TypesAhoy() {
+      def example(foo): List[String] = foo
+    }
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: decoratedSymbol, symbolColor: default, character: l },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: outside,
+      modifier:
+        { type: containingScope, scopeType: type, includeSiblings: false },
+      isImplicit: false,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/scala/chuckTypeLook3.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/scala/chuckTypeLook3.yml
new file mode 100644
index 0000000000..008c596fa7
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/scala/chuckTypeLook3.yml
@@ -0,0 +1,43 @@
+languageId: scala
+command:
+  version: 1
+  spokenForm: chuck type look
+  action: remove
+  targets:
+    - type: primitive
+      modifier:
+        { type: containingScope, scopeType: type, includeSiblings: false }
+      mark: { type: decoratedSymbol, symbolColor: default, character: l }
+initialState:
+  documentContents: |
+    class TypesAhoy() {
+      val foo: List[String] = List("foo")
+    }
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+  marks:
+    default.l:
+      start: { line: 1, character: 11 }
+      end: { line: 1, character: 15 }
+finalState:
+  documentContents: |
+    class TypesAhoy() {
+      val foo = List("foo")
+    }
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: decoratedSymbol, symbolColor: default, character: l },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: outside,
+      modifier:
+        { type: containingScope, scopeType: type, includeSiblings: false },
+      isImplicit: false,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/scala/chuckTypeOdd.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/scala/chuckTypeOdd.yml
new file mode 100644
index 0000000000..4fe104dc59
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/scala/chuckTypeOdd.yml
@@ -0,0 +1,43 @@
+languageId: scala
+command:
+  version: 1
+  spokenForm: chuck type odd
+  action: remove
+  targets:
+    - type: primitive
+      modifier:
+        { type: containingScope, scopeType: type, includeSiblings: false }
+      mark: { type: decoratedSymbol, symbolColor: default, character: o }
+initialState:
+  documentContents: |-
+    class Example(foo: String) {
+      def str(bar: String): String = foo + bar
+    }
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+  marks:
+    default.o:
+      start: { line: 0, character: 14 }
+      end: { line: 0, character: 17 }
+finalState:
+  documentContents: |-
+    class Example(foo) {
+      def str(bar: String): String = foo + bar
+    }
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: decoratedSymbol, symbolColor: default, character: o },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: outside,
+      modifier:
+        { type: containingScope, scopeType: type, includeSiblings: false },
+      isImplicit: false,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/scala/chuckTypeOdd2.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/scala/chuckTypeOdd2.yml
new file mode 100644
index 0000000000..59f29b591d
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/scala/chuckTypeOdd2.yml
@@ -0,0 +1,43 @@
+languageId: scala
+command:
+  version: 1
+  spokenForm: chuck type odd
+  action: remove
+  targets:
+    - type: primitive
+      modifier:
+        { type: containingScope, scopeType: type, includeSiblings: false }
+      mark: { type: decoratedSymbol, symbolColor: default, character: o }
+initialState:
+  documentContents: |
+    class TypesAhoy() {
+      def example(foo: List[String]): List[String] = foo
+    }
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+  marks:
+    default.o:
+      start: { line: 1, character: 49 }
+      end: { line: 1, character: 52 }
+finalState:
+  documentContents: |
+    class TypesAhoy() {
+      def example(foo: List[String]) = foo
+    }
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: decoratedSymbol, symbolColor: default, character: o },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: outside,
+      modifier:
+        { type: containingScope, scopeType: type, includeSiblings: false },
+      isImplicit: false,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/scala/chuckTypeOdd3.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/scala/chuckTypeOdd3.yml
new file mode 100644
index 0000000000..6e52801fde
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/scala/chuckTypeOdd3.yml
@@ -0,0 +1,47 @@
+languageId: scala
+command:
+  version: 1
+  spokenForm: chuck type odd
+  action: remove
+  targets:
+    - type: primitive
+      modifier:
+        { type: containingScope, scopeType: type, includeSiblings: false }
+      mark: { type: decoratedSymbol, symbolColor: default, character: o }
+initialState:
+  documentContents: |
+    class TypesAhoy() {
+      f match {
+        case foo: Foo => 12
+      }
+    }
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+  marks:
+    default.o:
+      start: { line: 2, character: 9 }
+      end: { line: 2, character: 12 }
+finalState:
+  documentContents: |
+    class TypesAhoy() {
+      f match {
+        case foo => 12
+      }
+    }
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: decoratedSymbol, symbolColor: default, character: o },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: outside,
+      modifier:
+        { type: containingScope, scopeType: type, includeSiblings: false },
+      isImplicit: false,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/scala/chuckTypeRed.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/scala/chuckTypeRed.yml
new file mode 100644
index 0000000000..8a78135cf3
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/scala/chuckTypeRed.yml
@@ -0,0 +1,43 @@
+languageId: scala
+command:
+  version: 1
+  spokenForm: chuck type red
+  action: remove
+  targets:
+    - type: primitive
+      modifier:
+        { type: containingScope, scopeType: type, includeSiblings: false }
+      mark: { type: decoratedSymbol, symbolColor: default, character: r }
+initialState:
+  documentContents: |
+    class TypesAhoy() {
+      def example(foo: List[String]): List[String] = foo
+    }
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+  marks:
+    default.r:
+      start: { line: 1, character: 24 }
+      end: { line: 1, character: 30 }
+finalState:
+  documentContents: |
+    class TypesAhoy() {
+      def example(foo): List[String] = foo
+    }
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: decoratedSymbol, symbolColor: default, character: r },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: outside,
+      modifier:
+        { type: containingScope, scopeType: type, includeSiblings: false },
+      isImplicit: false,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/scala/chuckTypeRed2.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/scala/chuckTypeRed2.yml
new file mode 100644
index 0000000000..ebf4b7db44
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/scala/chuckTypeRed2.yml
@@ -0,0 +1,43 @@
+languageId: scala
+command:
+  version: 1
+  spokenForm: chuck type red
+  action: remove
+  targets:
+    - type: primitive
+      modifier:
+        { type: containingScope, scopeType: type, includeSiblings: false }
+      mark: { type: decoratedSymbol, symbolColor: default, character: r }
+initialState:
+  documentContents: |
+    class TypesAhoy() {
+      val foo: List[String] = List("foo")
+    }
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+  marks:
+    default.r:
+      start: { line: 1, character: 16 }
+      end: { line: 1, character: 22 }
+finalState:
+  documentContents: |
+    class TypesAhoy() {
+      val foo = List("foo")
+    }
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: decoratedSymbol, symbolColor: default, character: r },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: outside,
+      modifier:
+        { type: containingScope, scopeType: type, includeSiblings: false },
+      isImplicit: false,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/scala/chuckTypeSit.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/scala/chuckTypeSit.yml
new file mode 100644
index 0000000000..a75a4d3905
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/scala/chuckTypeSit.yml
@@ -0,0 +1,43 @@
+languageId: scala
+command:
+  version: 1
+  spokenForm: chuck type sit
+  action: remove
+  targets:
+    - type: primitive
+      modifier:
+        { type: containingScope, scopeType: type, includeSiblings: false }
+      mark: { type: decoratedSymbol, symbolColor: default, character: i }
+initialState:
+  documentContents: |
+    class TypesAhoy() {
+      def example(foo: List[String]): List[String] = foo
+    }
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+  marks:
+    default.i:
+      start: { line: 1, character: 34 }
+      end: { line: 1, character: 38 }
+finalState:
+  documentContents: |
+    class TypesAhoy() {
+      def example(foo: List[String]) = foo
+    }
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: decoratedSymbol, symbolColor: default, character: i },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: outside,
+      modifier:
+        { type: containingScope, scopeType: type, includeSiblings: false },
+      isImplicit: false,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/scala/chuckTypeSit2.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/scala/chuckTypeSit2.yml
new file mode 100644
index 0000000000..56022ae3df
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/scala/chuckTypeSit2.yml
@@ -0,0 +1,43 @@
+languageId: scala
+command:
+  version: 1
+  spokenForm: chuck type sit
+  action: remove
+  targets:
+    - type: primitive
+      modifier:
+        { type: containingScope, scopeType: type, includeSiblings: false }
+      mark: { type: decoratedSymbol, symbolColor: default, character: i }
+initialState:
+  documentContents: |
+    class TypesAhoy() {
+      def foo = (x: Int) => x + 1
+    }
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+  marks:
+    default.i:
+      start: { line: 1, character: 16 }
+      end: { line: 1, character: 19 }
+finalState:
+  documentContents: |
+    class TypesAhoy() {
+      def foo = (x) => x + 1
+    }
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: decoratedSymbol, symbolColor: default, character: i },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: outside,
+      modifier:
+        { type: containingScope, scopeType: type, includeSiblings: false },
+      isImplicit: false,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/scala/chuckTypeSun.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/scala/chuckTypeSun.yml
new file mode 100644
index 0000000000..0f096f0c9e
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/scala/chuckTypeSun.yml
@@ -0,0 +1,39 @@
+languageId: scala
+command:
+  version: 1
+  spokenForm: chuck type sun
+  action: remove
+  targets:
+    - type: primitive
+      modifier:
+        { type: containingScope, scopeType: type, includeSiblings: false }
+      mark: { type: decoratedSymbol, symbolColor: default, character: s }
+initialState:
+  documentContents: |
+    class TypesAhoy(foo: String) {}
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+  marks:
+    default.s:
+      start: { line: 0, character: 21 }
+      end: { line: 0, character: 27 }
+finalState:
+  documentContents: |
+    class TypesAhoy(foo) {}
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: decoratedSymbol, symbolColor: default, character: s },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: outside,
+      modifier:
+        { type: containingScope, scopeType: type, includeSiblings: false },
+      isImplicit: false,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/scala/chuckTypeSun2.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/scala/chuckTypeSun2.yml
new file mode 100644
index 0000000000..3a8b636a29
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/scala/chuckTypeSun2.yml
@@ -0,0 +1,39 @@
+languageId: scala
+command:
+  version: 1
+  spokenForm: chuck type sun
+  action: remove
+  targets:
+    - type: primitive
+      modifier:
+        { type: containingScope, scopeType: type, includeSiblings: false }
+      mark: { type: decoratedSymbol, symbolColor: default, character: s }
+initialState:
+  documentContents: |
+    class TypesAhoy(foo: List[String]) {}
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+  marks:
+    default.s:
+      start: { line: 0, character: 26 }
+      end: { line: 0, character: 32 }
+finalState:
+  documentContents: |
+    class TypesAhoy(foo) {}
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: decoratedSymbol, symbolColor: default, character: s },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: outside,
+      modifier:
+        { type: containingScope, scopeType: type, includeSiblings: false },
+      isImplicit: false,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/scala/chuckTypeSun3.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/scala/chuckTypeSun3.yml
new file mode 100644
index 0000000000..424581dc86
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/scala/chuckTypeSun3.yml
@@ -0,0 +1,43 @@
+languageId: scala
+command:
+  version: 1
+  spokenForm: chuck type sun
+  action: remove
+  targets:
+    - type: primitive
+      modifier:
+        { type: containingScope, scopeType: type, includeSiblings: false }
+      mark: { type: decoratedSymbol, symbolColor: default, character: s }
+initialState:
+  documentContents: |
+    class TypesAhoy() {
+      def example(foo: String): String = "example"
+    }
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+  marks:
+    default.s:
+      start: { line: 1, character: 19 }
+      end: { line: 1, character: 25 }
+finalState:
+  documentContents: |
+    class TypesAhoy() {
+      def example(foo): String = "example"
+    }
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: decoratedSymbol, symbolColor: default, character: s },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: outside,
+      modifier:
+        { type: containingScope, scopeType: type, includeSiblings: false },
+      isImplicit: false,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/scala/chuckTypeSun4.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/scala/chuckTypeSun4.yml
new file mode 100644
index 0000000000..b85ba3f797
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/scala/chuckTypeSun4.yml
@@ -0,0 +1,43 @@
+languageId: scala
+command:
+  version: 1
+  spokenForm: chuck type sun
+  action: remove
+  targets:
+    - type: primitive
+      modifier:
+        { type: containingScope, scopeType: type, includeSiblings: false }
+      mark: { type: decoratedSymbol, symbolColor: default, character: s }
+initialState:
+  documentContents: |
+    class TypesAhoy() {
+      def example(foo: List[String]): List[String] = foo
+    }
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+  marks:
+    default.s:
+      start: { line: 1, character: 39 }
+      end: { line: 1, character: 45 }
+finalState:
+  documentContents: |
+    class TypesAhoy() {
+      def example(foo: List[String]) = foo
+    }
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: decoratedSymbol, symbolColor: default, character: s },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: outside,
+      modifier:
+        { type: containingScope, scopeType: type, includeSiblings: false },
+      isImplicit: false,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/scala/chuckTypeSun5.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/scala/chuckTypeSun5.yml
new file mode 100644
index 0000000000..60d14269a7
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/scala/chuckTypeSun5.yml
@@ -0,0 +1,43 @@
+languageId: scala
+command:
+  version: 1
+  spokenForm: chuck type sun
+  action: remove
+  targets:
+    - type: primitive
+      modifier:
+        { type: containingScope, scopeType: type, includeSiblings: false }
+      mark: { type: decoratedSymbol, symbolColor: default, character: s }
+initialState:
+  documentContents: |
+    class TypesAhoy() {
+      val foo: String = "foo"
+    }
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+  marks:
+    default.s:
+      start: { line: 1, character: 11 }
+      end: { line: 1, character: 17 }
+finalState:
+  documentContents: |
+    class TypesAhoy() {
+      val foo = "foo"
+    }
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: decoratedSymbol, symbolColor: default, character: s },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: outside,
+      modifier:
+        { type: containingScope, scopeType: type, includeSiblings: false },
+      isImplicit: false,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/scala/chuckTypeTrap.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/scala/chuckTypeTrap.yml
new file mode 100644
index 0000000000..1c11bca152
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/scala/chuckTypeTrap.yml
@@ -0,0 +1,43 @@
+languageId: scala
+command:
+  version: 1
+  spokenForm: chuck type trap
+  action: remove
+  targets:
+    - type: primitive
+      modifier:
+        { type: containingScope, scopeType: type, includeSiblings: false }
+      mark: { type: decoratedSymbol, symbolColor: default, character: t }
+initialState:
+  documentContents: |
+    class TypesAhoy() {
+      def example(foo: String): String = "example"
+    }
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+  marks:
+    default.t:
+      start: { line: 1, character: 28 }
+      end: { line: 1, character: 34 }
+finalState:
+  documentContents: |
+    class TypesAhoy() {
+      def example(foo: String) = "example"
+    }
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: decoratedSymbol, symbolColor: default, character: t },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: outside,
+      modifier:
+        { type: containingScope, scopeType: type, includeSiblings: false },
+      isImplicit: false,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/scala/chuckValue.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/scala/chuckValue.yml
new file mode 100644
index 0000000000..72b17648d0
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/scala/chuckValue.yml
@@ -0,0 +1,35 @@
+languageId: scala
+command:
+  version: 1
+  spokenForm: chuck value
+  action: remove
+  targets:
+    - type: primitive
+      modifier:
+        { type: containingScope, scopeType: value, includeSiblings: false }
+initialState:
+  documentContents: |
+    type Vector = (Int, Int)
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+  marks: {}
+finalState:
+  documentContents: |
+    type Vector
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: outside,
+      modifier:
+        { type: containingScope, scopeType: value, includeSiblings: false },
+      isImplicit: false,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/scala/chuckValueOdd.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/scala/chuckValueOdd.yml
new file mode 100644
index 0000000000..9296b36cb7
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/scala/chuckValueOdd.yml
@@ -0,0 +1,39 @@
+languageId: scala
+command:
+  version: 1
+  spokenForm: chuck value odd
+  action: remove
+  targets:
+    - type: primitive
+      modifier:
+        { type: containingScope, scopeType: value, includeSiblings: false }
+      mark: { type: decoratedSymbol, symbolColor: default, character: o }
+initialState:
+  documentContents: |
+    class Example(foo: String = "foo") {}
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+  marks:
+    default.o:
+      start: { line: 0, character: 29 }
+      end: { line: 0, character: 32 }
+finalState:
+  documentContents: |
+    class Example(foo: String) {}
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: decoratedSymbol, symbolColor: default, character: o },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: outside,
+      modifier:
+        { type: containingScope, scopeType: value, includeSiblings: false },
+      isImplicit: false,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/scala/chuckValueRed.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/scala/chuckValueRed.yml
new file mode 100644
index 0000000000..035ff00ef1
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/scala/chuckValueRed.yml
@@ -0,0 +1,43 @@
+languageId: scala
+command:
+  version: 1
+  spokenForm: chuck value red
+  action: remove
+  targets:
+    - type: primitive
+      modifier:
+        { type: containingScope, scopeType: value, includeSiblings: false }
+      mark: { type: decoratedSymbol, symbolColor: default, character: r }
+initialState:
+  documentContents: |
+    class Example() {
+      val bar = "bar" + "smang"
+    }
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+  marks:
+    default.r:
+      start: { line: 1, character: 13 }
+      end: { line: 1, character: 16 }
+finalState:
+  documentContents: |
+    class Example() {
+      val bar
+    }
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: decoratedSymbol, symbolColor: default, character: r },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: outside,
+      modifier:
+        { type: containingScope, scopeType: value, includeSiblings: false },
+      isImplicit: false,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/scala/chuckValueSit.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/scala/chuckValueSit.yml
new file mode 100644
index 0000000000..bc2841b37d
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/scala/chuckValueSit.yml
@@ -0,0 +1,43 @@
+languageId: scala
+command:
+  version: 1
+  spokenForm: chuck value sit
+  action: remove
+  targets:
+    - type: primitive
+      modifier:
+        { type: containingScope, scopeType: value, includeSiblings: false }
+      mark: { type: decoratedSymbol, symbolColor: default, character: i }
+initialState:
+  documentContents: |
+    class Example() {
+      val bling = "blang"
+    }
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+  marks:
+    default.i:
+      start: { line: 1, character: 6 }
+      end: { line: 1, character: 11 }
+finalState:
+  documentContents: |
+    class Example() {
+      val bling
+    }
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: decoratedSymbol, symbolColor: default, character: i },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: outside,
+      modifier:
+        { type: containingScope, scopeType: value, includeSiblings: false },
+      isImplicit: false,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/scala/clearArgFine.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/scala/clearArgFine.yml
new file mode 100644
index 0000000000..9930220aac
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/scala/clearArgFine.yml
@@ -0,0 +1,47 @@
+languageId: scala
+command:
+  version: 1
+  spokenForm: clear arg fine
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier:
+        {
+          type: containingScope,
+          scopeType: argumentOrParameter,
+          includeSiblings: false,
+        }
+      mark: { type: decoratedSymbol, symbolColor: default, character: f }
+initialState:
+  documentContents: |
+    class ExampleClass(foo: Int, bar: Int) {}
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+  marks:
+    default.f:
+      start: { line: 0, character: 19 }
+      end: { line: 0, character: 22 }
+finalState:
+  documentContents: |
+    class ExampleClass(, bar: Int) {}
+  selections:
+    - anchor: { line: 0, character: 19 }
+      active: { line: 0, character: 19 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: decoratedSymbol, symbolColor: default, character: f },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        {
+          type: containingScope,
+          scopeType: argumentOrParameter,
+          includeSiblings: false,
+        },
+      isImplicit: false,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/scala/clearArgFine2.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/scala/clearArgFine2.yml
new file mode 100644
index 0000000000..38d5b68db2
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/scala/clearArgFine2.yml
@@ -0,0 +1,51 @@
+languageId: scala
+command:
+  version: 1
+  spokenForm: clear arg fine
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier:
+        {
+          type: containingScope,
+          scopeType: argumentOrParameter,
+          includeSiblings: false,
+        }
+      mark: { type: decoratedSymbol, symbolColor: default, character: f }
+initialState:
+  documentContents: |
+    class ExampleClass() {
+      def example(foo: Int, bar: Int) = foo + bar
+    }
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+  marks:
+    default.f:
+      start: { line: 1, character: 14 }
+      end: { line: 1, character: 17 }
+finalState:
+  documentContents: |
+    class ExampleClass() {
+      def example(, bar: Int) = foo + bar
+    }
+  selections:
+    - anchor: { line: 1, character: 14 }
+      active: { line: 1, character: 14 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: decoratedSymbol, symbolColor: default, character: f },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        {
+          type: containingScope,
+          scopeType: argumentOrParameter,
+          includeSiblings: false,
+        },
+      isImplicit: false,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/scala/clearArgFine3.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/scala/clearArgFine3.yml
new file mode 100644
index 0000000000..59a7a63a4e
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/scala/clearArgFine3.yml
@@ -0,0 +1,51 @@
+languageId: scala
+command:
+  version: 1
+  spokenForm: clear arg fine
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier:
+        {
+          type: containingScope,
+          scopeType: argumentOrParameter,
+          includeSiblings: false,
+        }
+      mark: { type: decoratedSymbol, symbolColor: default, character: f }
+initialState:
+  documentContents: |
+    class ExampleClass() {
+      example(foo, bar)
+    }
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+  marks:
+    default.f:
+      start: { line: 1, character: 10 }
+      end: { line: 1, character: 13 }
+finalState:
+  documentContents: |
+    class ExampleClass() {
+      example(, bar)
+    }
+  selections:
+    - anchor: { line: 1, character: 10 }
+      active: { line: 1, character: 10 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: decoratedSymbol, symbolColor: default, character: f },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        {
+          type: containingScope,
+          scopeType: argumentOrParameter,
+          includeSiblings: false,
+        },
+      isImplicit: false,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/scala/clearBranch.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/scala/clearBranch.yml
new file mode 100644
index 0000000000..e98ba51afa
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/scala/clearBranch.yml
@@ -0,0 +1,38 @@
+languageId: scala
+command:
+  version: 3
+  spokenForm: clear branch
+  action: { name: clearAndSetSelection }
+  targets:
+    - type: primitive
+      modifiers:
+        - type: containingScope
+          scopeType: { type: branch }
+  usePrePhraseSnapshot: true
+initialState:
+  documentContents: |-
+    def matchTest(x: Int): String = x match {
+      case 0 => "zero"
+      case _ => "other"
+    }
+  selections:
+    - anchor: { line: 1, character: 2 }
+      active: { line: 1, character: 2 }
+  marks: {}
+finalState:
+  documentContents: |-
+    def matchTest(x: Int): String = x match {
+
+      case _ => "other"
+    }
+  selections:
+    - anchor: { line: 1, character: 2 }
+      active: { line: 1, character: 2 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      modifiers: [{ type: containingScope, scopeType: { type: branch } }],
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/scala/clearCallMade.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/scala/clearCallMade.yml
new file mode 100644
index 0000000000..35ef3c623a
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/scala/clearCallMade.yml
@@ -0,0 +1,53 @@
+languageId: scala
+command:
+  version: 0
+  spokenForm: clear call made
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier:
+        {
+          type: containingScope,
+          scopeType: functionCall,
+          includeSiblings: false,
+        }
+      mark: { type: decoratedSymbol, symbolColor: default, character: m }
+initialState:
+  documentContents: |-
+    object Example {
+      val numbers = List(1,2,3,4)
+      numbers.map(_ + 1)
+    }
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+  marks:
+    default.m:
+      start: { line: 2, character: 10 }
+      end: { line: 2, character: 13 }
+finalState:
+  documentContents: |-
+    object Example {
+      val numbers = List(1,2,3,4)
+
+    }
+  selections:
+    - anchor: { line: 2, character: 2 }
+      active: { line: 2, character: 2 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: decoratedSymbol, symbolColor: default, character: m },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        {
+          type: containingScope,
+          scopeType: functionCall,
+          includeSiblings: false,
+        },
+      isImplicit: false,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/scala/clearClass.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/scala/clearClass.yml
new file mode 100644
index 0000000000..304481889f
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/scala/clearClass.yml
@@ -0,0 +1,35 @@
+languageId: scala
+command:
+  version: 0
+  spokenForm: clear class
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier:
+        { type: containingScope, scopeType: class, includeSiblings: false }
+initialState:
+  documentContents: |
+    class ExampleClass() {}
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+  marks: {}
+finalState:
+  documentContents: |+
+
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        { type: containingScope, scopeType: class, includeSiblings: false },
+      isImplicit: false,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/scala/clearClass2.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/scala/clearClass2.yml
new file mode 100644
index 0000000000..716e8aa6ec
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/scala/clearClass2.yml
@@ -0,0 +1,35 @@
+languageId: scala
+command:
+  version: 0
+  spokenForm: clear class
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier:
+        { type: containingScope, scopeType: class, includeSiblings: false }
+initialState:
+  documentContents: |
+    object ExampleClass {}
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+  marks: {}
+finalState:
+  documentContents: |+
+
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        { type: containingScope, scopeType: class, includeSiblings: false },
+      isImplicit: false,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/scala/clearClass3.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/scala/clearClass3.yml
new file mode 100644
index 0000000000..09d6115d0c
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/scala/clearClass3.yml
@@ -0,0 +1,36 @@
+languageId: scala
+command:
+  version: 0
+  spokenForm: clear class
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier:
+        { type: containingScope, scopeType: class, includeSiblings: false }
+initialState:
+  documentContents: |-
+    trait Greeter {
+      def greet(name: String): Unit
+    }
+  selections:
+    - anchor: { line: 1, character: 0 }
+      active: { line: 1, character: 0 }
+  marks: {}
+finalState:
+  documentContents: ""
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        { type: containingScope, scopeType: class, includeSiblings: false },
+      isImplicit: false,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/scala/clearClass4.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/scala/clearClass4.yml
new file mode 100644
index 0000000000..dd77c8c2cc
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/scala/clearClass4.yml
@@ -0,0 +1,33 @@
+languageId: scala
+command:
+  version: 0
+  spokenForm: clear class
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier:
+        { type: containingScope, scopeType: class, includeSiblings: false }
+initialState:
+  documentContents: case class Example()
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+  marks: {}
+finalState:
+  documentContents: ""
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        { type: containingScope, scopeType: class, includeSiblings: false },
+      isImplicit: false,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/scala/clearClassName.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/scala/clearClassName.yml
new file mode 100644
index 0000000000..7ec8fca43d
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/scala/clearClassName.yml
@@ -0,0 +1,35 @@
+languageId: scala
+command:
+  version: 0
+  spokenForm: clear class name
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier:
+        { type: containingScope, scopeType: className, includeSiblings: false }
+initialState:
+  documentContents: |
+    class ExampleClass() {}
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+  marks: {}
+finalState:
+  documentContents: |
+    class () {}
+  selections:
+    - anchor: { line: 0, character: 6 }
+      active: { line: 0, character: 6 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        { type: containingScope, scopeType: className, includeSiblings: false },
+      isImplicit: false,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/scala/clearClassName2.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/scala/clearClassName2.yml
new file mode 100644
index 0000000000..5b0aa6199a
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/scala/clearClassName2.yml
@@ -0,0 +1,35 @@
+languageId: scala
+command:
+  version: 0
+  spokenForm: clear class name
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier:
+        { type: containingScope, scopeType: className, includeSiblings: false }
+initialState:
+  documentContents: |
+    object ExampleClass {}
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+  marks: {}
+finalState:
+  documentContents: |
+    object  {}
+  selections:
+    - anchor: { line: 0, character: 7 }
+      active: { line: 0, character: 7 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        { type: containingScope, scopeType: className, includeSiblings: false },
+      isImplicit: false,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/scala/clearClassName3.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/scala/clearClassName3.yml
new file mode 100644
index 0000000000..0fc73aa0df
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/scala/clearClassName3.yml
@@ -0,0 +1,39 @@
+languageId: scala
+command:
+  version: 0
+  spokenForm: clear class name
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier:
+        { type: containingScope, scopeType: className, includeSiblings: false }
+initialState:
+  documentContents: |-
+    trait Greeter {
+      def greet(name: String): Unit
+    }
+  selections:
+    - anchor: { line: 1, character: 0 }
+      active: { line: 1, character: 0 }
+  marks: {}
+finalState:
+  documentContents: |-
+    trait  {
+      def greet(name: String): Unit
+    }
+  selections:
+    - anchor: { line: 0, character: 6 }
+      active: { line: 0, character: 6 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        { type: containingScope, scopeType: className, includeSiblings: false },
+      isImplicit: false,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/scala/clearClassName4.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/scala/clearClassName4.yml
new file mode 100644
index 0000000000..2128b2e045
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/scala/clearClassName4.yml
@@ -0,0 +1,33 @@
+languageId: scala
+command:
+  version: 0
+  spokenForm: clear class name
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier:
+        { type: containingScope, scopeType: className, includeSiblings: false }
+initialState:
+  documentContents: case class Example()
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+  marks: {}
+finalState:
+  documentContents: case class ()
+  selections:
+    - anchor: { line: 0, character: 11 }
+      active: { line: 0, character: 11 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        { type: containingScope, scopeType: className, includeSiblings: false },
+      isImplicit: false,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/scala/clearComment.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/scala/clearComment.yml
new file mode 100644
index 0000000000..2b56064a82
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/scala/clearComment.yml
@@ -0,0 +1,33 @@
+languageId: scala
+command:
+  version: 0
+  spokenForm: clear comment
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier:
+        { type: containingScope, scopeType: comment, includeSiblings: false }
+initialState:
+  documentContents: // this is a line comment
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+  marks: {}
+finalState:
+  documentContents: ""
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        { type: containingScope, scopeType: comment, includeSiblings: false },
+      isImplicit: false,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/scala/clearComment2.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/scala/clearComment2.yml
new file mode 100644
index 0000000000..0dfb3b12fe
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/scala/clearComment2.yml
@@ -0,0 +1,36 @@
+languageId: scala
+command:
+  version: 0
+  spokenForm: clear comment
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier:
+        { type: containingScope, scopeType: comment, includeSiblings: false }
+initialState:
+  documentContents: |-
+    /*
+      block comment
+    */
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+  marks: {}
+finalState:
+  documentContents: ""
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        { type: containingScope, scopeType: comment, includeSiblings: false },
+      isImplicit: false,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/scala/clearConditionEquals.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/scala/clearConditionEquals.yml
new file mode 100644
index 0000000000..2da395bc84
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/scala/clearConditionEquals.yml
@@ -0,0 +1,43 @@
+languageId: scala
+command:
+  version: 1
+  spokenForm: clear condition equals
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier:
+        { type: containingScope, scopeType: condition, includeSiblings: false }
+      mark: { type: decoratedSymbol, symbolColor: default, character: "=" }
+initialState:
+  documentContents: |
+    class Example() {
+      if (1 + 2 == 3) println("wow")
+    }
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+  marks:
+    default.=:
+      start: { line: 1, character: 12 }
+      end: { line: 1, character: 14 }
+finalState:
+  documentContents: |
+    class Example() {
+      if () println("wow")
+    }
+  selections:
+    - anchor: { line: 1, character: 6 }
+      active: { line: 1, character: 6 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: decoratedSymbol, symbolColor: default, character: "=" },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        { type: containingScope, scopeType: condition, includeSiblings: false },
+      isImplicit: false,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/scala/clearConditionFine.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/scala/clearConditionFine.yml
new file mode 100644
index 0000000000..e0310903a0
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/scala/clearConditionFine.yml
@@ -0,0 +1,43 @@
+languageId: scala
+command:
+  version: 1
+  spokenForm: clear condition fine
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier:
+        { type: containingScope, scopeType: condition, includeSiblings: false }
+      mark: { type: decoratedSymbol, symbolColor: default, character: f }
+initialState:
+  documentContents: |-
+    class Example() {
+      if (1 + 2 == 3) println("wow")
+    }
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+  marks:
+    default.f:
+      start: { line: 1, character: 2 }
+      end: { line: 1, character: 4 }
+finalState:
+  documentContents: |-
+    class Example() {
+      if () println("wow")
+    }
+  selections:
+    - anchor: { line: 1, character: 6 }
+      active: { line: 1, character: 6 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: decoratedSymbol, symbolColor: default, character: f },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        { type: containingScope, scopeType: condition, includeSiblings: false },
+      isImplicit: false,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/scala/clearFunkFour.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/scala/clearFunkFour.yml
new file mode 100644
index 0000000000..7731ed798b
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/scala/clearFunkFour.yml
@@ -0,0 +1,51 @@
+languageId: scala
+command:
+  version: 1
+  spokenForm: clear funk four
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier:
+        {
+          type: containingScope,
+          scopeType: namedFunction,
+          includeSiblings: false,
+        }
+      mark: { type: decoratedSymbol, symbolColor: default, character: "4" }
+initialState:
+  documentContents: |
+    class ExampleClass() {
+      def foo() = 42
+    }
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+  marks:
+    default.4:
+      start: { line: 1, character: 14 }
+      end: { line: 1, character: 16 }
+finalState:
+  documentContents: |
+    class ExampleClass() {
+
+    }
+  selections:
+    - anchor: { line: 1, character: 2 }
+      active: { line: 1, character: 2 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: decoratedSymbol, symbolColor: default, character: "4" },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        {
+          type: containingScope,
+          scopeType: namedFunction,
+          includeSiblings: false,
+        },
+      isImplicit: false,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/scala/clearFunkNameFour.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/scala/clearFunkNameFour.yml
new file mode 100644
index 0000000000..ad937b935e
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/scala/clearFunkNameFour.yml
@@ -0,0 +1,51 @@
+languageId: scala
+command:
+  version: 1
+  spokenForm: clear funk name four
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier:
+        {
+          type: containingScope,
+          scopeType: functionName,
+          includeSiblings: false,
+        }
+      mark: { type: decoratedSymbol, symbolColor: default, character: "4" }
+initialState:
+  documentContents: |
+    class ExampleClass() {
+      def foo() = 42
+    }
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+  marks:
+    default.4:
+      start: { line: 1, character: 14 }
+      end: { line: 1, character: 16 }
+finalState:
+  documentContents: |
+    class ExampleClass() {
+      def () = 42
+    }
+  selections:
+    - anchor: { line: 1, character: 6 }
+      active: { line: 1, character: 6 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: decoratedSymbol, symbolColor: default, character: "4" },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        {
+          type: containingScope,
+          scopeType: functionName,
+          includeSiblings: false,
+        },
+      isImplicit: false,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/scala/clearIfState.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/scala/clearIfState.yml
new file mode 100644
index 0000000000..670d3770db
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/scala/clearIfState.yml
@@ -0,0 +1,41 @@
+languageId: scala
+command:
+  version: 0
+  spokenForm: clear if state
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier:
+        {
+          type: containingScope,
+          scopeType: ifStatement,
+          includeSiblings: false,
+        }
+initialState:
+  documentContents: val test = if (true) true else false
+  selections:
+    - anchor: { line: 0, character: 12 }
+      active: { line: 0, character: 12 }
+  marks: {}
+finalState:
+  documentContents: "val test = "
+  selections:
+    - anchor: { line: 0, character: 11 }
+      active: { line: 0, character: 11 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        {
+          type: containingScope,
+          scopeType: ifStatement,
+          includeSiblings: false,
+        },
+      isImplicit: false,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/scala/clearIfState2.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/scala/clearIfState2.yml
new file mode 100644
index 0000000000..21f2d88156
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/scala/clearIfState2.yml
@@ -0,0 +1,46 @@
+languageId: scala
+command:
+  version: 0
+  spokenForm: clear if state
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier:
+        {
+          type: containingScope,
+          scopeType: ifStatement,
+          includeSiblings: false,
+        }
+initialState:
+  documentContents: |-
+    val test = if (true) {
+      true
+    } else {
+      false
+    }
+  selections:
+    - anchor: { line: 0, character: 12 }
+      active: { line: 0, character: 12 }
+  marks: {}
+finalState:
+  documentContents: "val test = "
+  selections:
+    - anchor: { line: 0, character: 11 }
+      active: { line: 0, character: 11 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        {
+          type: containingScope,
+          scopeType: ifStatement,
+          includeSiblings: false,
+        },
+      isImplicit: false,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/scala/clearLambdaPlus.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/scala/clearLambdaPlus.yml
new file mode 100644
index 0000000000..fcfc9c9e60
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/scala/clearLambdaPlus.yml
@@ -0,0 +1,51 @@
+languageId: scala
+command:
+  version: 0
+  spokenForm: clear lambda plus
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier:
+        {
+          type: containingScope,
+          scopeType: anonymousFunction,
+          includeSiblings: false,
+        }
+      mark: { type: decoratedSymbol, symbolColor: default, character: + }
+initialState:
+  documentContents: |-
+    class ExampleClass() {
+      val example = List(1,2,3,4).map(x => x + 1)
+    }
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+  marks:
+    default.+:
+      start: { line: 1, character: 41 }
+      end: { line: 1, character: 42 }
+finalState:
+  documentContents: |-
+    class ExampleClass() {
+      val example = List(1,2,3,4).map()
+    }
+  selections:
+    - anchor: { line: 1, character: 34 }
+      active: { line: 1, character: 34 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: decoratedSymbol, symbolColor: default, character: + },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        {
+          type: containingScope,
+          scopeType: anonymousFunction,
+          includeSiblings: false,
+        },
+      isImplicit: false,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/scala/clearLambdaPlus2.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/scala/clearLambdaPlus2.yml
new file mode 100644
index 0000000000..2547f9ddf8
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/scala/clearLambdaPlus2.yml
@@ -0,0 +1,51 @@
+languageId: scala
+command:
+  version: 0
+  spokenForm: clear lambda plus
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier:
+        {
+          type: containingScope,
+          scopeType: anonymousFunction,
+          includeSiblings: false,
+        }
+      mark: { type: decoratedSymbol, symbolColor: default, character: + }
+initialState:
+  documentContents: |-
+    class ExampleClass() {
+      val example = List(1,2,3,4).map((x: Int) => x + 1)
+    }
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+  marks:
+    default.+:
+      start: { line: 1, character: 48 }
+      end: { line: 1, character: 49 }
+finalState:
+  documentContents: |-
+    class ExampleClass() {
+      val example = List(1,2,3,4).map()
+    }
+  selections:
+    - anchor: { line: 1, character: 34 }
+      active: { line: 1, character: 34 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: decoratedSymbol, symbolColor: default, character: + },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        {
+          type: containingScope,
+          scopeType: anonymousFunction,
+          includeSiblings: false,
+        },
+      isImplicit: false,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/scala/clearLambdaPlus3.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/scala/clearLambdaPlus3.yml
new file mode 100644
index 0000000000..cb66e516ae
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/scala/clearLambdaPlus3.yml
@@ -0,0 +1,53 @@
+languageId: scala
+command:
+  version: 0
+  spokenForm: clear lambda plus
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier:
+        {
+          type: containingScope,
+          scopeType: anonymousFunction,
+          includeSiblings: false,
+        }
+      mark: { type: decoratedSymbol, symbolColor: default, character: + }
+initialState:
+  documentContents: |-
+    class ExampleClass() {
+      val example = List(1,2,3,4).map((x: Int) => {
+        x + 1
+      })
+    }
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+  marks:
+    default.+:
+      start: { line: 2, character: 6 }
+      end: { line: 2, character: 7 }
+finalState:
+  documentContents: |-
+    class ExampleClass() {
+      val example = List(1,2,3,4).map()
+    }
+  selections:
+    - anchor: { line: 1, character: 34 }
+      active: { line: 1, character: 34 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: decoratedSymbol, symbolColor: default, character: + },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        {
+          type: containingScope,
+          scopeType: anonymousFunction,
+          includeSiblings: false,
+        },
+      isImplicit: false,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/scala/clearName.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/scala/clearName.yml
new file mode 100644
index 0000000000..c29060327a
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/scala/clearName.yml
@@ -0,0 +1,35 @@
+languageId: scala
+command:
+  version: 1
+  spokenForm: clear name
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier:
+        { type: containingScope, scopeType: name, includeSiblings: false }
+initialState:
+  documentContents: |
+    class ExampleClass() {}
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+  marks: {}
+finalState:
+  documentContents: |
+    class () {}
+  selections:
+    - anchor: { line: 0, character: 6 }
+      active: { line: 0, character: 6 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        { type: containingScope, scopeType: name, includeSiblings: false },
+      isImplicit: false,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/scala/clearNameFour.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/scala/clearNameFour.yml
new file mode 100644
index 0000000000..6a364d40de
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/scala/clearNameFour.yml
@@ -0,0 +1,43 @@
+languageId: scala
+command:
+  version: 1
+  spokenForm: clear name four
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier:
+        { type: containingScope, scopeType: name, includeSiblings: false }
+      mark: { type: decoratedSymbol, symbolColor: default, character: "4" }
+initialState:
+  documentContents: |
+    class ExampleClass() {
+      def foo() = 42
+    }
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+  marks:
+    default.4:
+      start: { line: 1, character: 14 }
+      end: { line: 1, character: 16 }
+finalState:
+  documentContents: |
+    class ExampleClass() {
+      def () = 42
+    }
+  selections:
+    - anchor: { line: 1, character: 6 }
+      active: { line: 1, character: 6 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: decoratedSymbol, symbolColor: default, character: "4" },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        { type: containingScope, scopeType: name, includeSiblings: false },
+      isImplicit: false,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/scala/clearNameFour2.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/scala/clearNameFour2.yml
new file mode 100644
index 0000000000..97c171ba9f
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/scala/clearNameFour2.yml
@@ -0,0 +1,43 @@
+languageId: scala
+command:
+  version: 1
+  spokenForm: clear name four
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier:
+        { type: containingScope, scopeType: name, includeSiblings: false }
+      mark: { type: decoratedSymbol, symbolColor: default, character: "4" }
+initialState:
+  documentContents: |
+    class ExampleClass() {
+      val foo = 42
+    }
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+  marks:
+    default.4:
+      start: { line: 1, character: 12 }
+      end: { line: 1, character: 14 }
+finalState:
+  documentContents: |
+    class ExampleClass() {
+      val  = 42
+    }
+  selections:
+    - anchor: { line: 1, character: 6 }
+      active: { line: 1, character: 6 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: decoratedSymbol, symbolColor: default, character: "4" },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        { type: containingScope, scopeType: name, includeSiblings: false },
+      isImplicit: false,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/scala/clearRoundWhale.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/scala/clearRoundWhale.yml
new file mode 100644
index 0000000000..cc202aaedc
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/scala/clearRoundWhale.yml
@@ -0,0 +1,41 @@
+languageId: scala
+command:
+  version: 1
+  spokenForm: clear round whale
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier: { type: surroundingPair, delimiter: parentheses }
+      mark: { type: decoratedSymbol, symbolColor: default, character: w }
+initialState:
+  documentContents: |
+    class Example() {
+      val example = "some (wrapped text) to test"
+    }
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+  marks:
+    default.w:
+      start: { line: 1, character: 23 }
+      end: { line: 1, character: 30 }
+finalState:
+  documentContents: |
+    class Example() {
+      val example = "some  to test"
+    }
+  selections:
+    - anchor: { line: 1, character: 22 }
+      active: { line: 1, character: 22 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: decoratedSymbol, symbolColor: default, character: w },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier: { type: surroundingPair, delimiter: parentheses },
+      isImplicit: false,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/scala/clearRoundWhale2.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/scala/clearRoundWhale2.yml
new file mode 100644
index 0000000000..06128d37bb
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/scala/clearRoundWhale2.yml
@@ -0,0 +1,46 @@
+languageId: scala
+command:
+  version: 1
+  spokenForm: clear round whale
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier: { type: surroundingPair, delimiter: parentheses }
+      mark: { type: decoratedSymbol, symbolColor: default, character: w }
+initialState:
+  documentContents: |
+    class Example() {
+      val example = """
+      some (wrapped
+      text) to test
+      """
+    }
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+  marks:
+    default.w:
+      start: { line: 2, character: 8 }
+      end: { line: 2, character: 15 }
+finalState:
+  documentContents: |
+    class Example() {
+      val example = """
+      some  to test
+      """
+    }
+  selections:
+    - anchor: { line: 2, character: 7 }
+      active: { line: 2, character: 7 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: decoratedSymbol, symbolColor: default, character: w },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier: { type: surroundingPair, delimiter: parentheses },
+      isImplicit: false,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/scala/clearString.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/scala/clearString.yml
new file mode 100644
index 0000000000..1f091a3387
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/scala/clearString.yml
@@ -0,0 +1,39 @@
+languageId: scala
+command:
+  version: 0
+  spokenForm: clear string
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier:
+        { type: containingScope, scopeType: string, includeSiblings: false }
+initialState:
+  documentContents: |
+    class ExampleClass() {
+      val string = "example string"
+    }
+  selections:
+    - anchor: { line: 1, character: 24 }
+      active: { line: 1, character: 24 }
+  marks: {}
+finalState:
+  documentContents: |
+    class ExampleClass() {
+      val string =
+    }
+  selections:
+    - anchor: { line: 1, character: 15 }
+      active: { line: 1, character: 15 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        { type: containingScope, scopeType: string, includeSiblings: false },
+      isImplicit: false,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/scala/clearString2.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/scala/clearString2.yml
new file mode 100644
index 0000000000..d947887b9e
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/scala/clearString2.yml
@@ -0,0 +1,39 @@
+languageId: scala
+command:
+  version: 0
+  spokenForm: clear string
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier:
+        { type: containingScope, scopeType: string, includeSiblings: false }
+initialState:
+  documentContents: |
+    val string = """
+    multi
+    line
+    string
+    """
+  selections:
+    - anchor: { line: 0, character: 16 }
+      active: { line: 0, character: 16 }
+  marks: {}
+finalState:
+  documentContents: |
+    val string =
+  selections:
+    - anchor: { line: 0, character: 13 }
+      active: { line: 0, character: 13 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        { type: containingScope, scopeType: string, includeSiblings: false },
+      isImplicit: false,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/scala/clearStringOdd.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/scala/clearStringOdd.yml
new file mode 100644
index 0000000000..dec232bba5
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/scala/clearStringOdd.yml
@@ -0,0 +1,43 @@
+languageId: scala
+command:
+  version: 0
+  spokenForm: clear string odd
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier:
+        { type: containingScope, scopeType: string, includeSiblings: false }
+      mark: { type: decoratedSymbol, symbolColor: default, character: o }
+initialState:
+  documentContents: |
+    class ExampleClass() {
+      val example = f"formatted ${1} string"
+    }
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+  marks:
+    default.o:
+      start: { line: 1, character: 18 }
+      end: { line: 1, character: 27 }
+finalState:
+  documentContents: |
+    class ExampleClass() {
+      val example =
+    }
+  selections:
+    - anchor: { line: 1, character: 16 }
+      active: { line: 1, character: 16 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: decoratedSymbol, symbolColor: default, character: o },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        { type: containingScope, scopeType: string, includeSiblings: false },
+      isImplicit: false,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/scala/clearSubject.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/scala/clearSubject.yml
new file mode 100644
index 0000000000..7e2f1c215f
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/scala/clearSubject.yml
@@ -0,0 +1,42 @@
+languageId: scala
+command:
+  spokenForm: clear subject
+  version: 3
+  targets:
+    - type: primitive
+      modifiers:
+        - type: containingScope
+          scopeType: { type: switchStatementSubject }
+  usePrePhraseSnapshot: true
+  action: { name: clearAndSetSelection }
+initialState:
+  documentContents: |
+    def matchTest(x: Int): String = x match {
+      case 0 => "zero"
+    }
+  selections:
+    - anchor: { line: 1, character: 15 }
+      active: { line: 1, character: 15 }
+  marks: {}
+finalState:
+  documentContents: |
+    def matchTest(x: Int): String =  match {
+      case 0 => "zero"
+    }
+  selections:
+    - anchor: { line: 0, character: 32 }
+      active: { line: 0, character: 32 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      modifiers:
+        [
+          {
+            type: containingScope,
+            scopeType: { type: switchStatementSubject },
+          },
+        ],
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/scala/clearType.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/scala/clearType.yml
new file mode 100644
index 0000000000..e15a5afe6c
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/scala/clearType.yml
@@ -0,0 +1,35 @@
+languageId: scala
+command:
+  version: 1
+  spokenForm: clear type
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier:
+        { type: containingScope, scopeType: type, includeSiblings: false }
+initialState:
+  documentContents: |
+    type Vector = (Int, Int)
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+  marks: {}
+finalState:
+  documentContents: |+
+
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        { type: containingScope, scopeType: type, includeSiblings: false },
+      isImplicit: false,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/scala/clearTypeBat.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/scala/clearTypeBat.yml
new file mode 100644
index 0000000000..a2ef8539ee
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/scala/clearTypeBat.yml
@@ -0,0 +1,43 @@
+languageId: scala
+command:
+  version: 1
+  spokenForm: clear type bat
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier:
+        { type: containingScope, scopeType: type, includeSiblings: false }
+      mark: { type: decoratedSymbol, symbolColor: default, character: b }
+initialState:
+  documentContents: |-
+    class Example(foo: String) {
+      def str(bar: String): String = foo + bar
+    }
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+  marks:
+    default.b:
+      start: { line: 1, character: 10 }
+      end: { line: 1, character: 13 }
+finalState:
+  documentContents: |-
+    class Example(foo: String) {
+      def str(bar: ): String = foo + bar
+    }
+  selections:
+    - anchor: { line: 1, character: 15 }
+      active: { line: 1, character: 15 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: decoratedSymbol, symbolColor: default, character: b },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        { type: containingScope, scopeType: type, includeSiblings: false },
+      isImplicit: false,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/scala/clearTypeComma.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/scala/clearTypeComma.yml
new file mode 100644
index 0000000000..34d78ca8cc
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/scala/clearTypeComma.yml
@@ -0,0 +1,39 @@
+languageId: scala
+command:
+  version: 1
+  spokenForm: clear type comma
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier:
+        { type: containingScope, scopeType: type, includeSiblings: false }
+      mark: { type: decoratedSymbol, symbolColor: default, character: "," }
+initialState:
+  documentContents: |
+    type Vector = (Int, Int)
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+  marks:
+    default.,:
+      start: { line: 0, character: 18 }
+      end: { line: 0, character: 19 }
+finalState:
+  documentContents: |+
+
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: decoratedSymbol, symbolColor: default, character: "," },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        { type: containingScope, scopeType: type, includeSiblings: false },
+      isImplicit: false,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/scala/clearTypeFine.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/scala/clearTypeFine.yml
new file mode 100644
index 0000000000..70e376ec3d
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/scala/clearTypeFine.yml
@@ -0,0 +1,43 @@
+languageId: scala
+command:
+  version: 1
+  spokenForm: clear type fine
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier:
+        { type: containingScope, scopeType: type, includeSiblings: false }
+      mark: { type: decoratedSymbol, symbolColor: default, character: f }
+initialState:
+  documentContents: |-
+    class Example(foo: String) {
+      def str(bar: String): String = foo + bar
+    }
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+  marks:
+    default.f:
+      start: { line: 1, character: 33 }
+      end: { line: 1, character: 36 }
+finalState:
+  documentContents: |-
+    class Example(foo: String) {
+      def str(bar: String):  = foo + bar
+    }
+  selections:
+    - anchor: { line: 1, character: 24 }
+      active: { line: 1, character: 24 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: decoratedSymbol, symbolColor: default, character: f },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        { type: containingScope, scopeType: type, includeSiblings: false },
+      isImplicit: false,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/scala/clearTypeFine2.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/scala/clearTypeFine2.yml
new file mode 100644
index 0000000000..5d0b046fea
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/scala/clearTypeFine2.yml
@@ -0,0 +1,43 @@
+languageId: scala
+command:
+  version: 1
+  spokenForm: clear type fine
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier:
+        { type: containingScope, scopeType: type, includeSiblings: false }
+      mark: { type: decoratedSymbol, symbolColor: default, character: f }
+initialState:
+  documentContents: |
+    class TypesAhoy() {
+      def example(foo: List[String]): List[String] = foo
+    }
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+  marks:
+    default.f:
+      start: { line: 1, character: 14 }
+      end: { line: 1, character: 17 }
+finalState:
+  documentContents: |
+    class TypesAhoy() {
+      def example(foo: ): List[String] = foo
+    }
+  selections:
+    - anchor: { line: 1, character: 19 }
+      active: { line: 1, character: 19 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: decoratedSymbol, symbolColor: default, character: f },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        { type: containingScope, scopeType: type, includeSiblings: false },
+      isImplicit: false,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/scala/clearTypeFine3.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/scala/clearTypeFine3.yml
new file mode 100644
index 0000000000..a67b3adf22
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/scala/clearTypeFine3.yml
@@ -0,0 +1,39 @@
+languageId: scala
+command:
+  version: 1
+  spokenForm: clear type fine
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier:
+        { type: containingScope, scopeType: type, includeSiblings: false }
+      mark: { type: decoratedSymbol, symbolColor: default, character: f }
+initialState:
+  documentContents: |
+    class TypesAhoy(foo: String) {}
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+  marks:
+    default.f:
+      start: { line: 0, character: 16 }
+      end: { line: 0, character: 19 }
+finalState:
+  documentContents: |
+    class TypesAhoy(foo: ) {}
+  selections:
+    - anchor: { line: 0, character: 21 }
+      active: { line: 0, character: 21 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: decoratedSymbol, symbolColor: default, character: f },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        { type: containingScope, scopeType: type, includeSiblings: false },
+      isImplicit: false,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/scala/clearTypeLook.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/scala/clearTypeLook.yml
new file mode 100644
index 0000000000..4b329848e4
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/scala/clearTypeLook.yml
@@ -0,0 +1,39 @@
+languageId: scala
+command:
+  version: 1
+  spokenForm: clear type look
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier:
+        { type: containingScope, scopeType: type, includeSiblings: false }
+      mark: { type: decoratedSymbol, symbolColor: default, character: l }
+initialState:
+  documentContents: |
+    class TypesAhoy(foo: List[String]) {}
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+  marks:
+    default.l:
+      start: { line: 0, character: 21 }
+      end: { line: 0, character: 25 }
+finalState:
+  documentContents: |
+    class TypesAhoy(foo: ) {}
+  selections:
+    - anchor: { line: 0, character: 21 }
+      active: { line: 0, character: 21 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: decoratedSymbol, symbolColor: default, character: l },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        { type: containingScope, scopeType: type, includeSiblings: false },
+      isImplicit: false,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/scala/clearTypeLook2.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/scala/clearTypeLook2.yml
new file mode 100644
index 0000000000..c70ed13a77
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/scala/clearTypeLook2.yml
@@ -0,0 +1,43 @@
+languageId: scala
+command:
+  version: 1
+  spokenForm: clear type look
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier:
+        { type: containingScope, scopeType: type, includeSiblings: false }
+      mark: { type: decoratedSymbol, symbolColor: default, character: l }
+initialState:
+  documentContents: |
+    class TypesAhoy() {
+      def example(foo: List[String]): List[String] = foo
+    }
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+  marks:
+    default.l:
+      start: { line: 1, character: 19 }
+      end: { line: 1, character: 23 }
+finalState:
+  documentContents: |
+    class TypesAhoy() {
+      def example(foo: ): List[String] = foo
+    }
+  selections:
+    - anchor: { line: 1, character: 19 }
+      active: { line: 1, character: 19 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: decoratedSymbol, symbolColor: default, character: l },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        { type: containingScope, scopeType: type, includeSiblings: false },
+      isImplicit: false,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/scala/clearTypeLook3.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/scala/clearTypeLook3.yml
new file mode 100644
index 0000000000..cdeb4a875d
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/scala/clearTypeLook3.yml
@@ -0,0 +1,43 @@
+languageId: scala
+command:
+  version: 1
+  spokenForm: clear type look
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier:
+        { type: containingScope, scopeType: type, includeSiblings: false }
+      mark: { type: decoratedSymbol, symbolColor: default, character: l }
+initialState:
+  documentContents: |
+    class TypesAhoy() {
+      val foo: List[String] = List("foo")
+    }
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+  marks:
+    default.l:
+      start: { line: 1, character: 11 }
+      end: { line: 1, character: 15 }
+finalState:
+  documentContents: |
+    class TypesAhoy() {
+      val foo:  = List("foo")
+    }
+  selections:
+    - anchor: { line: 1, character: 11 }
+      active: { line: 1, character: 11 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: decoratedSymbol, symbolColor: default, character: l },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        { type: containingScope, scopeType: type, includeSiblings: false },
+      isImplicit: false,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/scala/clearTypeOdd.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/scala/clearTypeOdd.yml
new file mode 100644
index 0000000000..c8f4d25fb8
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/scala/clearTypeOdd.yml
@@ -0,0 +1,43 @@
+languageId: scala
+command:
+  version: 1
+  spokenForm: clear type odd
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier:
+        { type: containingScope, scopeType: type, includeSiblings: false }
+      mark: { type: decoratedSymbol, symbolColor: default, character: o }
+initialState:
+  documentContents: |-
+    class Example(foo: String) {
+      def str(bar: String): String = foo + bar
+    }
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+  marks:
+    default.o:
+      start: { line: 0, character: 14 }
+      end: { line: 0, character: 17 }
+finalState:
+  documentContents: |-
+    class Example(foo: ) {
+      def str(bar: String): String = foo + bar
+    }
+  selections:
+    - anchor: { line: 0, character: 19 }
+      active: { line: 0, character: 19 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: decoratedSymbol, symbolColor: default, character: o },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        { type: containingScope, scopeType: type, includeSiblings: false },
+      isImplicit: false,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/scala/clearTypeOdd2.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/scala/clearTypeOdd2.yml
new file mode 100644
index 0000000000..0386614f9c
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/scala/clearTypeOdd2.yml
@@ -0,0 +1,43 @@
+languageId: scala
+command:
+  version: 1
+  spokenForm: clear type odd
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier:
+        { type: containingScope, scopeType: type, includeSiblings: false }
+      mark: { type: decoratedSymbol, symbolColor: default, character: o }
+initialState:
+  documentContents: |
+    class TypesAhoy() {
+      def example(foo: List[String]): List[String] = foo
+    }
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+  marks:
+    default.o:
+      start: { line: 1, character: 49 }
+      end: { line: 1, character: 52 }
+finalState:
+  documentContents: |
+    class TypesAhoy() {
+      def example(foo: List[String]):  = foo
+    }
+  selections:
+    - anchor: { line: 1, character: 34 }
+      active: { line: 1, character: 34 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: decoratedSymbol, symbolColor: default, character: o },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        { type: containingScope, scopeType: type, includeSiblings: false },
+      isImplicit: false,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/scala/clearTypeOdd3.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/scala/clearTypeOdd3.yml
new file mode 100644
index 0000000000..69af684254
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/scala/clearTypeOdd3.yml
@@ -0,0 +1,47 @@
+languageId: scala
+command:
+  version: 1
+  spokenForm: clear type odd
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier:
+        { type: containingScope, scopeType: type, includeSiblings: false }
+      mark: { type: decoratedSymbol, symbolColor: default, character: o }
+initialState:
+  documentContents: |
+    class TypesAhoy() {
+      f match {
+        case foo: Foo => 12
+      }
+    }
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+  marks:
+    default.o:
+      start: { line: 2, character: 9 }
+      end: { line: 2, character: 12 }
+finalState:
+  documentContents: |
+    class TypesAhoy() {
+      f match {
+        case foo:  => 12
+      }
+    }
+  selections:
+    - anchor: { line: 2, character: 14 }
+      active: { line: 2, character: 14 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: decoratedSymbol, symbolColor: default, character: o },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        { type: containingScope, scopeType: type, includeSiblings: false },
+      isImplicit: false,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/scala/clearTypeRed.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/scala/clearTypeRed.yml
new file mode 100644
index 0000000000..d9e3e4153c
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/scala/clearTypeRed.yml
@@ -0,0 +1,43 @@
+languageId: scala
+command:
+  version: 1
+  spokenForm: clear type red
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier:
+        { type: containingScope, scopeType: type, includeSiblings: false }
+      mark: { type: decoratedSymbol, symbolColor: default, character: r }
+initialState:
+  documentContents: |
+    class TypesAhoy() {
+      def example(foo: List[String]): List[String] = foo
+    }
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+  marks:
+    default.r:
+      start: { line: 1, character: 24 }
+      end: { line: 1, character: 30 }
+finalState:
+  documentContents: |
+    class TypesAhoy() {
+      def example(foo: ): List[String] = foo
+    }
+  selections:
+    - anchor: { line: 1, character: 19 }
+      active: { line: 1, character: 19 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: decoratedSymbol, symbolColor: default, character: r },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        { type: containingScope, scopeType: type, includeSiblings: false },
+      isImplicit: false,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/scala/clearTypeRed2.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/scala/clearTypeRed2.yml
new file mode 100644
index 0000000000..c7dc9aad19
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/scala/clearTypeRed2.yml
@@ -0,0 +1,43 @@
+languageId: scala
+command:
+  version: 1
+  spokenForm: clear type red
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier:
+        { type: containingScope, scopeType: type, includeSiblings: false }
+      mark: { type: decoratedSymbol, symbolColor: default, character: r }
+initialState:
+  documentContents: |
+    class TypesAhoy() {
+      val foo: List[String] = List("foo")
+    }
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+  marks:
+    default.r:
+      start: { line: 1, character: 16 }
+      end: { line: 1, character: 22 }
+finalState:
+  documentContents: |
+    class TypesAhoy() {
+      val foo:  = List("foo")
+    }
+  selections:
+    - anchor: { line: 1, character: 11 }
+      active: { line: 1, character: 11 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: decoratedSymbol, symbolColor: default, character: r },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        { type: containingScope, scopeType: type, includeSiblings: false },
+      isImplicit: false,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/scala/clearTypeSit.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/scala/clearTypeSit.yml
new file mode 100644
index 0000000000..b9514f837d
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/scala/clearTypeSit.yml
@@ -0,0 +1,43 @@
+languageId: scala
+command:
+  version: 1
+  spokenForm: clear type sit
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier:
+        { type: containingScope, scopeType: type, includeSiblings: false }
+      mark: { type: decoratedSymbol, symbolColor: default, character: i }
+initialState:
+  documentContents: |
+    class TypesAhoy() {
+      def example(foo: List[String]): List[String] = foo
+    }
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+  marks:
+    default.i:
+      start: { line: 1, character: 34 }
+      end: { line: 1, character: 38 }
+finalState:
+  documentContents: |
+    class TypesAhoy() {
+      def example(foo: List[String]):  = foo
+    }
+  selections:
+    - anchor: { line: 1, character: 34 }
+      active: { line: 1, character: 34 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: decoratedSymbol, symbolColor: default, character: i },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        { type: containingScope, scopeType: type, includeSiblings: false },
+      isImplicit: false,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/scala/clearTypeSit2.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/scala/clearTypeSit2.yml
new file mode 100644
index 0000000000..c7cfe86aa6
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/scala/clearTypeSit2.yml
@@ -0,0 +1,43 @@
+languageId: scala
+command:
+  version: 1
+  spokenForm: clear type sit
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier:
+        { type: containingScope, scopeType: type, includeSiblings: false }
+      mark: { type: decoratedSymbol, symbolColor: default, character: i }
+initialState:
+  documentContents: |
+    class TypesAhoy() {
+      def foo = (x: Int) => x + 1
+    }
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+  marks:
+    default.i:
+      start: { line: 1, character: 16 }
+      end: { line: 1, character: 19 }
+finalState:
+  documentContents: |
+    class TypesAhoy() {
+      def foo = (x: ) => x + 1
+    }
+  selections:
+    - anchor: { line: 1, character: 16 }
+      active: { line: 1, character: 16 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: decoratedSymbol, symbolColor: default, character: i },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        { type: containingScope, scopeType: type, includeSiblings: false },
+      isImplicit: false,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/scala/clearTypeSun.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/scala/clearTypeSun.yml
new file mode 100644
index 0000000000..db243ed81c
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/scala/clearTypeSun.yml
@@ -0,0 +1,39 @@
+languageId: scala
+command:
+  version: 1
+  spokenForm: clear type sun
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier:
+        { type: containingScope, scopeType: type, includeSiblings: false }
+      mark: { type: decoratedSymbol, symbolColor: default, character: s }
+initialState:
+  documentContents: |
+    class TypesAhoy(foo: String) {}
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+  marks:
+    default.s:
+      start: { line: 0, character: 21 }
+      end: { line: 0, character: 27 }
+finalState:
+  documentContents: |
+    class TypesAhoy(foo: ) {}
+  selections:
+    - anchor: { line: 0, character: 21 }
+      active: { line: 0, character: 21 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: decoratedSymbol, symbolColor: default, character: s },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        { type: containingScope, scopeType: type, includeSiblings: false },
+      isImplicit: false,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/scala/clearTypeSun2.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/scala/clearTypeSun2.yml
new file mode 100644
index 0000000000..07d758dace
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/scala/clearTypeSun2.yml
@@ -0,0 +1,39 @@
+languageId: scala
+command:
+  version: 1
+  spokenForm: clear type sun
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier:
+        { type: containingScope, scopeType: type, includeSiblings: false }
+      mark: { type: decoratedSymbol, symbolColor: default, character: s }
+initialState:
+  documentContents: |
+    class TypesAhoy(foo: List[String]) {}
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+  marks:
+    default.s:
+      start: { line: 0, character: 26 }
+      end: { line: 0, character: 32 }
+finalState:
+  documentContents: |
+    class TypesAhoy(foo: ) {}
+  selections:
+    - anchor: { line: 0, character: 21 }
+      active: { line: 0, character: 21 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: decoratedSymbol, symbolColor: default, character: s },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        { type: containingScope, scopeType: type, includeSiblings: false },
+      isImplicit: false,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/scala/clearTypeSun3.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/scala/clearTypeSun3.yml
new file mode 100644
index 0000000000..6bbceb1d12
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/scala/clearTypeSun3.yml
@@ -0,0 +1,43 @@
+languageId: scala
+command:
+  version: 1
+  spokenForm: clear type sun
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier:
+        { type: containingScope, scopeType: type, includeSiblings: false }
+      mark: { type: decoratedSymbol, symbolColor: default, character: s }
+initialState:
+  documentContents: |
+    class TypesAhoy() {
+      def example(foo: String): String = "example"
+    }
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+  marks:
+    default.s:
+      start: { line: 1, character: 19 }
+      end: { line: 1, character: 25 }
+finalState:
+  documentContents: |
+    class TypesAhoy() {
+      def example(foo: ): String = "example"
+    }
+  selections:
+    - anchor: { line: 1, character: 19 }
+      active: { line: 1, character: 19 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: decoratedSymbol, symbolColor: default, character: s },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        { type: containingScope, scopeType: type, includeSiblings: false },
+      isImplicit: false,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/scala/clearTypeSun4.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/scala/clearTypeSun4.yml
new file mode 100644
index 0000000000..d9907461b1
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/scala/clearTypeSun4.yml
@@ -0,0 +1,43 @@
+languageId: scala
+command:
+  version: 1
+  spokenForm: clear type sun
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier:
+        { type: containingScope, scopeType: type, includeSiblings: false }
+      mark: { type: decoratedSymbol, symbolColor: default, character: s }
+initialState:
+  documentContents: |
+    class TypesAhoy() {
+      def example(foo: List[String]): List[String] = foo
+    }
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+  marks:
+    default.s:
+      start: { line: 1, character: 39 }
+      end: { line: 1, character: 45 }
+finalState:
+  documentContents: |
+    class TypesAhoy() {
+      def example(foo: List[String]):  = foo
+    }
+  selections:
+    - anchor: { line: 1, character: 34 }
+      active: { line: 1, character: 34 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: decoratedSymbol, symbolColor: default, character: s },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        { type: containingScope, scopeType: type, includeSiblings: false },
+      isImplicit: false,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/scala/clearTypeSun5.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/scala/clearTypeSun5.yml
new file mode 100644
index 0000000000..5368294065
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/scala/clearTypeSun5.yml
@@ -0,0 +1,43 @@
+languageId: scala
+command:
+  version: 1
+  spokenForm: clear type sun
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier:
+        { type: containingScope, scopeType: type, includeSiblings: false }
+      mark: { type: decoratedSymbol, symbolColor: default, character: s }
+initialState:
+  documentContents: |
+    class TypesAhoy() {
+      val foo: String = "foo"
+    }
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+  marks:
+    default.s:
+      start: { line: 1, character: 11 }
+      end: { line: 1, character: 17 }
+finalState:
+  documentContents: |
+    class TypesAhoy() {
+      val foo:  = "foo"
+    }
+  selections:
+    - anchor: { line: 1, character: 11 }
+      active: { line: 1, character: 11 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: decoratedSymbol, symbolColor: default, character: s },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        { type: containingScope, scopeType: type, includeSiblings: false },
+      isImplicit: false,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/scala/clearTypeTrap.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/scala/clearTypeTrap.yml
new file mode 100644
index 0000000000..6dc5c57610
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/scala/clearTypeTrap.yml
@@ -0,0 +1,43 @@
+languageId: scala
+command:
+  version: 1
+  spokenForm: clear type trap
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier:
+        { type: containingScope, scopeType: type, includeSiblings: false }
+      mark: { type: decoratedSymbol, symbolColor: default, character: t }
+initialState:
+  documentContents: |
+    class TypesAhoy() {
+      def example(foo: String): String = "example"
+    }
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+  marks:
+    default.t:
+      start: { line: 1, character: 28 }
+      end: { line: 1, character: 34 }
+finalState:
+  documentContents: |
+    class TypesAhoy() {
+      def example(foo: String):  = "example"
+    }
+  selections:
+    - anchor: { line: 1, character: 28 }
+      active: { line: 1, character: 28 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: decoratedSymbol, symbolColor: default, character: t },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        { type: containingScope, scopeType: type, includeSiblings: false },
+      isImplicit: false,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/scala/clearValue.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/scala/clearValue.yml
new file mode 100644
index 0000000000..46fe2dee58
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/scala/clearValue.yml
@@ -0,0 +1,35 @@
+languageId: scala
+command:
+  version: 1
+  spokenForm: clear value
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier:
+        { type: containingScope, scopeType: value, includeSiblings: false }
+initialState:
+  documentContents: |
+    type Vector = (Int, Int)
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+  marks: {}
+finalState:
+  documentContents: |
+    type Vector =
+  selections:
+    - anchor: { line: 0, character: 14 }
+      active: { line: 0, character: 14 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        { type: containingScope, scopeType: value, includeSiblings: false },
+      isImplicit: false,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/scala/clearValueOdd.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/scala/clearValueOdd.yml
new file mode 100644
index 0000000000..4b163d2520
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/scala/clearValueOdd.yml
@@ -0,0 +1,39 @@
+languageId: scala
+command:
+  version: 1
+  spokenForm: clear value odd
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier:
+        { type: containingScope, scopeType: value, includeSiblings: false }
+      mark: { type: decoratedSymbol, symbolColor: default, character: o }
+initialState:
+  documentContents: |
+    class Example(foo: String = "foo") {}
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+  marks:
+    default.o:
+      start: { line: 0, character: 29 }
+      end: { line: 0, character: 32 }
+finalState:
+  documentContents: |
+    class Example(foo: String = ) {}
+  selections:
+    - anchor: { line: 0, character: 28 }
+      active: { line: 0, character: 28 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: decoratedSymbol, symbolColor: default, character: o },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        { type: containingScope, scopeType: value, includeSiblings: false },
+      isImplicit: false,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/scala/clearValueRed.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/scala/clearValueRed.yml
new file mode 100644
index 0000000000..f381cbae55
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/scala/clearValueRed.yml
@@ -0,0 +1,43 @@
+languageId: scala
+command:
+  version: 1
+  spokenForm: clear value red
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier:
+        { type: containingScope, scopeType: value, includeSiblings: false }
+      mark: { type: decoratedSymbol, symbolColor: default, character: r }
+initialState:
+  documentContents: |
+    class Example() {
+      val bar = "bar" + "smang"
+    }
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+  marks:
+    default.r:
+      start: { line: 1, character: 13 }
+      end: { line: 1, character: 16 }
+finalState:
+  documentContents: |
+    class Example() {
+      val bar =
+    }
+  selections:
+    - anchor: { line: 1, character: 12 }
+      active: { line: 1, character: 12 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: decoratedSymbol, symbolColor: default, character: r },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        { type: containingScope, scopeType: value, includeSiblings: false },
+      isImplicit: false,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/scala/clearValueSit.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/scala/clearValueSit.yml
new file mode 100644
index 0000000000..9b417afa56
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/scala/clearValueSit.yml
@@ -0,0 +1,43 @@
+languageId: scala
+command:
+  version: 1
+  spokenForm: clear value sit
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier:
+        { type: containingScope, scopeType: value, includeSiblings: false }
+      mark: { type: decoratedSymbol, symbolColor: default, character: i }
+initialState:
+  documentContents: |
+    class Example() {
+      val bling = "blang"
+    }
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+  marks:
+    default.i:
+      start: { line: 1, character: 6 }
+      end: { line: 1, character: 11 }
+finalState:
+  documentContents: |
+    class Example() {
+      val bling =
+    }
+  selections:
+    - anchor: { line: 1, character: 14 }
+      active: { line: 1, character: 14 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: decoratedSymbol, symbolColor: default, character: i },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        { type: containingScope, scopeType: value, includeSiblings: false },
+      isImplicit: false,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/scss/changeArgue.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/scss/changeArgue.yml
new file mode 100644
index 0000000000..249d7ade59
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/scss/changeArgue.yml
@@ -0,0 +1,49 @@
+languageId: scss
+command:
+  version: 1
+  spokenForm: change argue
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier:
+        {
+          type: containingScope,
+          scopeType: argumentOrParameter,
+          includeSiblings: false,
+        }
+initialState:
+  documentContents: |-
+
+    .double {
+      transform: translate(-50%, -50%);
+    }
+  selections:
+    - anchor: { line: 2, character: 25 }
+      active: { line: 2, character: 25 }
+  marks: {}
+finalState:
+  documentContents: |-
+
+    .double {
+      transform: translate(, -50%);
+    }
+  selections:
+    - anchor: { line: 2, character: 23 }
+      active: { line: 2, character: 23 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        {
+          type: containingScope,
+          scopeType: argumentOrParameter,
+          includeSiblings: false,
+        },
+      isImplicit: false,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/scss/changeArgue2.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/scss/changeArgue2.yml
new file mode 100644
index 0000000000..dcff24aafb
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/scss/changeArgue2.yml
@@ -0,0 +1,47 @@
+languageId: scss
+command:
+  version: 1
+  spokenForm: change argue
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier:
+        {
+          type: containingScope,
+          scopeType: argumentOrParameter,
+          includeSiblings: false,
+        }
+initialState:
+  documentContents: |-
+    @mixin replace-text($image, $color: red) {
+      text-align: left;
+    }
+  selections:
+    - anchor: { line: 0, character: 34 }
+      active: { line: 0, character: 34 }
+  marks: {}
+finalState:
+  documentContents: |-
+    @mixin replace-text($image, ) {
+      text-align: left;
+    }
+  selections:
+    - anchor: { line: 0, character: 28 }
+      active: { line: 0, character: 28 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        {
+          type: containingScope,
+          scopeType: argumentOrParameter,
+          includeSiblings: false,
+        },
+      isImplicit: false,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/scss/changeArgue3.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/scss/changeArgue3.yml
new file mode 100644
index 0000000000..bdcbdfab15
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/scss/changeArgue3.yml
@@ -0,0 +1,47 @@
+languageId: scss
+command:
+  version: 1
+  spokenForm: change argue
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier:
+        {
+          type: containingScope,
+          scopeType: argumentOrParameter,
+          includeSiblings: false,
+        }
+initialState:
+  documentContents: |-
+    @mixin replace-text($image, $color: red) {
+      text-align: left;
+    }
+  selections:
+    - anchor: { line: 0, character: 24 }
+      active: { line: 0, character: 24 }
+  marks: {}
+finalState:
+  documentContents: |-
+    @mixin replace-text(, $color: red) {
+      text-align: left;
+    }
+  selections:
+    - anchor: { line: 0, character: 20 }
+      active: { line: 0, character: 20 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        {
+          type: containingScope,
+          scopeType: argumentOrParameter,
+          includeSiblings: false,
+        },
+      isImplicit: false,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/scss/changeArgue4.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/scss/changeArgue4.yml
new file mode 100644
index 0000000000..1813b03054
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/scss/changeArgue4.yml
@@ -0,0 +1,47 @@
+languageId: scss
+command:
+  version: 1
+  spokenForm: change argue
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier:
+        {
+          type: containingScope,
+          scopeType: argumentOrParameter,
+          includeSiblings: false,
+        }
+initialState:
+  documentContents: |-
+    div {
+      clip-path: polygon(50% 0%, 60% 40%, 100% 50%, 60% 60%, 50% 100%, 40% 60%, 0% 50%, 40% 40%);
+    }
+  selections:
+    - anchor: { line: 1, character: 40 }
+      active: { line: 1, character: 40 }
+  marks: {}
+finalState:
+  documentContents: |-
+    div {
+      clip-path: polygon(50% 0%, 60% 40%, , 60% 60%, 50% 100%, 40% 60%, 0% 50%, 40% 40%);
+    }
+  selections:
+    - anchor: { line: 1, character: 38 }
+      active: { line: 1, character: 38 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        {
+          type: containingScope,
+          scopeType: argumentOrParameter,
+          includeSiblings: false,
+        },
+      isImplicit: false,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/scss/changeArgue5.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/scss/changeArgue5.yml
new file mode 100644
index 0000000000..85cfc10828
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/scss/changeArgue5.yml
@@ -0,0 +1,49 @@
+languageId: scss
+command:
+  version: 1
+  spokenForm: change argue
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier:
+        {
+          type: containingScope,
+          scopeType: argumentOrParameter,
+          includeSiblings: false,
+        }
+initialState:
+  documentContents: |-
+    a {
+      clip-path: polygon(50% 0%, 60% 40%, 100% 50%, 60% 60%, 50% 100%, 40% 60%, 0% 50%, 40% 40%);
+    }
+
+  selections:
+    - anchor: { line: 1, character: 27 }
+      active: { line: 1, character: 27 }
+  marks: {}
+finalState:
+  documentContents: |-
+    a {
+      clip-path: polygon(, 60% 40%, 100% 50%, 60% 60%, 50% 100%, 40% 60%, 0% 50%, 40% 40%);
+    }
+
+  selections:
+    - anchor: { line: 1, character: 21 }
+      active: { line: 1, character: 21 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        {
+          type: containingScope,
+          scopeType: argumentOrParameter,
+          includeSiblings: false,
+        },
+      isImplicit: false,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/scss/changeArgue6.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/scss/changeArgue6.yml
new file mode 100644
index 0000000000..4d90a18b36
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/scss/changeArgue6.yml
@@ -0,0 +1,47 @@
+languageId: scss
+command:
+  version: 1
+  spokenForm: change argue
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier:
+        {
+          type: containingScope,
+          scopeType: argumentOrParameter,
+          includeSiblings: false,
+        }
+initialState:
+  documentContents: |-
+    @mixin foo($foo: 123) {
+
+    }
+  selections:
+    - anchor: { line: 0, character: 18 }
+      active: { line: 0, character: 18 }
+  marks: {}
+finalState:
+  documentContents: |-
+    @mixin foo() {
+
+    }
+  selections:
+    - anchor: { line: 0, character: 11 }
+      active: { line: 0, character: 11 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        {
+          type: containingScope,
+          scopeType: argumentOrParameter,
+          includeSiblings: false,
+        },
+      isImplicit: false,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/scss/changeCallee.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/scss/changeCallee.yml
new file mode 100644
index 0000000000..767d7290e0
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/scss/changeCallee.yml
@@ -0,0 +1,41 @@
+languageId: scss
+command:
+  version: 1
+  spokenForm: change callee
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier:
+        {
+          type: containingScope,
+          scopeType: functionCallee,
+          includeSiblings: false,
+        }
+initialState:
+  documentContents: "margin-left: pow(4, 3)"
+  selections:
+    - anchor: { line: 0, character: 19 }
+      active: { line: 0, character: 19 }
+  marks: {}
+finalState:
+  documentContents: "margin-left: (4, 3)"
+  selections:
+    - anchor: { line: 0, character: 13 }
+      active: { line: 0, character: 13 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        {
+          type: containingScope,
+          scopeType: functionCallee,
+          includeSiblings: false,
+        },
+      isImplicit: false,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/scss/changeComment.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/scss/changeComment.yml
new file mode 100644
index 0000000000..9bee7e1a84
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/scss/changeComment.yml
@@ -0,0 +1,33 @@
+languageId: scss
+command:
+  version: 1
+  spokenForm: change comment
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier:
+        { type: containingScope, scopeType: comment, includeSiblings: false }
+initialState:
+  documentContents: // comment
+  selections:
+    - anchor: { line: 0, character: 9 }
+      active: { line: 0, character: 9 }
+  marks: {}
+finalState:
+  documentContents: ""
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        { type: containingScope, scopeType: comment, includeSiblings: false },
+      isImplicit: false,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/scss/changeComment2.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/scss/changeComment2.yml
new file mode 100644
index 0000000000..439c55102a
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/scss/changeComment2.yml
@@ -0,0 +1,36 @@
+languageId: scss
+command:
+  version: 1
+  spokenForm: change comment
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier:
+        { type: containingScope, scopeType: comment, includeSiblings: false }
+initialState:
+  documentContents: |-
+    /*
+      hello
+    */
+  selections:
+    - anchor: { line: 1, character: 7 }
+      active: { line: 1, character: 7 }
+  marks: {}
+finalState:
+  documentContents: ""
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        { type: containingScope, scopeType: comment, includeSiblings: false },
+      isImplicit: false,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/scss/changeEveryArgue.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/scss/changeEveryArgue.yml
new file mode 100644
index 0000000000..50255ab48d
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/scss/changeEveryArgue.yml
@@ -0,0 +1,51 @@
+languageId: scss
+command:
+  version: 1
+  spokenForm: change every argue
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier:
+        {
+          type: containingScope,
+          scopeType: argumentOrParameter,
+          includeSiblings: true,
+        }
+initialState:
+  documentContents: |-
+
+    .double {
+      transform: translate(-50%, -50%);
+    }
+  selections:
+    - anchor: { line: 2, character: 25 }
+      active: { line: 2, character: 25 }
+  marks: {}
+finalState:
+  documentContents: |-
+
+    .double {
+      transform: translate(, );
+    }
+  selections:
+    - anchor: { line: 2, character: 23 }
+      active: { line: 2, character: 23 }
+    - anchor: { line: 2, character: 25 }
+      active: { line: 2, character: 25 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        {
+          type: containingScope,
+          scopeType: argumentOrParameter,
+          includeSiblings: true,
+        },
+      isImplicit: false,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/scss/changeEveryArgue2.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/scss/changeEveryArgue2.yml
new file mode 100644
index 0000000000..2c3eedd0a0
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/scss/changeEveryArgue2.yml
@@ -0,0 +1,49 @@
+languageId: scss
+command:
+  version: 1
+  spokenForm: change every argue
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier:
+        {
+          type: containingScope,
+          scopeType: argumentOrParameter,
+          includeSiblings: true,
+        }
+initialState:
+  documentContents: |-
+    div {
+      background: repeating-linear-gradient(red, orange 50px);
+    }
+  selections:
+    - anchor: { line: 1, character: 50 }
+      active: { line: 1, character: 50 }
+  marks: {}
+finalState:
+  documentContents: |-
+    div {
+      background: repeating-linear-gradient(, );
+    }
+  selections:
+    - anchor: { line: 1, character: 40 }
+      active: { line: 1, character: 40 }
+    - anchor: { line: 1, character: 42 }
+      active: { line: 1, character: 42 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        {
+          type: containingScope,
+          scopeType: argumentOrParameter,
+          includeSiblings: true,
+        },
+      isImplicit: false,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/scss/changeEveryArgue3.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/scss/changeEveryArgue3.yml
new file mode 100644
index 0000000000..b75f7c50c2
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/scss/changeEveryArgue3.yml
@@ -0,0 +1,51 @@
+languageId: scss
+command:
+  version: 1
+  spokenForm: change every argue
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier:
+        {
+          type: containingScope,
+          scopeType: argumentOrParameter,
+          includeSiblings: true,
+        }
+initialState:
+  documentContents: |-
+    a {
+      clip-path: ellipse(115px 55px at 50% 40%);
+    }
+
+  selections:
+    - anchor: { line: 1, character: 25 }
+      active: { line: 1, character: 25 }
+  marks: {}
+finalState:
+  documentContents: |-
+    a {
+      clip-path: ellipse( at );
+    }
+
+  selections:
+    - anchor: { line: 1, character: 21 }
+      active: { line: 1, character: 21 }
+    - anchor: { line: 1, character: 25 }
+      active: { line: 1, character: 25 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        {
+          type: containingScope,
+          scopeType: argumentOrParameter,
+          includeSiblings: true,
+        },
+      isImplicit: false,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/scss/changeFirstWordLook.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/scss/changeFirstWordLook.yml
new file mode 100644
index 0000000000..3ee9ec3b94
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/scss/changeFirstWordLook.yml
@@ -0,0 +1,56 @@
+languageId: scss
+command:
+  spokenForm: change first word look
+  version: 2
+  targets:
+    - type: primitive
+      mark: { type: decoratedSymbol, symbolColor: default, character: l }
+      modifiers:
+        - type: ordinalRange
+          scopeType: { type: word }
+          anchor: 0
+          active: 0
+          excludeAnchor: false
+          excludeActive: false
+  usePrePhraseSnapshot: true
+  action: { name: clearAndSetSelection }
+initialState:
+  documentContents: |2-
+     .long-bem-class-name {
+       height: 10px;
+     }
+
+  selections:
+    - anchor: { line: 3, character: 1 }
+      active: { line: 3, character: 1 }
+  marks:
+    default.l:
+      start: { line: 0, character: 2 }
+      end: { line: 0, character: 21 }
+finalState:
+  documentContents: |2-
+     .-bem-class-name {
+       height: 10px;
+     }
+
+  selections:
+    - anchor: { line: 0, character: 2 }
+      active: { line: 0, character: 2 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: decoratedSymbol, symbolColor: default, character: l },
+      modifiers:
+        [
+          {
+            type: ordinalRange,
+            scopeType: { type: word },
+            anchor: 0,
+            active: 0,
+            excludeAnchor: false,
+            excludeActive: false,
+          },
+        ],
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/scss/changeFunk.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/scss/changeFunk.yml
new file mode 100644
index 0000000000..d6d4f2544f
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/scss/changeFunk.yml
@@ -0,0 +1,48 @@
+languageId: scss
+command:
+  version: 1
+  spokenForm: change funk
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier:
+        {
+          type: containingScope,
+          scopeType: namedFunction,
+          includeSiblings: false,
+        }
+initialState:
+  documentContents: |-
+    @function pow($base, $exponent) {
+      $result: 1;
+      @for $_ from 1 through $exponent {
+        $result: $result * $base;
+      }
+      @return $result;
+    }
+  selections:
+    - anchor: { line: 1, character: 13 }
+      active: { line: 1, character: 13 }
+  marks: {}
+finalState:
+  documentContents: ""
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        {
+          type: containingScope,
+          scopeType: namedFunction,
+          includeSiblings: false,
+        },
+      isImplicit: false,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/scss/changeFunk2.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/scss/changeFunk2.yml
new file mode 100644
index 0000000000..997a46a7dc
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/scss/changeFunk2.yml
@@ -0,0 +1,50 @@
+languageId: scss
+command:
+  version: 1
+  spokenForm: change funk
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier:
+        {
+          type: containingScope,
+          scopeType: namedFunction,
+          includeSiblings: false,
+        }
+initialState:
+  documentContents: |-
+    @mixin theme-colors($light-theme: true) {
+      @if $light-theme {
+        background-color: $light-background;
+        color: $light-text;
+      } @else {
+        background-color: $dark-background;
+        color: $dark-text;
+      }
+    }
+  selections:
+    - anchor: { line: 7, character: 3 }
+      active: { line: 7, character: 3 }
+  marks: {}
+finalState:
+  documentContents: ""
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        {
+          type: containingScope,
+          scopeType: namedFunction,
+          includeSiblings: false,
+        },
+      isImplicit: false,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/scss/changeItem.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/scss/changeItem.yml
new file mode 100644
index 0000000000..76fe98583c
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/scss/changeItem.yml
@@ -0,0 +1,47 @@
+languageId: scss
+command:
+  version: 1
+  spokenForm: change item
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier:
+        {
+          type: containingScope,
+          scopeType: collectionItem,
+          includeSiblings: false,
+        }
+initialState:
+  documentContents: |-
+    a {
+      width: calc(100% - 80px);
+    }
+  selections:
+    - anchor: { line: 1, character: 12 }
+      active: { line: 1, character: 12 }
+  marks: {}
+finalState:
+  documentContents: |-
+    a {
+
+    }
+  selections:
+    - anchor: { line: 1, character: 2 }
+      active: { line: 1, character: 2 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        {
+          type: containingScope,
+          scopeType: collectionItem,
+          includeSiblings: false,
+        },
+      isImplicit: false,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/scss/changeKey.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/scss/changeKey.yml
new file mode 100644
index 0000000000..cdb35b43d0
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/scss/changeKey.yml
@@ -0,0 +1,47 @@
+languageId: scss
+command:
+  version: 1
+  spokenForm: change key
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier:
+        {
+          type: containingScope,
+          scopeType: collectionKey,
+          includeSiblings: false,
+        }
+initialState:
+  documentContents: |
+    span[hello="Cleveland"][goodbye="Columbus"] {
+      color: blue;
+    }
+  selections:
+    - anchor: { line: 1, character: 4 }
+      active: { line: 1, character: 4 }
+  marks: {}
+finalState:
+  documentContents: |
+    span[hello="Cleveland"][goodbye="Columbus"] {
+      : blue;
+    }
+  selections:
+    - anchor: { line: 1, character: 2 }
+      active: { line: 1, character: 2 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        {
+          type: containingScope,
+          scopeType: collectionKey,
+          includeSiblings: false,
+        },
+      isImplicit: false,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/scss/changeKey2.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/scss/changeKey2.yml
new file mode 100644
index 0000000000..cc6d0b3f94
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/scss/changeKey2.yml
@@ -0,0 +1,47 @@
+languageId: scss
+command:
+  version: 1
+  spokenForm: change key
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier:
+        {
+          type: containingScope,
+          scopeType: collectionKey,
+          includeSiblings: false,
+        }
+initialState:
+  documentContents: |-
+    span[hello="Cleveland"][goodbye="Columbus"] {
+      color: blue;
+    }
+  selections:
+    - anchor: { line: 1, character: 12 }
+      active: { line: 1, character: 12 }
+  marks: {}
+finalState:
+  documentContents: |-
+    span[hello="Cleveland"][goodbye="Columbus"] {
+      : blue;
+    }
+  selections:
+    - anchor: { line: 1, character: 2 }
+      active: { line: 1, character: 2 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        {
+          type: containingScope,
+          scopeType: collectionKey,
+          includeSiblings: false,
+        },
+      isImplicit: false,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/scss/changeLastWordLook.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/scss/changeLastWordLook.yml
new file mode 100644
index 0000000000..74c7798ff9
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/scss/changeLastWordLook.yml
@@ -0,0 +1,56 @@
+languageId: scss
+command:
+  spokenForm: change last word look
+  version: 2
+  targets:
+    - type: primitive
+      mark: { type: decoratedSymbol, symbolColor: default, character: l }
+      modifiers:
+        - type: ordinalRange
+          scopeType: { type: word }
+          anchor: -1
+          active: -1
+          excludeAnchor: false
+          excludeActive: false
+  usePrePhraseSnapshot: true
+  action: { name: clearAndSetSelection }
+initialState:
+  documentContents: |2-
+     .long-bem-class-name {
+       height: 10px;
+     }
+
+  selections:
+    - anchor: { line: 3, character: 1 }
+      active: { line: 3, character: 1 }
+  marks:
+    default.l:
+      start: { line: 0, character: 2 }
+      end: { line: 0, character: 21 }
+finalState:
+  documentContents: |2-
+     .long-bem-class- {
+       height: 10px;
+     }
+
+  selections:
+    - anchor: { line: 0, character: 17 }
+      active: { line: 0, character: 17 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: decoratedSymbol, symbolColor: default, character: l },
+      modifiers:
+        [
+          {
+            type: ordinalRange,
+            scopeType: { type: word },
+            anchor: -1,
+            active: -1,
+            excludeAnchor: false,
+            excludeActive: false,
+          },
+        ],
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/scss/changeLeadingLastWordLook.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/scss/changeLeadingLastWordLook.yml
new file mode 100644
index 0000000000..c017ced197
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/scss/changeLeadingLastWordLook.yml
@@ -0,0 +1,58 @@
+languageId: scss
+command:
+  spokenForm: change leading last word look
+  version: 2
+  targets:
+    - type: primitive
+      mark: { type: decoratedSymbol, symbolColor: default, character: l }
+      modifiers:
+        - { type: leading }
+        - type: ordinalRange
+          scopeType: { type: word }
+          anchor: -1
+          active: -1
+          excludeAnchor: false
+          excludeActive: false
+  usePrePhraseSnapshot: true
+  action: { name: clearAndSetSelection }
+initialState:
+  documentContents: |2-
+     .long-bem-class-name {
+       height: 10px;
+     }
+
+  selections:
+    - anchor: { line: 3, character: 1 }
+      active: { line: 3, character: 1 }
+  marks:
+    default.l:
+      start: { line: 0, character: 2 }
+      end: { line: 0, character: 21 }
+finalState:
+  documentContents: |2-
+     .long-bem-classname {
+       height: 10px;
+     }
+
+  selections:
+    - anchor: { line: 0, character: 16 }
+      active: { line: 0, character: 16 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: decoratedSymbol, symbolColor: default, character: l },
+      modifiers:
+        [
+          { type: leading },
+          {
+            type: ordinalRange,
+            scopeType: { type: word },
+            anchor: -1,
+            active: -1,
+            excludeAnchor: false,
+            excludeActive: false,
+          },
+        ],
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/scss/changeName.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/scss/changeName.yml
new file mode 100644
index 0000000000..31d9d4e8d4
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/scss/changeName.yml
@@ -0,0 +1,41 @@
+languageId: scss
+command:
+  version: 1
+  spokenForm: change name
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier:
+        { type: containingScope, scopeType: name, includeSiblings: false }
+initialState:
+  documentContents: |-
+    a {
+      height: 10px;
+      color: red;
+    }
+  selections:
+    - anchor: { line: 1, character: 12 }
+      active: { line: 1, character: 12 }
+  marks: {}
+finalState:
+  documentContents: |-
+    a {
+      : 10px;
+      color: red;
+    }
+  selections:
+    - anchor: { line: 1, character: 2 }
+      active: { line: 1, character: 2 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        { type: containingScope, scopeType: name, includeSiblings: false },
+      isImplicit: false,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/scss/changeName2.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/scss/changeName2.yml
new file mode 100644
index 0000000000..cbade2e720
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/scss/changeName2.yml
@@ -0,0 +1,47 @@
+languageId: scss
+command:
+  version: 1
+  spokenForm: change name
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier:
+        { type: containingScope, scopeType: name, includeSiblings: false }
+initialState:
+  documentContents: |-
+    @function pow($base, $exponent) {
+      $result: 1;
+      @for $_ from 1 through $exponent {
+        $result: $result * $base;
+      }
+      @return $result;
+    }
+  selections:
+    - anchor: { line: 1, character: 13 }
+      active: { line: 1, character: 13 }
+  marks: {}
+finalState:
+  documentContents: |-
+    @function ($base, $exponent) {
+      $result: 1;
+      @for $_ from 1 through $exponent {
+        $result: $result * $base;
+      }
+      @return $result;
+    }
+  selections:
+    - anchor: { line: 0, character: 10 }
+      active: { line: 0, character: 10 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        { type: containingScope, scopeType: name, includeSiblings: false },
+      isImplicit: false,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/scss/changeName3.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/scss/changeName3.yml
new file mode 100644
index 0000000000..1a08ebdf2b
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/scss/changeName3.yml
@@ -0,0 +1,39 @@
+languageId: scss
+command:
+  version: 1
+  spokenForm: change name
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier:
+        { type: containingScope, scopeType: name, includeSiblings: false }
+initialState:
+  documentContents: |
+    a {
+      margin: 10px 10px 10px 10px;
+    }
+  selections:
+    - anchor: { line: 1, character: 14 }
+      active: { line: 1, character: 14 }
+  marks: {}
+finalState:
+  documentContents: |
+    a {
+      : 10px 10px 10px 10px;
+    }
+  selections:
+    - anchor: { line: 1, character: 2 }
+      active: { line: 1, character: 2 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        { type: containingScope, scopeType: name, includeSiblings: false },
+      isImplicit: false,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/scss/changeName4.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/scss/changeName4.yml
new file mode 100644
index 0000000000..f0653204c8
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/scss/changeName4.yml
@@ -0,0 +1,39 @@
+languageId: scss
+command:
+  version: 1
+  spokenForm: change name
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier:
+        { type: containingScope, scopeType: name, includeSiblings: false }
+initialState:
+  documentContents: |
+    @mixin move($left-start, $left-stop) {
+      transition: left ($left-stop - $left-start) * $transition-speed;
+    }
+  selections:
+    - anchor: { line: 1, character: 7 }
+      active: { line: 1, character: 7 }
+  marks: {}
+finalState:
+  documentContents: |
+    @mixin move($left-start, $left-stop) {
+      : left ($left-stop - $left-start) * $transition-speed;
+    }
+  selections:
+    - anchor: { line: 1, character: 2 }
+      active: { line: 1, character: 2 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        { type: containingScope, scopeType: name, includeSiblings: false },
+      isImplicit: false,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/scss/changeName5.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/scss/changeName5.yml
new file mode 100644
index 0000000000..16e54111c6
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/scss/changeName5.yml
@@ -0,0 +1,39 @@
+languageId: scss
+command:
+  version: 1
+  spokenForm: change name
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier:
+        { type: containingScope, scopeType: name, includeSiblings: false }
+initialState:
+  documentContents: |-
+    @mixin move($left-start, $left-stop) {
+      transition: left ($left-stop - $left-start) * $transition-speed;
+    }
+  selections:
+    - anchor: { line: 0, character: 3 }
+      active: { line: 0, character: 3 }
+  marks: {}
+finalState:
+  documentContents: |-
+    @mixin ($left-start, $left-stop) {
+      transition: left ($left-stop - $left-start) * $transition-speed;
+    }
+  selections:
+    - anchor: { line: 0, character: 7 }
+      active: { line: 0, character: 7 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        { type: containingScope, scopeType: name, includeSiblings: false },
+      isImplicit: false,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/scss/changeName6.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/scss/changeName6.yml
new file mode 100644
index 0000000000..9491edd0d5
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/scss/changeName6.yml
@@ -0,0 +1,39 @@
+languageId: scss
+command:
+  version: 1
+  spokenForm: change name
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier:
+        { type: containingScope, scopeType: name, includeSiblings: false }
+initialState:
+  documentContents: |-
+    a[data-lang^="tel"] {
+      color: rgba(0, 255, 0, 0.5);
+    }
+  selections:
+    - anchor: { line: 0, character: 15 }
+      active: { line: 0, character: 15 }
+  marks: {}
+finalState:
+  documentContents: |-
+    a[^="tel"] {
+      color: rgba(0, 255, 0, 0.5);
+    }
+  selections:
+    - anchor: { line: 0, character: 2 }
+      active: { line: 0, character: 2 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        { type: containingScope, scopeType: name, includeSiblings: false },
+      isImplicit: false,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/scss/changeName7.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/scss/changeName7.yml
new file mode 100644
index 0000000000..48582574bd
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/scss/changeName7.yml
@@ -0,0 +1,39 @@
+languageId: css
+command:
+  version: 1
+  spokenForm: change name
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier:
+        { type: containingScope, scopeType: name, includeSiblings: false }
+initialState:
+  documentContents: |-
+    a {
+      height: 10px;
+    }
+  selections:
+    - anchor: { line: 1, character: 5 }
+      active: { line: 1, character: 5 }
+  marks: {}
+finalState:
+  documentContents: |-
+    a {
+      : 10px;
+    }
+  selections:
+    - anchor: { line: 1, character: 2 }
+      active: { line: 1, character: 2 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        { type: containingScope, scopeType: name, includeSiblings: false },
+      isImplicit: false,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/scss/changeName8.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/scss/changeName8.yml
new file mode 100644
index 0000000000..bb155d636c
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/scss/changeName8.yml
@@ -0,0 +1,39 @@
+languageId: scss
+command:
+  version: 1
+  spokenForm: change name
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier:
+        { type: containingScope, scopeType: name, includeSiblings: false }
+initialState:
+  documentContents: |-
+    @mixin foo($foo: 123) {
+
+    }
+  selections:
+    - anchor: { line: 0, character: 13 }
+      active: { line: 0, character: 13 }
+  marks: {}
+finalState:
+  documentContents: |-
+    @mixin foo(: 123) {
+
+    }
+  selections:
+    - anchor: { line: 0, character: 11 }
+      active: { line: 0, character: 11 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        { type: containingScope, scopeType: name, includeSiblings: false },
+      isImplicit: false,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/scss/changeName9.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/scss/changeName9.yml
new file mode 100644
index 0000000000..3430b89210
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/scss/changeName9.yml
@@ -0,0 +1,39 @@
+languageId: scss
+command:
+  version: 1
+  spokenForm: change name
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier:
+        { type: containingScope, scopeType: name, includeSiblings: false }
+initialState:
+  documentContents: |-
+    @mixin foo($foo: 123) {
+
+    }
+  selections:
+    - anchor: { line: 0, character: 18 }
+      active: { line: 0, character: 18 }
+  marks: {}
+finalState:
+  documentContents: |-
+    @mixin foo(: 123) {
+
+    }
+  selections:
+    - anchor: { line: 0, character: 11 }
+      active: { line: 0, character: 11 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        { type: containingScope, scopeType: name, includeSiblings: false },
+      isImplicit: false,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/scss/changeRound.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/scss/changeRound.yml
new file mode 100644
index 0000000000..3b2ab99961
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/scss/changeRound.yml
@@ -0,0 +1,37 @@
+languageId: scss
+command:
+  version: 1
+  spokenForm: change round
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier: { type: surroundingPair, delimiter: parentheses }
+initialState:
+  documentContents: |-
+    a {
+      font-family: "hello (world)";
+    }
+  selections:
+    - anchor: { line: 1, character: 25 }
+      active: { line: 1, character: 25 }
+  marks: {}
+finalState:
+  documentContents: |-
+    a {
+      font-family: "hello ";
+    }
+  selections:
+    - anchor: { line: 1, character: 22 }
+      active: { line: 1, character: 22 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier: { type: surroundingPair, delimiter: parentheses },
+      isImplicit: false,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/scss/changeSecondWordLook.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/scss/changeSecondWordLook.yml
new file mode 100644
index 0000000000..78011684ce
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/scss/changeSecondWordLook.yml
@@ -0,0 +1,56 @@
+languageId: scss
+command:
+  spokenForm: change second word look
+  version: 2
+  targets:
+    - type: primitive
+      mark: { type: decoratedSymbol, symbolColor: default, character: l }
+      modifiers:
+        - type: ordinalRange
+          scopeType: { type: word }
+          anchor: 1
+          active: 1
+          excludeAnchor: false
+          excludeActive: false
+  usePrePhraseSnapshot: true
+  action: { name: clearAndSetSelection }
+initialState:
+  documentContents: |2-
+     .long-bem-class-name {
+       height: 10px;
+     }
+
+  selections:
+    - anchor: { line: 3, character: 1 }
+      active: { line: 3, character: 1 }
+  marks:
+    default.l:
+      start: { line: 0, character: 2 }
+      end: { line: 0, character: 21 }
+finalState:
+  documentContents: |2-
+     .long--class-name {
+       height: 10px;
+     }
+
+  selections:
+    - anchor: { line: 0, character: 7 }
+      active: { line: 0, character: 7 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: decoratedSymbol, symbolColor: default, character: l },
+      modifiers:
+        [
+          {
+            type: ordinalRange,
+            scopeType: { type: word },
+            anchor: 1,
+            active: 1,
+            excludeAnchor: false,
+            excludeActive: false,
+          },
+        ],
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/scss/changeSelector.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/scss/changeSelector.yml
new file mode 100644
index 0000000000..b19bb6018d
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/scss/changeSelector.yml
@@ -0,0 +1,39 @@
+languageId: scss
+command:
+  version: 1
+  spokenForm: change selector
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier:
+        { type: containingScope, scopeType: selector, includeSiblings: false }
+initialState:
+  documentContents: |
+    span[hello="Cleveland"][goodbye="Columbus"] {
+      color: blue;
+    }
+  selections:
+    - anchor: { line: 1, character: 4 }
+      active: { line: 1, character: 4 }
+  marks: {}
+finalState:
+  documentContents: |2
+     {
+      color: blue;
+    }
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        { type: containingScope, scopeType: selector, includeSiblings: false },
+      isImplicit: false,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/scss/changeSelector2.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/scss/changeSelector2.yml
new file mode 100644
index 0000000000..a0eb9c0cab
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/scss/changeSelector2.yml
@@ -0,0 +1,39 @@
+languageId: scss
+command:
+  version: 1
+  spokenForm: change selector
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier:
+        { type: containingScope, scopeType: selector, includeSiblings: false }
+initialState:
+  documentContents: |-
+    a.b ~ c.d {
+
+    }
+  selections:
+    - anchor: { line: 1, character: 2 }
+      active: { line: 1, character: 2 }
+  marks: {}
+finalState:
+  documentContents: |2-
+     {
+
+    }
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        { type: containingScope, scopeType: selector, includeSiblings: false },
+      isImplicit: false,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/scss/changeSelector3.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/scss/changeSelector3.yml
new file mode 100644
index 0000000000..0e52d69a2b
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/scss/changeSelector3.yml
@@ -0,0 +1,39 @@
+languageId: scss
+command:
+  version: 1
+  spokenForm: change selector
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier:
+        { type: containingScope, scopeType: selector, includeSiblings: false }
+initialState:
+  documentContents: |-
+    span[hello="Cleveland"][goodbye="Columbus"] {
+      color: blue;
+    }
+  selections:
+    - anchor: { line: 1, character: 11 }
+      active: { line: 1, character: 11 }
+  marks: {}
+finalState:
+  documentContents: |2-
+     {
+      color: blue;
+    }
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        { type: containingScope, scopeType: selector, includeSiblings: false },
+      isImplicit: false,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/scss/changeState.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/scss/changeState.yml
new file mode 100644
index 0000000000..4286c4f135
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/scss/changeState.yml
@@ -0,0 +1,35 @@
+languageId: scss
+command:
+  version: 1
+  spokenForm: change state
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier:
+        { type: containingScope, scopeType: statement, includeSiblings: false }
+initialState:
+  documentContents: |
+    @import "subs.css";
+  selections:
+    - anchor: { line: 0, character: 11 }
+      active: { line: 0, character: 11 }
+  marks: {}
+finalState:
+  documentContents: |+
+
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        { type: containingScope, scopeType: statement, includeSiblings: false },
+      isImplicit: false,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/scss/changeState4.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/scss/changeState4.yml
new file mode 100644
index 0000000000..4cbddbaaaf
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/scss/changeState4.yml
@@ -0,0 +1,39 @@
+languageId: scss
+command:
+  version: 1
+  spokenForm: change state
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier:
+        { type: containingScope, scopeType: statement, includeSiblings: false }
+initialState:
+  documentContents: |
+    a {
+      &:hover { cursor: pointer; }
+    }
+  selections:
+    - anchor: { line: 1, character: 11 }
+      active: { line: 1, character: 11 }
+  marks: {}
+finalState:
+  documentContents: |
+    a {
+
+    }
+  selections:
+    - anchor: { line: 1, character: 2 }
+      active: { line: 1, character: 2 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        { type: containingScope, scopeType: statement, includeSiblings: false },
+      isImplicit: false,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/scss/changeState5.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/scss/changeState5.yml
new file mode 100644
index 0000000000..04382f5639
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/scss/changeState5.yml
@@ -0,0 +1,41 @@
+languageId: scss
+command:
+  version: 1
+  spokenForm: change state
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier:
+        { type: containingScope, scopeType: statement, includeSiblings: false }
+initialState:
+  documentContents: |-
+    div {
+      a {
+        width: calc(100% - 80px);
+      }
+    }
+  selections:
+    - anchor: { line: 2, character: 6 }
+      active: { line: 2, character: 6 }
+  marks: {}
+finalState:
+  documentContents: |-
+    div {
+
+    }
+  selections:
+    - anchor: { line: 1, character: 2 }
+      active: { line: 1, character: 2 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        { type: containingScope, scopeType: statement, includeSiblings: false },
+      isImplicit: false,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/scss/changeState6.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/scss/changeState6.yml
new file mode 100644
index 0000000000..aae58e79d9
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/scss/changeState6.yml
@@ -0,0 +1,36 @@
+languageId: scss
+command:
+  version: 1
+  spokenForm: change state
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier:
+        { type: containingScope, scopeType: statement, includeSiblings: false }
+initialState:
+  documentContents: |-
+    a {
+      width: calc(100% - 80px);
+    }
+  selections:
+    - anchor: { line: 1, character: 12 }
+      active: { line: 1, character: 12 }
+  marks: {}
+finalState:
+  documentContents: ""
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        { type: containingScope, scopeType: statement, includeSiblings: false },
+      isImplicit: false,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/scss/changeStateAir.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/scss/changeStateAir.yml
new file mode 100644
index 0000000000..335b01edc5
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/scss/changeStateAir.yml
@@ -0,0 +1,41 @@
+languageId: scss
+command:
+  version: 1
+  spokenForm: change state air
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier:
+        { type: containingScope, scopeType: statement, includeSiblings: false }
+      mark: { type: decoratedSymbol, symbolColor: default, character: a }
+initialState:
+  documentContents: |-
+    a {
+      height: 10px;
+      color: red;
+    }
+  selections:
+    - anchor: { line: 0, character: 3 }
+      active: { line: 0, character: 3 }
+  marks:
+    default.a:
+      start: { line: 0, character: 0 }
+      end: { line: 0, character: 1 }
+finalState:
+  documentContents: ""
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: decoratedSymbol, symbolColor: default, character: a },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        { type: containingScope, scopeType: statement, includeSiblings: false },
+      isImplicit: false,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/scss/changeStateHarp.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/scss/changeStateHarp.yml
new file mode 100644
index 0000000000..a5a9f70e60
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/scss/changeStateHarp.yml
@@ -0,0 +1,41 @@
+languageId: scss
+command:
+  version: 1
+  spokenForm: change state harp
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier:
+        { type: containingScope, scopeType: statement, includeSiblings: false }
+      mark: { type: decoratedSymbol, symbolColor: default, character: h }
+initialState:
+  documentContents: |-
+    a .child-selector {
+      height: 10px;
+      color: red;
+    }
+  selections:
+    - anchor: { line: 2, character: 13 }
+      active: { line: 2, character: 13 }
+  marks:
+    default.h:
+      start: { line: 0, character: 3 }
+      end: { line: 0, character: 17 }
+finalState:
+  documentContents: ""
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: decoratedSymbol, symbolColor: default, character: h },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        { type: containingScope, scopeType: statement, includeSiblings: false },
+      isImplicit: false,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/scss/changeTrailingFirstWordLook.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/scss/changeTrailingFirstWordLook.yml
new file mode 100644
index 0000000000..e3b51c1ea3
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/scss/changeTrailingFirstWordLook.yml
@@ -0,0 +1,58 @@
+languageId: scss
+command:
+  spokenForm: change trailing first word look
+  version: 2
+  targets:
+    - type: primitive
+      mark: { type: decoratedSymbol, symbolColor: default, character: l }
+      modifiers:
+        - { type: trailing }
+        - type: ordinalRange
+          scopeType: { type: word }
+          anchor: 0
+          active: 0
+          excludeAnchor: false
+          excludeActive: false
+  usePrePhraseSnapshot: true
+  action: { name: clearAndSetSelection }
+initialState:
+  documentContents: |2-
+     .long-bem-class-name {
+       height: 10px;
+     }
+
+  selections:
+    - anchor: { line: 3, character: 1 }
+      active: { line: 3, character: 1 }
+  marks:
+    default.l:
+      start: { line: 0, character: 2 }
+      end: { line: 0, character: 21 }
+finalState:
+  documentContents: |2-
+     .longbem-class-name {
+       height: 10px;
+     }
+
+  selections:
+    - anchor: { line: 0, character: 6 }
+      active: { line: 0, character: 6 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: decoratedSymbol, symbolColor: default, character: l },
+      modifiers:
+        [
+          { type: trailing },
+          {
+            type: ordinalRange,
+            scopeType: { type: word },
+            anchor: 0,
+            active: 0,
+            excludeAnchor: false,
+            excludeActive: false,
+          },
+        ],
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/scss/changeUnit.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/scss/changeUnit.yml
new file mode 100644
index 0000000000..a62089a2fe
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/scss/changeUnit.yml
@@ -0,0 +1,39 @@
+languageId: css
+command:
+  version: 1
+  spokenForm: change unit
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier:
+        { type: containingScope, scopeType: unit, includeSiblings: false }
+initialState:
+  documentContents: |2-
+     .child-selector {
+      height: 10vmax;
+    }
+  selections:
+    - anchor: { line: 1, character: 15 }
+      active: { line: 1, character: 15 }
+  marks: {}
+finalState:
+  documentContents: |2-
+     .child-selector {
+      height: 10;
+    }
+  selections:
+    - anchor: { line: 1, character: 12 }
+      active: { line: 1, character: 12 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        { type: containingScope, scopeType: unit, includeSiblings: false },
+      isImplicit: false,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/scss/changeUnit2.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/scss/changeUnit2.yml
new file mode 100644
index 0000000000..a056a49c82
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/scss/changeUnit2.yml
@@ -0,0 +1,39 @@
+languageId: css
+command:
+  version: 1
+  spokenForm: change unit
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier:
+        { type: containingScope, scopeType: unit, includeSiblings: false }
+initialState:
+  documentContents: |2-
+     .child-selector {
+      height: 10rlh;
+    }
+  selections:
+    - anchor: { line: 1, character: 12 }
+      active: { line: 1, character: 12 }
+  marks: {}
+finalState:
+  documentContents: |2-
+     .child-selector {
+      height: 10;
+    }
+  selections:
+    - anchor: { line: 1, character: 12 }
+      active: { line: 1, character: 12 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        { type: containingScope, scopeType: unit, includeSiblings: false },
+      isImplicit: false,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/scss/changeUnitGust.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/scss/changeUnitGust.yml
new file mode 100644
index 0000000000..f1cdc0fd65
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/scss/changeUnitGust.yml
@@ -0,0 +1,43 @@
+languageId: css
+command:
+  version: 1
+  spokenForm: change unit gust
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier:
+        { type: containingScope, scopeType: unit, includeSiblings: false }
+      mark: { type: decoratedSymbol, symbolColor: default, character: g }
+initialState:
+  documentContents: |2-
+     .child-selector {
+      height: 10rem;
+    }
+  selections:
+    - anchor: { line: 2, character: 1 }
+      active: { line: 2, character: 1 }
+  marks:
+    default.g:
+      start: { line: 1, character: 2 }
+      end: { line: 1, character: 8 }
+finalState:
+  documentContents: |2-
+     .child-selector {
+      height: 10;
+    }
+  selections:
+    - anchor: { line: 1, character: 12 }
+      active: { line: 1, character: 12 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: decoratedSymbol, symbolColor: default, character: g },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        { type: containingScope, scopeType: unit, includeSiblings: false },
+      isImplicit: false,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/scss/changeUnitOne.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/scss/changeUnitOne.yml
new file mode 100644
index 0000000000..4d20f8d203
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/scss/changeUnitOne.yml
@@ -0,0 +1,43 @@
+languageId: css
+command:
+  version: 1
+  spokenForm: change unit one
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier:
+        { type: containingScope, scopeType: unit, includeSiblings: false }
+      mark: { type: decoratedSymbol, symbolColor: default, character: "1" }
+initialState:
+  documentContents: |2-
+     .child-selector {
+      height: 10Q;
+    }
+  selections:
+    - anchor: { line: 1, character: 2 }
+      active: { line: 1, character: 2 }
+  marks:
+    default.1:
+      start: { line: 1, character: 10 }
+      end: { line: 1, character: 13 }
+finalState:
+  documentContents: |2-
+     .child-selector {
+      height: 10;
+    }
+  selections:
+    - anchor: { line: 1, character: 12 }
+      active: { line: 1, character: 12 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: decoratedSymbol, symbolColor: default, character: "1" },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        { type: containingScope, scopeType: unit, includeSiblings: false },
+      isImplicit: false,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/scss/changeValue.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/scss/changeValue.yml
new file mode 100644
index 0000000000..d4975d85ee
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/scss/changeValue.yml
@@ -0,0 +1,35 @@
+languageId: scss
+command:
+  version: 1
+  spokenForm: change value
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier:
+        { type: containingScope, scopeType: value, includeSiblings: false }
+initialState:
+  documentContents: |
+    @import "subs.css";
+  selections:
+    - anchor: { line: 0, character: 10 }
+      active: { line: 0, character: 10 }
+  marks: {}
+finalState:
+  documentContents: |
+    @import ;
+  selections:
+    - anchor: { line: 0, character: 8 }
+      active: { line: 0, character: 8 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        { type: containingScope, scopeType: value, includeSiblings: false },
+      isImplicit: false,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/scss/changeValue10.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/scss/changeValue10.yml
new file mode 100644
index 0000000000..efaa955afb
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/scss/changeValue10.yml
@@ -0,0 +1,39 @@
+languageId: scss
+command:
+  version: 1
+  spokenForm: change value
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier:
+        { type: containingScope, scopeType: value, includeSiblings: false }
+initialState:
+  documentContents: |
+    @mixin horizontal-list {
+      @include rtl(float, left, right);
+    }
+  selections:
+    - anchor: { line: 1, character: 8 }
+      active: { line: 1, character: 8 }
+  marks: {}
+finalState:
+  documentContents: |
+    @mixin horizontal-list {
+      @include ;
+    }
+  selections:
+    - anchor: { line: 1, character: 11 }
+      active: { line: 1, character: 11 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        { type: containingScope, scopeType: value, includeSiblings: false },
+      isImplicit: false,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/scss/changeValue11.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/scss/changeValue11.yml
new file mode 100644
index 0000000000..bdda0cdb78
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/scss/changeValue11.yml
@@ -0,0 +1,39 @@
+languageId: scss
+command:
+  version: 1
+  spokenForm: change value
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier:
+        { type: containingScope, scopeType: value, includeSiblings: false }
+initialState:
+  documentContents: |-
+    a[data-lang^="tel"] {
+      color: rgba(0, 255, 0, 0.5);
+    }
+  selections:
+    - anchor: { line: 0, character: 3 }
+      active: { line: 0, character: 3 }
+  marks: {}
+finalState:
+  documentContents: |-
+    a[data-lang^=] {
+      color: rgba(0, 255, 0, 0.5);
+    }
+  selections:
+    - anchor: { line: 0, character: 13 }
+      active: { line: 0, character: 13 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        { type: containingScope, scopeType: value, includeSiblings: false },
+      isImplicit: false,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/scss/changeValue12.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/scss/changeValue12.yml
new file mode 100644
index 0000000000..0d82ab3739
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/scss/changeValue12.yml
@@ -0,0 +1,39 @@
+languageId: scss
+command:
+  version: 1
+  spokenForm: change value
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier:
+        { type: containingScope, scopeType: value, includeSiblings: false }
+initialState:
+  documentContents: |-
+    @mixin foo($foo: 123) {
+
+    }
+  selections:
+    - anchor: { line: 0, character: 13 }
+      active: { line: 0, character: 13 }
+  marks: {}
+finalState:
+  documentContents: |-
+    @mixin foo($foo: ) {
+
+    }
+  selections:
+    - anchor: { line: 0, character: 17 }
+      active: { line: 0, character: 17 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        { type: containingScope, scopeType: value, includeSiblings: false },
+      isImplicit: false,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/scss/changeValue13.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/scss/changeValue13.yml
new file mode 100644
index 0000000000..92a2069be1
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/scss/changeValue13.yml
@@ -0,0 +1,39 @@
+languageId: scss
+command:
+  version: 1
+  spokenForm: change value
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier:
+        { type: containingScope, scopeType: value, includeSiblings: false }
+initialState:
+  documentContents: |-
+    @mixin foo($foo: 123) {
+
+    }
+  selections:
+    - anchor: { line: 0, character: 18 }
+      active: { line: 0, character: 18 }
+  marks: {}
+finalState:
+  documentContents: |-
+    @mixin foo($foo: ) {
+
+    }
+  selections:
+    - anchor: { line: 0, character: 17 }
+      active: { line: 0, character: 17 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        { type: containingScope, scopeType: value, includeSiblings: false },
+      isImplicit: false,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/scss/changeValue14.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/scss/changeValue14.yml
new file mode 100644
index 0000000000..3992cd2b64
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/scss/changeValue14.yml
@@ -0,0 +1,39 @@
+languageId: scss
+command:
+  version: 1
+  spokenForm: change value
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier:
+        { type: containingScope, scopeType: value, includeSiblings: false }
+initialState:
+  documentContents: |-
+    @mixin foo($foo: red) {
+
+    }
+  selections:
+    - anchor: { line: 0, character: 13 }
+      active: { line: 0, character: 13 }
+  marks: {}
+finalState:
+  documentContents: |-
+    @mixin foo($foo: ) {
+
+    }
+  selections:
+    - anchor: { line: 0, character: 17 }
+      active: { line: 0, character: 17 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        { type: containingScope, scopeType: value, includeSiblings: false },
+      isImplicit: false,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/scss/changeValue15.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/scss/changeValue15.yml
new file mode 100644
index 0000000000..a958889e69
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/scss/changeValue15.yml
@@ -0,0 +1,39 @@
+languageId: scss
+command:
+  version: 1
+  spokenForm: change value
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier:
+        { type: containingScope, scopeType: value, includeSiblings: false }
+initialState:
+  documentContents: |-
+    @mixin foo($foo: red) {
+
+    }
+  selections:
+    - anchor: { line: 0, character: 19 }
+      active: { line: 0, character: 19 }
+  marks: {}
+finalState:
+  documentContents: |-
+    @mixin foo($foo: ) {
+
+    }
+  selections:
+    - anchor: { line: 0, character: 17 }
+      active: { line: 0, character: 17 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        { type: containingScope, scopeType: value, includeSiblings: false },
+      isImplicit: false,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/scss/changeValue2.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/scss/changeValue2.yml
new file mode 100644
index 0000000000..cdf77ba008
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/scss/changeValue2.yml
@@ -0,0 +1,41 @@
+languageId: scss
+command:
+  version: 1
+  spokenForm: change value
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier:
+        { type: containingScope, scopeType: value, includeSiblings: false }
+initialState:
+  documentContents: |-
+    a {
+      height: 10px;
+      color: red;
+    }
+  selections:
+    - anchor: { line: 1, character: 12 }
+      active: { line: 1, character: 12 }
+  marks: {}
+finalState:
+  documentContents: |-
+    a {
+      height: ;
+      color: red;
+    }
+  selections:
+    - anchor: { line: 1, character: 10 }
+      active: { line: 1, character: 10 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        { type: containingScope, scopeType: value, includeSiblings: false },
+      isImplicit: false,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/scss/changeValue3.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/scss/changeValue3.yml
new file mode 100644
index 0000000000..eb0eda45f0
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/scss/changeValue3.yml
@@ -0,0 +1,47 @@
+languageId: scss
+command:
+  version: 1
+  spokenForm: change value
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier:
+        { type: containingScope, scopeType: value, includeSiblings: false }
+initialState:
+  documentContents: |-
+    @function pow($base, $exponent) {
+      $result: 1;
+      @for $_ from 1 through $exponent {
+        $result: $result * $base;
+      }
+      @return $result;
+    }
+  selections:
+    - anchor: { line: 5, character: 11 }
+      active: { line: 5, character: 11 }
+  marks: {}
+finalState:
+  documentContents: |-
+    @function pow($base, $exponent) {
+      $result: 1;
+      @for $_ from 1 through $exponent {
+        $result: $result * $base;
+      }
+      @return ;
+    }
+  selections:
+    - anchor: { line: 5, character: 10 }
+      active: { line: 5, character: 10 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        { type: containingScope, scopeType: value, includeSiblings: false },
+      isImplicit: false,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/scss/changeValue4.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/scss/changeValue4.yml
new file mode 100644
index 0000000000..a3253bcf8b
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/scss/changeValue4.yml
@@ -0,0 +1,39 @@
+languageId: scss
+command:
+  version: 1
+  spokenForm: change value
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier:
+        { type: containingScope, scopeType: value, includeSiblings: false }
+initialState:
+  documentContents: |
+    a {
+      margin: 10px 10px 10px 10px;
+    }
+  selections:
+    - anchor: { line: 1, character: 4 }
+      active: { line: 1, character: 4 }
+  marks: {}
+finalState:
+  documentContents: |
+    a {
+      margin: ;
+    }
+  selections:
+    - anchor: { line: 1, character: 10 }
+      active: { line: 1, character: 10 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        { type: containingScope, scopeType: value, includeSiblings: false },
+      isImplicit: false,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/scss/changeValue5.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/scss/changeValue5.yml
new file mode 100644
index 0000000000..4dfdd88c93
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/scss/changeValue5.yml
@@ -0,0 +1,39 @@
+languageId: scss
+command:
+  version: 1
+  spokenForm: change value
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier:
+        { type: containingScope, scopeType: value, includeSiblings: false }
+initialState:
+  documentContents: |
+    a {
+      height: $button-height;
+    }
+  selections:
+    - anchor: { line: 1, character: 5 }
+      active: { line: 1, character: 5 }
+  marks: {}
+finalState:
+  documentContents: |
+    a {
+      height: ;
+    }
+  selections:
+    - anchor: { line: 1, character: 10 }
+      active: { line: 1, character: 10 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        { type: containingScope, scopeType: value, includeSiblings: false },
+      isImplicit: false,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/scss/changeValue6.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/scss/changeValue6.yml
new file mode 100644
index 0000000000..50714e3152
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/scss/changeValue6.yml
@@ -0,0 +1,39 @@
+languageId: scss
+command:
+  version: 1
+  spokenForm: change value
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier:
+        { type: containingScope, scopeType: value, includeSiblings: false }
+initialState:
+  documentContents: |
+    a {
+      background-image: url("/icons/mail.svg");
+    }
+  selections:
+    - anchor: { line: 1, character: 35 }
+      active: { line: 1, character: 35 }
+  marks: {}
+finalState:
+  documentContents: |
+    a {
+      background-image: ;
+    }
+  selections:
+    - anchor: { line: 1, character: 20 }
+      active: { line: 1, character: 20 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        { type: containingScope, scopeType: value, includeSiblings: false },
+      isImplicit: false,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/scss/changeValue7.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/scss/changeValue7.yml
new file mode 100644
index 0000000000..3cf3755dd3
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/scss/changeValue7.yml
@@ -0,0 +1,39 @@
+languageId: scss
+command:
+  version: 1
+  spokenForm: change value
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier:
+        { type: containingScope, scopeType: value, includeSiblings: false }
+initialState:
+  documentContents: |
+    @mixin move($left-start, $left-stop) {
+      transition: left ($left-stop - $left-start) * $transition-speed;
+    }
+  selections:
+    - anchor: { line: 1, character: 11 }
+      active: { line: 1, character: 11 }
+  marks: {}
+finalState:
+  documentContents: |
+    @mixin move($left-start, $left-stop) {
+      transition: ;
+    }
+  selections:
+    - anchor: { line: 1, character: 14 }
+      active: { line: 1, character: 14 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        { type: containingScope, scopeType: value, includeSiblings: false },
+      isImplicit: false,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/scss/changeValue8.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/scss/changeValue8.yml
new file mode 100644
index 0000000000..95b4c02bd8
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/scss/changeValue8.yml
@@ -0,0 +1,39 @@
+languageId: scss
+command:
+  version: 1
+  spokenForm: change value
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier:
+        { type: containingScope, scopeType: value, includeSiblings: false }
+initialState:
+  documentContents: |
+    @mixin horizontal-list {
+      @include rtl(float, left, right);
+    }
+  selections:
+    - anchor: { line: 1, character: 13 }
+      active: { line: 1, character: 13 }
+  marks: {}
+finalState:
+  documentContents: |
+    @mixin horizontal-list {
+      @include ;
+    }
+  selections:
+    - anchor: { line: 1, character: 11 }
+      active: { line: 1, character: 11 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        { type: containingScope, scopeType: value, includeSiblings: false },
+      isImplicit: false,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/scss/changeValue9.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/scss/changeValue9.yml
new file mode 100644
index 0000000000..b672060336
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/scss/changeValue9.yml
@@ -0,0 +1,39 @@
+languageId: scss
+command:
+  version: 1
+  spokenForm: change value
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier:
+        { type: containingScope, scopeType: value, includeSiblings: false }
+initialState:
+  documentContents: |-
+    a[data-lang^="tel"] {
+      color: rgba(0, 255, 0, 0.5);
+    }
+  selections:
+    - anchor: { line: 0, character: 16 }
+      active: { line: 0, character: 16 }
+  marks: {}
+finalState:
+  documentContents: |-
+    a[data-lang^=] {
+      color: rgba(0, 255, 0, 0.5);
+    }
+  selections:
+    - anchor: { line: 0, character: 13 }
+      active: { line: 0, character: 13 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        { type: containingScope, scopeType: value, includeSiblings: false },
+      isImplicit: false,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/scss/chuckArgue.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/scss/chuckArgue.yml
new file mode 100644
index 0000000000..fad24e88f5
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/scss/chuckArgue.yml
@@ -0,0 +1,47 @@
+languageId: scss
+command:
+  version: 1
+  spokenForm: chuck argue
+  action: remove
+  targets:
+    - type: primitive
+      modifier:
+        {
+          type: containingScope,
+          scopeType: argumentOrParameter,
+          includeSiblings: false,
+        }
+initialState:
+  documentContents: |
+    @function invert($color, $amount: 100%) {
+      $inverse: change-color($color, $hue: hue($color) + 180);
+    }
+  selections:
+    - anchor: { line: 0, character: 30 }
+      active: { line: 0, character: 30 }
+  marks: {}
+finalState:
+  documentContents: |
+    @function invert($color) {
+      $inverse: change-color($color, $hue: hue($color) + 180);
+    }
+  selections:
+    - anchor: { line: 0, character: 23 }
+      active: { line: 0, character: 23 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: outside,
+      modifier:
+        {
+          type: containingScope,
+          scopeType: argumentOrParameter,
+          includeSiblings: false,
+        },
+      isImplicit: false,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/scss/chuckArgue2.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/scss/chuckArgue2.yml
new file mode 100644
index 0000000000..9409cff35d
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/scss/chuckArgue2.yml
@@ -0,0 +1,47 @@
+languageId: scss
+command:
+  version: 1
+  spokenForm: chuck argue
+  action: remove
+  targets:
+    - type: primitive
+      modifier:
+        {
+          type: containingScope,
+          scopeType: argumentOrParameter,
+          includeSiblings: false,
+        }
+initialState:
+  documentContents: |
+    @function invert($amount: 100%, $color) {
+      $inverse: change-color($color, $hue: hue($color) + 180);
+    }
+  selections:
+    - anchor: { line: 0, character: 36 }
+      active: { line: 0, character: 36 }
+  marks: {}
+finalState:
+  documentContents: |
+    @function invert($amount: 100%) {
+      $inverse: change-color($color, $hue: hue($color) + 180);
+    }
+  selections:
+    - anchor: { line: 0, character: 30 }
+      active: { line: 0, character: 30 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: outside,
+      modifier:
+        {
+          type: containingScope,
+          scopeType: argumentOrParameter,
+          includeSiblings: false,
+        },
+      isImplicit: false,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/scss/chuckArgue3.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/scss/chuckArgue3.yml
new file mode 100644
index 0000000000..2a0dfeeeb9
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/scss/chuckArgue3.yml
@@ -0,0 +1,47 @@
+languageId: scss
+command:
+  version: 1
+  spokenForm: chuck argue
+  action: remove
+  targets:
+    - type: primitive
+      modifier:
+        {
+          type: containingScope,
+          scopeType: argumentOrParameter,
+          includeSiblings: false,
+        }
+initialState:
+  documentContents: |
+    @function invert($amount: 100%, $color) {
+      $inverse: change-color($color, $hue: hue($color) + 180);
+    }
+  selections:
+    - anchor: { line: 0, character: 22 }
+      active: { line: 0, character: 22 }
+  marks: {}
+finalState:
+  documentContents: |
+    @function invert($color) {
+      $inverse: change-color($color, $hue: hue($color) + 180);
+    }
+  selections:
+    - anchor: { line: 0, character: 17 }
+      active: { line: 0, character: 17 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: outside,
+      modifier:
+        {
+          type: containingScope,
+          scopeType: argumentOrParameter,
+          includeSiblings: false,
+        },
+      isImplicit: false,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/scss/chuckArgue4.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/scss/chuckArgue4.yml
new file mode 100644
index 0000000000..2fca0db428
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/scss/chuckArgue4.yml
@@ -0,0 +1,47 @@
+languageId: scss
+command:
+  version: 1
+  spokenForm: chuck argue
+  action: remove
+  targets:
+    - type: primitive
+      modifier:
+        {
+          type: containingScope,
+          scopeType: argumentOrParameter,
+          includeSiblings: false,
+        }
+initialState:
+  documentContents: |
+    @function invert($color, $amount: 100%) {
+      $inverse: change-color($color, $hue: hue($color) + 180);
+    }
+  selections:
+    - anchor: { line: 0, character: 18 }
+      active: { line: 0, character: 18 }
+  marks: {}
+finalState:
+  documentContents: |
+    @function invert($amount: 100%) {
+      $inverse: change-color($color, $hue: hue($color) + 180);
+    }
+  selections:
+    - anchor: { line: 0, character: 17 }
+      active: { line: 0, character: 17 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: outside,
+      modifier:
+        {
+          type: containingScope,
+          scopeType: argumentOrParameter,
+          includeSiblings: false,
+        },
+      isImplicit: false,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/scss/chuckArgue5.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/scss/chuckArgue5.yml
new file mode 100644
index 0000000000..1c8abd80c9
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/scss/chuckArgue5.yml
@@ -0,0 +1,47 @@
+languageId: scss
+command:
+  version: 1
+  spokenForm: chuck argue
+  action: remove
+  targets:
+    - type: primitive
+      modifier:
+        {
+          type: containingScope,
+          scopeType: argumentOrParameter,
+          includeSiblings: false,
+        }
+initialState:
+  documentContents: |-
+    .micro {
+      width: sum(50px, 30px, 100px);
+    }
+  selections:
+    - anchor: { line: 1, character: 14 }
+      active: { line: 1, character: 14 }
+  marks: {}
+finalState:
+  documentContents: |-
+    .micro {
+      width: sum(30px, 100px);
+    }
+  selections:
+    - anchor: { line: 1, character: 13 }
+      active: { line: 1, character: 13 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: outside,
+      modifier:
+        {
+          type: containingScope,
+          scopeType: argumentOrParameter,
+          includeSiblings: false,
+        },
+      isImplicit: false,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/scss/chuckArgue6.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/scss/chuckArgue6.yml
new file mode 100644
index 0000000000..4cb496738d
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/scss/chuckArgue6.yml
@@ -0,0 +1,47 @@
+languageId: scss
+command:
+  version: 1
+  spokenForm: chuck argue
+  action: remove
+  targets:
+    - type: primitive
+      modifier:
+        {
+          type: containingScope,
+          scopeType: argumentOrParameter,
+          includeSiblings: false,
+        }
+initialState:
+  documentContents: |-
+    .micro {
+      width: sum(50px, 30px, 100px);
+    }
+  selections:
+    - anchor: { line: 1, character: 27 }
+      active: { line: 1, character: 27 }
+  marks: {}
+finalState:
+  documentContents: |-
+    .micro {
+      width: sum(50px, 30px);
+    }
+  selections:
+    - anchor: { line: 1, character: 23 }
+      active: { line: 1, character: 23 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: outside,
+      modifier:
+        {
+          type: containingScope,
+          scopeType: argumentOrParameter,
+          includeSiblings: false,
+        },
+      isImplicit: false,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/scss/chuckArgue7.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/scss/chuckArgue7.yml
new file mode 100644
index 0000000000..733825c811
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/scss/chuckArgue7.yml
@@ -0,0 +1,47 @@
+languageId: scss
+command:
+  version: 1
+  spokenForm: chuck argue
+  action: remove
+  targets:
+    - type: primitive
+      modifier:
+        {
+          type: containingScope,
+          scopeType: argumentOrParameter,
+          includeSiblings: false,
+        }
+initialState:
+  documentContents: |-
+    div {
+      background: repeating-linear-gradient(red, orange 50px);
+    }
+  selections:
+    - anchor: { line: 1, character: 48 }
+      active: { line: 1, character: 48 }
+  marks: {}
+finalState:
+  documentContents: |-
+    div {
+      background: repeating-linear-gradient(red);
+    }
+  selections:
+    - anchor: { line: 1, character: 43 }
+      active: { line: 1, character: 43 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: outside,
+      modifier:
+        {
+          type: containingScope,
+          scopeType: argumentOrParameter,
+          includeSiblings: false,
+        },
+      isImplicit: false,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/scss/chuckArgue8.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/scss/chuckArgue8.yml
new file mode 100644
index 0000000000..5d1e71ebc9
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/scss/chuckArgue8.yml
@@ -0,0 +1,49 @@
+languageId: scss
+command:
+  version: 1
+  spokenForm: chuck argue
+  action: remove
+  targets:
+    - type: primitive
+      modifier:
+        {
+          type: containingScope,
+          scopeType: argumentOrParameter,
+          includeSiblings: false,
+        }
+initialState:
+  documentContents: |-
+    a {
+      width: calc(100% - 80px);
+    }
+
+  selections:
+    - anchor: { line: 1, character: 14 }
+      active: { line: 1, character: 14 }
+  marks: {}
+finalState:
+  documentContents: |-
+    a {
+      width: calc();
+    }
+
+  selections:
+    - anchor: { line: 1, character: 14 }
+      active: { line: 1, character: 14 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: outside,
+      modifier:
+        {
+          type: containingScope,
+          scopeType: argumentOrParameter,
+          includeSiblings: false,
+        },
+      isImplicit: false,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/scss/chuckArgue9.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/scss/chuckArgue9.yml
new file mode 100644
index 0000000000..117ae0d4cf
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/scss/chuckArgue9.yml
@@ -0,0 +1,49 @@
+languageId: scss
+command:
+  version: 1
+  spokenForm: chuck argue
+  action: remove
+  targets:
+    - type: primitive
+      modifier:
+        {
+          type: containingScope,
+          scopeType: argumentOrParameter,
+          includeSiblings: false,
+        }
+initialState:
+  documentContents: |-
+    a {
+      clip-path: ellipse(115px 55px at 50% 40%);
+    }
+
+  selections:
+    - anchor: { line: 1, character: 24 }
+      active: { line: 1, character: 24 }
+  marks: {}
+finalState:
+  documentContents: |-
+    a {
+      clip-path: ellipse(50% 40%);
+    }
+
+  selections:
+    - anchor: { line: 1, character: 21 }
+      active: { line: 1, character: 21 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: outside,
+      modifier:
+        {
+          type: containingScope,
+          scopeType: argumentOrParameter,
+          includeSiblings: false,
+        },
+      isImplicit: false,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/scss/chuckEveryArgue.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/scss/chuckEveryArgue.yml
new file mode 100644
index 0000000000..bb6d45026e
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/scss/chuckEveryArgue.yml
@@ -0,0 +1,49 @@
+languageId: scss
+command:
+  version: 1
+  spokenForm: chuck every argue
+  action: remove
+  targets:
+    - type: primitive
+      modifier:
+        {
+          type: containingScope,
+          scopeType: argumentOrParameter,
+          includeSiblings: true,
+        }
+initialState:
+  documentContents: |-
+    a {
+      clip-path: ellipse(115px 55px at 50% 40%);
+    }
+
+  selections:
+    - anchor: { line: 1, character: 24 }
+      active: { line: 1, character: 24 }
+  marks: {}
+finalState:
+  documentContents: |-
+    a {
+      clip-path: ellipse();
+    }
+
+  selections:
+    - anchor: { line: 1, character: 21 }
+      active: { line: 1, character: 21 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: outside,
+      modifier:
+        {
+          type: containingScope,
+          scopeType: argumentOrParameter,
+          includeSiblings: true,
+        },
+      isImplicit: false,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/scss/chuckFirstWordCap.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/scss/chuckFirstWordCap.yml
new file mode 100644
index 0000000000..ded4cc9b1d
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/scss/chuckFirstWordCap.yml
@@ -0,0 +1,54 @@
+languageId: scss
+command:
+  spokenForm: chuck first word cap
+  version: 2
+  targets:
+    - type: primitive
+      mark: { type: decoratedSymbol, symbolColor: default, character: c }
+      modifiers:
+        - type: ordinalRange
+          scopeType: { type: word }
+          anchor: 0
+          active: 0
+          excludeAnchor: false
+          excludeActive: false
+  usePrePhraseSnapshot: true
+  action: { name: remove }
+initialState:
+  documentContents: |2-
+     .child-selector {
+       height: 10px;
+     }
+  selections:
+    - anchor: { line: 2, character: 2 }
+      active: { line: 2, character: 2 }
+  marks:
+    default.c:
+      start: { line: 0, character: 2 }
+      end: { line: 0, character: 16 }
+finalState:
+  documentContents: |2-
+     .selector {
+       height: 10px;
+     }
+  selections:
+    - anchor: { line: 2, character: 2 }
+      active: { line: 2, character: 2 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: decoratedSymbol, symbolColor: default, character: c },
+      modifiers:
+        [
+          {
+            type: ordinalRange,
+            scopeType: { type: word },
+            anchor: 0,
+            active: 0,
+            excludeAnchor: false,
+            excludeActive: false,
+          },
+        ],
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/scss/chuckLastWordCap.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/scss/chuckLastWordCap.yml
new file mode 100644
index 0000000000..076b137bfd
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/scss/chuckLastWordCap.yml
@@ -0,0 +1,54 @@
+languageId: scss
+command:
+  spokenForm: chuck last word cap
+  version: 2
+  targets:
+    - type: primitive
+      mark: { type: decoratedSymbol, symbolColor: default, character: c }
+      modifiers:
+        - type: ordinalRange
+          scopeType: { type: word }
+          anchor: -1
+          active: -1
+          excludeAnchor: false
+          excludeActive: false
+  usePrePhraseSnapshot: true
+  action: { name: remove }
+initialState:
+  documentContents: |2-
+     .child-selector {
+       height: 10px;
+     }
+  selections:
+    - anchor: { line: 2, character: 2 }
+      active: { line: 2, character: 2 }
+  marks:
+    default.c:
+      start: { line: 0, character: 2 }
+      end: { line: 0, character: 16 }
+finalState:
+  documentContents: |2-
+     .child {
+       height: 10px;
+     }
+  selections:
+    - anchor: { line: 2, character: 2 }
+      active: { line: 2, character: 2 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: decoratedSymbol, symbolColor: default, character: c },
+      modifiers:
+        [
+          {
+            type: ordinalRange,
+            scopeType: { type: word },
+            anchor: -1,
+            active: -1,
+            excludeAnchor: false,
+            excludeActive: false,
+          },
+        ],
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/scss/chuckState.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/scss/chuckState.yml
new file mode 100644
index 0000000000..cd97c692c4
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/scss/chuckState.yml
@@ -0,0 +1,33 @@
+languageId: scss
+command:
+  version: 1
+  spokenForm: chuck state
+  action: remove
+  targets:
+    - type: primitive
+      modifier:
+        { type: containingScope, scopeType: statement, includeSiblings: false }
+initialState:
+  documentContents: '@namespace prefix "XML-namespace-URL";'
+  selections:
+    - anchor: { line: 0, character: 15 }
+      active: { line: 0, character: 15 }
+  marks: {}
+finalState:
+  documentContents: ""
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: outside,
+      modifier:
+        { type: containingScope, scopeType: statement, includeSiblings: false },
+      isImplicit: false,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/scss/chuckState2.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/scss/chuckState2.yml
new file mode 100644
index 0000000000..0be19db6a8
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/scss/chuckState2.yml
@@ -0,0 +1,39 @@
+languageId: scss
+command:
+  version: 1
+  spokenForm: chuck state
+  action: remove
+  targets:
+    - type: primitive
+      modifier:
+        { type: containingScope, scopeType: statement, includeSiblings: false }
+initialState:
+  documentContents: |
+    @keyframes important1 {
+      from { margin-top: 50px; }
+      50%  { margin-top: 150px !important; } /* ignored */
+      to   { margin-top: 100px; }
+    }
+  selections:
+    - anchor: { line: 0, character: 4 }
+      active: { line: 0, character: 4 }
+  marks: {}
+finalState:
+  documentContents: |+
+
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: outside,
+      modifier:
+        { type: containingScope, scopeType: statement, includeSiblings: false },
+      isImplicit: false,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/scss/chuckValue.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/scss/chuckValue.yml
new file mode 100644
index 0000000000..78966b91ce
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/scss/chuckValue.yml
@@ -0,0 +1,33 @@
+languageId: scss
+command:
+  version: 1
+  spokenForm: chuck value
+  action: remove
+  targets:
+    - type: primitive
+      modifier:
+        { type: containingScope, scopeType: value, includeSiblings: false }
+initialState:
+  documentContents: '@namespace prefix "XML-namespace-URL";'
+  selections:
+    - anchor: { line: 0, character: 16 }
+      active: { line: 0, character: 16 }
+  marks: {}
+finalState:
+  documentContents: "@namespace;"
+  selections:
+    - anchor: { line: 0, character: 10 }
+      active: { line: 0, character: 10 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: outside,
+      modifier:
+        { type: containingScope, scopeType: value, includeSiblings: false },
+      isImplicit: false,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/scss/chuckValue2.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/scss/chuckValue2.yml
new file mode 100644
index 0000000000..d9529b69a1
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/scss/chuckValue2.yml
@@ -0,0 +1,33 @@
+languageId: scss
+command:
+  version: 1
+  spokenForm: chuck value
+  action: remove
+  targets:
+    - type: primitive
+      modifier:
+        { type: containingScope, scopeType: value, includeSiblings: false }
+initialState:
+  documentContents: "@namespace url(http://www.w3.org/1999/xhtml);"
+  selections:
+    - anchor: { line: 0, character: 6 }
+      active: { line: 0, character: 6 }
+  marks: {}
+finalState:
+  documentContents: "@namespace;"
+  selections:
+    - anchor: { line: 0, character: 6 }
+      active: { line: 0, character: 6 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: outside,
+      modifier:
+        { type: containingScope, scopeType: value, includeSiblings: false },
+      isImplicit: false,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/scss/chuckValue3.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/scss/chuckValue3.yml
new file mode 100644
index 0000000000..00fbe6b220
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/scss/chuckValue3.yml
@@ -0,0 +1,39 @@
+languageId: scss
+command:
+  version: 1
+  spokenForm: chuck value
+  action: remove
+  targets:
+    - type: primitive
+      modifier:
+        { type: containingScope, scopeType: value, includeSiblings: false }
+initialState:
+  documentContents: |
+    a {
+      margin-top: 150px !important;
+    }
+  selections:
+    - anchor: { line: 1, character: 7 }
+      active: { line: 1, character: 7 }
+  marks: {}
+finalState:
+  documentContents: |
+    a {
+      margin-top:;
+    }
+  selections:
+    - anchor: { line: 1, character: 7 }
+      active: { line: 1, character: 7 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: outside,
+      modifier:
+        { type: containingScope, scopeType: value, includeSiblings: false },
+      isImplicit: false,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/scss/moveFirstWordZipBeforeFineTakeFine.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/scss/moveFirstWordZipBeforeFineTakeFine.yml
new file mode 100644
index 0000000000..e8e2c6a6bc
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/scss/moveFirstWordZipBeforeFineTakeFine.yml
@@ -0,0 +1,68 @@
+languageId: scss
+command:
+  spokenForm: move first word zip before fine take fine
+  version: 2
+  targets:
+    - type: primitive
+      mark: { type: decoratedSymbol, symbolColor: default, character: z }
+      modifiers:
+        - type: ordinalRange
+          scopeType: { type: word }
+          anchor: 0
+          active: 0
+          excludeAnchor: false
+          excludeActive: false
+    - type: primitive
+      mark: { type: decoratedSymbol, symbolColor: default, character: f }
+      modifiers:
+        - { type: position, position: before }
+  usePrePhraseSnapshot: true
+  action: { name: moveToTarget }
+marksToCheck: [default.f]
+initialState:
+  documentContents: foo-bar baz-bongo
+  selections:
+    - anchor: { line: 0, character: 17 }
+      active: { line: 0, character: 17 }
+  marks:
+    default.z:
+      start: { line: 0, character: 8 }
+      end: { line: 0, character: 17 }
+    default.f:
+      start: { line: 0, character: 0 }
+      end: { line: 0, character: 7 }
+finalState:
+  documentContents: baz-foo-bar bongo
+  selections:
+    - anchor: { line: 0, character: 17 }
+      active: { line: 0, character: 17 }
+  marks:
+    default.z:
+      start: { line: 0, character: 12 }
+      end: { line: 0, character: 17 }
+    default.f:
+      start: { line: 0, character: 0 }
+      end: { line: 0, character: 11 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: decoratedSymbol, symbolColor: default, character: z },
+      modifiers:
+        [
+          {
+            type: ordinalRange,
+            scopeType: { type: word },
+            anchor: 0,
+            active: 0,
+            excludeAnchor: false,
+            excludeActive: false,
+          },
+        ],
+    },
+    {
+      type: primitive,
+      mark: { type: decoratedSymbol, symbolColor: default, character: f },
+      modifiers: [{ type: position, position: before }],
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/scss/moveFirstWordZipBeforeFineTakeZip.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/scss/moveFirstWordZipBeforeFineTakeZip.yml
new file mode 100644
index 0000000000..636db138f4
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/scss/moveFirstWordZipBeforeFineTakeZip.yml
@@ -0,0 +1,68 @@
+languageId: scss
+command:
+  spokenForm: move first word zip before fine take zip
+  version: 2
+  targets:
+    - type: primitive
+      mark: { type: decoratedSymbol, symbolColor: default, character: z }
+      modifiers:
+        - type: ordinalRange
+          scopeType: { type: word }
+          anchor: 0
+          active: 0
+          excludeAnchor: false
+          excludeActive: false
+    - type: primitive
+      mark: { type: decoratedSymbol, symbolColor: default, character: f }
+      modifiers:
+        - { type: position, position: before }
+  usePrePhraseSnapshot: true
+  action: { name: moveToTarget }
+marksToCheck: [default.z]
+initialState:
+  documentContents: foo-bar baz-bongo
+  selections:
+    - anchor: { line: 0, character: 17 }
+      active: { line: 0, character: 17 }
+  marks:
+    default.z:
+      start: { line: 0, character: 8 }
+      end: { line: 0, character: 17 }
+    default.f:
+      start: { line: 0, character: 0 }
+      end: { line: 0, character: 7 }
+finalState:
+  documentContents: baz-foo-bar bongo
+  selections:
+    - anchor: { line: 0, character: 17 }
+      active: { line: 0, character: 17 }
+  marks:
+    default.z:
+      start: { line: 0, character: 12 }
+      end: { line: 0, character: 17 }
+    default.f:
+      start: { line: 0, character: 0 }
+      end: { line: 0, character: 11 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: decoratedSymbol, symbolColor: default, character: z },
+      modifiers:
+        [
+          {
+            type: ordinalRange,
+            scopeType: { type: word },
+            anchor: 0,
+            active: 0,
+            excludeAnchor: false,
+            excludeActive: false,
+          },
+        ],
+    },
+    {
+      type: primitive,
+      mark: { type: decoratedSymbol, symbolColor: default, character: f },
+      modifiers: [{ type: position, position: before }],
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/scss/moveLastWordZipAfterFineTakeFine.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/scss/moveLastWordZipAfterFineTakeFine.yml
new file mode 100644
index 0000000000..5c4993e1d8
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/scss/moveLastWordZipAfterFineTakeFine.yml
@@ -0,0 +1,68 @@
+languageId: scss
+command:
+  spokenForm: move last word zip after fine take fine
+  version: 2
+  targets:
+    - type: primitive
+      mark: { type: decoratedSymbol, symbolColor: default, character: z }
+      modifiers:
+        - type: ordinalRange
+          scopeType: { type: word }
+          anchor: -1
+          active: -1
+          excludeAnchor: false
+          excludeActive: false
+    - type: primitive
+      mark: { type: decoratedSymbol, symbolColor: default, character: f }
+      modifiers:
+        - { type: position, position: after }
+  usePrePhraseSnapshot: true
+  action: { name: moveToTarget }
+marksToCheck: [default.f]
+initialState:
+  documentContents: foo-bar baz-bongo
+  selections:
+    - anchor: { line: 0, character: 17 }
+      active: { line: 0, character: 17 }
+  marks:
+    default.z:
+      start: { line: 0, character: 8 }
+      end: { line: 0, character: 17 }
+    default.f:
+      start: { line: 0, character: 0 }
+      end: { line: 0, character: 7 }
+finalState:
+  documentContents: foo-bar-bongo baz
+  selections:
+    - anchor: { line: 0, character: 17 }
+      active: { line: 0, character: 17 }
+  marks:
+    default.z:
+      start: { line: 0, character: 14 }
+      end: { line: 0, character: 17 }
+    default.f:
+      start: { line: 0, character: 0 }
+      end: { line: 0, character: 13 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: decoratedSymbol, symbolColor: default, character: z },
+      modifiers:
+        [
+          {
+            type: ordinalRange,
+            scopeType: { type: word },
+            anchor: -1,
+            active: -1,
+            excludeAnchor: false,
+            excludeActive: false,
+          },
+        ],
+    },
+    {
+      type: primitive,
+      mark: { type: decoratedSymbol, symbolColor: default, character: f },
+      modifiers: [{ type: position, position: after }],
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/scss/moveLastWordZipAfterFineTakeZip.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/scss/moveLastWordZipAfterFineTakeZip.yml
new file mode 100644
index 0000000000..95b550203f
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/scss/moveLastWordZipAfterFineTakeZip.yml
@@ -0,0 +1,68 @@
+languageId: scss
+command:
+  spokenForm: move last word zip after fine take zip
+  version: 2
+  targets:
+    - type: primitive
+      mark: { type: decoratedSymbol, symbolColor: default, character: z }
+      modifiers:
+        - type: ordinalRange
+          scopeType: { type: word }
+          anchor: -1
+          active: -1
+          excludeAnchor: false
+          excludeActive: false
+    - type: primitive
+      mark: { type: decoratedSymbol, symbolColor: default, character: f }
+      modifiers:
+        - { type: position, position: after }
+  usePrePhraseSnapshot: true
+  action: { name: moveToTarget }
+marksToCheck: [default.z]
+initialState:
+  documentContents: foo-bar baz-bongo
+  selections:
+    - anchor: { line: 0, character: 17 }
+      active: { line: 0, character: 17 }
+  marks:
+    default.z:
+      start: { line: 0, character: 8 }
+      end: { line: 0, character: 17 }
+    default.f:
+      start: { line: 0, character: 0 }
+      end: { line: 0, character: 7 }
+finalState:
+  documentContents: foo-bar-bongo baz
+  selections:
+    - anchor: { line: 0, character: 17 }
+      active: { line: 0, character: 17 }
+  marks:
+    default.z:
+      start: { line: 0, character: 14 }
+      end: { line: 0, character: 17 }
+    default.f:
+      start: { line: 0, character: 0 }
+      end: { line: 0, character: 13 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: decoratedSymbol, symbolColor: default, character: z },
+      modifiers:
+        [
+          {
+            type: ordinalRange,
+            scopeType: { type: word },
+            anchor: -1,
+            active: -1,
+            excludeAnchor: false,
+            excludeActive: false,
+          },
+        ],
+    },
+    {
+      type: primitive,
+      mark: { type: decoratedSymbol, symbolColor: default, character: f },
+      modifiers: [{ type: position, position: after }],
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/scss/takeEveryToken.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/scss/takeEveryToken.yml
new file mode 100644
index 0000000000..1b7ccd3081
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/scss/takeEveryToken.yml
@@ -0,0 +1,36 @@
+languageId: scss
+command:
+  spokenForm: take every token
+  version: 2
+  targets:
+    - type: primitive
+      modifiers:
+        - type: everyScope
+          scopeType: { type: token }
+  usePrePhraseSnapshot: true
+  action: { name: setSelection }
+initialState:
+  documentContents: .long-bem-class-name {}
+  selections:
+    - anchor: { line: 0, character: 2 }
+      active: { line: 0, character: 2 }
+  marks: {}
+finalState:
+  documentContents: .long-bem-class-name {}
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 1 }
+    - anchor: { line: 0, character: 1 }
+      active: { line: 0, character: 20 }
+    - anchor: { line: 0, character: 21 }
+      active: { line: 0, character: 22 }
+    - anchor: { line: 0, character: 22 }
+      active: { line: 0, character: 23 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      modifiers: [{ type: everyScope, scopeType: { type: token } }],
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/shellscript/changeThirdWordDash.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/shellscript/changeThirdWordDash.yml
new file mode 100644
index 0000000000..0d6f236647
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/shellscript/changeThirdWordDash.yml
@@ -0,0 +1,50 @@
+languageId: shellscript
+command:
+  spokenForm: change third word dash
+  version: 2
+  targets:
+    - type: primitive
+      modifiers:
+        - type: ordinalRange
+          scopeType: { type: word }
+          anchor: 2
+          active: 2
+          excludeAnchor: false
+          excludeActive: false
+      mark: { type: decoratedSymbol, symbolColor: default, character: "-" }
+  usePrePhraseSnapshot: true
+  action: { name: clearAndSetSelection }
+initialState:
+  documentContents: |2
+     npm version patch --force --commit-hooks false --git-tag-version false
+  selections:
+    - anchor: { line: 1, character: 0 }
+      active: { line: 1, character: 0 }
+  marks:
+    default.-:
+      start: { line: 0, character: 48 }
+      end: { line: 0, character: 65 }
+finalState:
+  documentContents: |2
+     npm version patch --force --commit-hooks false --git-tag- false
+  selections:
+    - anchor: { line: 0, character: 58 }
+      active: { line: 0, character: 58 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: decoratedSymbol, symbolColor: default, character: "-" },
+      modifiers:
+        [
+          {
+            type: ordinalRange,
+            scopeType: { type: word },
+            anchor: 2,
+            active: 2,
+            excludeAnchor: false,
+            excludeActive: false,
+          },
+        ],
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/shellscript/chuckFirstWordBat.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/shellscript/chuckFirstWordBat.yml
new file mode 100644
index 0000000000..034aa95733
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/shellscript/chuckFirstWordBat.yml
@@ -0,0 +1,50 @@
+languageId: shellscript
+command:
+  spokenForm: chuck first word bat
+  version: 2
+  targets:
+    - type: primitive
+      modifiers:
+        - type: ordinalRange
+          scopeType: { type: word }
+          anchor: 0
+          active: 0
+          excludeAnchor: false
+          excludeActive: false
+      mark: { type: decoratedSymbol, symbolColor: default, character: b }
+  usePrePhraseSnapshot: true
+  action: { name: remove }
+initialState:
+  documentContents: |2
+     npm version patch --foo-bar --force --commit-hooks false --git-tag-version false
+  selections:
+    - anchor: { line: 1, character: 0 }
+      active: { line: 1, character: 0 }
+  marks:
+    default.b:
+      start: { line: 0, character: 19 }
+      end: { line: 0, character: 28 }
+finalState:
+  documentContents: |2
+     npm version patch --bar --force --commit-hooks false --git-tag-version false
+  selections:
+    - anchor: { line: 1, character: 0 }
+      active: { line: 1, character: 0 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: decoratedSymbol, symbolColor: default, character: b },
+      modifiers:
+        [
+          {
+            type: ordinalRange,
+            scopeType: { type: word },
+            anchor: 0,
+            active: 0,
+            excludeAnchor: false,
+            excludeActive: false,
+          },
+        ],
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/shellscript/chuckSecondWordCap.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/shellscript/chuckSecondWordCap.yml
new file mode 100644
index 0000000000..6498f98093
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/shellscript/chuckSecondWordCap.yml
@@ -0,0 +1,50 @@
+languageId: shellscript
+command:
+  spokenForm: chuck second word cap
+  version: 2
+  targets:
+    - type: primitive
+      modifiers:
+        - type: ordinalRange
+          scopeType: { type: word }
+          anchor: 1
+          active: 1
+          excludeAnchor: false
+          excludeActive: false
+      mark: { type: decoratedSymbol, symbolColor: default, character: c }
+  usePrePhraseSnapshot: true
+  action: { name: remove }
+initialState:
+  documentContents: |2
+     npm version patch --force --commit-hooks false --git-tag-version false
+  selections:
+    - anchor: { line: 1, character: 0 }
+      active: { line: 1, character: 0 }
+  marks:
+    default.c:
+      start: { line: 0, character: 27 }
+      end: { line: 0, character: 41 }
+finalState:
+  documentContents: |2
+     npm version patch --force --commit false --git-tag-version false
+  selections:
+    - anchor: { line: 1, character: 0 }
+      active: { line: 1, character: 0 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: decoratedSymbol, symbolColor: default, character: c },
+      modifiers:
+        [
+          {
+            type: ordinalRange,
+            scopeType: { type: word },
+            anchor: 1,
+            active: 1,
+            excludeAnchor: false,
+            excludeActive: false,
+          },
+        ],
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/typescript/changeCallee.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/typescript/changeCallee.yml
new file mode 100644
index 0000000000..fb291e5eef
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/typescript/changeCallee.yml
@@ -0,0 +1,41 @@
+languageId: typescript
+command:
+  version: 1
+  spokenForm: change callee
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier:
+        {
+          type: containingScope,
+          scopeType: functionCallee,
+          includeSiblings: false,
+        }
+initialState:
+  documentContents: foo`hello ${bar}`;
+  selections:
+    - anchor: { line: 0, character: 10 }
+      active: { line: 0, character: 10 }
+  marks: {}
+finalState:
+  documentContents: "`hello ${bar}`;"
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        {
+          type: containingScope,
+          scopeType: functionCallee,
+          includeSiblings: false,
+        },
+      isImplicit: false,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/typescript/changeCallee3.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/typescript/changeCallee3.yml
new file mode 100644
index 0000000000..656372b348
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/typescript/changeCallee3.yml
@@ -0,0 +1,41 @@
+languageId: typescript
+command:
+  version: 1
+  spokenForm: change callee
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier:
+        {
+          type: containingScope,
+          scopeType: functionCallee,
+          includeSiblings: false,
+        }
+initialState:
+  documentContents: eval(action)[0]()
+  selections:
+    - anchor: { line: 0, character: 16 }
+      active: { line: 0, character: 16 }
+  marks: {}
+finalState:
+  documentContents: ()
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        {
+          type: containingScope,
+          scopeType: functionCallee,
+          includeSiblings: false,
+        },
+      isImplicit: false,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/typescript/changeCallee4.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/typescript/changeCallee4.yml
new file mode 100644
index 0000000000..329848bb32
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/typescript/changeCallee4.yml
@@ -0,0 +1,41 @@
+languageId: typescript
+command:
+  version: 1
+  spokenForm: change callee
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier:
+        {
+          type: containingScope,
+          scopeType: functionCallee,
+          includeSiblings: false,
+        }
+initialState:
+  documentContents: object.method()
+  selections:
+    - anchor: { line: 0, character: 14 }
+      active: { line: 0, character: 14 }
+  marks: {}
+finalState:
+  documentContents: ()
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        {
+          type: containingScope,
+          scopeType: functionCallee,
+          includeSiblings: false,
+        },
+      isImplicit: false,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/typescript/changeCallee5.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/typescript/changeCallee5.yml
new file mode 100644
index 0000000000..2974af22ec
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/typescript/changeCallee5.yml
@@ -0,0 +1,41 @@
+languageId: typescript
+command:
+  version: 1
+  spokenForm: change callee
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier:
+        {
+          type: containingScope,
+          scopeType: functionCallee,
+          includeSiblings: false,
+        }
+initialState:
+  documentContents: let test = new obj.Test()
+  selections:
+    - anchor: { line: 0, character: 24 }
+      active: { line: 0, character: 24 }
+  marks: {}
+finalState:
+  documentContents: let test = new ()
+  selections:
+    - anchor: { line: 0, character: 15 }
+      active: { line: 0, character: 15 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        {
+          type: containingScope,
+          scopeType: functionCallee,
+          includeSiblings: false,
+        },
+      isImplicit: false,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/typescript/changeCallee6.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/typescript/changeCallee6.yml
new file mode 100644
index 0000000000..31188fc3af
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/typescript/changeCallee6.yml
@@ -0,0 +1,41 @@
+languageId: typescript
+command:
+  version: 1
+  spokenForm: change callee
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier:
+        {
+          type: containingScope,
+          scopeType: functionCallee,
+          includeSiblings: false,
+        }
+initialState:
+  documentContents: let test = new obj.Tests[0]()
+  selections:
+    - anchor: { line: 0, character: 28 }
+      active: { line: 0, character: 28 }
+  marks: {}
+finalState:
+  documentContents: let test = new ()
+  selections:
+    - anchor: { line: 0, character: 15 }
+      active: { line: 0, character: 15 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        {
+          type: containingScope,
+          scopeType: functionCallee,
+          includeSiblings: false,
+        },
+      isImplicit: false,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/typescript/changeCallee7.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/typescript/changeCallee7.yml
new file mode 100644
index 0000000000..4a78c8133a
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/typescript/changeCallee7.yml
@@ -0,0 +1,41 @@
+languageId: typescript
+command:
+  version: 1
+  spokenForm: change callee
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier:
+        {
+          type: containingScope,
+          scopeType: functionCallee,
+          includeSiblings: false,
+        }
+initialState:
+  documentContents: let test = new (foo[0])()
+  selections:
+    - anchor: { line: 0, character: 24 }
+      active: { line: 0, character: 24 }
+  marks: {}
+finalState:
+  documentContents: let test = new ()
+  selections:
+    - anchor: { line: 0, character: 15 }
+      active: { line: 0, character: 15 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        {
+          type: containingScope,
+          scopeType: functionCallee,
+          includeSiblings: false,
+        },
+      isImplicit: false,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/typescript/changeCalleeParen.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/typescript/changeCalleeParen.yml
new file mode 100644
index 0000000000..f304a11690
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/typescript/changeCalleeParen.yml
@@ -0,0 +1,45 @@
+languageId: typescript
+command:
+  version: 1
+  spokenForm: change callee paren
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier:
+        {
+          type: containingScope,
+          scopeType: functionCallee,
+          includeSiblings: false,
+        }
+      mark: { type: decoratedSymbol, symbolColor: default, character: ( }
+initialState:
+  documentContents: test()
+  selections:
+    - anchor: { line: 0, character: 6 }
+      active: { line: 0, character: 6 }
+  marks:
+    default.(:
+      start: { line: 0, character: 4 }
+      end: { line: 0, character: 5 }
+finalState:
+  documentContents: ()
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: decoratedSymbol, symbolColor: default, character: ( },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        {
+          type: containingScope,
+          scopeType: functionCallee,
+          includeSiblings: false,
+        },
+      isImplicit: false,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/typescript/changeCalleeParen2.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/typescript/changeCalleeParen2.yml
new file mode 100644
index 0000000000..4aad38ebe9
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/typescript/changeCalleeParen2.yml
@@ -0,0 +1,45 @@
+languageId: typescript
+command:
+  version: 1
+  spokenForm: change callee paren
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier:
+        {
+          type: containingScope,
+          scopeType: functionCallee,
+          includeSiblings: false,
+        }
+      mark: { type: decoratedSymbol, symbolColor: default, character: ( }
+initialState:
+  documentContents: test()()
+  selections:
+    - anchor: { line: 0, character: 7 }
+      active: { line: 0, character: 7 }
+  marks:
+    default.(:
+      start: { line: 0, character: 6 }
+      end: { line: 0, character: 7 }
+finalState:
+  documentContents: ()
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: decoratedSymbol, symbolColor: default, character: ( },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        {
+          type: containingScope,
+          scopeType: functionCallee,
+          includeSiblings: false,
+        },
+      isImplicit: false,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/typescript/changeFunk.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/typescript/changeFunk.yml
new file mode 100644
index 0000000000..27135e5899
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/typescript/changeFunk.yml
@@ -0,0 +1,44 @@
+languageId: typescript
+command:
+  version: 1
+  spokenForm: change funk
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier:
+        {
+          type: containingScope,
+          scopeType: namedFunction,
+          includeSiblings: false,
+        }
+initialState:
+  documentContents: |-
+    function* generator(i) {
+      yield i + 10;
+    }
+  selections:
+    - anchor: { line: 1, character: 15 }
+      active: { line: 1, character: 15 }
+  marks: {}
+finalState:
+  documentContents: ""
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        {
+          type: containingScope,
+          scopeType: namedFunction,
+          includeSiblings: false,
+        },
+      isImplicit: false,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/typescript/changeName.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/typescript/changeName.yml
new file mode 100644
index 0000000000..83b6d66610
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/typescript/changeName.yml
@@ -0,0 +1,39 @@
+languageId: typescript
+command:
+  version: 1
+  spokenForm: change name
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier:
+        { type: containingScope, scopeType: name, includeSiblings: false }
+initialState:
+  documentContents: |-
+    function* generator(i) {
+      yield i + 10;
+    }
+  selections:
+    - anchor: { line: 1, character: 15 }
+      active: { line: 1, character: 15 }
+  marks: {}
+finalState:
+  documentContents: |-
+    function* (i) {
+      yield i + 10;
+    }
+  selections:
+    - anchor: { line: 0, character: 10 }
+      active: { line: 0, character: 10 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        { type: containingScope, scopeType: name, includeSiblings: false },
+      isImplicit: false,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/typescript/changeName2.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/typescript/changeName2.yml
new file mode 100644
index 0000000000..e8d08e6610
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/typescript/changeName2.yml
@@ -0,0 +1,33 @@
+languageId: typescript
+command:
+  version: 1
+  spokenForm: change name
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier:
+        { type: containingScope, scopeType: name, includeSiblings: false }
+initialState:
+  documentContents: this.leadingDelimiterRange_ = parameters.leadingDelimiterRange;
+  selections:
+    - anchor: { line: 0, character: 37 }
+      active: { line: 0, character: 37 }
+  marks: {}
+finalState:
+  documentContents: " = parameters.leadingDelimiterRange;"
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        { type: containingScope, scopeType: name, includeSiblings: false },
+      isImplicit: false,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/typescript/changeName3.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/typescript/changeName3.yml
new file mode 100644
index 0000000000..badf870cd6
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/typescript/changeName3.yml
@@ -0,0 +1,33 @@
+languageId: typescript
+command:
+  version: 1
+  spokenForm: change name
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier:
+        { type: containingScope, scopeType: name, includeSiblings: false }
+initialState:
+  documentContents: leadingDelimiterRange_[0] = parameters.leadingDelimiterRange;
+  selections:
+    - anchor: { line: 0, character: 36 }
+      active: { line: 0, character: 36 }
+  marks: {}
+finalState:
+  documentContents: " = parameters.leadingDelimiterRange;"
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        { type: containingScope, scopeType: name, includeSiblings: false },
+      isImplicit: false,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/typescript/changeName4.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/typescript/changeName4.yml
new file mode 100644
index 0000000000..0a33474b47
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/typescript/changeName4.yml
@@ -0,0 +1,33 @@
+languageId: typescript
+command:
+  version: 1
+  spokenForm: change name
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier:
+        { type: containingScope, scopeType: name, includeSiblings: false }
+initialState:
+  documentContents: let name = parameters.leadingDelimiterRange;
+  selections:
+    - anchor: { line: 0, character: 26 }
+      active: { line: 0, character: 26 }
+  marks: {}
+finalState:
+  documentContents: let  = parameters.leadingDelimiterRange;
+  selections:
+    - anchor: { line: 0, character: 4 }
+      active: { line: 0, character: 4 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        { type: containingScope, scopeType: name, includeSiblings: false },
+      isImplicit: false,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/typescript/changeName5.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/typescript/changeName5.yml
new file mode 100644
index 0000000000..65e441ca1f
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/typescript/changeName5.yml
@@ -0,0 +1,33 @@
+languageId: typescript
+command:
+  version: 1
+  spokenForm: change name
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier:
+        { type: containingScope, scopeType: name, includeSiblings: false }
+initialState:
+  documentContents: foo().bar = parameters.leadingDelimiterRange;
+  selections:
+    - anchor: { line: 0, character: 25 }
+      active: { line: 0, character: 26 }
+  marks: {}
+finalState:
+  documentContents: " = parameters.leadingDelimiterRange;"
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        { type: containingScope, scopeType: name, includeSiblings: false },
+      isImplicit: false,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/typescript/changeValue.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/typescript/changeValue.yml
new file mode 100644
index 0000000000..b0d5748185
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/typescript/changeValue.yml
@@ -0,0 +1,39 @@
+languageId: typescript
+command:
+  version: 1
+  spokenForm: change value
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier:
+        { type: containingScope, scopeType: value, includeSiblings: false }
+initialState:
+  documentContents: |-
+    function* generator(i) {
+      yield i + 10;
+    }
+  selections:
+    - anchor: { line: 1, character: 11 }
+      active: { line: 1, character: 11 }
+  marks: {}
+finalState:
+  documentContents: |-
+    function* generator(i) {
+      yield ;
+    }
+  selections:
+    - anchor: { line: 1, character: 8 }
+      active: { line: 1, character: 8 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        { type: containingScope, scopeType: value, includeSiblings: false },
+      isImplicit: false,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/typescript/chuckCoreElement.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/typescript/chuckCoreElement.yml
new file mode 100644
index 0000000000..64cc6d9349
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/typescript/chuckCoreElement.yml
@@ -0,0 +1,38 @@
+languageId: typescriptreact
+command:
+  spokenForm: chuck core element
+  version: 2
+  targets:
+    - type: primitive
+      modifiers:
+        - { type: interiorOnly }
+        - type: containingScope
+          scopeType: { type: xmlElement }
+  usePrePhraseSnapshot: true
+  action: { name: remove }
+initialState:
+  documentContents: |-
+    <div>
+        aaa
+    </div>
+  selections:
+    - anchor: { line: 1, character: 4 }
+      active: { line: 1, character: 4 }
+  marks: {}
+finalState:
+  documentContents: <div></div>
+  selections:
+    - anchor: { line: 0, character: 5 }
+      active: { line: 0, character: 5 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      modifiers:
+        [
+          { type: interiorOnly },
+          { type: containingScope, scopeType: { type: xmlElement } },
+        ],
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/typescript/chuckKey.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/typescript/chuckKey.yml
new file mode 100644
index 0000000000..5ec05902cf
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/typescript/chuckKey.yml
@@ -0,0 +1,46 @@
+languageId: typescript
+command:
+  version: 1
+  spokenForm: chuck key
+  action: remove
+  targets:
+    - type: primitive
+      modifier:
+        {
+          type: containingScope,
+          scopeType: collectionKey,
+          includeSiblings: false,
+        }
+initialState:
+  documentContents: |-
+    {
+        foo: "bar"
+    }
+  selections:
+    - anchor: { line: 1, character: 5 }
+      active: { line: 1, character: 5 }
+  marks: {}
+finalState:
+  documentContents: |-
+    {
+        "bar"
+    }
+  selections:
+    - anchor: { line: 1, character: 4 }
+      active: { line: 1, character: 4 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: outside,
+      modifier:
+        {
+          type: containingScope,
+          scopeType: collectionKey,
+          includeSiblings: false,
+        },
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/typescript/chuckState.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/typescript/chuckState.yml
new file mode 100644
index 0000000000..0ab6e7fc90
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/typescript/chuckState.yml
@@ -0,0 +1,38 @@
+languageId: typescript
+command:
+  spokenForm: chuck state
+  version: 3
+  targets:
+    - type: primitive
+      modifiers:
+        - type: containingScope
+          scopeType: { type: statement }
+  usePrePhraseSnapshot: true
+  action: { name: remove }
+initialState:
+  documentContents: |-
+    interface Foo {
+      bar: Bar;
+      baz: Baz;
+    }
+  selections:
+    - anchor: { line: 1, character: 2 }
+      active: { line: 1, character: 2 }
+  marks: {}
+finalState:
+  documentContents: |-
+    interface Foo {
+
+      baz: Baz;
+    }
+  selections:
+    - anchor: { line: 1, character: 0 }
+      active: { line: 1, character: 0 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      modifiers: [{ type: containingScope, scopeType: { type: statement } }],
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/typescript/chuckState2.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/typescript/chuckState2.yml
new file mode 100644
index 0000000000..1d454904a3
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/typescript/chuckState2.yml
@@ -0,0 +1,36 @@
+languageId: typescript
+command:
+  spokenForm: chuck state
+  version: 3
+  targets:
+    - type: primitive
+      modifiers:
+        - type: containingScope
+          scopeType: { type: statement }
+  usePrePhraseSnapshot: true
+  action: { name: remove }
+initialState:
+  documentContents: |-
+    class Foo {
+        private value: string;
+    }
+  selections:
+    - anchor: { line: 1, character: 4 }
+      active: { line: 1, character: 4 }
+  marks: {}
+finalState:
+  documentContents: |-
+    class Foo {
+
+    }
+  selections:
+    - anchor: { line: 1, character: 0 }
+      active: { line: 1, character: 0 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      modifiers: [{ type: containingScope, scopeType: { type: statement } }],
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/typescript/chuckTypeRam.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/typescript/chuckTypeRam.yml
new file mode 100644
index 0000000000..e53d3cb930
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/typescript/chuckTypeRam.yml
@@ -0,0 +1,36 @@
+languageId: typescript
+command:
+  version: 1
+  spokenForm: chuck type ram
+  action: remove
+  targets:
+    - type: primitive
+      modifier:
+        { type: containingScope, scopeType: type, includeSiblings: false }
+      mark: { type: decoratedSymbol, symbolColor: default, character: r }
+initialState:
+  documentContents: 'const hello: string = "hello";'
+  selections:
+    - anchor: { line: 0, character: 30 }
+      active: { line: 0, character: 30 }
+  marks:
+    default.r:
+      start: { line: 0, character: 13 }
+      end: { line: 0, character: 19 }
+finalState:
+  documentContents: const hello = "hello";
+  selections:
+    - anchor: { line: 0, character: 22 }
+      active: { line: 0, character: 22 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: decoratedSymbol, symbolColor: default, character: r },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: outside,
+      modifier:
+        { type: containingScope, scopeType: type, includeSiblings: false },
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/typescript/chuckTypeSoon.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/typescript/chuckTypeSoon.yml
new file mode 100644
index 0000000000..293c82b52c
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/typescript/chuckTypeSoon.yml
@@ -0,0 +1,42 @@
+languageId: typescript
+command:
+  version: 1
+  spokenForm: chuck type soon
+  action: remove
+  targets:
+    - type: primitive
+      modifier:
+        { type: containingScope, scopeType: type, includeSiblings: false }
+      mark: { type: decoratedSymbol, symbolColor: default, character: s }
+initialState:
+  documentContents: |-
+    function myFunk (value: string): string {
+        return value;
+    }
+  selections:
+    - anchor: { line: 2, character: 1 }
+      active: { line: 2, character: 1 }
+  marks:
+    default.s:
+      start: { line: 0, character: 24 }
+      end: { line: 0, character: 30 }
+finalState:
+  documentContents: |-
+    function myFunk (value): string {
+        return value;
+    }
+  selections:
+    - anchor: { line: 2, character: 1 }
+      active: { line: 2, character: 1 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: decoratedSymbol, symbolColor: default, character: s },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: outside,
+      modifier:
+        { type: containingScope, scopeType: type, includeSiblings: false },
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/typescript/chuckTypeSoon2.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/typescript/chuckTypeSoon2.yml
new file mode 100644
index 0000000000..39087a8d5f
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/typescript/chuckTypeSoon2.yml
@@ -0,0 +1,42 @@
+languageId: typescript
+command:
+  version: 1
+  spokenForm: chuck type soon
+  action: remove
+  targets:
+    - type: primitive
+      modifier:
+        { type: containingScope, scopeType: type, includeSiblings: false }
+      mark: { type: decoratedSymbol, symbolColor: default, character: s }
+initialState:
+  documentContents: |-
+    interface MyType {
+        name: string;
+    }
+  selections:
+    - anchor: { line: 2, character: 1 }
+      active: { line: 2, character: 1 }
+  marks:
+    default.s:
+      start: { line: 1, character: 10 }
+      end: { line: 1, character: 16 }
+finalState:
+  documentContents: |-
+    interface MyType {
+        name;
+    }
+  selections:
+    - anchor: { line: 2, character: 1 }
+      active: { line: 2, character: 1 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: decoratedSymbol, symbolColor: default, character: s },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: outside,
+      modifier:
+        { type: containingScope, scopeType: type, includeSiblings: false },
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/typescript/chuckTypeTrap.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/typescript/chuckTypeTrap.yml
new file mode 100644
index 0000000000..6ac0757929
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/typescript/chuckTypeTrap.yml
@@ -0,0 +1,42 @@
+languageId: typescript
+command:
+  version: 1
+  spokenForm: chuck type trap
+  action: remove
+  targets:
+    - type: primitive
+      modifier:
+        { type: containingScope, scopeType: type, includeSiblings: false }
+      mark: { type: decoratedSymbol, symbolColor: default, character: t }
+initialState:
+  documentContents: |-
+    function myFunk (value: string): string {
+        return value;
+    }
+  selections:
+    - anchor: { line: 2, character: 1 }
+      active: { line: 2, character: 1 }
+  marks:
+    default.t:
+      start: { line: 0, character: 33 }
+      end: { line: 0, character: 39 }
+finalState:
+  documentContents: |-
+    function myFunk (value: string) {
+        return value;
+    }
+  selections:
+    - anchor: { line: 2, character: 1 }
+      active: { line: 2, character: 1 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: decoratedSymbol, symbolColor: default, character: t },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: outside,
+      modifier:
+        { type: containingScope, scopeType: type, includeSiblings: false },
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/typescript/chuckTypeYank.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/typescript/chuckTypeYank.yml
new file mode 100644
index 0000000000..efae74187e
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/typescript/chuckTypeYank.yml
@@ -0,0 +1,39 @@
+languageId: typescript
+command:
+  version: 1
+  spokenForm: chuck type yank
+  action: remove
+  targets:
+    - type: primitive
+      modifier:
+        { type: containingScope, scopeType: type, includeSiblings: false }
+      mark: { type: decoratedSymbol, symbolColor: default, character: "y" }
+initialState:
+  documentContents: |-
+    interface MyType {
+        name: string;
+    }
+  selections:
+    - anchor: { line: 2, character: 1 }
+      active: { line: 2, character: 1 }
+  marks:
+    default.y:
+      start: { line: 0, character: 10 }
+      end: { line: 0, character: 16 }
+finalState:
+  documentContents: ""
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: decoratedSymbol, symbolColor: default, character: "y" },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: outside,
+      modifier:
+        { type: containingScope, scopeType: type, includeSiblings: false },
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/typescript/chuckValue.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/typescript/chuckValue.yml
new file mode 100644
index 0000000000..28dce193a3
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/typescript/chuckValue.yml
@@ -0,0 +1,101 @@
+languageId: typescript
+command:
+  version: 1
+  spokenForm: chuck value
+  action: remove
+  targets:
+    - type: primitive
+      modifier:
+        { type: containingScope, scopeType: value, includeSiblings: false }
+initialState:
+  documentContents: |
+    a = 1;
+    a += 1;
+    a -= 1;
+    a *= 1;
+    a /= 1;
+    a %= 1;
+    a **= 1;
+    a &= 1;
+    a |= 1;
+    a ^= 1;
+    a <<= 1;
+    a >>= 1;
+  selections:
+    - anchor: { line: 11, character: 6 }
+      active: { line: 11, character: 7 }
+    - anchor: { line: 1, character: 5 }
+      active: { line: 1, character: 6 }
+    - anchor: { line: 2, character: 5 }
+      active: { line: 2, character: 6 }
+    - anchor: { line: 3, character: 5 }
+      active: { line: 3, character: 6 }
+    - anchor: { line: 4, character: 5 }
+      active: { line: 4, character: 6 }
+    - anchor: { line: 5, character: 5 }
+      active: { line: 5, character: 6 }
+    - anchor: { line: 6, character: 6 }
+      active: { line: 6, character: 7 }
+    - anchor: { line: 7, character: 5 }
+      active: { line: 7, character: 6 }
+    - anchor: { line: 8, character: 5 }
+      active: { line: 8, character: 6 }
+    - anchor: { line: 9, character: 5 }
+      active: { line: 9, character: 6 }
+    - anchor: { line: 10, character: 6 }
+      active: { line: 10, character: 7 }
+    - anchor: { line: 0, character: 4 }
+      active: { line: 0, character: 5 }
+  marks: {}
+finalState:
+  documentContents: |
+    a;
+    a;
+    a;
+    a;
+    a;
+    a;
+    a;
+    a;
+    a;
+    a;
+    a;
+    a;
+  selections:
+    - anchor: { line: 11, character: 1 }
+      active: { line: 11, character: 1 }
+    - anchor: { line: 1, character: 1 }
+      active: { line: 1, character: 1 }
+    - anchor: { line: 2, character: 1 }
+      active: { line: 2, character: 1 }
+    - anchor: { line: 3, character: 1 }
+      active: { line: 3, character: 1 }
+    - anchor: { line: 4, character: 1 }
+      active: { line: 4, character: 1 }
+    - anchor: { line: 5, character: 1 }
+      active: { line: 5, character: 1 }
+    - anchor: { line: 6, character: 1 }
+      active: { line: 6, character: 1 }
+    - anchor: { line: 7, character: 1 }
+      active: { line: 7, character: 1 }
+    - anchor: { line: 8, character: 1 }
+      active: { line: 8, character: 1 }
+    - anchor: { line: 9, character: 1 }
+      active: { line: 9, character: 1 }
+    - anchor: { line: 10, character: 1 }
+      active: { line: 10, character: 1 }
+    - anchor: { line: 0, character: 1 }
+      active: { line: 0, character: 1 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: outside,
+      modifier:
+        { type: containingScope, scopeType: value, includeSiblings: false },
+      isImplicit: false,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/typescript/clearBranch.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/typescript/clearBranch.yml
new file mode 100644
index 0000000000..b17f027bb2
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/typescript/clearBranch.yml
@@ -0,0 +1,41 @@
+languageId: typescript
+command:
+  version: 3
+  spokenForm: clear branch
+  action: { name: clearAndSetSelection }
+  targets:
+    - type: primitive
+      modifiers:
+        - type: containingScope
+          scopeType: { type: branch }
+  usePrePhraseSnapshot: true
+initialState:
+  documentContents: |-
+    switch (aaa) {
+      case 0:
+        break;
+      case 1:
+        break;
+    }
+  selections:
+    - anchor: { line: 1, character: 2 }
+      active: { line: 1, character: 2 }
+  marks: {}
+finalState:
+  documentContents: |-
+    switch (aaa) {
+
+      case 1:
+        break;
+    }
+  selections:
+    - anchor: { line: 1, character: 2 }
+      active: { line: 1, character: 2 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      modifiers: [{ type: containingScope, scopeType: { type: branch } }],
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/typescript/clearBranch10.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/typescript/clearBranch10.yml
new file mode 100644
index 0000000000..f8fb1b1838
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/typescript/clearBranch10.yml
@@ -0,0 +1,30 @@
+languageId: typescript
+command:
+  version: 3
+  spokenForm: clear branch
+  action: { name: clearAndSetSelection }
+  targets:
+    - type: primitive
+      modifiers:
+        - type: containingScope
+          scopeType: { type: branch }
+  usePrePhraseSnapshot: true
+initialState:
+  documentContents: "const aaa = bbb ? ccc : ddd;"
+  selections:
+    - anchor: { line: 0, character: 24 }
+      active: { line: 0, character: 24 }
+  marks: {}
+finalState:
+  documentContents: "const aaa = bbb ? ccc : ;"
+  selections:
+    - anchor: { line: 0, character: 24 }
+      active: { line: 0, character: 24 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      modifiers: [{ type: containingScope, scopeType: { type: branch } }],
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/typescript/clearBranch11.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/typescript/clearBranch11.yml
new file mode 100644
index 0000000000..331f2fe479
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/typescript/clearBranch11.yml
@@ -0,0 +1,30 @@
+languageId: typescript
+command:
+  version: 3
+  spokenForm: clear branch
+  action: { name: clearAndSetSelection }
+  targets:
+    - type: primitive
+      modifiers:
+        - type: containingScope
+          scopeType: { type: branch }
+  usePrePhraseSnapshot: false
+initialState:
+  documentContents: "const aaa = bbb ? ccc : ddd;"
+  selections:
+    - anchor: { line: 0, character: 18 }
+      active: { line: 0, character: 18 }
+  marks: {}
+finalState:
+  documentContents: "const aaa = bbb ?  : ddd;"
+  selections:
+    - anchor: { line: 0, character: 18 }
+      active: { line: 0, character: 18 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      modifiers: [{ type: containingScope, scopeType: { type: branch } }],
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/typescript/clearBranch12.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/typescript/clearBranch12.yml
new file mode 100644
index 0000000000..7102806ccf
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/typescript/clearBranch12.yml
@@ -0,0 +1,26 @@
+languageId: typescript
+command:
+  version: 3
+  spokenForm: clear branch
+  action: { name: clearAndSetSelection }
+  targets:
+    - type: primitive
+      modifiers:
+        - type: containingScope
+          scopeType: { type: branch }
+  usePrePhraseSnapshot: false
+initialState:
+  documentContents: "const aaa = bbb ? ccc : ddd;"
+  selections:
+    - anchor: { line: 0, character: 12 }
+      active: { line: 0, character: 12 }
+  marks: {}
+thrownError: { name: NoContainingScopeError }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      modifiers: [{ type: containingScope, scopeType: { type: branch } }],
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/typescript/clearBranch2.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/typescript/clearBranch2.yml
new file mode 100644
index 0000000000..0c1fd7144a
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/typescript/clearBranch2.yml
@@ -0,0 +1,42 @@
+languageId: typescript
+command:
+  version: 3
+  spokenForm: clear branch
+  action: { name: clearAndSetSelection }
+  targets:
+    - type: primitive
+      modifiers:
+        - type: containingScope
+          scopeType: { type: branch }
+  usePrePhraseSnapshot: true
+initialState:
+  documentContents: |-
+    if (true) {
+      const whatever = "hello";
+    } else if (false) {
+      const whatever = "hello";
+    } else {
+      const whatever = "hello";
+    }
+  selections:
+    - anchor: { line: 4, character: 2 }
+      active: { line: 4, character: 2 }
+  marks: {}
+finalState:
+  documentContents: |-
+    if (true) {
+      const whatever = "hello";
+    } else if (false) {
+      const whatever = "hello";
+    }
+  selections:
+    - anchor: { line: 4, character: 2 }
+      active: { line: 4, character: 2 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      modifiers: [{ type: containingScope, scopeType: { type: branch } }],
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/typescript/clearBranch3.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/typescript/clearBranch3.yml
new file mode 100644
index 0000000000..f21a6a1179
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/typescript/clearBranch3.yml
@@ -0,0 +1,42 @@
+languageId: typescript
+command:
+  version: 3
+  spokenForm: clear branch
+  action: { name: clearAndSetSelection }
+  targets:
+    - type: primitive
+      modifiers:
+        - type: containingScope
+          scopeType: { type: branch }
+  usePrePhraseSnapshot: true
+initialState:
+  documentContents: |-
+    if (true) {
+      const whatever = "hello";
+    } else if (false) {
+      const whatever = "hello";
+    } else {
+      const whatever = "hello";
+    }
+  selections:
+    - anchor: { line: 5, character: 2 }
+      active: { line: 5, character: 2 }
+  marks: {}
+finalState:
+  documentContents: |-
+    if (true) {
+      const whatever = "hello";
+    } else if (false) {
+      const whatever = "hello";
+    }
+  selections:
+    - anchor: { line: 4, character: 2 }
+      active: { line: 4, character: 2 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      modifiers: [{ type: containingScope, scopeType: { type: branch } }],
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/typescript/clearBranch4.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/typescript/clearBranch4.yml
new file mode 100644
index 0000000000..e56722a4b4
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/typescript/clearBranch4.yml
@@ -0,0 +1,42 @@
+languageId: typescript
+command:
+  version: 3
+  spokenForm: clear branch
+  action: { name: clearAndSetSelection }
+  targets:
+    - type: primitive
+      modifiers:
+        - type: containingScope
+          scopeType: { type: branch }
+  usePrePhraseSnapshot: false
+initialState:
+  documentContents: |-
+    if (true) {
+      const whatever = "hello";
+    } else if (false) {
+      const whatever = "hello";
+    } else {
+      const whatever = "hello";
+    }
+  selections:
+    - anchor: { line: 3, character: 2 }
+      active: { line: 3, character: 2 }
+  marks: {}
+finalState:
+  documentContents: |-
+    if (true) {
+      const whatever = "hello";
+    } else  else {
+      const whatever = "hello";
+    }
+  selections:
+    - anchor: { line: 2, character: 7 }
+      active: { line: 2, character: 7 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      modifiers: [{ type: containingScope, scopeType: { type: branch } }],
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/typescript/clearBranch5.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/typescript/clearBranch5.yml
new file mode 100644
index 0000000000..bc54d80876
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/typescript/clearBranch5.yml
@@ -0,0 +1,42 @@
+languageId: typescript
+command:
+  version: 3
+  spokenForm: clear branch
+  action: { name: clearAndSetSelection }
+  targets:
+    - type: primitive
+      modifiers:
+        - type: containingScope
+          scopeType: { type: branch }
+  usePrePhraseSnapshot: true
+initialState:
+  documentContents: |-
+    if (true) {
+      const whatever = "hello";
+    } else if (false) {
+      const whatever = "hello";
+    } else {
+      const whatever = "hello";
+    }
+  selections:
+    - anchor: { line: 2, character: 2 }
+      active: { line: 2, character: 2 }
+  marks: {}
+finalState:
+  documentContents: |-
+    if (true) {
+      const whatever = "hello";
+    } else  else {
+      const whatever = "hello";
+    }
+  selections:
+    - anchor: { line: 2, character: 7 }
+      active: { line: 2, character: 7 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      modifiers: [{ type: containingScope, scopeType: { type: branch } }],
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/typescript/clearBranch6.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/typescript/clearBranch6.yml
new file mode 100644
index 0000000000..35a50714eb
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/typescript/clearBranch6.yml
@@ -0,0 +1,42 @@
+languageId: typescript
+command:
+  version: 3
+  spokenForm: clear branch
+  action: { name: clearAndSetSelection }
+  targets:
+    - type: primitive
+      modifiers:
+        - type: containingScope
+          scopeType: { type: branch }
+  usePrePhraseSnapshot: true
+initialState:
+  documentContents: |-
+    if (true) {
+      const whatever = "hello";
+    } else if (false) {
+      const whatever = "hello";
+    } else {
+      const whatever = "hello";
+    }
+  selections:
+    - anchor: { line: 1, character: 2 }
+      active: { line: 1, character: 2 }
+  marks: {}
+finalState:
+  documentContents: |2-
+     else if (false) {
+      const whatever = "hello";
+    } else {
+      const whatever = "hello";
+    }
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      modifiers: [{ type: containingScope, scopeType: { type: branch } }],
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/typescript/clearBranch7.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/typescript/clearBranch7.yml
new file mode 100644
index 0000000000..83864c778b
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/typescript/clearBranch7.yml
@@ -0,0 +1,42 @@
+languageId: typescript
+command:
+  version: 3
+  spokenForm: clear branch
+  action: { name: clearAndSetSelection }
+  targets:
+    - type: primitive
+      modifiers:
+        - type: containingScope
+          scopeType: { type: branch }
+  usePrePhraseSnapshot: true
+initialState:
+  documentContents: |-
+    try {
+      const aaa = "bbb";
+    } catch (err) {
+      const aaa = "bbb";
+    } finally {
+      const aaa = "bbb";
+    }
+  selections:
+    - anchor: { line: 3, character: 2 }
+      active: { line: 3, character: 2 }
+  marks: {}
+finalState:
+  documentContents: |-
+    try {
+      const aaa = "bbb";
+    }  finally {
+      const aaa = "bbb";
+    }
+  selections:
+    - anchor: { line: 2, character: 2 }
+      active: { line: 2, character: 2 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      modifiers: [{ type: containingScope, scopeType: { type: branch } }],
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/typescript/clearBranch8.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/typescript/clearBranch8.yml
new file mode 100644
index 0000000000..bef4aae06a
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/typescript/clearBranch8.yml
@@ -0,0 +1,42 @@
+languageId: typescript
+command:
+  version: 3
+  spokenForm: clear branch
+  action: { name: clearAndSetSelection }
+  targets:
+    - type: primitive
+      modifiers:
+        - type: containingScope
+          scopeType: { type: branch }
+  usePrePhraseSnapshot: false
+initialState:
+  documentContents: |-
+    try {
+      const aaa = "bbb";
+    } catch (err) {
+      const aaa = "bbb";
+    } finally {
+      const aaa = "bbb";
+    }
+  selections:
+    - anchor: { line: 5, character: 2 }
+      active: { line: 5, character: 2 }
+  marks: {}
+finalState:
+  documentContents: |-
+    try {
+      const aaa = "bbb";
+    } catch (err) {
+      const aaa = "bbb";
+    }
+  selections:
+    - anchor: { line: 4, character: 2 }
+      active: { line: 4, character: 2 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      modifiers: [{ type: containingScope, scopeType: { type: branch } }],
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/typescript/clearBranch9.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/typescript/clearBranch9.yml
new file mode 100644
index 0000000000..d7262a3f26
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/typescript/clearBranch9.yml
@@ -0,0 +1,42 @@
+languageId: typescript
+command:
+  version: 3
+  spokenForm: clear branch
+  action: { name: clearAndSetSelection }
+  targets:
+    - type: primitive
+      modifiers:
+        - type: containingScope
+          scopeType: { type: branch }
+  usePrePhraseSnapshot: false
+initialState:
+  documentContents: |-
+    try {
+      const aaa = "bbb";
+    } catch (err) {
+      const aaa = "bbb";
+    } finally {
+      const aaa = "bbb";
+    }
+  selections:
+    - anchor: { line: 1, character: 2 }
+      active: { line: 1, character: 2 }
+  marks: {}
+finalState:
+  documentContents: |2-
+     catch (err) {
+      const aaa = "bbb";
+    } finally {
+      const aaa = "bbb";
+    }
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      modifiers: [{ type: containingScope, scopeType: { type: branch } }],
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/typescript/clearClass.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/typescript/clearClass.yml
new file mode 100644
index 0000000000..46b2d3b59a
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/typescript/clearClass.yml
@@ -0,0 +1,30 @@
+languageId: typescript
+command:
+  spokenForm: clear class
+  version: 2
+  targets:
+    - type: primitive
+      modifiers:
+        - type: containingScope
+          scopeType: { type: class }
+  usePrePhraseSnapshot: true
+  action: { name: clearAndSetSelection }
+initialState:
+  documentContents: export abstract class Foo {}
+  selections:
+    - anchor: { line: 0, character: 27 }
+      active: { line: 0, character: 27 }
+  marks: {}
+finalState:
+  documentContents: ""
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      modifiers: [{ type: containingScope, scopeType: { type: class } }],
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/typescript/clearClass2.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/typescript/clearClass2.yml
new file mode 100644
index 0000000000..9a8aff7e3f
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/typescript/clearClass2.yml
@@ -0,0 +1,30 @@
+languageId: typescript
+command:
+  spokenForm: clear class
+  version: 2
+  targets:
+    - type: primitive
+      modifiers:
+        - type: containingScope
+          scopeType: { type: class }
+  usePrePhraseSnapshot: true
+  action: { name: clearAndSetSelection }
+initialState:
+  documentContents: abstract class Foo {}
+  selections:
+    - anchor: { line: 0, character: 20 }
+      active: { line: 0, character: 20 }
+  marks: {}
+finalState:
+  documentContents: ""
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      modifiers: [{ type: containingScope, scopeType: { type: class } }],
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/typescript/clearClass3.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/typescript/clearClass3.yml
new file mode 100644
index 0000000000..d494cc62fd
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/typescript/clearClass3.yml
@@ -0,0 +1,30 @@
+languageId: typescript
+command:
+  spokenForm: clear class
+  version: 2
+  targets:
+    - type: primitive
+      modifiers:
+        - type: containingScope
+          scopeType: { type: class }
+  usePrePhraseSnapshot: true
+  action: { name: clearAndSetSelection }
+initialState:
+  documentContents: class Foo {}
+  selections:
+    - anchor: { line: 0, character: 11 }
+      active: { line: 0, character: 11 }
+  marks: {}
+finalState:
+  documentContents: ""
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      modifiers: [{ type: containingScope, scopeType: { type: class } }],
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/typescript/clearClass4.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/typescript/clearClass4.yml
new file mode 100644
index 0000000000..9d08fe1760
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/typescript/clearClass4.yml
@@ -0,0 +1,30 @@
+languageId: typescript
+command:
+  spokenForm: clear class
+  version: 2
+  targets:
+    - type: primitive
+      modifiers:
+        - type: containingScope
+          scopeType: { type: class }
+  usePrePhraseSnapshot: true
+  action: { name: clearAndSetSelection }
+initialState:
+  documentContents: export class Foo {}
+  selections:
+    - anchor: { line: 0, character: 18 }
+      active: { line: 0, character: 18 }
+  marks: {}
+finalState:
+  documentContents: ""
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      modifiers: [{ type: containingScope, scopeType: { type: class } }],
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/typescript/clearCondition.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/typescript/clearCondition.yml
new file mode 100644
index 0000000000..1d0da5d2be
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/typescript/clearCondition.yml
@@ -0,0 +1,30 @@
+languageId: typescript
+command:
+  spokenForm: clear condition
+  version: 2
+  targets:
+    - type: primitive
+      modifiers:
+        - type: containingScope
+          scopeType: { type: condition }
+  usePrePhraseSnapshot: true
+  action: { name: clearAndSetSelection }
+initialState:
+  documentContents: "(process.env._ || '').match() ? path1: path2;"
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+  marks: {}
+finalState:
+  documentContents: " ? path1: path2;"
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      modifiers: [{ type: containingScope, scopeType: { type: condition } }],
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/typescript/clearCondition2.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/typescript/clearCondition2.yml
new file mode 100644
index 0000000000..07ff19726d
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/typescript/clearCondition2.yml
@@ -0,0 +1,34 @@
+languageId: typescript
+command:
+  spokenForm: clear condition
+  version: 2
+  targets:
+    - type: primitive
+      modifiers:
+        - type: containingScope
+          scopeType: { type: condition }
+  usePrePhraseSnapshot: true
+  action: { name: clearAndSetSelection }
+initialState:
+  documentContents: |-
+    do {
+    } while (true);
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+  marks: {}
+finalState:
+  documentContents: |-
+    do {
+    } while ();
+  selections:
+    - anchor: { line: 1, character: 9 }
+      active: { line: 1, character: 9 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      modifiers: [{ type: containingScope, scopeType: { type: condition } }],
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/typescript/clearCoreElement.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/typescript/clearCoreElement.yml
new file mode 100644
index 0000000000..c5c8078b80
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/typescript/clearCoreElement.yml
@@ -0,0 +1,42 @@
+languageId: typescriptreact
+command:
+  spokenForm: clear core element
+  version: 2
+  targets:
+    - type: primitive
+      modifiers:
+        - { type: interiorOnly }
+        - type: containingScope
+          scopeType: { type: xmlElement }
+  usePrePhraseSnapshot: true
+  action: { name: clearAndSetSelection }
+initialState:
+  documentContents: |-
+    <div>
+        aaa
+        <span>bbb</span>
+    </div>
+  selections:
+    - anchor: { line: 1, character: 4 }
+      active: { line: 1, character: 4 }
+  marks: {}
+finalState:
+  documentContents: |-
+    <div>
+
+    </div>
+  selections:
+    - anchor: { line: 1, character: 4 }
+      active: { line: 1, character: 4 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      modifiers:
+        [
+          { type: interiorOnly },
+          { type: containingScope, scopeType: { type: xmlElement } },
+        ],
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/typescript/clearCoreElement2.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/typescript/clearCoreElement2.yml
new file mode 100644
index 0000000000..686e9bc63f
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/typescript/clearCoreElement2.yml
@@ -0,0 +1,41 @@
+languageId: typescriptreact
+command:
+  spokenForm: clear core element
+  version: 2
+  targets:
+    - type: primitive
+      modifiers:
+        - { type: interiorOnly }
+        - type: containingScope
+          scopeType: { type: xmlElement }
+  usePrePhraseSnapshot: true
+  action: { name: clearAndSetSelection }
+initialState:
+  documentContents: |-
+    <div>
+        aaa
+    </div>
+  selections:
+    - anchor: { line: 1, character: 4 }
+      active: { line: 1, character: 4 }
+  marks: {}
+finalState:
+  documentContents: |-
+    <div>
+
+    </div>
+  selections:
+    - anchor: { line: 1, character: 4 }
+      active: { line: 1, character: 4 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      modifiers:
+        [
+          { type: interiorOnly },
+          { type: containingScope, scopeType: { type: xmlElement } },
+        ],
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/typescript/clearFunk.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/typescript/clearFunk.yml
new file mode 100644
index 0000000000..1a03b1e9ef
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/typescript/clearFunk.yml
@@ -0,0 +1,46 @@
+languageId: typescript
+command:
+  version: 1
+  spokenForm: clear funk
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier:
+        {
+          type: containingScope,
+          scopeType: namedFunction,
+          includeSiblings: false,
+        }
+initialState:
+  documentContents: |
+    function bar() {
+      foo(function () {
+
+      });
+    }
+  selections:
+    - anchor: { line: 2, character: 6 }
+      active: { line: 2, character: 6 }
+  marks: {}
+finalState:
+  documentContents: |+
+
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        {
+          type: containingScope,
+          scopeType: namedFunction,
+          includeSiblings: false,
+        },
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/typescript/clearFunk2.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/typescript/clearFunk2.yml
new file mode 100644
index 0000000000..49d6495430
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/typescript/clearFunk2.yml
@@ -0,0 +1,46 @@
+languageId: typescript
+command:
+  version: 1
+  spokenForm: clear funk
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier:
+        {
+          type: containingScope,
+          scopeType: namedFunction,
+          includeSiblings: false,
+        }
+initialState:
+  documentContents: |
+    function bar() {
+      foo(() => {
+
+      });
+    }
+  selections:
+    - anchor: { line: 2, character: 6 }
+      active: { line: 2, character: 6 }
+  marks: {}
+finalState:
+  documentContents: |+
+
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        {
+          type: containingScope,
+          scopeType: namedFunction,
+          includeSiblings: false,
+        },
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/typescript/clearFunk3.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/typescript/clearFunk3.yml
new file mode 100644
index 0000000000..eac2ea0536
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/typescript/clearFunk3.yml
@@ -0,0 +1,37 @@
+languageId: typescript
+command:
+  spokenForm: clear funk
+  version: 3
+  targets:
+    - type: primitive
+      modifiers:
+        - type: containingScope
+          scopeType: { type: namedFunction }
+  usePrePhraseSnapshot: true
+  action: { name: clearAndSetSelection }
+initialState:
+  documentContents: |-
+    abstract class Foo {
+        protected abstract bar(): void;
+    }
+  selections:
+    - anchor: { line: 1, character: 26 }
+      active: { line: 1, character: 26 }
+  marks: {}
+finalState:
+  documentContents: |-
+    abstract class Foo {
+
+    }
+  selections:
+    - anchor: { line: 1, character: 4 }
+      active: { line: 1, character: 4 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      modifiers:
+        [{ type: containingScope, scopeType: { type: namedFunction } }],
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/typescript/clearFunkName.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/typescript/clearFunkName.yml
new file mode 100644
index 0000000000..f872213249
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/typescript/clearFunkName.yml
@@ -0,0 +1,36 @@
+languageId: typescript
+command:
+  spokenForm: clear funk name
+  version: 3
+  targets:
+    - type: primitive
+      modifiers:
+        - type: containingScope
+          scopeType: { type: functionName }
+  usePrePhraseSnapshot: true
+  action: { name: clearAndSetSelection }
+initialState:
+  documentContents: |-
+    abstract class Foo {
+        protected abstract bar(): void;
+      }
+  selections:
+    - anchor: { line: 1, character: 30 }
+      active: { line: 1, character: 30 }
+  marks: {}
+finalState:
+  documentContents: |-
+    abstract class Foo {
+        protected abstract (): void;
+      }
+  selections:
+    - anchor: { line: 1, character: 23 }
+      active: { line: 1, character: 23 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      modifiers: [{ type: containingScope, scopeType: { type: functionName } }],
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/typescript/clearItem.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/typescript/clearItem.yml
new file mode 100644
index 0000000000..c37f389424
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/typescript/clearItem.yml
@@ -0,0 +1,31 @@
+languageId: typescript
+command:
+  spokenForm: clear item
+  version: 3
+  targets:
+    - type: primitive
+      modifiers:
+        - type: containingScope
+          scopeType: { type: collectionItem }
+  usePrePhraseSnapshot: true
+  action: { name: clearAndSetSelection }
+initialState:
+  documentContents: "let foo: { a: string };"
+  selections:
+    - anchor: { line: 0, character: 11 }
+      active: { line: 0, character: 11 }
+  marks: {}
+finalState:
+  documentContents: "let foo: {  };"
+  selections:
+    - anchor: { line: 0, character: 11 }
+      active: { line: 0, character: 11 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      modifiers:
+        [{ type: containingScope, scopeType: { type: collectionItem } }],
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/typescript/clearItem2.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/typescript/clearItem2.yml
new file mode 100644
index 0000000000..fc241d2176
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/typescript/clearItem2.yml
@@ -0,0 +1,31 @@
+languageId: typescript
+command:
+  spokenForm: clear item
+  version: 3
+  targets:
+    - type: primitive
+      modifiers:
+        - type: containingScope
+          scopeType: { type: collectionItem }
+  usePrePhraseSnapshot: true
+  action: { name: clearAndSetSelection }
+initialState:
+  documentContents: "let foo: { a: string, b: string };"
+  selections:
+    - anchor: { line: 0, character: 11 }
+      active: { line: 0, character: 11 }
+  marks: {}
+finalState:
+  documentContents: "let foo: { , b: string };"
+  selections:
+    - anchor: { line: 0, character: 11 }
+      active: { line: 0, character: 11 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      modifiers:
+        [{ type: containingScope, scopeType: { type: collectionItem } }],
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/typescript/clearItem3.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/typescript/clearItem3.yml
new file mode 100644
index 0000000000..0ee5d2f51e
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/typescript/clearItem3.yml
@@ -0,0 +1,31 @@
+languageId: typescript
+command:
+  spokenForm: clear item
+  version: 3
+  targets:
+    - type: primitive
+      modifiers:
+        - type: containingScope
+          scopeType: { type: collectionItem }
+  usePrePhraseSnapshot: true
+  action: { name: clearAndSetSelection }
+initialState:
+  documentContents: "let foo: { a: string, b: string };"
+  selections:
+    - anchor: { line: 0, character: 22 }
+      active: { line: 0, character: 22 }
+  marks: {}
+finalState:
+  documentContents: "let foo: { a: string,  };"
+  selections:
+    - anchor: { line: 0, character: 22 }
+      active: { line: 0, character: 22 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      modifiers:
+        [{ type: containingScope, scopeType: { type: collectionItem } }],
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/typescript/clearItemBrace.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/typescript/clearItemBrace.yml
new file mode 100644
index 0000000000..aaa8cb903e
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/typescript/clearItemBrace.yml
@@ -0,0 +1,43 @@
+languageId: typescript
+command:
+  spokenForm: clear item brace
+  version: 2
+  targets:
+    - type: primitive
+      mark: { type: decoratedSymbol, symbolColor: default, character: "{" }
+      modifiers:
+        - type: containingScope
+          scopeType: { type: collectionItem }
+  usePrePhraseSnapshot: true
+  action: { name: clearAndSetSelection }
+initialState:
+  documentContents: |-
+    [
+      {
+        foo: "bar",
+      },
+    ]
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+  marks:
+    default.{:
+      start: { line: 1, character: 2 }
+      end: { line: 1, character: 3 }
+finalState:
+  documentContents: |-
+    [
+      ,
+    ]
+  selections:
+    - anchor: { line: 1, character: 2 }
+      active: { line: 1, character: 2 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: decoratedSymbol, symbolColor: default, character: "{" },
+      modifiers:
+        [{ type: containingScope, scopeType: { type: collectionItem } }],
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/typescript/clearKey.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/typescript/clearKey.yml
new file mode 100644
index 0000000000..4b8650cff3
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/typescript/clearKey.yml
@@ -0,0 +1,46 @@
+languageId: typescript
+command:
+  version: 1
+  spokenForm: clear key
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier:
+        {
+          type: containingScope,
+          scopeType: collectionKey,
+          includeSiblings: false,
+        }
+initialState:
+  documentContents: |-
+    {
+        foo: "bar"
+    }
+  selections:
+    - anchor: { line: 1, character: 10 }
+      active: { line: 1, character: 10 }
+  marks: {}
+finalState:
+  documentContents: |-
+    {
+        : "bar"
+    }
+  selections:
+    - anchor: { line: 1, character: 4 }
+      active: { line: 1, character: 4 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        {
+          type: containingScope,
+          scopeType: collectionKey,
+          includeSiblings: false,
+        },
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/typescript/clearLambda.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/typescript/clearLambda.yml
new file mode 100644
index 0000000000..ba174772cd
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/typescript/clearLambda.yml
@@ -0,0 +1,43 @@
+languageId: typescript
+command:
+  version: 1
+  spokenForm: clear lambda
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier:
+        {
+          type: containingScope,
+          scopeType: anonymousFunction,
+          includeSiblings: false,
+        }
+initialState:
+  documentContents: |-
+    foo(() => {
+
+    })
+  selections:
+    - anchor: { line: 1, character: 0 }
+      active: { line: 1, character: 0 }
+  marks: {}
+finalState:
+  documentContents: foo()
+  selections:
+    - anchor: { line: 0, character: 4 }
+      active: { line: 0, character: 4 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        {
+          type: containingScope,
+          scopeType: anonymousFunction,
+          includeSiblings: false,
+        },
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/typescript/clearLambda2.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/typescript/clearLambda2.yml
new file mode 100644
index 0000000000..31e4e8cf15
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/typescript/clearLambda2.yml
@@ -0,0 +1,43 @@
+languageId: typescript
+command:
+  version: 1
+  spokenForm: clear lambda
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier:
+        {
+          type: containingScope,
+          scopeType: anonymousFunction,
+          includeSiblings: false,
+        }
+initialState:
+  documentContents: |-
+    foo(function () {
+
+    })
+  selections:
+    - anchor: { line: 1, character: 0 }
+      active: { line: 1, character: 0 }
+  marks: {}
+finalState:
+  documentContents: foo()
+  selections:
+    - anchor: { line: 0, character: 4 }
+      active: { line: 0, character: 4 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        {
+          type: containingScope,
+          scopeType: anonymousFunction,
+          includeSiblings: false,
+        },
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/typescript/clearLambda3.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/typescript/clearLambda3.yml
new file mode 100644
index 0000000000..830b822652
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/typescript/clearLambda3.yml
@@ -0,0 +1,43 @@
+languageId: typescript
+command:
+  version: 1
+  spokenForm: clear lambda
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier:
+        {
+          type: containingScope,
+          scopeType: anonymousFunction,
+          includeSiblings: false,
+        }
+initialState:
+  documentContents: |-
+    foo(async function () {
+
+    })
+  selections:
+    - anchor: { line: 1, character: 0 }
+      active: { line: 1, character: 0 }
+  marks: {}
+finalState:
+  documentContents: foo()
+  selections:
+    - anchor: { line: 0, character: 4 }
+      active: { line: 0, character: 4 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        {
+          type: containingScope,
+          scopeType: anonymousFunction,
+          includeSiblings: false,
+        },
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/typescript/clearLambda4.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/typescript/clearLambda4.yml
new file mode 100644
index 0000000000..a1eee21b9a
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/typescript/clearLambda4.yml
@@ -0,0 +1,43 @@
+languageId: typescript
+command:
+  version: 1
+  spokenForm: clear lambda
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier:
+        {
+          type: containingScope,
+          scopeType: anonymousFunction,
+          includeSiblings: false,
+        }
+initialState:
+  documentContents: |-
+    foo(async () => {
+
+    })
+  selections:
+    - anchor: { line: 1, character: 0 }
+      active: { line: 1, character: 0 }
+  marks: {}
+finalState:
+  documentContents: foo()
+  selections:
+    - anchor: { line: 0, character: 4 }
+      active: { line: 0, character: 4 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        {
+          type: containingScope,
+          scopeType: anonymousFunction,
+          includeSiblings: false,
+        },
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/typescript/clearName.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/typescript/clearName.yml
new file mode 100644
index 0000000000..0646972852
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/typescript/clearName.yml
@@ -0,0 +1,33 @@
+languageId: typescript
+command:
+  version: 1
+  spokenForm: clear name
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier:
+        { type: containingScope, scopeType: name, includeSiblings: false }
+initialState:
+  documentContents: a += "world";
+  selections:
+    - anchor: { line: 0, character: 6 }
+      active: { line: 0, character: 6 }
+  marks: {}
+finalState:
+  documentContents: ' += "world";'
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        { type: containingScope, scopeType: name, includeSiblings: false },
+      isImplicit: false,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/typescript/clearPair.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/typescript/clearPair.yml
new file mode 100644
index 0000000000..0de188f90f
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/typescript/clearPair.yml
@@ -0,0 +1,36 @@
+languageId: typescriptreact
+command:
+  spokenForm: clear pair
+  version: 3
+  targets:
+    - type: primitive
+      modifiers:
+        - type: containingScope
+          scopeType: { type: surroundingPair, delimiter: any }
+  usePrePhraseSnapshot: true
+  action: { name: clearAndSetSelection }
+initialState:
+  documentContents: <div>(category.count)</div>
+  selections:
+    - anchor: { line: 0, character: 14 }
+      active: { line: 0, character: 14 }
+  marks: {}
+finalState:
+  documentContents: <div></div>
+  selections:
+    - anchor: { line: 0, character: 5 }
+      active: { line: 0, character: 5 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      modifiers:
+        [
+          {
+            type: containingScope,
+            scopeType: { type: surroundingPair, delimiter: any },
+          },
+        ],
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/typescript/clearState.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/typescript/clearState.yml
new file mode 100644
index 0000000000..7d26fe841d
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/typescript/clearState.yml
@@ -0,0 +1,38 @@
+languageId: typescript
+command:
+  spokenForm: clear state
+  version: 3
+  targets:
+    - type: primitive
+      modifiers:
+        - type: containingScope
+          scopeType: { type: statement }
+  usePrePhraseSnapshot: true
+  action: { name: clearAndSetSelection }
+initialState:
+  documentContents: |-
+    interface Foo {
+      bar: Bar;
+      baz: Baz;
+    }
+  selections:
+    - anchor: { line: 1, character: 2 }
+      active: { line: 1, character: 2 }
+  marks: {}
+finalState:
+  documentContents: |-
+    interface Foo {
+
+      baz: Baz;
+    }
+  selections:
+    - anchor: { line: 1, character: 2 }
+      active: { line: 1, character: 2 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      modifiers: [{ type: containingScope, scopeType: { type: statement } }],
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/typescript/clearState2.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/typescript/clearState2.yml
new file mode 100644
index 0000000000..93febca0cd
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/typescript/clearState2.yml
@@ -0,0 +1,36 @@
+languageId: typescript
+command:
+  spokenForm: clear state
+  version: 3
+  targets:
+    - type: primitive
+      modifiers:
+        - type: containingScope
+          scopeType: { type: statement }
+  usePrePhraseSnapshot: true
+  action: { name: clearAndSetSelection }
+initialState:
+  documentContents: |-
+    type Foo = {
+      bar: string;
+    }
+  selections:
+    - anchor: { line: 1, character: 2 }
+      active: { line: 1, character: 2 }
+  marks: {}
+finalState:
+  documentContents: |-
+    type Foo = {
+
+    }
+  selections:
+    - anchor: { line: 1, character: 2 }
+      active: { line: 1, character: 2 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      modifiers: [{ type: containingScope, scopeType: { type: statement } }],
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/typescript/clearState3.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/typescript/clearState3.yml
new file mode 100644
index 0000000000..d2ecfe5642
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/typescript/clearState3.yml
@@ -0,0 +1,36 @@
+languageId: typescript
+command:
+  spokenForm: clear state
+  version: 3
+  targets:
+    - type: primitive
+      modifiers:
+        - type: containingScope
+          scopeType: { type: statement }
+  usePrePhraseSnapshot: true
+  action: { name: clearAndSetSelection }
+initialState:
+  documentContents: |-
+    class Foo {
+        private value: string;
+    }
+  selections:
+    - anchor: { line: 1, character: 4 }
+      active: { line: 1, character: 4 }
+  marks: {}
+finalState:
+  documentContents: |-
+    class Foo {
+
+    }
+  selections:
+    - anchor: { line: 1, character: 4 }
+      active: { line: 1, character: 4 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      modifiers: [{ type: containingScope, scopeType: { type: statement } }],
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/typescript/clearState4.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/typescript/clearState4.yml
new file mode 100644
index 0000000000..6dfbedce25
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/typescript/clearState4.yml
@@ -0,0 +1,30 @@
+languageId: typescript
+command:
+  spokenForm: clear state
+  version: 3
+  targets:
+    - type: primitive
+      modifiers:
+        - type: containingScope
+          scopeType: { type: statement }
+  usePrePhraseSnapshot: true
+  action: { name: clearAndSetSelection }
+initialState:
+  documentContents: "let foo: { a: string };"
+  selections:
+    - anchor: { line: 0, character: 12 }
+      active: { line: 0, character: 12 }
+  marks: {}
+finalState:
+  documentContents: "let foo: {  };"
+  selections:
+    - anchor: { line: 0, character: 11 }
+      active: { line: 0, character: 11 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      modifiers: [{ type: containingScope, scopeType: { type: statement } }],
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/typescript/clearState5.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/typescript/clearState5.yml
new file mode 100644
index 0000000000..8ee4f0df6b
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/typescript/clearState5.yml
@@ -0,0 +1,48 @@
+languageId: typescript
+command:
+  spokenForm: clear state
+  version: 3
+  targets:
+    - type: primitive
+      modifiers:
+        - type: containingScope
+          scopeType: { type: statement }
+  usePrePhraseSnapshot: true
+  action: { name: clearAndSetSelection }
+initialState:
+  documentContents: |-
+    abstract class Foo {
+        value: string;
+        abstract bar(): void;
+        baz() { }
+    }
+  selections:
+    - anchor: { line: 1, character: 4 }
+      active: { line: 1, character: 4 }
+    - anchor: { line: 2, character: 4 }
+      active: { line: 2, character: 4 }
+    - anchor: { line: 3, character: 4 }
+      active: { line: 3, character: 4 }
+  marks: {}
+finalState:
+  documentContents: |-
+    abstract class Foo {
+
+
+
+    }
+  selections:
+    - anchor: { line: 1, character: 4 }
+      active: { line: 1, character: 4 }
+    - anchor: { line: 2, character: 4 }
+      active: { line: 2, character: 4 }
+    - anchor: { line: 3, character: 4 }
+      active: { line: 3, character: 4 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      modifiers: [{ type: containingScope, scopeType: { type: statement } }],
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/typescript/clearSubject.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/typescript/clearSubject.yml
new file mode 100644
index 0000000000..032245aa35
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/typescript/clearSubject.yml
@@ -0,0 +1,44 @@
+languageId: typescript
+command:
+  version: 3
+  spokenForm: clear subject
+  action: { name: clearAndSetSelection }
+  targets:
+    - type: primitive
+      modifiers:
+        - type: containingScope
+          scopeType: { type: switchStatementSubject }
+  usePrePhraseSnapshot: true
+initialState:
+  documentContents: |-
+    switch(aaa) {
+      case 0:
+        break;
+    }
+  selections:
+    - anchor: { line: 2, character: 4 }
+      active: { line: 2, character: 4 }
+  marks: {}
+finalState:
+  documentContents: |-
+    switch() {
+      case 0:
+        break;
+    }
+  selections:
+    - anchor: { line: 0, character: 7 }
+      active: { line: 0, character: 7 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      modifiers:
+        [
+          {
+            type: containingScope,
+            scopeType: { type: switchStatementSubject },
+          },
+        ],
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/typescript/clearSubject2.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/typescript/clearSubject2.yml
new file mode 100644
index 0000000000..4f9f95a68b
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/typescript/clearSubject2.yml
@@ -0,0 +1,44 @@
+languageId: typescript
+command:
+  version: 3
+  spokenForm: clear subject
+  action: { name: clearAndSetSelection }
+  targets:
+    - type: primitive
+      modifiers:
+        - type: containingScope
+          scopeType: { type: switchStatementSubject }
+  usePrePhraseSnapshot: true
+initialState:
+  documentContents: |-
+    switch(aaa + 1) {
+      case 0:
+        break;
+    }
+  selections:
+    - anchor: { line: 2, character: 4 }
+      active: { line: 2, character: 4 }
+  marks: {}
+finalState:
+  documentContents: |-
+    switch() {
+      case 0:
+        break;
+    }
+  selections:
+    - anchor: { line: 0, character: 7 }
+      active: { line: 0, character: 7 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      modifiers:
+        [
+          {
+            type: containingScope,
+            scopeType: { type: switchStatementSubject },
+          },
+        ],
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/typescript/clearType.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/typescript/clearType.yml
new file mode 100644
index 0000000000..fd6cf2f46f
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/typescript/clearType.yml
@@ -0,0 +1,32 @@
+languageId: typescript
+command:
+  version: 1
+  spokenForm: clear type
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier:
+        { type: containingScope, scopeType: type, includeSiblings: false }
+initialState:
+  documentContents: "function whatever<T>(): string {}"
+  selections:
+    - anchor: { line: 0, character: 18 }
+      active: { line: 0, character: 18 }
+  marks: {}
+finalState:
+  documentContents: "function whatever<T>():  {}"
+  selections:
+    - anchor: { line: 0, character: 24 }
+      active: { line: 0, character: 24 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        { type: containingScope, scopeType: type, includeSiblings: false },
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/typescript/clearType2.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/typescript/clearType2.yml
new file mode 100644
index 0000000000..edebb59f39
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/typescript/clearType2.yml
@@ -0,0 +1,32 @@
+languageId: typescript
+command:
+  version: 1
+  spokenForm: clear type
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier:
+        { type: containingScope, scopeType: type, includeSiblings: false }
+initialState:
+  documentContents: "const foo: string = new Bar()"
+  selections:
+    - anchor: { line: 0, character: 24 }
+      active: { line: 0, character: 24 }
+  marks: {}
+finalState:
+  documentContents: "const foo: string = new ()"
+  selections:
+    - anchor: { line: 0, character: 24 }
+      active: { line: 0, character: 24 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        { type: containingScope, scopeType: type, includeSiblings: false },
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/typescript/clearTypeAir.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/typescript/clearTypeAir.yml
new file mode 100644
index 0000000000..d2f6b63a08
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/typescript/clearTypeAir.yml
@@ -0,0 +1,42 @@
+languageId: typescript
+command:
+  version: 1
+  spokenForm: clear type air
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier:
+        { type: containingScope, scopeType: type, includeSiblings: false }
+      mark: { type: decoratedSymbol, symbolColor: default, character: a }
+initialState:
+  documentContents: "const foo: string = new Bar<number>(foo);"
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+  marks:
+    default.a:
+      start: { line: 0, character: 24 }
+      end: { line: 0, character: 27 }
+finalState:
+  documentContents: "const foo: string = new (foo);"
+  selections:
+    - anchor: { line: 0, character: 24 }
+      active: { line: 0, character: 24 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark:
+        {
+          type: decoratedSymbol,
+          symbolColor: default,
+          character: a,
+          usePrePhraseSnapshot: true,
+        },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        { type: containingScope, scopeType: type, includeSiblings: false },
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/typescript/clearTypeBat.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/typescript/clearTypeBat.yml
new file mode 100644
index 0000000000..0da8bb59d6
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/typescript/clearTypeBat.yml
@@ -0,0 +1,42 @@
+languageId: typescript
+command:
+  version: 1
+  spokenForm: clear type bat
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier:
+        { type: containingScope, scopeType: type, includeSiblings: false }
+      mark: { type: decoratedSymbol, symbolColor: default, character: b }
+initialState:
+  documentContents: "const foo: Bar<number> = bar<number>(foo);"
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+  marks:
+    default.b:
+      start: { line: 0, character: 25 }
+      end: { line: 0, character: 28 }
+finalState:
+  documentContents: "const foo:  = bar<number>(foo);"
+  selections:
+    - anchor: { line: 0, character: 11 }
+      active: { line: 0, character: 11 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark:
+        {
+          type: decoratedSymbol,
+          symbolColor: default,
+          character: b,
+          usePrePhraseSnapshot: true,
+        },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        { type: containingScope, scopeType: type, includeSiblings: false },
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/typescript/clearTypeLangle.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/typescript/clearTypeLangle.yml
new file mode 100644
index 0000000000..114ccc1b3d
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/typescript/clearTypeLangle.yml
@@ -0,0 +1,42 @@
+languageId: typescript
+command:
+  version: 1
+  spokenForm: clear type langle
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier:
+        { type: containingScope, scopeType: type, includeSiblings: false }
+      mark: { type: decoratedSymbol, symbolColor: default, character: < }
+initialState:
+  documentContents: "const foo: string = new Bar<number>(foo);"
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+  marks:
+    default.<:
+      start: { line: 0, character: 27 }
+      end: { line: 0, character: 28 }
+finalState:
+  documentContents: "const foo: string = new (foo);"
+  selections:
+    - anchor: { line: 0, character: 24 }
+      active: { line: 0, character: 24 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark:
+        {
+          type: decoratedSymbol,
+          symbolColor: default,
+          character: <,
+          usePrePhraseSnapshot: true,
+        },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        { type: containingScope, scopeType: type, includeSiblings: false },
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/typescript/clearTypeNear.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/typescript/clearTypeNear.yml
new file mode 100644
index 0000000000..4c7018d75a
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/typescript/clearTypeNear.yml
@@ -0,0 +1,42 @@
+languageId: typescript
+command:
+  version: 1
+  spokenForm: clear type near
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier:
+        { type: containingScope, scopeType: type, includeSiblings: false }
+      mark: { type: decoratedSymbol, symbolColor: default, character: "n" }
+initialState:
+  documentContents: "const foo: string = new Bar<number>(foo);"
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+  marks:
+    default.n:
+      start: { line: 0, character: 28 }
+      end: { line: 0, character: 34 }
+finalState:
+  documentContents: "const foo: string = new (foo);"
+  selections:
+    - anchor: { line: 0, character: 24 }
+      active: { line: 0, character: 24 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark:
+        {
+          type: decoratedSymbol,
+          symbolColor: default,
+          character: "n",
+          usePrePhraseSnapshot: true,
+        },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        { type: containingScope, scopeType: type, includeSiblings: false },
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/typescript/clearTypeNear2.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/typescript/clearTypeNear2.yml
new file mode 100644
index 0000000000..a5de96dff1
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/typescript/clearTypeNear2.yml
@@ -0,0 +1,42 @@
+languageId: typescript
+command:
+  version: 1
+  spokenForm: clear type near
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier:
+        { type: containingScope, scopeType: type, includeSiblings: false }
+      mark: { type: decoratedSymbol, symbolColor: default, character: "n" }
+initialState:
+  documentContents: "const foo: string = bar<number>(foo);"
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+  marks:
+    default.n:
+      start: { line: 0, character: 24 }
+      end: { line: 0, character: 30 }
+finalState:
+  documentContents: "const foo:  = bar<number>(foo);"
+  selections:
+    - anchor: { line: 0, character: 11 }
+      active: { line: 0, character: 11 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark:
+        {
+          type: decoratedSymbol,
+          symbolColor: default,
+          character: "n",
+          usePrePhraseSnapshot: true,
+        },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        { type: containingScope, scopeType: type, includeSiblings: false },
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/typescript/clearTypeOx.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/typescript/clearTypeOx.yml
new file mode 100644
index 0000000000..eae2d533d0
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/typescript/clearTypeOx.yml
@@ -0,0 +1,42 @@
+languageId: typescript
+command:
+  version: 1
+  spokenForm: clear type ox
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier:
+        { type: containingScope, scopeType: type, includeSiblings: false }
+      mark: { type: decoratedSymbol, symbolColor: default, character: o }
+initialState:
+  documentContents: "const foo: string = new Bar<number>(foo);"
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+  marks:
+    default.o:
+      start: { line: 0, character: 36 }
+      end: { line: 0, character: 39 }
+finalState:
+  documentContents: "const foo:  = new Bar<number>(foo);"
+  selections:
+    - anchor: { line: 0, character: 11 }
+      active: { line: 0, character: 11 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark:
+        {
+          type: decoratedSymbol,
+          symbolColor: default,
+          character: o,
+          usePrePhraseSnapshot: true,
+        },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        { type: containingScope, scopeType: type, includeSiblings: false },
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/typescript/clearTypeOx2.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/typescript/clearTypeOx2.yml
new file mode 100644
index 0000000000..f0a7a78e43
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/typescript/clearTypeOx2.yml
@@ -0,0 +1,42 @@
+languageId: typescript
+command:
+  version: 1
+  spokenForm: clear type ox
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier:
+        { type: containingScope, scopeType: type, includeSiblings: false }
+      mark: { type: decoratedSymbol, symbolColor: default, character: o }
+initialState:
+  documentContents: "const foo: string = bar<number>(foo);"
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+  marks:
+    default.o:
+      start: { line: 0, character: 32 }
+      end: { line: 0, character: 35 }
+finalState:
+  documentContents: "const foo:  = bar<number>(foo);"
+  selections:
+    - anchor: { line: 0, character: 11 }
+      active: { line: 0, character: 11 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark:
+        {
+          type: decoratedSymbol,
+          symbolColor: default,
+          character: o,
+          usePrePhraseSnapshot: true,
+        },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        { type: containingScope, scopeType: type, includeSiblings: false },
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/typescript/clearTypeUrge.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/typescript/clearTypeUrge.yml
new file mode 100644
index 0000000000..84f1b8b574
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/typescript/clearTypeUrge.yml
@@ -0,0 +1,42 @@
+languageId: typescript
+command:
+  version: 1
+  spokenForm: clear type urge
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier:
+        { type: containingScope, scopeType: type, includeSiblings: false }
+      mark: { type: decoratedSymbol, symbolColor: default, character: u }
+initialState:
+  documentContents: "const foo: Bar<number> = new Bar<number>(foo);"
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+  marks:
+    default.u:
+      start: { line: 0, character: 15 }
+      end: { line: 0, character: 21 }
+finalState:
+  documentContents: "const foo:  = new Bar<number>(foo);"
+  selections:
+    - anchor: { line: 0, character: 11 }
+      active: { line: 0, character: 11 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark:
+        {
+          type: decoratedSymbol,
+          symbolColor: default,
+          character: u,
+          usePrePhraseSnapshot: true,
+        },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        { type: containingScope, scopeType: type, includeSiblings: false },
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/typescript/clearTypeWhale.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/typescript/clearTypeWhale.yml
new file mode 100644
index 0000000000..13fc61b3c0
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/typescript/clearTypeWhale.yml
@@ -0,0 +1,42 @@
+languageId: typescript
+command:
+  version: 1
+  spokenForm: clear type whale
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier:
+        { type: containingScope, scopeType: type, includeSiblings: false }
+      mark: { type: decoratedSymbol, symbolColor: default, character: w }
+initialState:
+  documentContents: "const foo: string = new Bar<number>(foo);"
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+  marks:
+    default.w:
+      start: { line: 0, character: 20 }
+      end: { line: 0, character: 23 }
+finalState:
+  documentContents: "const foo:  = new Bar<number>(foo);"
+  selections:
+    - anchor: { line: 0, character: 11 }
+      active: { line: 0, character: 11 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark:
+        {
+          type: decoratedSymbol,
+          symbolColor: default,
+          character: w,
+          usePrePhraseSnapshot: true,
+        },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        { type: containingScope, scopeType: type, includeSiblings: false },
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/typescript/clearTypeWrangle.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/typescript/clearTypeWrangle.yml
new file mode 100644
index 0000000000..d6f6d5349e
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/typescript/clearTypeWrangle.yml
@@ -0,0 +1,42 @@
+languageId: typescript
+command:
+  version: 1
+  spokenForm: clear type wrangle
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier:
+        { type: containingScope, scopeType: type, includeSiblings: false }
+      mark: { type: decoratedSymbol, symbolColor: default, character: ">" }
+initialState:
+  documentContents: "const foo: string = new Bar<number>(foo);"
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+  marks:
+    default.>:
+      start: { line: 0, character: 34 }
+      end: { line: 0, character: 35 }
+finalState:
+  documentContents: "const foo: string = new (foo);"
+  selections:
+    - anchor: { line: 0, character: 24 }
+      active: { line: 0, character: 24 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark:
+        {
+          type: decoratedSymbol,
+          symbolColor: default,
+          character: ">",
+          usePrePhraseSnapshot: true,
+        },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        { type: containingScope, scopeType: type, includeSiblings: false },
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/typescript/clearValue.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/typescript/clearValue.yml
new file mode 100644
index 0000000000..ff507d961b
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/typescript/clearValue.yml
@@ -0,0 +1,33 @@
+languageId: typescript
+command:
+  version: 1
+  spokenForm: clear value
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier:
+        { type: containingScope, scopeType: value, includeSiblings: false }
+initialState:
+  documentContents: a += "world";
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+  marks: {}
+finalState:
+  documentContents: a += ;
+  selections:
+    - anchor: { line: 0, character: 5 }
+      active: { line: 0, character: 5 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        { type: containingScope, scopeType: value, includeSiblings: false },
+      isImplicit: false,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/typescript/ditchBranch.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/typescript/ditchBranch.yml
new file mode 100644
index 0000000000..46da086aa6
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/typescript/ditchBranch.yml
@@ -0,0 +1,42 @@
+languageId: typescript
+command:
+  version: 3
+  spokenForm: ditch branch
+  action: { name: remove }
+  targets:
+    - type: primitive
+      modifiers:
+        - type: containingScope
+          scopeType: { type: branch }
+  usePrePhraseSnapshot: true
+initialState:
+  documentContents: |-
+    if (true) {
+      const whatever = "hello";
+    } else if (false) {
+      const whatever = "hello";
+    } else {
+      const whatever = "hello";
+    }
+  selections:
+    - anchor: { line: 3, character: 2 }
+      active: { line: 3, character: 2 }
+  marks: {}
+finalState:
+  documentContents: |-
+    if (true) {
+      const whatever = "hello";
+    }  else {
+      const whatever = "hello";
+    }
+  selections:
+    - anchor: { line: 2, character: 2 }
+      active: { line: 2, character: 2 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      modifiers: [{ type: containingScope, scopeType: { type: branch } }],
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/typescript/ditchBranch2.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/typescript/ditchBranch2.yml
new file mode 100644
index 0000000000..697e85e675
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/typescript/ditchBranch2.yml
@@ -0,0 +1,42 @@
+languageId: typescript
+command:
+  version: 3
+  spokenForm: ditch branch
+  action: { name: remove }
+  targets:
+    - type: primitive
+      modifiers:
+        - type: containingScope
+          scopeType: { type: branch }
+  usePrePhraseSnapshot: false
+initialState:
+  documentContents: |-
+    if (true) {
+      const whatever = "hello";
+    } else if (false) {
+      const whatever = "hello";
+    } else {
+      const whatever = "hello";
+    }
+  selections:
+    - anchor: { line: 2, character: 2 }
+      active: { line: 2, character: 2 }
+  marks: {}
+finalState:
+  documentContents: |-
+    if (true) {
+      const whatever = "hello";
+    }  else {
+      const whatever = "hello";
+    }
+  selections:
+    - anchor: { line: 2, character: 2 }
+      active: { line: 2, character: 2 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      modifiers: [{ type: containingScope, scopeType: { type: branch } }],
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/typescript/ditchBranch3.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/typescript/ditchBranch3.yml
new file mode 100644
index 0000000000..539ef314c8
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/typescript/ditchBranch3.yml
@@ -0,0 +1,42 @@
+languageId: typescript
+command:
+  version: 3
+  spokenForm: ditch branch
+  action: { name: remove }
+  targets:
+    - type: primitive
+      modifiers:
+        - type: containingScope
+          scopeType: { type: branch }
+  usePrePhraseSnapshot: true
+initialState:
+  documentContents: |-
+    if (true) {
+      const whatever = "hello";
+    } else if (false) {
+      const whatever = "hello";
+    } else {
+      const whatever = "hello";
+    }
+  selections:
+    - anchor: { line: 1, character: 2 }
+      active: { line: 1, character: 2 }
+  marks: {}
+finalState:
+  documentContents: |-
+    if (false) {
+      const whatever = "hello";
+    } else {
+      const whatever = "hello";
+    }
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      modifiers: [{ type: containingScope, scopeType: { type: branch } }],
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/typescript/ditchFunk.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/typescript/ditchFunk.yml
new file mode 100644
index 0000000000..2f2f5a6668
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/typescript/ditchFunk.yml
@@ -0,0 +1,43 @@
+languageId: typescript
+command:
+  spokenForm: ditch funk
+  version: 3
+  targets:
+    - type: primitive
+      modifiers:
+        - type: containingScope
+          scopeType: { type: namedFunction }
+  usePrePhraseSnapshot: true
+  action: { name: remove }
+initialState:
+  documentContents: |-
+    abstract class Foo {
+        protected abstract bar(): void;
+        protected abstract bongo(): void;
+
+        baz() {}
+    }
+  selections:
+    - anchor: { line: 2, character: 4 }
+      active: { line: 2, character: 4 }
+  marks: {}
+finalState:
+  documentContents: |-
+    abstract class Foo {
+        protected abstract bar(): void;
+
+
+        baz() {}
+    }
+  selections:
+    - anchor: { line: 2, character: 0 }
+      active: { line: 2, character: 0 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      modifiers:
+        [{ type: containingScope, scopeType: { type: namedFunction } }],
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/typescript/ditchFunk2.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/typescript/ditchFunk2.yml
new file mode 100644
index 0000000000..4f37957a7d
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/typescript/ditchFunk2.yml
@@ -0,0 +1,37 @@
+languageId: typescript
+command:
+  spokenForm: ditch funk
+  version: 3
+  targets:
+    - type: primitive
+      modifiers:
+        - type: containingScope
+          scopeType: { type: namedFunction }
+  usePrePhraseSnapshot: true
+  action: { name: remove }
+initialState:
+  documentContents: |-
+    abstract class Foo {
+        protected abstract bongo(): void;
+    }
+  selections:
+    - anchor: { line: 1, character: 4 }
+      active: { line: 1, character: 4 }
+  marks: {}
+finalState:
+  documentContents: |-
+    abstract class Foo {
+
+    }
+  selections:
+    - anchor: { line: 1, character: 0 }
+      active: { line: 1, character: 0 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      modifiers:
+        [{ type: containingScope, scopeType: { type: namedFunction } }],
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/typescript/elseStateWrapThis.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/typescript/elseStateWrapThis.yml
new file mode 100644
index 0000000000..9dbf9fbd09
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/typescript/elseStateWrapThis.yml
@@ -0,0 +1,37 @@
+languageId: typescript
+command:
+  version: 1
+  spokenForm: else state wrap this
+  action: wrapWithSnippet
+  targets:
+    - type: primitive
+      mark: { type: cursor }
+  extraArgs: [ifElseStatement.alternative]
+initialState:
+  documentContents: const foo = "hello";
+  selections:
+    - anchor: { line: 0, character: 6 }
+      active: { line: 0, character: 6 }
+  marks: {}
+finalState:
+  documentContents: |-
+    if () {
+
+    } else {
+        const foo = "hello";
+    }
+  selections:
+    - anchor: { line: 0, character: 4 }
+      active: { line: 0, character: 4 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        { type: containingScope, scopeType: statement, includeSiblings: false },
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/typescript/ifElseWrapThis.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/typescript/ifElseWrapThis.yml
new file mode 100644
index 0000000000..908a98d385
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/typescript/ifElseWrapThis.yml
@@ -0,0 +1,37 @@
+languageId: typescript
+command:
+  version: 1
+  spokenForm: if else wrap this
+  action: wrapWithSnippet
+  targets:
+    - type: primitive
+      mark: { type: cursor }
+  extraArgs: [ifElseStatement.consequence]
+initialState:
+  documentContents: const foo = "hello";
+  selections:
+    - anchor: { line: 0, character: 6 }
+      active: { line: 0, character: 6 }
+  marks: {}
+finalState:
+  documentContents: |-
+    if () {
+        const foo = "hello";
+    } else {
+
+    }
+  selections:
+    - anchor: { line: 0, character: 4 }
+      active: { line: 0, character: 4 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        { type: containingScope, scopeType: statement, includeSiblings: false },
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/typescript/ifStateWrapThis.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/typescript/ifStateWrapThis.yml
new file mode 100644
index 0000000000..485d102b03
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/typescript/ifStateWrapThis.yml
@@ -0,0 +1,35 @@
+languageId: typescript
+command:
+  version: 1
+  spokenForm: if state wrap this
+  action: wrapWithSnippet
+  targets:
+    - type: primitive
+      mark: { type: cursor }
+  extraArgs: [ifStatement.consequence]
+initialState:
+  documentContents: const foo = "hello";
+  selections:
+    - anchor: { line: 0, character: 6 }
+      active: { line: 0, character: 6 }
+  marks: {}
+finalState:
+  documentContents: |-
+    if () {
+        const foo = "hello";
+    }
+  selections:
+    - anchor: { line: 0, character: 4 }
+      active: { line: 0, character: 4 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        { type: containingScope, scopeType: statement, includeSiblings: false },
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/typescript/takeArg.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/typescript/takeArg.yml
new file mode 100644
index 0000000000..35833a35b1
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/typescript/takeArg.yml
@@ -0,0 +1,38 @@
+languageId: typescript
+command:
+  version: 1
+  spokenForm: take arg
+  action: setSelection
+  targets:
+    - type: primitive
+      modifier: { type: containingScope, scopeType: argumentOrParameter }
+initialState:
+  documentContents: |
+
+    function myFunk (name: string) {
+
+    }
+  selections:
+    - anchor: { line: 1, character: 21 }
+      active: { line: 1, character: 21 }
+  marks: {}
+finalState:
+  documentContents: |
+
+    function myFunk (name: string) {
+
+    }
+  selections:
+    - anchor: { line: 1, character: 17 }
+      active: { line: 1, character: 29 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      modifier: { type: containingScope, scopeType: argumentOrParameter },
+      insideOutsideType: inside,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/typescript/takeArg2.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/typescript/takeArg2.yml
new file mode 100644
index 0000000000..0bf1abe6a4
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/typescript/takeArg2.yml
@@ -0,0 +1,34 @@
+languageId: typescript
+command:
+  version: 1
+  spokenForm: take arg
+  action: setSelection
+  targets:
+    - type: primitive
+      modifier: { type: containingScope, scopeType: argumentOrParameter }
+initialState:
+  documentContents: |
+
+    myFunk(1, 2, 3)
+  selections:
+    - anchor: { line: 1, character: 8 }
+      active: { line: 1, character: 8 }
+  marks: {}
+finalState:
+  documentContents: |
+
+    myFunk(1, 2, 3)
+  selections:
+    - anchor: { line: 1, character: 7 }
+      active: { line: 1, character: 8 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      modifier: { type: containingScope, scopeType: argumentOrParameter },
+      insideOutsideType: inside,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/typescript/takeArrow.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/typescript/takeArrow.yml
new file mode 100644
index 0000000000..4b304d038f
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/typescript/takeArrow.yml
@@ -0,0 +1,38 @@
+languageId: typescript
+command:
+  version: 1
+  spokenForm: take arrow
+  action: setSelection
+  targets:
+    - type: primitive
+      modifier: { type: containingScope, scopeType: anonymousFunction }
+initialState:
+  documentContents: |
+
+    const value = () => {
+
+    }
+  selections:
+    - anchor: { line: 2, character: 0 }
+      active: { line: 2, character: 0 }
+  marks: {}
+finalState:
+  documentContents: |
+
+    const value = () => {
+
+    }
+  selections:
+    - anchor: { line: 1, character: 14 }
+      active: { line: 3, character: 1 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      modifier: { type: containingScope, scopeType: anonymousFunction },
+      insideOutsideType: inside,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/typescript/takeCall.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/typescript/takeCall.yml
new file mode 100644
index 0000000000..f1559f94ab
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/typescript/takeCall.yml
@@ -0,0 +1,34 @@
+languageId: typescript
+command:
+  version: 1
+  spokenForm: take call
+  action: setSelection
+  targets:
+    - type: primitive
+      modifier: { type: containingScope, scopeType: functionCall }
+initialState:
+  documentContents: |
+
+    myFunk()
+  selections:
+    - anchor: { line: 1, character: 1 }
+      active: { line: 1, character: 1 }
+  marks: {}
+finalState:
+  documentContents: |
+
+    myFunk()
+  selections:
+    - anchor: { line: 1, character: 0 }
+      active: { line: 1, character: 8 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      modifier: { type: containingScope, scopeType: functionCall },
+      insideOutsideType: inside,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/typescript/takeClass.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/typescript/takeClass.yml
new file mode 100644
index 0000000000..f83d31e86e
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/typescript/takeClass.yml
@@ -0,0 +1,48 @@
+languageId: typescript
+command:
+  version: 1
+  spokenForm: take class
+  action: setSelection
+  targets:
+    - type: primitive
+      modifier: { type: containingScope, scopeType: class }
+initialState:
+  documentContents: |
+
+    class MyClass {
+        constructor () {
+
+        }
+        myFunk () {
+
+        }
+    }
+  selections:
+    - anchor: { line: 5, character: 4 }
+      active: { line: 5, character: 4 }
+  marks: {}
+finalState:
+  documentContents: |
+
+    class MyClass {
+        constructor () {
+
+        }
+        myFunk () {
+
+        }
+    }
+  selections:
+    - anchor: { line: 1, character: 0 }
+      active: { line: 8, character: 1 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      modifier: { type: containingScope, scopeType: class },
+      insideOutsideType: inside,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/typescript/takeClassName.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/typescript/takeClassName.yml
new file mode 100644
index 0000000000..095ce6fa59
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/typescript/takeClassName.yml
@@ -0,0 +1,48 @@
+languageId: typescript
+command:
+  version: 1
+  spokenForm: take class name
+  action: setSelection
+  targets:
+    - type: primitive
+      modifier: { type: containingScope, scopeType: className }
+initialState:
+  documentContents: |
+
+    class MyClass {
+        constructor () {
+
+        }
+        myFunk () {
+
+        }
+    }
+  selections:
+    - anchor: { line: 5, character: 4 }
+      active: { line: 5, character: 4 }
+  marks: {}
+finalState:
+  documentContents: |
+
+    class MyClass {
+        constructor () {
+
+        }
+        myFunk () {
+
+        }
+    }
+  selections:
+    - anchor: { line: 1, character: 6 }
+      active: { line: 1, character: 13 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      modifier: { type: containingScope, scopeType: className },
+      insideOutsideType: inside,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/typescript/takeComment.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/typescript/takeComment.yml
new file mode 100644
index 0000000000..558b77fd92
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/typescript/takeComment.yml
@@ -0,0 +1,34 @@
+languageId: typescript
+command:
+  version: 1
+  spokenForm: take comment
+  action: setSelection
+  targets:
+    - type: primitive
+      modifier: { type: containingScope, scopeType: comment }
+initialState:
+  documentContents: |
+
+    // const value: string = "Hello world";
+  selections:
+    - anchor: { line: 1, character: 32 }
+      active: { line: 1, character: 32 }
+  marks: {}
+finalState:
+  documentContents: |
+
+    // const value: string = "Hello world";
+  selections:
+    - anchor: { line: 1, character: 0 }
+      active: { line: 1, character: 39 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      modifier: { type: containingScope, scopeType: comment },
+      insideOutsideType: inside,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/typescript/takeCondition.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/typescript/takeCondition.yml
new file mode 100644
index 0000000000..09c8f01937
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/typescript/takeCondition.yml
@@ -0,0 +1,50 @@
+languageId: typescript
+command:
+  version: 1
+  spokenForm: take condition
+  action: setSelection
+  targets:
+    - type: primitive
+      modifier:
+        { type: containingScope, scopeType: condition, includeSiblings: false }
+initialState:
+  documentContents: |-
+    if (true) {
+
+    }
+    for (let i = 0; i < length; ++i) {
+
+    }
+    while (true) {
+
+    }
+  selections:
+    - anchor: { line: 1, character: 0 }
+      active: { line: 1, character: 0 }
+  marks: {}
+finalState:
+  documentContents: |-
+    if (true) {
+
+    }
+    for (let i = 0; i < length; ++i) {
+
+    }
+    while (true) {
+
+    }
+  selections:
+    - anchor: { line: 0, character: 4 }
+      active: { line: 0, character: 8 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        { type: containingScope, scopeType: condition, includeSiblings: false },
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/typescript/takeCondition2.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/typescript/takeCondition2.yml
new file mode 100644
index 0000000000..4cc3682547
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/typescript/takeCondition2.yml
@@ -0,0 +1,50 @@
+languageId: typescript
+command:
+  version: 1
+  spokenForm: take condition
+  action: setSelection
+  targets:
+    - type: primitive
+      modifier:
+        { type: containingScope, scopeType: condition, includeSiblings: false }
+initialState:
+  documentContents: |-
+    if (true) {
+
+    }
+    for (let i = 0; i < length; ++i) {
+
+    }
+    while (true) {
+
+    }
+  selections:
+    - anchor: { line: 4, character: 0 }
+      active: { line: 4, character: 0 }
+  marks: {}
+finalState:
+  documentContents: |-
+    if (true) {
+
+    }
+    for (let i = 0; i < length; ++i) {
+
+    }
+    while (true) {
+
+    }
+  selections:
+    - anchor: { line: 3, character: 16 }
+      active: { line: 3, character: 26 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        { type: containingScope, scopeType: condition, includeSiblings: false },
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/typescript/takeCondition3.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/typescript/takeCondition3.yml
new file mode 100644
index 0000000000..5b433a8170
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/typescript/takeCondition3.yml
@@ -0,0 +1,50 @@
+languageId: typescript
+command:
+  version: 1
+  spokenForm: take condition
+  action: setSelection
+  targets:
+    - type: primitive
+      modifier:
+        { type: containingScope, scopeType: condition, includeSiblings: false }
+initialState:
+  documentContents: |-
+    if (true) {
+
+    }
+    for (let i = 0; i < length; ++i) {
+
+    }
+    while (true) {
+
+    }
+  selections:
+    - anchor: { line: 7, character: 0 }
+      active: { line: 7, character: 0 }
+  marks: {}
+finalState:
+  documentContents: |-
+    if (true) {
+
+    }
+    for (let i = 0; i < length; ++i) {
+
+    }
+    while (true) {
+
+    }
+  selections:
+    - anchor: { line: 6, character: 7 }
+      active: { line: 6, character: 11 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        { type: containingScope, scopeType: condition, includeSiblings: false },
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/typescript/takeEveryArgAir.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/typescript/takeEveryArgAir.yml
new file mode 100644
index 0000000000..ee23a97e58
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/typescript/takeEveryArgAir.yml
@@ -0,0 +1,46 @@
+languageId: typescript
+command:
+  version: 1
+  spokenForm: take every arg air
+  action: setSelection
+  targets:
+    - type: primitive
+      modifier:
+        {
+          type: containingScope,
+          scopeType: argumentOrParameter,
+          includeSiblings: true,
+        }
+      mark: { type: decoratedSymbol, symbolColor: default, character: a }
+initialState:
+  documentContents: foo(bar(baz, bongo), bazman)
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+  marks:
+    default.a:
+      start: { line: 0, character: 8 }
+      end: { line: 0, character: 11 }
+finalState:
+  documentContents: foo(bar(baz, bongo), bazman)
+  selections:
+    - anchor: { line: 0, character: 8 }
+      active: { line: 0, character: 11 }
+    - anchor: { line: 0, character: 13 }
+      active: { line: 0, character: 18 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: decoratedSymbol, symbolColor: default, character: a },
+      selectionType: token,
+      position: contents,
+      modifier:
+        {
+          type: containingScope,
+          scopeType: argumentOrParameter,
+          includeSiblings: true,
+        },
+      insideOutsideType: inside,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/typescript/takeEveryArgBat.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/typescript/takeEveryArgBat.yml
new file mode 100644
index 0000000000..3c32901213
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/typescript/takeEveryArgBat.yml
@@ -0,0 +1,46 @@
+languageId: typescript
+command:
+  version: 1
+  spokenForm: take every arg bat
+  action: setSelection
+  targets:
+    - type: primitive
+      modifier:
+        {
+          type: containingScope,
+          scopeType: argumentOrParameter,
+          includeSiblings: true,
+        }
+      mark: { type: decoratedSymbol, symbolColor: default, character: b }
+initialState:
+  documentContents: foo(bar(baz, bongo), bazman)
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+  marks:
+    default.b:
+      start: { line: 0, character: 21 }
+      end: { line: 0, character: 27 }
+finalState:
+  documentContents: foo(bar(baz, bongo), bazman)
+  selections:
+    - anchor: { line: 0, character: 4 }
+      active: { line: 0, character: 19 }
+    - anchor: { line: 0, character: 21 }
+      active: { line: 0, character: 27 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: decoratedSymbol, symbolColor: default, character: b },
+      selectionType: token,
+      position: contents,
+      modifier:
+        {
+          type: containingScope,
+          scopeType: argumentOrParameter,
+          includeSiblings: true,
+        },
+      insideOutsideType: inside,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/typescript/takeEveryArgRam.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/typescript/takeEveryArgRam.yml
new file mode 100644
index 0000000000..9401054d07
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/typescript/takeEveryArgRam.yml
@@ -0,0 +1,46 @@
+languageId: typescript
+command:
+  version: 1
+  spokenForm: take every arg ram
+  action: setSelection
+  targets:
+    - type: primitive
+      modifier:
+        {
+          type: containingScope,
+          scopeType: argumentOrParameter,
+          includeSiblings: true,
+        }
+      mark: { type: decoratedSymbol, symbolColor: default, character: r }
+initialState:
+  documentContents: foo(bar(baz, bongo), bazman)
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+  marks:
+    default.r:
+      start: { line: 0, character: 4 }
+      end: { line: 0, character: 7 }
+finalState:
+  documentContents: foo(bar(baz, bongo), bazman)
+  selections:
+    - anchor: { line: 0, character: 4 }
+      active: { line: 0, character: 19 }
+    - anchor: { line: 0, character: 21 }
+      active: { line: 0, character: 27 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: decoratedSymbol, symbolColor: default, character: r },
+      selectionType: token,
+      position: contents,
+      modifier:
+        {
+          type: containingScope,
+          scopeType: argumentOrParameter,
+          includeSiblings: true,
+        },
+      insideOutsideType: inside,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/typescript/takeEveryItem.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/typescript/takeEveryItem.yml
new file mode 100644
index 0000000000..6d8b4da515
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/typescript/takeEveryItem.yml
@@ -0,0 +1,50 @@
+languageId: typescript
+command:
+  version: 1
+  spokenForm: take every item
+  action: setSelection
+  targets:
+    - type: primitive
+      modifier:
+        {
+          type: containingScope,
+          scopeType: collectionItem,
+          includeSiblings: true,
+        }
+initialState:
+  documentContents: |
+
+    const value = { a: 1, b: 2, c: 3, foo };
+  selections:
+    - anchor: { line: 1, character: 17 }
+      active: { line: 1, character: 17 }
+  marks: {}
+finalState:
+  documentContents: |
+
+    const value = { a: 1, b: 2, c: 3, foo };
+  selections:
+    - anchor: { line: 1, character: 16 }
+      active: { line: 1, character: 20 }
+    - anchor: { line: 1, character: 22 }
+      active: { line: 1, character: 26 }
+    - anchor: { line: 1, character: 28 }
+      active: { line: 1, character: 32 }
+    - anchor: { line: 1, character: 34 }
+      active: { line: 1, character: 37 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      modifier:
+        {
+          type: containingScope,
+          scopeType: collectionItem,
+          includeSiblings: true,
+        },
+      insideOutsideType: inside,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/typescript/takeEveryItem2.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/typescript/takeEveryItem2.yml
new file mode 100644
index 0000000000..51bd7ca147
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/typescript/takeEveryItem2.yml
@@ -0,0 +1,50 @@
+languageId: typescript
+command:
+  version: 1
+  spokenForm: take every item
+  action: setSelection
+  targets:
+    - type: primitive
+      modifier:
+        {
+          type: containingScope,
+          scopeType: collectionItem,
+          includeSiblings: true,
+        }
+initialState:
+  documentContents: |
+
+    const value = [1, 2, 3, foo];
+  selections:
+    - anchor: { line: 1, character: 17 }
+      active: { line: 1, character: 17 }
+  marks: {}
+finalState:
+  documentContents: |
+
+    const value = [1, 2, 3, foo];
+  selections:
+    - anchor: { line: 1, character: 15 }
+      active: { line: 1, character: 16 }
+    - anchor: { line: 1, character: 18 }
+      active: { line: 1, character: 19 }
+    - anchor: { line: 1, character: 21 }
+      active: { line: 1, character: 22 }
+    - anchor: { line: 1, character: 24 }
+      active: { line: 1, character: 27 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      modifier:
+        {
+          type: containingScope,
+          scopeType: collectionItem,
+          includeSiblings: true,
+        },
+      insideOutsideType: inside,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/typescript/takeEveryItem3.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/typescript/takeEveryItem3.yml
new file mode 100644
index 0000000000..02ff7577b5
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/typescript/takeEveryItem3.yml
@@ -0,0 +1,48 @@
+languageId: typescript
+command:
+  version: 1
+  spokenForm: take every item
+  action: setSelection
+  targets:
+    - type: primitive
+      modifier:
+        {
+          type: containingScope,
+          scopeType: collectionItem,
+          includeSiblings: true,
+        }
+initialState:
+  documentContents: |
+
+    const { a, b, c } = {};
+  selections:
+    - anchor: { line: 1, character: 10 }
+      active: { line: 1, character: 10 }
+  marks: {}
+finalState:
+  documentContents: |
+
+    const { a, b, c } = {};
+  selections:
+    - anchor: { line: 1, character: 8 }
+      active: { line: 1, character: 9 }
+    - anchor: { line: 1, character: 11 }
+      active: { line: 1, character: 12 }
+    - anchor: { line: 1, character: 14 }
+      active: { line: 1, character: 15 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      modifier:
+        {
+          type: containingScope,
+          scopeType: collectionItem,
+          includeSiblings: true,
+        },
+      insideOutsideType: inside,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/typescript/takeEveryItem4.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/typescript/takeEveryItem4.yml
new file mode 100644
index 0000000000..b40e509221
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/typescript/takeEveryItem4.yml
@@ -0,0 +1,48 @@
+languageId: typescript
+command:
+  version: 1
+  spokenForm: take every item
+  action: setSelection
+  targets:
+    - type: primitive
+      modifier:
+        {
+          type: containingScope,
+          scopeType: collectionItem,
+          includeSiblings: true,
+        }
+initialState:
+  documentContents: |
+
+    const [a, b, c] = [];
+  selections:
+    - anchor: { line: 1, character: 9 }
+      active: { line: 1, character: 9 }
+  marks: {}
+finalState:
+  documentContents: |
+
+    const [a, b, c] = [];
+  selections:
+    - anchor: { line: 1, character: 7 }
+      active: { line: 1, character: 8 }
+    - anchor: { line: 1, character: 10 }
+      active: { line: 1, character: 11 }
+    - anchor: { line: 1, character: 13 }
+      active: { line: 1, character: 14 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      modifier:
+        {
+          type: containingScope,
+          scopeType: collectionItem,
+          includeSiblings: true,
+        },
+      insideOutsideType: inside,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/typescript/takeEveryItem5.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/typescript/takeEveryItem5.yml
new file mode 100644
index 0000000000..5b46046521
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/typescript/takeEveryItem5.yml
@@ -0,0 +1,52 @@
+languageId: typescript
+command:
+  version: 1
+  spokenForm: take every item
+  action: setSelection
+  targets:
+    - type: primitive
+      modifier:
+        {
+          type: containingScope,
+          scopeType: collectionItem,
+          includeSiblings: true,
+        }
+initialState:
+  documentContents: |-
+    const value = {
+        key1: "hello",
+        key2: "there",
+    };
+  selections:
+    - anchor: { line: 1, character: 10 }
+      active: { line: 1, character: 10 }
+    - anchor: { line: 2, character: 10 }
+      active: { line: 2, character: 17 }
+  marks: {}
+finalState:
+  documentContents: |-
+    const value = {
+        key1: "hello",
+        key2: "there",
+    };
+  selections:
+    - anchor: { line: 1, character: 4 }
+      active: { line: 1, character: 17 }
+    - anchor: { line: 2, character: 4 }
+      active: { line: 2, character: 17 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      modifier:
+        {
+          type: containingScope,
+          scopeType: collectionItem,
+          includeSiblings: true,
+        },
+      insideOutsideType: inside,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/typescript/takeEveryKey.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/typescript/takeEveryKey.yml
new file mode 100644
index 0000000000..4c750c1459
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/typescript/takeEveryKey.yml
@@ -0,0 +1,50 @@
+languageId: typescript
+command:
+  version: 1
+  spokenForm: take every key
+  action: setSelection
+  targets:
+    - type: primitive
+      modifier:
+        {
+          type: containingScope,
+          scopeType: collectionKey,
+          includeSiblings: true,
+        }
+initialState:
+  documentContents: |-
+    const value = {
+        key1: "hello",
+        key2: "there",
+    };
+  selections:
+    - anchor: { line: 1, character: 10 }
+      active: { line: 1, character: 10 }
+  marks: {}
+finalState:
+  documentContents: |-
+    const value = {
+        key1: "hello",
+        key2: "there",
+    };
+  selections:
+    - anchor: { line: 1, character: 4 }
+      active: { line: 1, character: 8 }
+    - anchor: { line: 2, character: 4 }
+      active: { line: 2, character: 8 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      modifier:
+        {
+          type: containingScope,
+          scopeType: collectionKey,
+          includeSiblings: true,
+        },
+      insideOutsideType: inside,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/typescript/takeEveryKey2.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/typescript/takeEveryKey2.yml
new file mode 100644
index 0000000000..e4f3db9a73
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/typescript/takeEveryKey2.yml
@@ -0,0 +1,50 @@
+languageId: typescript
+command:
+  version: 1
+  spokenForm: take every key
+  action: setSelection
+  targets:
+    - type: primitive
+      modifier:
+        {
+          type: containingScope,
+          scopeType: collectionKey,
+          includeSiblings: true,
+        }
+initialState:
+  documentContents: |-
+    {
+        foo: "hello",
+        bar,
+    }
+  selections:
+    - anchor: { line: 1, character: 4 }
+      active: { line: 1, character: 4 }
+  marks: {}
+finalState:
+  documentContents: |-
+    {
+        foo: "hello",
+        bar,
+    }
+  selections:
+    - anchor: { line: 1, character: 4 }
+      active: { line: 1, character: 7 }
+    - anchor: { line: 2, character: 4 }
+      active: { line: 2, character: 7 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        {
+          type: containingScope,
+          scopeType: collectionKey,
+          includeSiblings: true,
+        },
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/typescript/takeEveryValue.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/typescript/takeEveryValue.yml
new file mode 100644
index 0000000000..96bb86d4d2
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/typescript/takeEveryValue.yml
@@ -0,0 +1,42 @@
+languageId: typescript
+command:
+  version: 1
+  spokenForm: take every value
+  action: setSelection
+  targets:
+    - type: primitive
+      modifier:
+        { type: containingScope, scopeType: value, includeSiblings: true }
+initialState:
+  documentContents: |-
+    const value = {
+        key1: "hello",
+        key2: "there",
+    };
+  selections:
+    - anchor: { line: 1, character: 10 }
+      active: { line: 1, character: 10 }
+  marks: {}
+finalState:
+  documentContents: |-
+    const value = {
+        key1: "hello",
+        key2: "there",
+    };
+  selections:
+    - anchor: { line: 1, character: 10 }
+      active: { line: 1, character: 17 }
+    - anchor: { line: 2, character: 10 }
+      active: { line: 2, character: 17 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      modifier:
+        { type: containingScope, scopeType: value, includeSiblings: true },
+      insideOutsideType: inside,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/typescript/takeEveryValue2.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/typescript/takeEveryValue2.yml
new file mode 100644
index 0000000000..45b496cbb2
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/typescript/takeEveryValue2.yml
@@ -0,0 +1,42 @@
+languageId: typescript
+command:
+  version: 1
+  spokenForm: take every value
+  action: setSelection
+  targets:
+    - type: primitive
+      modifier:
+        { type: containingScope, scopeType: value, includeSiblings: true }
+initialState:
+  documentContents: |-
+    {
+        foo: "hello",
+        bar,
+    }
+  selections:
+    - anchor: { line: 1, character: 4 }
+      active: { line: 1, character: 4 }
+  marks: {}
+finalState:
+  documentContents: |-
+    {
+        foo: "hello",
+        bar,
+    }
+  selections:
+    - anchor: { line: 1, character: 9 }
+      active: { line: 1, character: 16 }
+    - anchor: { line: 2, character: 4 }
+      active: { line: 2, character: 7 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        { type: containingScope, scopeType: value, includeSiblings: true },
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/typescript/takeFunk.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/typescript/takeFunk.yml
new file mode 100644
index 0000000000..4744b8aa6e
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/typescript/takeFunk.yml
@@ -0,0 +1,38 @@
+languageId: typescript
+command:
+  version: 1
+  spokenForm: take funk
+  action: setSelection
+  targets:
+    - type: primitive
+      modifier: { type: containingScope, scopeType: namedFunction }
+initialState:
+  documentContents: |
+
+    function foo () {
+
+    }
+  selections:
+    - anchor: { line: 2, character: 0 }
+      active: { line: 2, character: 0 }
+  marks: {}
+finalState:
+  documentContents: |
+
+    function foo () {
+
+    }
+  selections:
+    - anchor: { line: 1, character: 0 }
+      active: { line: 3, character: 1 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      modifier: { type: containingScope, scopeType: namedFunction },
+      insideOutsideType: inside,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/typescript/takeFunk10.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/typescript/takeFunk10.yml
new file mode 100644
index 0000000000..a161dcaf89
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/typescript/takeFunk10.yml
@@ -0,0 +1,42 @@
+languageId: typescript
+command:
+  version: 1
+  spokenForm: take funk
+  action: setSelection
+  targets:
+    - type: primitive
+      modifier: { type: containingScope, scopeType: namedFunction }
+initialState:
+  documentContents: |-
+
+    class Bar {
+        foo () {
+
+        }
+    }
+  selections:
+    - anchor: { line: 3, character: 0 }
+      active: { line: 3, character: 0 }
+  marks: {}
+finalState:
+  documentContents: |-
+
+    class Bar {
+        foo () {
+
+        }
+    }
+  selections:
+    - anchor: { line: 2, character: 4 }
+      active: { line: 4, character: 5 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      modifier: { type: containingScope, scopeType: namedFunction },
+      insideOutsideType: inside,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/typescript/takeFunk11.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/typescript/takeFunk11.yml
new file mode 100644
index 0000000000..e5b1858666
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/typescript/takeFunk11.yml
@@ -0,0 +1,42 @@
+languageId: typescript
+command:
+  version: 1
+  spokenForm: take funk
+  action: setSelection
+  targets:
+    - type: primitive
+      modifier: { type: containingScope, scopeType: namedFunction }
+initialState:
+  documentContents: |-
+
+    class Bar {
+        foo = () => {
+
+        }
+    }
+  selections:
+    - anchor: { line: 3, character: 0 }
+      active: { line: 3, character: 0 }
+  marks: {}
+finalState:
+  documentContents: |-
+
+    class Bar {
+        foo = () => {
+
+        }
+    }
+  selections:
+    - anchor: { line: 2, character: 4 }
+      active: { line: 4, character: 5 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      modifier: { type: containingScope, scopeType: namedFunction },
+      insideOutsideType: inside,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/typescript/takeFunk12.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/typescript/takeFunk12.yml
new file mode 100644
index 0000000000..7c436d2665
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/typescript/takeFunk12.yml
@@ -0,0 +1,38 @@
+languageId: typescript
+command:
+  version: 1
+  spokenForm: take funk
+  action: setSelection
+  targets:
+    - type: primitive
+      modifier: { type: containingScope, scopeType: namedFunction }
+initialState:
+  documentContents: |
+
+    export default function() {
+
+    }
+  selections:
+    - anchor: { line: 2, character: 0 }
+      active: { line: 2, character: 0 }
+  marks: {}
+finalState:
+  documentContents: |
+
+    export default function() {
+
+    }
+  selections:
+    - anchor: { line: 1, character: 0 }
+      active: { line: 3, character: 1 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      modifier: { type: containingScope, scopeType: namedFunction },
+      insideOutsideType: inside,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/typescript/takeFunk13.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/typescript/takeFunk13.yml
new file mode 100644
index 0000000000..e3e3163f68
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/typescript/takeFunk13.yml
@@ -0,0 +1,38 @@
+languageId: typescript
+command:
+  version: 1
+  spokenForm: take funk
+  action: setSelection
+  targets:
+    - type: primitive
+      modifier: { type: containingScope, scopeType: namedFunction }
+initialState:
+  documentContents: |-
+
+    export default () => {
+
+    }
+  selections:
+    - anchor: { line: 2, character: 0 }
+      active: { line: 2, character: 0 }
+  marks: {}
+finalState:
+  documentContents: |-
+
+    export default () => {
+
+    }
+  selections:
+    - anchor: { line: 1, character: 0 }
+      active: { line: 3, character: 1 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      modifier: { type: containingScope, scopeType: namedFunction },
+      insideOutsideType: inside,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/typescript/takeFunk2.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/typescript/takeFunk2.yml
new file mode 100644
index 0000000000..eb8290e026
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/typescript/takeFunk2.yml
@@ -0,0 +1,38 @@
+languageId: typescript
+command:
+  version: 1
+  spokenForm: take funk
+  action: setSelection
+  targets:
+    - type: primitive
+      modifier: { type: containingScope, scopeType: namedFunction }
+initialState:
+  documentContents: |
+
+    export function foo () {
+
+    }
+  selections:
+    - anchor: { line: 2, character: 0 }
+      active: { line: 2, character: 0 }
+  marks: {}
+finalState:
+  documentContents: |
+
+    export function foo () {
+
+    }
+  selections:
+    - anchor: { line: 1, character: 0 }
+      active: { line: 3, character: 1 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      modifier: { type: containingScope, scopeType: namedFunction },
+      insideOutsideType: inside,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/typescript/takeFunk3.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/typescript/takeFunk3.yml
new file mode 100644
index 0000000000..d3fe05900b
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/typescript/takeFunk3.yml
@@ -0,0 +1,38 @@
+languageId: typescript
+command:
+  version: 1
+  spokenForm: take funk
+  action: setSelection
+  targets:
+    - type: primitive
+      modifier: { type: containingScope, scopeType: namedFunction }
+initialState:
+  documentContents: |
+
+    export default function foo () {
+
+    }
+  selections:
+    - anchor: { line: 2, character: 0 }
+      active: { line: 2, character: 0 }
+  marks: {}
+finalState:
+  documentContents: |
+
+    export default function foo () {
+
+    }
+  selections:
+    - anchor: { line: 1, character: 0 }
+      active: { line: 3, character: 1 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      modifier: { type: containingScope, scopeType: namedFunction },
+      insideOutsideType: inside,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/typescript/takeFunk4.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/typescript/takeFunk4.yml
new file mode 100644
index 0000000000..8668656ba8
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/typescript/takeFunk4.yml
@@ -0,0 +1,38 @@
+languageId: typescript
+command:
+  version: 1
+  spokenForm: take funk
+  action: setSelection
+  targets:
+    - type: primitive
+      modifier: { type: containingScope, scopeType: namedFunction }
+initialState:
+  documentContents: |
+
+    let foo = function() {
+
+    }
+  selections:
+    - anchor: { line: 2, character: 0 }
+      active: { line: 2, character: 0 }
+  marks: {}
+finalState:
+  documentContents: |
+
+    let foo = function() {
+
+    }
+  selections:
+    - anchor: { line: 1, character: 0 }
+      active: { line: 3, character: 1 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      modifier: { type: containingScope, scopeType: namedFunction },
+      insideOutsideType: inside,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/typescript/takeFunk5.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/typescript/takeFunk5.yml
new file mode 100644
index 0000000000..950970842c
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/typescript/takeFunk5.yml
@@ -0,0 +1,38 @@
+languageId: typescript
+command:
+  version: 1
+  spokenForm: take funk
+  action: setSelection
+  targets:
+    - type: primitive
+      modifier: { type: containingScope, scopeType: namedFunction }
+initialState:
+  documentContents: |
+
+    foo = function() {
+
+    }
+  selections:
+    - anchor: { line: 2, character: 0 }
+      active: { line: 2, character: 0 }
+  marks: {}
+finalState:
+  documentContents: |
+
+    foo = function() {
+
+    }
+  selections:
+    - anchor: { line: 1, character: 0 }
+      active: { line: 3, character: 1 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      modifier: { type: containingScope, scopeType: namedFunction },
+      insideOutsideType: inside,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/typescript/takeFunk6.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/typescript/takeFunk6.yml
new file mode 100644
index 0000000000..cf7f7ffe49
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/typescript/takeFunk6.yml
@@ -0,0 +1,38 @@
+languageId: typescript
+command:
+  version: 1
+  spokenForm: take funk
+  action: setSelection
+  targets:
+    - type: primitive
+      modifier: { type: containingScope, scopeType: namedFunction }
+initialState:
+  documentContents: |
+
+    let foo = () => {
+
+    }
+  selections:
+    - anchor: { line: 2, character: 0 }
+      active: { line: 2, character: 0 }
+  marks: {}
+finalState:
+  documentContents: |
+
+    let foo = () => {
+
+    }
+  selections:
+    - anchor: { line: 1, character: 0 }
+      active: { line: 3, character: 1 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      modifier: { type: containingScope, scopeType: namedFunction },
+      insideOutsideType: inside,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/typescript/takeFunk7.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/typescript/takeFunk7.yml
new file mode 100644
index 0000000000..38ac2ec109
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/typescript/takeFunk7.yml
@@ -0,0 +1,38 @@
+languageId: typescript
+command:
+  version: 1
+  spokenForm: take funk
+  action: setSelection
+  targets:
+    - type: primitive
+      modifier: { type: containingScope, scopeType: namedFunction }
+initialState:
+  documentContents: |
+
+    foo = () => {
+
+    }
+  selections:
+    - anchor: { line: 2, character: 0 }
+      active: { line: 2, character: 0 }
+  marks: {}
+finalState:
+  documentContents: |
+
+    foo = () => {
+
+    }
+  selections:
+    - anchor: { line: 1, character: 0 }
+      active: { line: 3, character: 1 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      modifier: { type: containingScope, scopeType: namedFunction },
+      insideOutsideType: inside,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/typescript/takeFunk8.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/typescript/takeFunk8.yml
new file mode 100644
index 0000000000..340f0ac3ff
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/typescript/takeFunk8.yml
@@ -0,0 +1,38 @@
+languageId: typescript
+command:
+  version: 1
+  spokenForm: take funk
+  action: setSelection
+  targets:
+    - type: primitive
+      modifier: { type: containingScope, scopeType: namedFunction }
+initialState:
+  documentContents: |
+
+    export let foo = () => {
+
+    }
+  selections:
+    - anchor: { line: 2, character: 0 }
+      active: { line: 2, character: 0 }
+  marks: {}
+finalState:
+  documentContents: |
+
+    export let foo = () => {
+
+    }
+  selections:
+    - anchor: { line: 1, character: 0 }
+      active: { line: 3, character: 1 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      modifier: { type: containingScope, scopeType: namedFunction },
+      insideOutsideType: inside,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/typescript/takeFunk9.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/typescript/takeFunk9.yml
new file mode 100644
index 0000000000..958b1a9964
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/typescript/takeFunk9.yml
@@ -0,0 +1,42 @@
+languageId: typescript
+command:
+  version: 1
+  spokenForm: take funk
+  action: setSelection
+  targets:
+    - type: primitive
+      modifier: { type: containingScope, scopeType: namedFunction }
+initialState:
+  documentContents: |
+
+    class Bar {
+        constructor () {
+
+        }
+    }
+  selections:
+    - anchor: { line: 3, character: 0 }
+      active: { line: 3, character: 0 }
+  marks: {}
+finalState:
+  documentContents: |
+
+    class Bar {
+        constructor () {
+
+        }
+    }
+  selections:
+    - anchor: { line: 2, character: 4 }
+      active: { line: 4, character: 5 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      modifier: { type: containingScope, scopeType: namedFunction },
+      insideOutsideType: inside,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/typescript/takeFunkCap.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/typescript/takeFunkCap.yml
new file mode 100644
index 0000000000..a3447b51f4
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/typescript/takeFunkCap.yml
@@ -0,0 +1,49 @@
+languageId: typescript
+command:
+  version: 1
+  spokenForm: take funk cap
+  action: setSelection
+  targets:
+    - type: primitive
+      modifier:
+        {
+          type: containingScope,
+          scopeType: namedFunction,
+          includeSiblings: false,
+        }
+      mark: { type: decoratedSymbol, symbolColor: default, character: c }
+initialState:
+  documentContents: |
+    const myFunk = () => {
+    };
+  selections:
+    - anchor: { line: 2, character: 0 }
+      active: { line: 2, character: 0 }
+  marks:
+    default.c:
+      start: { line: 0, character: 0 }
+      end: { line: 0, character: 5 }
+finalState:
+  documentContents: |
+    const myFunk = () => {
+    };
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 1, character: 2 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: decoratedSymbol, symbolColor: default, character: c },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        {
+          type: containingScope,
+          scopeType: namedFunction,
+          includeSiblings: false,
+        },
+      isImplicit: false,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/typescript/takeFunkMade.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/typescript/takeFunkMade.yml
new file mode 100644
index 0000000000..514ce5f780
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/typescript/takeFunkMade.yml
@@ -0,0 +1,49 @@
+languageId: typescript
+command:
+  version: 1
+  spokenForm: take funk made
+  action: setSelection
+  targets:
+    - type: primitive
+      modifier:
+        {
+          type: containingScope,
+          scopeType: namedFunction,
+          includeSiblings: false,
+        }
+      mark: { type: decoratedSymbol, symbolColor: default, character: m }
+initialState:
+  documentContents: |
+    const myFunk = () => {
+    };
+  selections:
+    - anchor: { line: 2, character: 0 }
+      active: { line: 2, character: 0 }
+  marks:
+    default.m:
+      start: { line: 0, character: 6 }
+      end: { line: 0, character: 12 }
+finalState:
+  documentContents: |
+    const myFunk = () => {
+    };
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 1, character: 2 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: decoratedSymbol, symbolColor: default, character: m },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        {
+          type: containingScope,
+          scopeType: namedFunction,
+          includeSiblings: false,
+        },
+      isImplicit: false,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/typescript/takeFunkMade2.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/typescript/takeFunkMade2.yml
new file mode 100644
index 0000000000..06528c1b1a
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/typescript/takeFunkMade2.yml
@@ -0,0 +1,49 @@
+languageId: typescript
+command:
+  version: 1
+  spokenForm: take funk made
+  action: setSelection
+  targets:
+    - type: primitive
+      modifier:
+        {
+          type: containingScope,
+          scopeType: namedFunction,
+          includeSiblings: false,
+        }
+      mark: { type: decoratedSymbol, symbolColor: default, character: m }
+initialState:
+  documentContents: |
+    const myFunk = function() {
+    }
+  selections:
+    - anchor: { line: 2, character: 0 }
+      active: { line: 2, character: 0 }
+  marks:
+    default.m:
+      start: { line: 0, character: 6 }
+      end: { line: 0, character: 12 }
+finalState:
+  documentContents: |
+    const myFunk = function() {
+    }
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 1, character: 1 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: decoratedSymbol, symbolColor: default, character: m },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        {
+          type: containingScope,
+          scopeType: namedFunction,
+          includeSiblings: false,
+        },
+      isImplicit: false,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/typescript/takeFunkName.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/typescript/takeFunkName.yml
new file mode 100644
index 0000000000..59959970f5
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/typescript/takeFunkName.yml
@@ -0,0 +1,38 @@
+languageId: typescript
+command:
+  version: 1
+  spokenForm: take funk name
+  action: setSelection
+  targets:
+    - type: primitive
+      modifier: { type: containingScope, scopeType: functionName }
+initialState:
+  documentContents: |
+
+    function foo () {
+
+    }
+  selections:
+    - anchor: { line: 2, character: 0 }
+      active: { line: 2, character: 0 }
+  marks: {}
+finalState:
+  documentContents: |
+
+    function foo () {
+
+    }
+  selections:
+    - anchor: { line: 1, character: 9 }
+      active: { line: 1, character: 12 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      modifier: { type: containingScope, scopeType: functionName },
+      insideOutsideType: inside,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/typescript/takeFunkName10.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/typescript/takeFunkName10.yml
new file mode 100644
index 0000000000..6b68a10f41
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/typescript/takeFunkName10.yml
@@ -0,0 +1,42 @@
+languageId: typescript
+command:
+  version: 1
+  spokenForm: take funk name
+  action: setSelection
+  targets:
+    - type: primitive
+      modifier: { type: containingScope, scopeType: functionName }
+initialState:
+  documentContents: |-
+
+    class Bar {
+        foo () {
+
+        }
+    }
+  selections:
+    - anchor: { line: 3, character: 0 }
+      active: { line: 3, character: 0 }
+  marks: {}
+finalState:
+  documentContents: |-
+
+    class Bar {
+        foo () {
+
+        }
+    }
+  selections:
+    - anchor: { line: 2, character: 4 }
+      active: { line: 2, character: 7 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      modifier: { type: containingScope, scopeType: functionName },
+      insideOutsideType: inside,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/typescript/takeFunkName11.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/typescript/takeFunkName11.yml
new file mode 100644
index 0000000000..0cc02fc229
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/typescript/takeFunkName11.yml
@@ -0,0 +1,42 @@
+languageId: typescript
+command:
+  version: 1
+  spokenForm: take funk name
+  action: setSelection
+  targets:
+    - type: primitive
+      modifier: { type: containingScope, scopeType: functionName }
+initialState:
+  documentContents: |-
+
+    class Bar {
+        foo = () => {
+
+        }
+    }
+  selections:
+    - anchor: { line: 3, character: 0 }
+      active: { line: 3, character: 0 }
+  marks: {}
+finalState:
+  documentContents: |-
+
+    class Bar {
+        foo = () => {
+
+        }
+    }
+  selections:
+    - anchor: { line: 2, character: 4 }
+      active: { line: 2, character: 7 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      modifier: { type: containingScope, scopeType: functionName },
+      insideOutsideType: inside,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/typescript/takeFunkName2.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/typescript/takeFunkName2.yml
new file mode 100644
index 0000000000..067af493aa
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/typescript/takeFunkName2.yml
@@ -0,0 +1,38 @@
+languageId: typescript
+command:
+  version: 1
+  spokenForm: take funk name
+  action: setSelection
+  targets:
+    - type: primitive
+      modifier: { type: containingScope, scopeType: functionName }
+initialState:
+  documentContents: |
+
+    export function foo () {
+
+    }
+  selections:
+    - anchor: { line: 2, character: 0 }
+      active: { line: 2, character: 0 }
+  marks: {}
+finalState:
+  documentContents: |
+
+    export function foo () {
+
+    }
+  selections:
+    - anchor: { line: 1, character: 16 }
+      active: { line: 1, character: 19 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      modifier: { type: containingScope, scopeType: functionName },
+      insideOutsideType: inside,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/typescript/takeFunkName3.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/typescript/takeFunkName3.yml
new file mode 100644
index 0000000000..af5e03b699
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/typescript/takeFunkName3.yml
@@ -0,0 +1,38 @@
+languageId: typescript
+command:
+  version: 1
+  spokenForm: take funk name
+  action: setSelection
+  targets:
+    - type: primitive
+      modifier: { type: containingScope, scopeType: functionName }
+initialState:
+  documentContents: |
+
+    export default function foo () {
+
+    }
+  selections:
+    - anchor: { line: 2, character: 0 }
+      active: { line: 2, character: 0 }
+  marks: {}
+finalState:
+  documentContents: |
+
+    export default function foo () {
+
+    }
+  selections:
+    - anchor: { line: 1, character: 24 }
+      active: { line: 1, character: 27 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      modifier: { type: containingScope, scopeType: functionName },
+      insideOutsideType: inside,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/typescript/takeFunkName4.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/typescript/takeFunkName4.yml
new file mode 100644
index 0000000000..cf7150763f
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/typescript/takeFunkName4.yml
@@ -0,0 +1,38 @@
+languageId: typescript
+command:
+  version: 1
+  spokenForm: take funk name
+  action: setSelection
+  targets:
+    - type: primitive
+      modifier: { type: containingScope, scopeType: functionName }
+initialState:
+  documentContents: |
+
+    let foo = function() {
+
+    }
+  selections:
+    - anchor: { line: 2, character: 0 }
+      active: { line: 2, character: 0 }
+  marks: {}
+finalState:
+  documentContents: |
+
+    let foo = function() {
+
+    }
+  selections:
+    - anchor: { line: 1, character: 4 }
+      active: { line: 1, character: 7 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      modifier: { type: containingScope, scopeType: functionName },
+      insideOutsideType: inside,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/typescript/takeFunkName5.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/typescript/takeFunkName5.yml
new file mode 100644
index 0000000000..3a9aa75d05
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/typescript/takeFunkName5.yml
@@ -0,0 +1,38 @@
+languageId: typescript
+command:
+  version: 1
+  spokenForm: take funk name
+  action: setSelection
+  targets:
+    - type: primitive
+      modifier: { type: containingScope, scopeType: functionName }
+initialState:
+  documentContents: |
+
+    foo = function() {
+
+    }
+  selections:
+    - anchor: { line: 2, character: 0 }
+      active: { line: 2, character: 0 }
+  marks: {}
+finalState:
+  documentContents: |
+
+    foo = function() {
+
+    }
+  selections:
+    - anchor: { line: 1, character: 0 }
+      active: { line: 1, character: 3 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      modifier: { type: containingScope, scopeType: functionName },
+      insideOutsideType: inside,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/typescript/takeFunkName6.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/typescript/takeFunkName6.yml
new file mode 100644
index 0000000000..fbefc72ed2
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/typescript/takeFunkName6.yml
@@ -0,0 +1,38 @@
+languageId: typescript
+command:
+  version: 1
+  spokenForm: take funk name
+  action: setSelection
+  targets:
+    - type: primitive
+      modifier: { type: containingScope, scopeType: functionName }
+initialState:
+  documentContents: |
+
+    let foo = () => {
+
+    }
+  selections:
+    - anchor: { line: 2, character: 0 }
+      active: { line: 2, character: 0 }
+  marks: {}
+finalState:
+  documentContents: |
+
+    let foo = () => {
+
+    }
+  selections:
+    - anchor: { line: 1, character: 4 }
+      active: { line: 1, character: 7 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      modifier: { type: containingScope, scopeType: functionName },
+      insideOutsideType: inside,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/typescript/takeFunkName7.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/typescript/takeFunkName7.yml
new file mode 100644
index 0000000000..3c81c01053
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/typescript/takeFunkName7.yml
@@ -0,0 +1,38 @@
+languageId: typescript
+command:
+  version: 1
+  spokenForm: take funk name
+  action: setSelection
+  targets:
+    - type: primitive
+      modifier: { type: containingScope, scopeType: functionName }
+initialState:
+  documentContents: |
+
+    foo = () => {
+
+    }
+  selections:
+    - anchor: { line: 2, character: 0 }
+      active: { line: 2, character: 0 }
+  marks: {}
+finalState:
+  documentContents: |
+
+    foo = () => {
+
+    }
+  selections:
+    - anchor: { line: 1, character: 0 }
+      active: { line: 1, character: 3 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      modifier: { type: containingScope, scopeType: functionName },
+      insideOutsideType: inside,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/typescript/takeFunkName8.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/typescript/takeFunkName8.yml
new file mode 100644
index 0000000000..416579d0b8
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/typescript/takeFunkName8.yml
@@ -0,0 +1,38 @@
+languageId: typescript
+command:
+  version: 1
+  spokenForm: take funk name
+  action: setSelection
+  targets:
+    - type: primitive
+      modifier: { type: containingScope, scopeType: functionName }
+initialState:
+  documentContents: |
+
+    export let foo = () => {
+
+    }
+  selections:
+    - anchor: { line: 2, character: 0 }
+      active: { line: 2, character: 0 }
+  marks: {}
+finalState:
+  documentContents: |
+
+    export let foo = () => {
+
+    }
+  selections:
+    - anchor: { line: 1, character: 11 }
+      active: { line: 1, character: 14 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      modifier: { type: containingScope, scopeType: functionName },
+      insideOutsideType: inside,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/typescript/takeFunkName9.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/typescript/takeFunkName9.yml
new file mode 100644
index 0000000000..9b3684e64d
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/typescript/takeFunkName9.yml
@@ -0,0 +1,42 @@
+languageId: typescript
+command:
+  version: 1
+  spokenForm: take funk name
+  action: setSelection
+  targets:
+    - type: primitive
+      modifier: { type: containingScope, scopeType: functionName }
+initialState:
+  documentContents: |
+
+    class Bar {
+        constructor () {
+
+        }
+    }
+  selections:
+    - anchor: { line: 3, character: 0 }
+      active: { line: 3, character: 0 }
+  marks: {}
+finalState:
+  documentContents: |
+
+    class Bar {
+        constructor () {
+
+        }
+    }
+  selections:
+    - anchor: { line: 2, character: 4 }
+      active: { line: 2, character: 15 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      modifier: { type: containingScope, scopeType: functionName },
+      insideOutsideType: inside,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/typescript/takeFunkSoon.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/typescript/takeFunkSoon.yml
new file mode 100644
index 0000000000..5ef8626030
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/typescript/takeFunkSoon.yml
@@ -0,0 +1,49 @@
+languageId: typescript
+command:
+  version: 1
+  spokenForm: take funk soon
+  action: setSelection
+  targets:
+    - type: primitive
+      modifier:
+        {
+          type: containingScope,
+          scopeType: namedFunction,
+          includeSiblings: false,
+        }
+      mark: { type: decoratedSymbol, symbolColor: default, character: s }
+initialState:
+  documentContents: |
+    const myFunk = function() {
+    }
+  selections:
+    - anchor: { line: 2, character: 0 }
+      active: { line: 2, character: 0 }
+  marks:
+    default.s:
+      start: { line: 0, character: 0 }
+      end: { line: 0, character: 5 }
+finalState:
+  documentContents: |
+    const myFunk = function() {
+    }
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 1, character: 1 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: decoratedSymbol, symbolColor: default, character: s },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        {
+          type: containingScope,
+          scopeType: namedFunction,
+          includeSiblings: false,
+        },
+      isImplicit: false,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/typescript/takeIf.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/typescript/takeIf.yml
new file mode 100644
index 0000000000..f7b25348da
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/typescript/takeIf.yml
@@ -0,0 +1,38 @@
+languageId: typescript
+command:
+  version: 1
+  spokenForm: take if
+  action: setSelection
+  targets:
+    - type: primitive
+      modifier: { type: containingScope, scopeType: ifStatement }
+initialState:
+  documentContents: |
+
+    if () {
+
+    }
+  selections:
+    - anchor: { line: 2, character: 0 }
+      active: { line: 2, character: 0 }
+  marks: {}
+finalState:
+  documentContents: |
+
+    if () {
+
+    }
+  selections:
+    - anchor: { line: 1, character: 0 }
+      active: { line: 3, character: 1 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      modifier: { type: containingScope, scopeType: ifStatement },
+      insideOutsideType: inside,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/typescript/takeItem.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/typescript/takeItem.yml
new file mode 100644
index 0000000000..8a743ccbc4
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/typescript/takeItem.yml
@@ -0,0 +1,34 @@
+languageId: typescript
+command:
+  version: 1
+  spokenForm: take item
+  action: setSelection
+  targets:
+    - type: primitive
+      modifier: { type: containingScope, scopeType: collectionItem }
+initialState:
+  documentContents: |
+
+    const value = { a: 1, b: 2, c: 3 };
+  selections:
+    - anchor: { line: 1, character: 15 }
+      active: { line: 1, character: 15 }
+  marks: {}
+finalState:
+  documentContents: |
+
+    const value = { a: 1, b: 2, c: 3 };
+  selections:
+    - anchor: { line: 1, character: 16 }
+      active: { line: 1, character: 20 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      modifier: { type: containingScope, scopeType: collectionItem },
+      insideOutsideType: inside,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/typescript/takeItem2.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/typescript/takeItem2.yml
new file mode 100644
index 0000000000..91558e97f9
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/typescript/takeItem2.yml
@@ -0,0 +1,34 @@
+languageId: typescript
+command:
+  version: 1
+  spokenForm: take item
+  action: setSelection
+  targets:
+    - type: primitive
+      modifier: { type: containingScope, scopeType: collectionItem }
+initialState:
+  documentContents: |
+
+    const value = { a: 1, b: 2, c: 3 };
+  selections:
+    - anchor: { line: 1, character: 16 }
+      active: { line: 1, character: 16 }
+  marks: {}
+finalState:
+  documentContents: |
+
+    const value = { a: 1, b: 2, c: 3 };
+  selections:
+    - anchor: { line: 1, character: 16 }
+      active: { line: 1, character: 20 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      modifier: { type: containingScope, scopeType: collectionItem },
+      insideOutsideType: inside,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/typescript/takeItem3.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/typescript/takeItem3.yml
new file mode 100644
index 0000000000..72e48e3e58
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/typescript/takeItem3.yml
@@ -0,0 +1,34 @@
+languageId: typescript
+command:
+  version: 1
+  spokenForm: take item
+  action: setSelection
+  targets:
+    - type: primitive
+      modifier: { type: containingScope, scopeType: collectionItem }
+initialState:
+  documentContents: |
+
+    const value = { a: 1, b: 2, c: 3 };
+  selections:
+    - anchor: { line: 1, character: 20 }
+      active: { line: 1, character: 20 }
+  marks: {}
+finalState:
+  documentContents: |
+
+    const value = { a: 1, b: 2, c: 3 };
+  selections:
+    - anchor: { line: 1, character: 16 }
+      active: { line: 1, character: 20 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      modifier: { type: containingScope, scopeType: collectionItem },
+      insideOutsideType: inside,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/typescript/takeItem4.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/typescript/takeItem4.yml
new file mode 100644
index 0000000000..23bcde3255
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/typescript/takeItem4.yml
@@ -0,0 +1,34 @@
+languageId: typescript
+command:
+  version: 1
+  spokenForm: take item
+  action: setSelection
+  targets:
+    - type: primitive
+      modifier: { type: containingScope, scopeType: collectionItem }
+initialState:
+  documentContents: |
+
+    const value = { a: 1, b: 2, c: 3 };
+  selections:
+    - anchor: { line: 1, character: 21 }
+      active: { line: 1, character: 21 }
+  marks: {}
+finalState:
+  documentContents: |
+
+    const value = { a: 1, b: 2, c: 3 };
+  selections:
+    - anchor: { line: 1, character: 22 }
+      active: { line: 1, character: 26 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      modifier: { type: containingScope, scopeType: collectionItem },
+      insideOutsideType: inside,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/typescript/takeItemAir.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/typescript/takeItemAir.yml
new file mode 100644
index 0000000000..ebee2ab907
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/typescript/takeItemAir.yml
@@ -0,0 +1,38 @@
+languageId: typescript
+command:
+  version: 1
+  spokenForm: take item air
+  action: setSelection
+  targets:
+    - type: primitive
+      modifier: { type: containingScope, scopeType: collectionItem }
+      mark: { type: decoratedSymbol, symbolColor: default, character: a }
+initialState:
+  documentContents: |
+
+    const value = { a: 1, b: 2, c: 3 };
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+  marks:
+    default.a:
+      start: { line: 1, character: 16 }
+      end: { line: 1, character: 17 }
+finalState:
+  documentContents: |
+
+    const value = { a: 1, b: 2, c: 3 };
+  selections:
+    - anchor: { line: 1, character: 16 }
+      active: { line: 1, character: 20 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: decoratedSymbol, symbolColor: default, character: a },
+      selectionType: token,
+      position: contents,
+      modifier: { type: containingScope, scopeType: collectionItem },
+      insideOutsideType: inside,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/typescript/takeItemComma.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/typescript/takeItemComma.yml
new file mode 100644
index 0000000000..c333178fc2
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/typescript/takeItemComma.yml
@@ -0,0 +1,38 @@
+languageId: typescript
+command:
+  version: 1
+  spokenForm: take item comma
+  action: setSelection
+  targets:
+    - type: primitive
+      modifier: { type: containingScope, scopeType: collectionItem }
+      mark: { type: decoratedSymbol, symbolColor: default, character: "," }
+initialState:
+  documentContents: |
+
+    const value = { a: 1, b: 2, c: 3 };
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+  marks:
+    default.,:
+      start: { line: 1, character: 20 }
+      end: { line: 1, character: 21 }
+finalState:
+  documentContents: |
+
+    const value = { a: 1, b: 2, c: 3 };
+  selections:
+    - anchor: { line: 1, character: 16 }
+      active: { line: 1, character: 26 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: decoratedSymbol, symbolColor: default, character: "," },
+      selectionType: token,
+      position: contents,
+      modifier: { type: containingScope, scopeType: collectionItem },
+      insideOutsideType: inside,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/typescript/takeItemOne.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/typescript/takeItemOne.yml
new file mode 100644
index 0000000000..b1bca07edc
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/typescript/takeItemOne.yml
@@ -0,0 +1,38 @@
+languageId: typescript
+command:
+  version: 1
+  spokenForm: take item one
+  action: setSelection
+  targets:
+    - type: primitive
+      modifier: { type: containingScope, scopeType: collectionItem }
+      mark: { type: decoratedSymbol, symbolColor: default, character: "1" }
+initialState:
+  documentContents: |
+
+    const value = [1, 2, 3]
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+  marks:
+    default.1:
+      start: { line: 1, character: 15 }
+      end: { line: 1, character: 16 }
+finalState:
+  documentContents: |
+
+    const value = [1, 2, 3]
+  selections:
+    - anchor: { line: 1, character: 15 }
+      active: { line: 1, character: 16 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: decoratedSymbol, symbolColor: default, character: "1" },
+      selectionType: token,
+      position: contents,
+      modifier: { type: containingScope, scopeType: collectionItem },
+      insideOutsideType: inside,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/typescript/takeKey.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/typescript/takeKey.yml
new file mode 100644
index 0000000000..9002aae61a
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/typescript/takeKey.yml
@@ -0,0 +1,34 @@
+languageId: typescript
+command:
+  version: 1
+  spokenForm: take key
+  action: setSelection
+  targets:
+    - type: primitive
+      modifier: { type: containingScope, scopeType: collectionKey }
+initialState:
+  documentContents: |
+
+    const value = { a: 1, b: 2, c: 3 };
+  selections:
+    - anchor: { line: 1, character: 17 }
+      active: { line: 1, character: 17 }
+  marks: {}
+finalState:
+  documentContents: |
+
+    const value = { a: 1, b: 2, c: 3 };
+  selections:
+    - anchor: { line: 1, character: 16 }
+      active: { line: 1, character: 17 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      modifier: { type: containingScope, scopeType: collectionKey },
+      insideOutsideType: inside,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/typescript/takeList.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/typescript/takeList.yml
new file mode 100644
index 0000000000..5c35119021
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/typescript/takeList.yml
@@ -0,0 +1,34 @@
+languageId: typescript
+command:
+  version: 1
+  spokenForm: take list
+  action: setSelection
+  targets:
+    - type: primitive
+      modifier: { type: containingScope, scopeType: list }
+initialState:
+  documentContents: |
+
+    const value = [1, 2, 3]
+  selections:
+    - anchor: { line: 1, character: 16 }
+      active: { line: 1, character: 16 }
+  marks: {}
+finalState:
+  documentContents: |
+
+    const value = [1, 2, 3]
+  selections:
+    - anchor: { line: 1, character: 14 }
+      active: { line: 1, character: 23 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      modifier: { type: containingScope, scopeType: list },
+      insideOutsideType: inside,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/typescript/takeList2.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/typescript/takeList2.yml
new file mode 100644
index 0000000000..f8e0a87aa6
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/typescript/takeList2.yml
@@ -0,0 +1,34 @@
+languageId: typescript
+command:
+  version: 1
+  spokenForm: take list
+  action: setSelection
+  targets:
+    - type: primitive
+      modifier: { type: containingScope, scopeType: list }
+initialState:
+  documentContents: |
+
+    const [a, b, c] = [];
+  selections:
+    - anchor: { line: 1, character: 9 }
+      active: { line: 1, character: 9 }
+  marks: {}
+finalState:
+  documentContents: |
+
+    const [a, b, c] = [];
+  selections:
+    - anchor: { line: 1, character: 6 }
+      active: { line: 1, character: 15 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      modifier: { type: containingScope, scopeType: list },
+      insideOutsideType: inside,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/typescript/takeMap.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/typescript/takeMap.yml
new file mode 100644
index 0000000000..8eaae986f1
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/typescript/takeMap.yml
@@ -0,0 +1,34 @@
+languageId: typescript
+command:
+  version: 1
+  spokenForm: take map
+  action: setSelection
+  targets:
+    - type: primitive
+      modifier: { type: containingScope, scopeType: map }
+initialState:
+  documentContents: |
+
+    const value = { a: 1, b: 2, c: 3 };
+  selections:
+    - anchor: { line: 1, character: 17 }
+      active: { line: 1, character: 17 }
+  marks: {}
+finalState:
+  documentContents: |
+
+    const value = { a: 1, b: 2, c: 3 };
+  selections:
+    - anchor: { line: 1, character: 14 }
+      active: { line: 1, character: 34 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      modifier: { type: containingScope, scopeType: map },
+      insideOutsideType: inside,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/typescript/takeMap2.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/typescript/takeMap2.yml
new file mode 100644
index 0000000000..eae4740322
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/typescript/takeMap2.yml
@@ -0,0 +1,34 @@
+languageId: typescript
+command:
+  version: 1
+  spokenForm: take map
+  action: setSelection
+  targets:
+    - type: primitive
+      modifier: { type: containingScope, scopeType: map }
+initialState:
+  documentContents: |
+
+    const { a, b, c } = {};
+  selections:
+    - anchor: { line: 1, character: 11 }
+      active: { line: 1, character: 11 }
+  marks: {}
+finalState:
+  documentContents: |
+
+    const { a, b, c } = {};
+  selections:
+    - anchor: { line: 1, character: 6 }
+      active: { line: 1, character: 17 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      modifier: { type: containingScope, scopeType: map },
+      insideOutsideType: inside,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/typescript/takeName.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/typescript/takeName.yml
new file mode 100644
index 0000000000..cbb2d45602
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/typescript/takeName.yml
@@ -0,0 +1,34 @@
+languageId: typescript
+command:
+  version: 1
+  spokenForm: take name
+  action: setSelection
+  targets:
+    - type: primitive
+      modifier: { type: containingScope, scopeType: name }
+initialState:
+  documentContents: |
+
+    const value: string = "Hello world";
+  selections:
+    - anchor: { line: 1, character: 29 }
+      active: { line: 1, character: 29 }
+  marks: {}
+finalState:
+  documentContents: |
+
+    const value: string = "Hello world";
+  selections:
+    - anchor: { line: 1, character: 6 }
+      active: { line: 1, character: 11 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      modifier: { type: containingScope, scopeType: name },
+      insideOutsideType: inside,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/typescript/takeName2.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/typescript/takeName2.yml
new file mode 100644
index 0000000000..52dd83b44e
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/typescript/takeName2.yml
@@ -0,0 +1,38 @@
+languageId: typescript
+command:
+  version: 1
+  spokenForm: take name
+  action: setSelection
+  targets:
+    - type: primitive
+      modifier: { type: containingScope, scopeType: name }
+initialState:
+  documentContents: |
+
+    function myFunk (name: string) {
+
+    }
+  selections:
+    - anchor: { line: 1, character: 22 }
+      active: { line: 1, character: 22 }
+  marks: {}
+finalState:
+  documentContents: |
+
+    function myFunk (name: string) {
+
+    }
+  selections:
+    - anchor: { line: 1, character: 17 }
+      active: { line: 1, character: 21 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      modifier: { type: containingScope, scopeType: name },
+      insideOutsideType: inside,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/typescript/takeRegex.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/typescript/takeRegex.yml
new file mode 100644
index 0000000000..9d8d81c722
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/typescript/takeRegex.yml
@@ -0,0 +1,34 @@
+languageId: typescript
+command:
+  version: 1
+  spokenForm: take regex
+  action: setSelection
+  targets:
+    - type: primitive
+      modifier: { type: containingScope, scopeType: regularExpression }
+initialState:
+  documentContents: |
+
+    const value = /\w.+$/
+  selections:
+    - anchor: { line: 1, character: 17 }
+      active: { line: 1, character: 17 }
+  marks: {}
+finalState:
+  documentContents: |
+
+    const value = /\w.+$/
+  selections:
+    - anchor: { line: 1, character: 14 }
+      active: { line: 1, character: 21 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      modifier: { type: containingScope, scopeType: regularExpression },
+      insideOutsideType: inside,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/typescript/takeState.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/typescript/takeState.yml
new file mode 100644
index 0000000000..203a789182
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/typescript/takeState.yml
@@ -0,0 +1,34 @@
+languageId: typescript
+command:
+  version: 1
+  spokenForm: take state
+  action: setSelection
+  targets:
+    - type: primitive
+      modifier: { type: containingScope, scopeType: statement }
+initialState:
+  documentContents: |
+
+    const value: string = "Hello world";
+  selections:
+    - anchor: { line: 1, character: 29 }
+      active: { line: 1, character: 29 }
+  marks: {}
+finalState:
+  documentContents: |
+
+    const value: string = "Hello world";
+  selections:
+    - anchor: { line: 1, character: 0 }
+      active: { line: 1, character: 36 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      modifier: { type: containingScope, scopeType: statement },
+      insideOutsideType: inside,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/typescript/takeState2.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/typescript/takeState2.yml
new file mode 100644
index 0000000000..24593ba247
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/typescript/takeState2.yml
@@ -0,0 +1,38 @@
+languageId: typescript
+command:
+  version: 1
+  spokenForm: take state
+  action: setSelection
+  targets:
+    - type: primitive
+      modifier:
+        { type: containingScope, scopeType: statement, includeSiblings: false }
+initialState:
+  documentContents: |-
+    if (true) {
+
+    }
+  selections:
+    - anchor: { line: 1, character: 0 }
+      active: { line: 1, character: 0 }
+  marks: {}
+finalState:
+  documentContents: |-
+    if (true) {
+
+    }
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 2, character: 1 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        { type: containingScope, scopeType: statement, includeSiblings: false },
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/typescript/takeString.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/typescript/takeString.yml
new file mode 100644
index 0000000000..57a221be38
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/typescript/takeString.yml
@@ -0,0 +1,34 @@
+languageId: typescript
+command:
+  version: 1
+  spokenForm: take string
+  action: setSelection
+  targets:
+    - type: primitive
+      modifier: { type: containingScope, scopeType: string }
+initialState:
+  documentContents: |
+
+    const value: string = "Hello world";
+  selections:
+    - anchor: { line: 1, character: 29 }
+      active: { line: 1, character: 29 }
+  marks: {}
+finalState:
+  documentContents: |
+
+    const value: string = "Hello world";
+  selections:
+    - anchor: { line: 1, character: 22 }
+      active: { line: 1, character: 35 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      modifier: { type: containingScope, scopeType: string },
+      insideOutsideType: inside,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/typescript/takeType.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/typescript/takeType.yml
new file mode 100644
index 0000000000..a00713037f
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/typescript/takeType.yml
@@ -0,0 +1,34 @@
+languageId: typescript
+command:
+  version: 1
+  spokenForm: take type
+  action: setSelection
+  targets:
+    - type: primitive
+      modifier: { type: containingScope, scopeType: type }
+initialState:
+  documentContents: |
+
+    const value: string = "Hello world";
+  selections:
+    - anchor: { line: 1, character: 29 }
+      active: { line: 1, character: 29 }
+  marks: {}
+finalState:
+  documentContents: |
+
+    const value: string = "Hello world";
+  selections:
+    - anchor: { line: 1, character: 13 }
+      active: { line: 1, character: 19 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      modifier: { type: containingScope, scopeType: type },
+      insideOutsideType: inside,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/typescript/takeType2.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/typescript/takeType2.yml
new file mode 100644
index 0000000000..a4eec929e5
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/typescript/takeType2.yml
@@ -0,0 +1,38 @@
+languageId: typescript
+command:
+  version: 1
+  spokenForm: take type
+  action: setSelection
+  targets:
+    - type: primitive
+      modifier: { type: containingScope, scopeType: type }
+initialState:
+  documentContents: |
+
+    function myFunk (name: string) {
+
+    }
+  selections:
+    - anchor: { line: 1, character: 22 }
+      active: { line: 1, character: 22 }
+  marks: {}
+finalState:
+  documentContents: |
+
+    function myFunk (name: string) {
+
+    }
+  selections:
+    - anchor: { line: 1, character: 23 }
+      active: { line: 1, character: 29 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      modifier: { type: containingScope, scopeType: type },
+      insideOutsideType: inside,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/typescript/takeValue.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/typescript/takeValue.yml
new file mode 100644
index 0000000000..6a8046051b
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/typescript/takeValue.yml
@@ -0,0 +1,34 @@
+languageId: typescript
+command:
+  version: 1
+  spokenForm: take value
+  action: setSelection
+  targets:
+    - type: primitive
+      modifier: { type: containingScope, scopeType: value }
+initialState:
+  documentContents: |
+
+    const value: string = "Hello world";
+  selections:
+    - anchor: { line: 1, character: 11 }
+      active: { line: 1, character: 11 }
+  marks: {}
+finalState:
+  documentContents: |
+
+    const value: string = "Hello world";
+  selections:
+    - anchor: { line: 1, character: 22 }
+      active: { line: 1, character: 35 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      modifier: { type: containingScope, scopeType: value },
+      insideOutsideType: inside,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/typescript/takeValue2.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/typescript/takeValue2.yml
new file mode 100644
index 0000000000..a40e1a8e54
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/typescript/takeValue2.yml
@@ -0,0 +1,34 @@
+languageId: typescript
+command:
+  version: 1
+  spokenForm: take value
+  action: setSelection
+  targets:
+    - type: primitive
+      modifier: { type: containingScope, scopeType: value }
+initialState:
+  documentContents: |
+
+    const value = { a: 1, b: 2, c: 3 };
+  selections:
+    - anchor: { line: 1, character: 17 }
+      active: { line: 1, character: 17 }
+  marks: {}
+finalState:
+  documentContents: |
+
+    const value = { a: 1, b: 2, c: 3 };
+  selections:
+    - anchor: { line: 1, character: 19 }
+      active: { line: 1, character: 20 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      modifier: { type: containingScope, scopeType: value },
+      insideOutsideType: inside,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/typescript/takeValue3.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/typescript/takeValue3.yml
new file mode 100644
index 0000000000..2366823443
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/typescript/takeValue3.yml
@@ -0,0 +1,38 @@
+languageId: typescript
+command:
+  version: 1
+  spokenForm: take value
+  action: setSelection
+  targets:
+    - type: primitive
+      modifier:
+        { type: containingScope, scopeType: value, includeSiblings: false }
+initialState:
+  documentContents: |-
+    function foo() {
+        return "hello";
+    }
+  selections:
+    - anchor: { line: 1, character: 14 }
+      active: { line: 1, character: 14 }
+  marks: {}
+finalState:
+  documentContents: |-
+    function foo() {
+        return "hello";
+    }
+  selections:
+    - anchor: { line: 1, character: 11 }
+      active: { line: 1, character: 18 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        { type: containingScope, scopeType: value, includeSiblings: false },
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/typescript/takeValue4.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/typescript/takeValue4.yml
new file mode 100644
index 0000000000..692885cb45
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/typescript/takeValue4.yml
@@ -0,0 +1,38 @@
+languageId: typescript
+command:
+  version: 1
+  spokenForm: take value
+  action: setSelection
+  targets:
+    - type: primitive
+      modifier:
+        { type: containingScope, scopeType: value, includeSiblings: false }
+initialState:
+  documentContents: |-
+    function foo() {
+        return "hello";
+    }
+  selections:
+    - anchor: { line: 1, character: 7 }
+      active: { line: 1, character: 7 }
+  marks: {}
+finalState:
+  documentContents: |-
+    function foo() {
+        return "hello";
+    }
+  selections:
+    - anchor: { line: 1, character: 11 }
+      active: { line: 1, character: 18 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        { type: containingScope, scopeType: value, includeSiblings: false },
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/typescript/tryCatchWrapThis.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/typescript/tryCatchWrapThis.yml
new file mode 100644
index 0000000000..5ca368a411
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/typescript/tryCatchWrapThis.yml
@@ -0,0 +1,37 @@
+languageId: typescript
+command:
+  version: 1
+  spokenForm: try catch wrap this
+  action: wrapWithSnippet
+  targets:
+    - type: primitive
+      mark: { type: cursor }
+  extraArgs: [tryCatchStatement.body]
+initialState:
+  documentContents: const foo = "hello";
+  selections:
+    - anchor: { line: 0, character: 6 }
+      active: { line: 0, character: 6 }
+  marks: {}
+finalState:
+  documentContents: |-
+    try {
+        const foo = "hello";
+    } catch (err) {
+
+    }
+  selections:
+    - anchor: { line: 3, character: 4 }
+      active: { line: 3, character: 4 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        { type: containingScope, scopeType: statement, includeSiblings: false },
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/typescript/tryCatchWrapThis2.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/typescript/tryCatchWrapThis2.yml
new file mode 100644
index 0000000000..a28e6a37b9
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/typescript/tryCatchWrapThis2.yml
@@ -0,0 +1,54 @@
+languageId: typescript
+command:
+  version: 1
+  spokenForm: try catch wrap this
+  action: wrapWithSnippet
+  targets:
+    - type: primitive
+      mark: { type: cursor }
+  extraArgs: [tryCatchStatement.body]
+initialState:
+  documentContents: |-
+    if (true) {
+        const foo = "hello";
+    }
+
+    const bar = "hello";
+  selections:
+    - anchor: { line: 4, character: 0 }
+      active: { line: 4, character: 0 }
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+  marks: {}
+finalState:
+  documentContents: |-
+    try {
+        if (true) {
+            const foo = "hello";
+        }
+    } catch (err) {
+
+    }
+
+    try {
+        const bar = "hello";
+    } catch (err) {
+
+    }
+  selections:
+    - anchor: { line: 11, character: 4 }
+      active: { line: 11, character: 4 }
+    - anchor: { line: 5, character: 4 }
+      active: { line: 5, character: 4 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        { type: containingScope, scopeType: statement, includeSiblings: false },
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/xml/clearAtHerThen.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/xml/clearAtHerThen.yml
new file mode 100644
index 0000000000..0ec128a02f
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/xml/clearAtHerThen.yml
@@ -0,0 +1,33 @@
+languageId: xml
+command:
+  version: 1
+  spokenForm: clear at her then
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier:
+        { type: containingScope, scopeType: attribute, includeSiblings: false }
+initialState:
+  documentContents: <note bar="back">foo</note>
+  selections:
+    - anchor: { line: 0, character: 14 }
+      active: { line: 0, character: 14 }
+  marks: {}
+finalState:
+  documentContents: <note >foo</note>
+  selections:
+    - anchor: { line: 0, character: 6 }
+      active: { line: 0, character: 6 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        { type: containingScope, scopeType: attribute, includeSiblings: false },
+      isImplicit: false,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/xml/clearCore.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/xml/clearCore.yml
new file mode 100644
index 0000000000..20caa9bb91
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/xml/clearCore.yml
@@ -0,0 +1,41 @@
+languageId: xml
+command:
+  version: 1
+  spokenForm: clear core
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier:
+        {
+          type: surroundingPair,
+          delimiter: any,
+          delimiterInclusion: interiorOnly,
+        }
+initialState:
+  documentContents: <note>foo</note>
+  selections:
+    - anchor: { line: 0, character: 13 }
+      active: { line: 0, character: 13 }
+  marks: {}
+finalState:
+  documentContents: <note>foo</>
+  selections:
+    - anchor: { line: 0, character: 11 }
+      active: { line: 0, character: 11 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        {
+          type: surroundingPair,
+          delimiter: any,
+          delimiterInclusion: interiorOnly,
+        },
+      isImplicit: false,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/xml/clearCore2.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/xml/clearCore2.yml
new file mode 100644
index 0000000000..29d9c0f209
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/xml/clearCore2.yml
@@ -0,0 +1,41 @@
+languageId: xml
+command:
+  version: 1
+  spokenForm: clear core
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier:
+        {
+          type: surroundingPair,
+          delimiter: any,
+          delimiterInclusion: interiorOnly,
+        }
+initialState:
+  documentContents: <note>foo</note>
+  selections:
+    - anchor: { line: 0, character: 3 }
+      active: { line: 0, character: 3 }
+  marks: {}
+finalState:
+  documentContents: <>foo</note>
+  selections:
+    - anchor: { line: 0, character: 1 }
+      active: { line: 0, character: 1 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        {
+          type: surroundingPair,
+          delimiter: any,
+          delimiterInclusion: interiorOnly,
+        },
+      isImplicit: false,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/xml/clearEli.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/xml/clearEli.yml
new file mode 100644
index 0000000000..0c958f44f8
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/xml/clearEli.yml
@@ -0,0 +1,37 @@
+languageId: xml
+command:
+  version: 1
+  spokenForm: clear eli
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier:
+        { type: containingScope, scopeType: xmlElement, includeSiblings: false }
+initialState:
+  documentContents: <note>foo</note>
+  selections:
+    - anchor: { line: 0, character: 8 }
+      active: { line: 0, character: 8 }
+  marks: {}
+finalState:
+  documentContents: ""
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        {
+          type: containingScope,
+          scopeType: xmlElement,
+          includeSiblings: false,
+        },
+      isImplicit: false,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/xml/clearEndTag.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/xml/clearEndTag.yml
new file mode 100644
index 0000000000..a6824a822e
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/xml/clearEndTag.yml
@@ -0,0 +1,33 @@
+languageId: xml
+command:
+  version: 1
+  spokenForm: clear end tag
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier:
+        { type: containingScope, scopeType: xmlEndTag, includeSiblings: false }
+initialState:
+  documentContents: <note>foo</note>
+  selections:
+    - anchor: { line: 0, character: 8 }
+      active: { line: 0, character: 8 }
+  marks: {}
+finalState:
+  documentContents: <note>foo
+  selections:
+    - anchor: { line: 0, character: 9 }
+      active: { line: 0, character: 9 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        { type: containingScope, scopeType: xmlEndTag, includeSiblings: false },
+      isImplicit: false,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/xml/clearEveryAtHer.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/xml/clearEveryAtHer.yml
new file mode 100644
index 0000000000..e8a1f3be78
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/xml/clearEveryAtHer.yml
@@ -0,0 +1,35 @@
+languageId: xml
+command:
+  version: 1
+  spokenForm: clear every at her
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier:
+        { type: containingScope, scopeType: attribute, includeSiblings: true }
+initialState:
+  documentContents: <note bar="back" bongo="badman">foo</note>
+  selections:
+    - anchor: { line: 0, character: 26 }
+      active: { line: 0, character: 26 }
+  marks: {}
+finalState:
+  documentContents: <note  >foo</note>
+  selections:
+    - anchor: { line: 0, character: 6 }
+      active: { line: 0, character: 6 }
+    - anchor: { line: 0, character: 7 }
+      active: { line: 0, character: 7 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        { type: containingScope, scopeType: attribute, includeSiblings: true },
+      isImplicit: false,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/xml/clearEveryEli.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/xml/clearEveryEli.yml
new file mode 100644
index 0000000000..f38210dd24
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/xml/clearEveryEli.yml
@@ -0,0 +1,51 @@
+languageId: xml
+command:
+  version: 1
+  spokenForm: clear every eli
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier:
+        { type: containingScope, scopeType: xmlElement, includeSiblings: true }
+initialState:
+  documentContents: |-
+    <note>
+        <to>Tove</to>
+        <from>Jani</from>
+        <heading>Reminder</heading>
+        <body>Don't forget me this weekend!</body>
+    </note>
+  selections:
+    - anchor: { line: 1, character: 10 }
+      active: { line: 1, character: 10 }
+  marks: {}
+finalState:
+  documentContents: |-
+    <note>
+
+
+
+
+    </note>
+  selections:
+    - anchor: { line: 1, character: 4 }
+      active: { line: 1, character: 4 }
+    - anchor: { line: 2, character: 4 }
+      active: { line: 2, character: 4 }
+    - anchor: { line: 3, character: 4 }
+      active: { line: 3, character: 4 }
+    - anchor: { line: 4, character: 4 }
+      active: { line: 4, character: 4 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        { type: containingScope, scopeType: xmlElement, includeSiblings: true },
+      isImplicit: false,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/xml/clearEveryTags.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/xml/clearEveryTags.yml
new file mode 100644
index 0000000000..dd0e0d7d34
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/xml/clearEveryTags.yml
@@ -0,0 +1,63 @@
+languageId: xml
+command:
+  version: 1
+  spokenForm: clear every tags
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier:
+        { type: containingScope, scopeType: xmlBothTags, includeSiblings: true }
+initialState:
+  documentContents: |-
+    <note>
+        <to>Tove</to>
+        <from>Jani</from>
+        <heading>Reminder</heading>
+        <body>Don't forget me this weekend!</body>
+    </note>
+  selections:
+    - anchor: { line: 1, character: 10 }
+      active: { line: 1, character: 10 }
+  marks: {}
+finalState:
+  documentContents: |-
+    <note>
+        Tove
+        Jani
+        Reminder
+        Don't forget me this weekend!
+    </note>
+  selections:
+    - anchor: { line: 1, character: 4 }
+      active: { line: 1, character: 4 }
+    - anchor: { line: 1, character: 8 }
+      active: { line: 1, character: 8 }
+    - anchor: { line: 2, character: 4 }
+      active: { line: 2, character: 4 }
+    - anchor: { line: 2, character: 8 }
+      active: { line: 2, character: 8 }
+    - anchor: { line: 3, character: 4 }
+      active: { line: 3, character: 4 }
+    - anchor: { line: 3, character: 12 }
+      active: { line: 3, character: 12 }
+    - anchor: { line: 4, character: 4 }
+      active: { line: 4, character: 4 }
+    - anchor: { line: 4, character: 33 }
+      active: { line: 4, character: 33 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        {
+          type: containingScope,
+          scopeType: xmlBothTags,
+          includeSiblings: true,
+        },
+      isImplicit: false,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/xml/clearKeyThen.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/xml/clearKeyThen.yml
new file mode 100644
index 0000000000..6e1b76add5
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/xml/clearKeyThen.yml
@@ -0,0 +1,41 @@
+languageId: xml
+command:
+  version: 1
+  spokenForm: clear key then
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier:
+        {
+          type: containingScope,
+          scopeType: collectionKey,
+          includeSiblings: false,
+        }
+initialState:
+  documentContents: <note bar="back">foo</note>
+  selections:
+    - anchor: { line: 0, character: 14 }
+      active: { line: 0, character: 14 }
+  marks: {}
+finalState:
+  documentContents: <note ="back">foo</note>
+  selections:
+    - anchor: { line: 0, character: 6 }
+      active: { line: 0, character: 6 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        {
+          type: containingScope,
+          scopeType: collectionKey,
+          includeSiblings: false,
+        },
+      isImplicit: false,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/xml/clearName.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/xml/clearName.yml
new file mode 100644
index 0000000000..ab8aeafa43
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/xml/clearName.yml
@@ -0,0 +1,33 @@
+languageId: xml
+command:
+  version: 1
+  spokenForm: clear name
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier:
+        { type: containingScope, scopeType: name, includeSiblings: false }
+initialState:
+  documentContents: <note bar="back">foo</note>
+  selections:
+    - anchor: { line: 0, character: 14 }
+      active: { line: 0, character: 14 }
+  marks: {}
+finalState:
+  documentContents: < bar="back">foo</note>
+  selections:
+    - anchor: { line: 0, character: 1 }
+      active: { line: 0, character: 1 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        { type: containingScope, scopeType: name, includeSiblings: false },
+      isImplicit: false,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/xml/clearPair.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/xml/clearPair.yml
new file mode 100644
index 0000000000..4fd6c14209
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/xml/clearPair.yml
@@ -0,0 +1,31 @@
+languageId: xml
+command:
+  version: 1
+  spokenForm: clear pair
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier: { type: surroundingPair, delimiter: any }
+initialState:
+  documentContents: <note>foo</note>
+  selections:
+    - anchor: { line: 0, character: 3 }
+      active: { line: 0, character: 3 }
+  marks: {}
+finalState:
+  documentContents: foo</note>
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier: { type: surroundingPair, delimiter: any },
+      isImplicit: false,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/xml/clearPair2.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/xml/clearPair2.yml
new file mode 100644
index 0000000000..c3c0d86da6
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/xml/clearPair2.yml
@@ -0,0 +1,31 @@
+languageId: xml
+command:
+  version: 1
+  spokenForm: clear pair
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier: { type: surroundingPair, delimiter: any }
+initialState:
+  documentContents: <note>foo</note>
+  selections:
+    - anchor: { line: 0, character: 13 }
+      active: { line: 0, character: 13 }
+  marks: {}
+finalState:
+  documentContents: <note>foo
+  selections:
+    - anchor: { line: 0, character: 9 }
+      active: { line: 0, character: 9 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier: { type: surroundingPair, delimiter: any },
+      isImplicit: false,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/xml/clearRound.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/xml/clearRound.yml
new file mode 100644
index 0000000000..15757f6933
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/xml/clearRound.yml
@@ -0,0 +1,31 @@
+languageId: xml
+command:
+  version: 1
+  spokenForm: clear round
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier: { type: surroundingPair, delimiter: parentheses }
+initialState:
+  documentContents: <note>foo (hello) whatever</note>
+  selections:
+    - anchor: { line: 0, character: 13 }
+      active: { line: 0, character: 13 }
+  marks: {}
+finalState:
+  documentContents: <note>foo  whatever</note>
+  selections:
+    - anchor: { line: 0, character: 10 }
+      active: { line: 0, character: 10 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier: { type: surroundingPair, delimiter: parentheses },
+      isImplicit: false,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/xml/clearStartTag.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/xml/clearStartTag.yml
new file mode 100644
index 0000000000..45060bd1b4
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/xml/clearStartTag.yml
@@ -0,0 +1,41 @@
+languageId: xml
+command:
+  version: 1
+  spokenForm: clear start tag
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier:
+        {
+          type: containingScope,
+          scopeType: xmlStartTag,
+          includeSiblings: false,
+        }
+initialState:
+  documentContents: <note>foo</note>
+  selections:
+    - anchor: { line: 0, character: 8 }
+      active: { line: 0, character: 8 }
+  marks: {}
+finalState:
+  documentContents: foo</note>
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        {
+          type: containingScope,
+          scopeType: xmlStartTag,
+          includeSiblings: false,
+        },
+      isImplicit: false,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/xml/clearTags.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/xml/clearTags.yml
new file mode 100644
index 0000000000..92789adde7
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/xml/clearTags.yml
@@ -0,0 +1,43 @@
+languageId: xml
+command:
+  version: 1
+  spokenForm: clear tags
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier:
+        {
+          type: containingScope,
+          scopeType: xmlBothTags,
+          includeSiblings: false,
+        }
+initialState:
+  documentContents: <note>foo</note>
+  selections:
+    - anchor: { line: 0, character: 8 }
+      active: { line: 0, character: 8 }
+  marks: {}
+finalState:
+  documentContents: foo
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+    - anchor: { line: 0, character: 3 }
+      active: { line: 0, character: 3 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        {
+          type: containingScope,
+          scopeType: xmlBothTags,
+          includeSiblings: false,
+        },
+      isImplicit: false,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/xml/scratchClearValue.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/xml/scratchClearValue.yml
new file mode 100644
index 0000000000..1d1784946f
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/xml/scratchClearValue.yml
@@ -0,0 +1,33 @@
+languageId: xml
+command:
+  version: 1
+  spokenForm: scratch clear value
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier:
+        { type: containingScope, scopeType: value, includeSiblings: false }
+initialState:
+  documentContents: <note bar="back">foo</note>
+  selections:
+    - anchor: { line: 0, character: 13 }
+      active: { line: 0, character: 13 }
+  marks: {}
+finalState:
+  documentContents: <note bar=>foo</note>
+  selections:
+    - anchor: { line: 0, character: 10 }
+      active: { line: 0, character: 10 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        { type: containingScope, scopeType: value, includeSiblings: false },
+      isImplicit: false,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/leadingTrailing/chuckLeadingWhale.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/leadingTrailing/chuckLeadingWhale.yml
new file mode 100644
index 0000000000..58de7bca1f
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/leadingTrailing/chuckLeadingWhale.yml
@@ -0,0 +1,33 @@
+languageId: plaintext
+command:
+  spokenForm: chuck leading whale
+  version: 2
+  targets:
+    - type: primitive
+      mark: { type: decoratedSymbol, symbolColor: default, character: w }
+      modifiers:
+        - { type: leading }
+  usePrePhraseSnapshot: true
+  action: { name: remove }
+initialState:
+  documentContents: hello world whatever
+  selections:
+    - anchor: { line: 0, character: 20 }
+      active: { line: 0, character: 20 }
+  marks:
+    default.w:
+      start: { line: 0, character: 6 }
+      end: { line: 0, character: 11 }
+finalState:
+  documentContents: helloworld whatever
+  selections:
+    - anchor: { line: 0, character: 19 }
+      active: { line: 0, character: 19 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: decoratedSymbol, symbolColor: default, character: w },
+      modifiers: [{ type: leading }],
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/leadingTrailing/chuckPastLeadingTrap.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/leadingTrailing/chuckPastLeadingTrap.yml
new file mode 100644
index 0000000000..216ccd4db6
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/leadingTrailing/chuckPastLeadingTrap.yml
@@ -0,0 +1,46 @@
+languageId: plaintext
+command:
+  spokenForm: chuck past leading trap
+  version: 2
+  targets:
+    - type: range
+      anchor: { type: primitive, isImplicit: true }
+      active:
+        type: primitive
+        mark: { type: decoratedSymbol, symbolColor: default, character: t }
+        modifiers:
+          - { type: leading }
+      excludeAnchor: false
+      excludeActive: false
+  usePrePhraseSnapshot: true
+  action: { name: remove }
+initialState:
+  documentContents: hello there
+  selections:
+    - anchor: { line: 0, character: 8 }
+      active: { line: 0, character: 8 }
+  marks:
+    default.t:
+      start: { line: 0, character: 6 }
+      end: { line: 0, character: 11 }
+finalState:
+  documentContents: helloere
+  selections:
+    - anchor: { line: 0, character: 5 }
+      active: { line: 0, character: 5 }
+fullTargets:
+  [
+    {
+      type: range,
+      excludeAnchor: false,
+      excludeActive: false,
+      rangeType: continuous,
+      anchor: { type: primitive, mark: { type: cursor }, modifiers: [] },
+      active:
+        {
+          type: primitive,
+          mark: { type: decoratedSymbol, symbolColor: default, character: t },
+          modifiers: [{ type: leading }],
+        },
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/leadingTrailing/chuckPastTrailingLook.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/leadingTrailing/chuckPastTrailingLook.yml
new file mode 100644
index 0000000000..ef4cdb2d7d
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/leadingTrailing/chuckPastTrailingLook.yml
@@ -0,0 +1,46 @@
+languageId: plaintext
+command:
+  spokenForm: chuck past trailing look
+  version: 2
+  targets:
+    - type: range
+      anchor: { type: primitive, isImplicit: true }
+      active:
+        type: primitive
+        mark: { type: decoratedSymbol, symbolColor: default, character: l }
+        modifiers:
+          - { type: trailing }
+      excludeAnchor: false
+      excludeActive: false
+  usePrePhraseSnapshot: true
+  action: { name: remove }
+initialState:
+  documentContents: hello there
+  selections:
+    - anchor: { line: 0, character: 2 }
+      active: { line: 0, character: 2 }
+  marks:
+    default.l:
+      start: { line: 0, character: 0 }
+      end: { line: 0, character: 5 }
+finalState:
+  documentContents: hethere
+  selections:
+    - anchor: { line: 0, character: 2 }
+      active: { line: 0, character: 2 }
+fullTargets:
+  [
+    {
+      type: range,
+      excludeAnchor: false,
+      excludeActive: false,
+      rangeType: continuous,
+      anchor: { type: primitive, mark: { type: cursor }, modifiers: [] },
+      active:
+        {
+          type: primitive,
+          mark: { type: decoratedSymbol, symbolColor: default, character: l },
+          modifiers: [{ type: trailing }],
+        },
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/leadingTrailing/chuckTrailingDrum.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/leadingTrailing/chuckTrailingDrum.yml
new file mode 100644
index 0000000000..735393e39d
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/leadingTrailing/chuckTrailingDrum.yml
@@ -0,0 +1,33 @@
+languageId: plaintext
+command:
+  spokenForm: chuck trailing drum
+  version: 2
+  targets:
+    - type: primitive
+      mark: { type: decoratedSymbol, symbolColor: default, character: d }
+      modifiers:
+        - { type: trailing }
+  usePrePhraseSnapshot: true
+  action: { name: remove }
+initialState:
+  documentContents: hello world whatever
+  selections:
+    - anchor: { line: 0, character: 5 }
+      active: { line: 0, character: 6 }
+  marks:
+    default.d:
+      start: { line: 0, character: 6 }
+      end: { line: 0, character: 11 }
+finalState:
+  documentContents: hello worldwhatever
+  selections:
+    - anchor: { line: 0, character: 5 }
+      active: { line: 0, character: 6 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: decoratedSymbol, symbolColor: default, character: d },
+      modifiers: [{ type: trailing }],
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/leadingTrailing/clearLeadingWhale.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/leadingTrailing/clearLeadingWhale.yml
new file mode 100644
index 0000000000..38d4186950
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/leadingTrailing/clearLeadingWhale.yml
@@ -0,0 +1,33 @@
+languageId: plaintext
+command:
+  spokenForm: clear leading whale
+  version: 2
+  targets:
+    - type: primitive
+      mark: { type: decoratedSymbol, symbolColor: default, character: w }
+      modifiers:
+        - { type: leading }
+  usePrePhraseSnapshot: true
+  action: { name: clearAndSetSelection }
+initialState:
+  documentContents: hello world whatever
+  selections:
+    - anchor: { line: 0, character: 20 }
+      active: { line: 0, character: 20 }
+  marks:
+    default.w:
+      start: { line: 0, character: 6 }
+      end: { line: 0, character: 11 }
+finalState:
+  documentContents: helloworld whatever
+  selections:
+    - anchor: { line: 0, character: 5 }
+      active: { line: 0, character: 5 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: decoratedSymbol, symbolColor: default, character: w },
+      modifiers: [{ type: leading }],
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/leadingTrailing/clearTrailingWhale.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/leadingTrailing/clearTrailingWhale.yml
new file mode 100644
index 0000000000..6382dcde34
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/leadingTrailing/clearTrailingWhale.yml
@@ -0,0 +1,33 @@
+languageId: plaintext
+command:
+  spokenForm: clear trailing whale
+  version: 2
+  targets:
+    - type: primitive
+      mark: { type: decoratedSymbol, symbolColor: default, character: w }
+      modifiers:
+        - { type: trailing }
+  usePrePhraseSnapshot: true
+  action: { name: clearAndSetSelection }
+initialState:
+  documentContents: hello world whatever
+  selections:
+    - anchor: { line: 0, character: 20 }
+      active: { line: 0, character: 20 }
+  marks:
+    default.w:
+      start: { line: 0, character: 6 }
+      end: { line: 0, character: 11 }
+finalState:
+  documentContents: hello worldwhatever
+  selections:
+    - anchor: { line: 0, character: 11 }
+      active: { line: 0, character: 11 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: decoratedSymbol, symbolColor: default, character: w },
+      modifiers: [{ type: trailing }],
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/lineEndings/chuckVestLF.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/lineEndings/chuckVestLF.yml
new file mode 100644
index 0000000000..52134de669
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/lineEndings/chuckVestLF.yml
@@ -0,0 +1,37 @@
+languageId: typescript
+command:
+  version: 1
+  spokenForm: chuck vest
+  action: remove
+  targets:
+    - type: primitive
+      mark: { type: decoratedSymbol, symbolColor: default, character: v }
+initialState:
+  documentContents: |
+
+    const value = "Hello world";
+  selections:
+    - anchor: { line: 1, character: 28 }
+      active: { line: 1, character: 28 }
+  marks:
+    default.v:
+      start: { line: 1, character: 6 }
+      end: { line: 1, character: 11 }
+finalState:
+  documentContents: |
+
+    const = "Hello world";
+  selections:
+    - anchor: { line: 1, character: 22 }
+      active: { line: 1, character: 22 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: decoratedSymbol, symbolColor: default, character: v },
+      selectionType: token,
+      position: contents,
+      modifier: { type: identity },
+      insideOutsideType: outside,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/lineEndings/chuckVestLFCR.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/lineEndings/chuckVestLFCR.yml
new file mode 100644
index 0000000000..c60c4883fc
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/lineEndings/chuckVestLFCR.yml
@@ -0,0 +1,33 @@
+languageId: typescript
+command:
+  version: 1
+  spokenForm: chuck vest
+  action: remove
+  targets:
+    - type: primitive
+      mark: { type: decoratedSymbol, symbolColor: default, character: v }
+initialState:
+  documentContents: "\r\nconst value = \"Hello world\";\r\n"
+  selections:
+    - anchor: { line: 1, character: 28 }
+      active: { line: 1, character: 28 }
+  marks:
+    default.v:
+      start: { line: 1, character: 6 }
+      end: { line: 1, character: 11 }
+finalState:
+  documentContents: "\r\nconst = \"Hello world\";\r\n"
+  selections:
+    - anchor: { line: 1, character: 22 }
+      active: { line: 1, character: 22 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: decoratedSymbol, symbolColor: default, character: v },
+      selectionType: token,
+      position: contents,
+      modifier: { type: identity },
+      insideOutsideType: outside,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/lineEndings/clearCoreFileLFCR.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/lineEndings/clearCoreFileLFCR.yml
new file mode 100644
index 0000000000..6d6b92d61f
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/lineEndings/clearCoreFileLFCR.yml
@@ -0,0 +1,35 @@
+languageId: plaintext
+command:
+  spokenForm: clear core file
+  version: 2
+  targets:
+    - type: primitive
+      modifiers:
+        - { type: interiorOnly }
+        - type: containingScope
+          scopeType: { type: document }
+  usePrePhraseSnapshot: true
+  action: { name: clearAndSetSelection }
+initialState:
+  documentContents: "\r\n abc \r\n"
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+  marks: {}
+finalState:
+  documentContents: "\r\n  \r\n"
+  selections:
+    - anchor: { line: 1, character: 1 }
+      active: { line: 1, character: 1 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      modifiers:
+        [
+          { type: interiorOnly },
+          { type: containingScope, scopeType: { type: document } },
+        ],
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/lineEndings/dropVestLF.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/lineEndings/dropVestLF.yml
new file mode 100644
index 0000000000..8ecce58d67
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/lineEndings/dropVestLF.yml
@@ -0,0 +1,38 @@
+languageId: typescript
+command:
+  version: 1
+  spokenForm: drop vest
+  action: insertEmptyLineBefore
+  targets:
+    - type: primitive
+      mark: { type: decoratedSymbol, symbolColor: default, character: v }
+initialState:
+  documentContents: |
+
+    const value = "Hello world";
+  selections:
+    - anchor: { line: 1, character: 28 }
+      active: { line: 1, character: 28 }
+  marks:
+    default.v:
+      start: { line: 1, character: 6 }
+      end: { line: 1, character: 11 }
+finalState:
+  documentContents: |
+
+
+    const value = "Hello world";
+  selections:
+    - anchor: { line: 2, character: 28 }
+      active: { line: 2, character: 28 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: decoratedSymbol, symbolColor: default, character: v },
+      selectionType: token,
+      position: contents,
+      modifier: { type: identity },
+      insideOutsideType: inside,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/lineEndings/dropVestLFCR.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/lineEndings/dropVestLFCR.yml
new file mode 100644
index 0000000000..a7a7ed31f1
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/lineEndings/dropVestLFCR.yml
@@ -0,0 +1,33 @@
+languageId: typescript
+command:
+  version: 1
+  spokenForm: drop vest
+  action: insertEmptyLineBefore
+  targets:
+    - type: primitive
+      mark: { type: decoratedSymbol, symbolColor: default, character: v }
+initialState:
+  documentContents: "\r\nconst value = \"Hello world\";\r\n"
+  selections:
+    - anchor: { line: 1, character: 28 }
+      active: { line: 1, character: 28 }
+  marks:
+    default.v:
+      start: { line: 1, character: 6 }
+      end: { line: 1, character: 11 }
+finalState:
+  documentContents: "\r\n\r\nconst value = \"Hello world\";\r\n"
+  selections:
+    - anchor: { line: 2, character: 28 }
+      active: { line: 2, character: 28 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: decoratedSymbol, symbolColor: default, character: v },
+      selectionType: token,
+      position: contents,
+      modifier: { type: identity },
+      insideOutsideType: inside,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/marks/chuckNothing.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/marks/chuckNothing.yml
new file mode 100644
index 0000000000..71733a034e
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/marks/chuckNothing.yml
@@ -0,0 +1,31 @@
+languageId: plaintext
+command:
+  version: 1
+  spokenForm: chuck nothing
+  action: remove
+  targets:
+    - type: primitive
+      mark: { type: nothing }
+initialState:
+  documentContents: hello world
+  selections:
+    - anchor: { line: 0, character: 11 }
+      active: { line: 0, character: 11 }
+  marks: {}
+finalState:
+  documentContents: hello world
+  selections:
+    - anchor: { line: 0, character: 11 }
+      active: { line: 0, character: 11 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: nothing },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: outside,
+      modifier: { type: identity },
+      isImplicit: false,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/marks/highlightHarp.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/marks/highlightHarp.yml
new file mode 100644
index 0000000000..c1f503134d
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/marks/highlightHarp.yml
@@ -0,0 +1,40 @@
+languageId: plaintext
+command:
+  version: 1
+  spokenForm: highlight harp
+  action: highlight
+  targets:
+    - type: primitive
+      mark: { type: decoratedSymbol, symbolColor: default, character: h }
+initialState:
+  documentContents: hello world
+  selections:
+    - anchor: { line: 0, character: 11 }
+      active: { line: 0, character: 11 }
+  marks:
+    default.h:
+      start: { line: 0, character: 0 }
+      end: { line: 0, character: 5 }
+finalState:
+  documentContents: hello world
+  selections:
+    - anchor: { line: 0, character: 11 }
+      active: { line: 0, character: 11 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: decoratedSymbol, symbolColor: default, character: h },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier: { type: identity },
+      isImplicit: false,
+    },
+  ]
+ide:
+  highlights:
+    - ranges:
+        - type: character
+          start: { line: 0, character: 0 }
+          end: { line: 0, character: 5 }
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/marks/takeDownOne.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/marks/takeDownOne.yml
new file mode 100644
index 0000000000..cfa83eb660
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/marks/takeDownOne.yml
@@ -0,0 +1,47 @@
+languageId: typescript
+command:
+  version: 1
+  spokenForm: take down one
+  action: setSelection
+  targets:
+    - type: primitive
+      selectionType: line
+      mark:
+        type: lineNumber
+        anchor: { lineNumber: 1, type: relative }
+        active: { lineNumber: 1, type: relative }
+initialState:
+  documentContents: |
+
+    const value = "Hello world";
+
+    const value = "Hello world";
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+  marks: {}
+finalState:
+  documentContents: |
+
+    const value = "Hello world";
+
+    const value = "Hello world";
+  selections:
+    - anchor: { line: 1, character: 0 }
+      active: { line: 1, character: 28 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: line,
+      position: contents,
+      modifier:
+        {
+          type: lineNumber,
+          anchor: { lineNumber: 1, type: relative },
+          active: { lineNumber: 1, type: relative },
+        },
+      insideOutsideType: inside,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/marks/takeDownOnePastThree.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/marks/takeDownOnePastThree.yml
new file mode 100644
index 0000000000..6def382d97
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/marks/takeDownOnePastThree.yml
@@ -0,0 +1,47 @@
+languageId: typescript
+command:
+  version: 1
+  spokenForm: take down one past three
+  action: setSelection
+  targets:
+    - type: primitive
+      selectionType: line
+      mark:
+        type: lineNumber
+        anchor: { lineNumber: 1, type: relative }
+        active: { lineNumber: 3, type: relative }
+initialState:
+  documentContents: |
+
+    const value = "Hello world";
+
+    const value = "Hello world";
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+  marks: {}
+finalState:
+  documentContents: |
+
+    const value = "Hello world";
+
+    const value = "Hello world";
+  selections:
+    - anchor: { line: 1, character: 0 }
+      active: { line: 3, character: 28 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: line,
+      position: contents,
+      modifier:
+        {
+          type: lineNumber,
+          anchor: { lineNumber: 1, type: relative },
+          active: { lineNumber: 3, type: relative },
+        },
+      insideOutsideType: inside,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/marks/takeRowFive.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/marks/takeRowFive.yml
new file mode 100644
index 0000000000..c538b0dc74
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/marks/takeRowFive.yml
@@ -0,0 +1,47 @@
+languageId: typescript
+command:
+  version: 1
+  spokenForm: take row five
+  action: setSelection
+  targets:
+    - type: primitive
+      selectionType: line
+      mark:
+        type: lineNumber
+        anchor: { lineNumber: 4, type: modulo100 }
+        active: { lineNumber: 4, type: modulo100 }
+initialState:
+  documentContents: |+
+
+
+
+
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+  marks: {}
+finalState:
+  documentContents: |+
+
+
+
+
+  selections:
+    - anchor: { line: 4, character: 0 }
+      active: { line: 4, character: 0 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark:
+        {
+          type: lineNumber,
+          anchor: { lineNumber: 4, type: modulo100 },
+          active: { lineNumber: 4, type: modulo100 },
+        },
+      selectionType: line,
+      position: contents,
+      insideOutsideType: inside,
+      modifier: { type: identity },
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/marks/takeRowFour.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/marks/takeRowFour.yml
new file mode 100644
index 0000000000..092819826a
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/marks/takeRowFour.yml
@@ -0,0 +1,47 @@
+languageId: typescript
+command:
+  version: 1
+  spokenForm: take row four
+  action: setSelection
+  targets:
+    - type: primitive
+      selectionType: line
+      mark:
+        type: lineNumber
+        anchor: { lineNumber: 3, type: absolute }
+        active: { lineNumber: 3, type: absolute }
+initialState:
+  documentContents: |
+
+    const value = "Hello world";
+
+    const value = "Hello world";
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+  marks: {}
+finalState:
+  documentContents: |
+
+    const value = "Hello world";
+
+    const value = "Hello world";
+  selections:
+    - anchor: { line: 3, character: 0 }
+      active: { line: 3, character: 28 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: line,
+      position: contents,
+      modifier:
+        {
+          type: lineNumber,
+          anchor: { lineNumber: 3, type: absolute },
+          active: { lineNumber: 3, type: absolute },
+        },
+      insideOutsideType: inside,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/marks/takeRowOne.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/marks/takeRowOne.yml
new file mode 100644
index 0000000000..d5c2814952
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/marks/takeRowOne.yml
@@ -0,0 +1,47 @@
+languageId: typescript
+command:
+  version: 1
+  spokenForm: take row one
+  action: setSelection
+  targets:
+    - type: primitive
+      selectionType: line
+      mark:
+        type: lineNumber
+        anchor: { lineNumber: 0, type: modulo100 }
+        active: { lineNumber: 0, type: modulo100 }
+initialState:
+  documentContents: |+
+
+
+
+
+  selections:
+    - anchor: { line: 4, character: 0 }
+      active: { line: 4, character: 0 }
+  marks: {}
+finalState:
+  documentContents: |+
+
+
+
+
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark:
+        {
+          type: lineNumber,
+          anchor: { lineNumber: 0, type: modulo100 },
+          active: { lineNumber: 0, type: modulo100 },
+        },
+      selectionType: line,
+      position: contents,
+      insideOutsideType: inside,
+      modifier: { type: identity },
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/marks/takeRowTwoPastDownThree.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/marks/takeRowTwoPastDownThree.yml
new file mode 100644
index 0000000000..fd9e881f9d
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/marks/takeRowTwoPastDownThree.yml
@@ -0,0 +1,47 @@
+languageId: typescript
+command:
+  version: 1
+  spokenForm: take row two past down three
+  action: setSelection
+  targets:
+    - type: primitive
+      selectionType: line
+      mark:
+        type: lineNumber
+        anchor: { lineNumber: 1, type: absolute }
+        active: { lineNumber: 3, type: relative }
+initialState:
+  documentContents: |
+
+    const value = "Hello world";
+
+    const value = "Hello world";
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+  marks: {}
+finalState:
+  documentContents: |
+
+    const value = "Hello world";
+
+    const value = "Hello world";
+  selections:
+    - anchor: { line: 1, character: 0 }
+      active: { line: 3, character: 28 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: line,
+      position: contents,
+      modifier:
+        {
+          type: lineNumber,
+          anchor: { lineNumber: 1, type: absolute },
+          active: { lineNumber: 3, type: relative },
+        },
+      insideOutsideType: inside,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/marks/takeRowTwoPastFour.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/marks/takeRowTwoPastFour.yml
new file mode 100644
index 0000000000..36038d1506
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/marks/takeRowTwoPastFour.yml
@@ -0,0 +1,47 @@
+languageId: typescript
+command:
+  version: 1
+  spokenForm: take row two past four
+  action: setSelection
+  targets:
+    - type: primitive
+      selectionType: line
+      mark:
+        type: lineNumber
+        anchor: { lineNumber: 1, type: absolute }
+        active: { lineNumber: 3, type: absolute }
+initialState:
+  documentContents: |
+
+    const value = "Hello world";
+
+    const value = "Hello world";
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+  marks: {}
+finalState:
+  documentContents: |
+
+    const value = "Hello world";
+
+    const value = "Hello world";
+  selections:
+    - anchor: { line: 1, character: 0 }
+      active: { line: 3, character: 28 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: line,
+      position: contents,
+      modifier:
+        {
+          type: lineNumber,
+          anchor: { lineNumber: 1, type: absolute },
+          active: { lineNumber: 3, type: absolute },
+        },
+      insideOutsideType: inside,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/marks/takeSource.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/marks/takeSource.yml
new file mode 100644
index 0000000000..cb21de25a7
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/marks/takeSource.yml
@@ -0,0 +1,41 @@
+languageId: typescript
+command:
+  version: 1
+  spokenForm: take source
+  action: setSelection
+  targets:
+    - type: primitive
+      mark: { type: source }
+initialState:
+  documentContents: |
+    value
+    const value = "Hello world";
+  selections:
+    - anchor: { line: 0, character: 5 }
+      active: { line: 0, character: 5 }
+  sourceMark:
+    - type: UntypedTarget
+      contentRange:
+        start: { line: 1, character: 6 }
+        end: { line: 1, character: 11 }
+      isReversed: false
+      hasExplicitRange: true
+  marks: {}
+finalState:
+  documentContents: |
+    value
+    const value = "Hello world";
+  selections:
+    - anchor: { line: 1, character: 6 }
+      active: { line: 1, character: 11 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: source },
+      selectionType: token,
+      position: contents,
+      modifier: { type: identity },
+      insideOutsideType: inside,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/marks/takeThat.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/marks/takeThat.yml
new file mode 100644
index 0000000000..5f69a726a9
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/marks/takeThat.yml
@@ -0,0 +1,41 @@
+languageId: typescript
+command:
+  version: 1
+  spokenForm: take that
+  action: setSelection
+  targets:
+    - type: primitive
+      mark: { type: that }
+initialState:
+  documentContents: |
+    value
+    const value = "Hello world";
+  selections:
+    - anchor: { line: 0, character: 5 }
+      active: { line: 0, character: 5 }
+  thatMark:
+    - type: UntypedTarget
+      contentRange:
+        start: { line: 0, character: 0 }
+        end: { line: 0, character: 5 }
+      isReversed: false
+      hasExplicitRange: true
+  marks: {}
+finalState:
+  documentContents: |
+    value
+    const value = "Hello world";
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 5 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: that },
+      selectionType: token,
+      position: contents,
+      modifier: { type: identity },
+      insideOutsideType: inside,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/marks/takeThis.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/marks/takeThis.yml
new file mode 100644
index 0000000000..919b64cee5
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/marks/takeThis.yml
@@ -0,0 +1,42 @@
+languageId: typescript
+command:
+  version: 1
+  spokenForm: take this
+  action: setSelection
+  targets:
+    - type: primitive
+      mark: { type: cursor }
+initialState:
+  documentContents: |
+
+    const value = "Hello world";
+  selections:
+    - anchor: { line: 1, character: 0 }
+      active: { line: 1, character: 5 }
+    - anchor: { line: 1, character: 6 }
+      active: { line: 1, character: 11 }
+    - anchor: { line: 1, character: 15 }
+      active: { line: 1, character: 20 }
+  marks: {}
+finalState:
+  documentContents: |
+
+    const value = "Hello world";
+  selections:
+    - anchor: { line: 1, character: 0 }
+      active: { line: 1, character: 5 }
+    - anchor: { line: 1, character: 6 }
+      active: { line: 1, character: 11 }
+    - anchor: { line: 1, character: 15 }
+      active: { line: 1, character: 20 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      modifier: { type: identity },
+      insideOutsideType: inside,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/marks/takeUpOnePastDownOne.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/marks/takeUpOnePastDownOne.yml
new file mode 100644
index 0000000000..9e2f0842d4
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/marks/takeUpOnePastDownOne.yml
@@ -0,0 +1,47 @@
+languageId: typescript
+command:
+  version: 1
+  spokenForm: take up one past down one
+  action: setSelection
+  targets:
+    - type: primitive
+      selectionType: line
+      mark:
+        type: lineNumber
+        anchor: { lineNumber: -1, type: relative }
+        active: { lineNumber: 1, type: relative }
+initialState:
+  documentContents: |
+
+    const value = "Hello world";
+
+    const value = "Hello world";
+  selections:
+    - anchor: { line: 2, character: 0 }
+      active: { line: 2, character: 0 }
+  marks: {}
+finalState:
+  documentContents: |
+
+    const value = "Hello world";
+
+    const value = "Hello world";
+  selections:
+    - anchor: { line: 1, character: 0 }
+      active: { line: 3, character: 28 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: line,
+      position: contents,
+      modifier:
+        {
+          type: lineNumber,
+          anchor: { lineNumber: -1, type: relative },
+          active: { lineNumber: 1, type: relative },
+        },
+      insideOutsideType: inside,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/marks/takeUpOnePastRowFour.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/marks/takeUpOnePastRowFour.yml
new file mode 100644
index 0000000000..0ba522e350
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/marks/takeUpOnePastRowFour.yml
@@ -0,0 +1,47 @@
+languageId: typescript
+command:
+  version: 1
+  spokenForm: take up one past row four
+  action: setSelection
+  targets:
+    - type: primitive
+      selectionType: line
+      mark:
+        type: lineNumber
+        anchor: { lineNumber: -1, type: relative }
+        active: { lineNumber: 3, type: absolute }
+initialState:
+  documentContents: |
+
+    const value = "Hello world";
+
+    const value = "Hello world";
+  selections:
+    - anchor: { line: 2, character: 0 }
+      active: { line: 2, character: 0 }
+  marks: {}
+finalState:
+  documentContents: |
+
+    const value = "Hello world";
+
+    const value = "Hello world";
+  selections:
+    - anchor: { line: 1, character: 0 }
+      active: { line: 3, character: 28 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: line,
+      position: contents,
+      modifier:
+        {
+          type: lineNumber,
+          anchor: { lineNumber: -1, type: relative },
+          active: { lineNumber: 3, type: absolute },
+        },
+      insideOutsideType: inside,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/modifiers/everyScope/clearEveryLine.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/modifiers/everyScope/clearEveryLine.yml
new file mode 100644
index 0000000000..317683f609
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/modifiers/everyScope/clearEveryLine.yml
@@ -0,0 +1,38 @@
+languageId: plaintext
+command:
+  spokenForm: clear every line
+  version: 3
+  targets:
+    - type: primitive
+      modifiers:
+        - type: everyScope
+          scopeType: { type: line }
+  usePrePhraseSnapshot: true
+  action: { name: clearAndSetSelection }
+initialState:
+  documentContents: |
+    aaa bbb ccc
+    ddd eee fff
+  selections:
+    - anchor: { line: 0, character: 4 }
+      active: { line: 0, character: 7 }
+  marks: {}
+finalState:
+  documentContents: |+
+
+
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+    - anchor: { line: 1, character: 0 }
+      active: { line: 1, character: 0 }
+    - anchor: { line: 2, character: 0 }
+      active: { line: 2, character: 0 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      modifiers: [{ type: everyScope, scopeType: { type: line } }],
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/modifiers/everyScope/clearEveryToken.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/modifiers/everyScope/clearEveryToken.yml
new file mode 100644
index 0000000000..e6c607a5d3
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/modifiers/everyScope/clearEveryToken.yml
@@ -0,0 +1,36 @@
+languageId: plaintext
+command:
+  spokenForm: clear every token
+  version: 3
+  targets:
+    - type: primitive
+      modifiers:
+        - type: everyScope
+          scopeType: { type: token }
+  usePrePhraseSnapshot: true
+  action: { name: clearAndSetSelection }
+initialState:
+  documentContents: aaa bbb ccc ddd
+  selections:
+    - anchor: { line: 0, character: 4 }
+      active: { line: 0, character: 7 }
+  marks: {}
+finalState:
+  documentContents: "   "
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+    - anchor: { line: 0, character: 1 }
+      active: { line: 0, character: 1 }
+    - anchor: { line: 0, character: 2 }
+      active: { line: 0, character: 2 }
+    - anchor: { line: 0, character: 3 }
+      active: { line: 0, character: 3 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      modifiers: [{ type: everyScope, scopeType: { type: token } }],
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/modifiers/everyScope/clearFirstToken.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/modifiers/everyScope/clearFirstToken.yml
new file mode 100644
index 0000000000..8f5f833c41
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/modifiers/everyScope/clearFirstToken.yml
@@ -0,0 +1,40 @@
+languageId: plaintext
+command:
+  spokenForm: clear first token
+  version: 3
+  targets:
+    - type: primitive
+      modifiers:
+        - type: ordinalScope
+          scopeType: { type: token }
+          start: 0
+          length: 1
+  usePrePhraseSnapshot: true
+  action: { name: clearAndSetSelection }
+initialState:
+  documentContents: aaa bbb ccc ddd
+  selections:
+    - anchor: { line: 0, character: 4 }
+      active: { line: 0, character: 7 }
+  marks: {}
+finalState:
+  documentContents: " bbb ccc ddd"
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      modifiers:
+        [
+          {
+            type: ordinalScope,
+            scopeType: { type: token },
+            start: 0,
+            length: 1,
+          },
+        ],
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/modifiers/everyScope/clearLastToken.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/modifiers/everyScope/clearLastToken.yml
new file mode 100644
index 0000000000..e742bc60a5
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/modifiers/everyScope/clearLastToken.yml
@@ -0,0 +1,40 @@
+languageId: plaintext
+command:
+  spokenForm: clear last token
+  version: 3
+  targets:
+    - type: primitive
+      modifiers:
+        - type: ordinalScope
+          scopeType: { type: token }
+          start: -1
+          length: 1
+  usePrePhraseSnapshot: true
+  action: { name: clearAndSetSelection }
+initialState:
+  documentContents: aaa bbb ccc ddd
+  selections:
+    - anchor: { line: 0, character: 4 }
+      active: { line: 0, character: 7 }
+  marks: {}
+finalState:
+  documentContents: "aaa bbb ccc "
+  selections:
+    - anchor: { line: 0, character: 12 }
+      active: { line: 0, character: 12 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      modifiers:
+        [
+          {
+            type: ordinalScope,
+            scopeType: { type: token },
+            start: -1,
+            length: 1,
+          },
+        ],
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/modifiers/everyScope/clearSecondLine.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/modifiers/everyScope/clearSecondLine.yml
new file mode 100644
index 0000000000..3fce735ca6
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/modifiers/everyScope/clearSecondLine.yml
@@ -0,0 +1,44 @@
+languageId: plaintext
+command:
+  spokenForm: clear second line
+  version: 3
+  targets:
+    - type: primitive
+      modifiers:
+        - type: ordinalScope
+          scopeType: { type: line }
+          start: 1
+          length: 1
+  usePrePhraseSnapshot: true
+  action: { name: clearAndSetSelection }
+initialState:
+  documentContents: |
+    aaa bbb ccc
+    ddd eee fff
+  selections:
+    - anchor: { line: 0, character: 4 }
+      active: { line: 0, character: 7 }
+  marks: {}
+finalState:
+  documentContents: |+
+    aaa bbb ccc
+
+  selections:
+    - anchor: { line: 1, character: 0 }
+      active: { line: 1, character: 0 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      modifiers:
+        [
+          {
+            type: ordinalScope,
+            scopeType: { type: line },
+            start: 1,
+            length: 1,
+          },
+        ],
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/nonMatchErrors/takeFunk.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/nonMatchErrors/takeFunk.yml
new file mode 100644
index 0000000000..e155c694e4
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/nonMatchErrors/takeFunk.yml
@@ -0,0 +1,38 @@
+languageId: ruby
+command:
+  version: 1
+  spokenForm: take funk
+  action: setSelection
+  targets:
+    - type: primitive
+      modifier:
+        {
+          type: containingScope,
+          scopeType: namedFunction,
+          includeSiblings: false,
+        }
+initialState:
+  documentContents: |2
+      [1, 2, 3, [4, 5, 6]]
+  selections:
+    - anchor: { line: 0, character: 11 }
+      active: { line: 0, character: 11 }
+  marks: {}
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        {
+          type: containingScope,
+          scopeType: namedFunction,
+          includeSiblings: false,
+        },
+      isImplicit: false,
+    },
+  ]
+thrownError: { name: NoContainingScopeError }
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/nonMatchErrors/takeList.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/nonMatchErrors/takeList.yml
new file mode 100644
index 0000000000..b1fcbb9bcc
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/nonMatchErrors/takeList.yml
@@ -0,0 +1,30 @@
+languageId: ruby
+command:
+  version: 1
+  spokenForm: take list
+  action: setSelection
+  targets:
+    - type: primitive
+      modifier:
+        { type: containingScope, scopeType: list, includeSiblings: false }
+initialState:
+  documentContents: |2
+      [1, 2, 3, [4, 5, 6]]
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+  marks: {}
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        { type: containingScope, scopeType: list, includeSiblings: false },
+      isImplicit: false,
+    },
+  ]
+thrownError: { name: NoContainingScopeError }
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/ordinalScopes/clearFirstPaint.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/ordinalScopes/clearFirstPaint.yml
new file mode 100644
index 0000000000..2b0ed5c75b
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/ordinalScopes/clearFirstPaint.yml
@@ -0,0 +1,40 @@
+languageId: plaintext
+command:
+  spokenForm: clear first paint
+  version: 3
+  targets:
+    - type: primitive
+      modifiers:
+        - type: ordinalScope
+          scopeType: { type: customRegex, regex: '[^\s"''`]+' }
+          start: 0
+          length: 1
+  usePrePhraseSnapshot: true
+  action: { name: clearAndSetSelection }
+initialState:
+  documentContents: aaa-bbb ccc-ddd eee-fff ggg-hhh
+  selections:
+    - anchor: { line: 0, character: 11 }
+      active: { line: 0, character: 20 }
+  marks: {}
+finalState:
+  documentContents: aaa-bbb  eee-fff ggg-hhh
+  selections:
+    - anchor: { line: 0, character: 8 }
+      active: { line: 0, character: 8 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      modifiers:
+        [
+          {
+            type: ordinalScope,
+            scopeType: { type: customRegex, regex: '[^\s"''`]+' },
+            start: 0,
+            length: 1,
+          },
+        ],
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/ordinalScopes/clearFirstPaint2.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/ordinalScopes/clearFirstPaint2.yml
new file mode 100644
index 0000000000..62a0ed2f0d
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/ordinalScopes/clearFirstPaint2.yml
@@ -0,0 +1,40 @@
+languageId: plaintext
+command:
+  spokenForm: clear first paint
+  version: 3
+  targets:
+    - type: primitive
+      modifiers:
+        - type: ordinalScope
+          scopeType: { type: customRegex, regex: '[^\s"''`]+' }
+          start: 0
+          length: 1
+  usePrePhraseSnapshot: true
+  action: { name: clearAndSetSelection }
+initialState:
+  documentContents: aaa-bbb ccc-ddd eee-fff ggg-hhh
+  selections:
+    - anchor: { line: 0, character: 11 }
+      active: { line: 0, character: 11 }
+  marks: {}
+finalState:
+  documentContents: " ccc-ddd eee-fff ggg-hhh"
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      modifiers:
+        [
+          {
+            type: ordinalScope,
+            scopeType: { type: customRegex, regex: '[^\s"''`]+' },
+            start: 0,
+            length: 1,
+          },
+        ],
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/ordinalScopes/clearFirstToken.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/ordinalScopes/clearFirstToken.yml
new file mode 100644
index 0000000000..1eda6288ca
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/ordinalScopes/clearFirstToken.yml
@@ -0,0 +1,40 @@
+languageId: plaintext
+command:
+  spokenForm: clear first token
+  version: 3
+  targets:
+    - type: primitive
+      modifiers:
+        - type: ordinalScope
+          scopeType: { type: token }
+          start: 0
+          length: 1
+  usePrePhraseSnapshot: true
+  action: { name: clearAndSetSelection }
+initialState:
+  documentContents: aaa bbb ccc ddd
+  selections:
+    - anchor: { line: 0, character: 5 }
+      active: { line: 0, character: 10 }
+  marks: {}
+finalState:
+  documentContents: aaa  ccc ddd
+  selections:
+    - anchor: { line: 0, character: 4 }
+      active: { line: 0, character: 4 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      modifiers:
+        [
+          {
+            type: ordinalScope,
+            scopeType: { type: token },
+            start: 0,
+            length: 1,
+          },
+        ],
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/ordinalScopes/clearFirstToken2.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/ordinalScopes/clearFirstToken2.yml
new file mode 100644
index 0000000000..1c56fda2ee
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/ordinalScopes/clearFirstToken2.yml
@@ -0,0 +1,40 @@
+languageId: plaintext
+command:
+  spokenForm: clear first token
+  version: 3
+  targets:
+    - type: primitive
+      modifiers:
+        - type: ordinalScope
+          scopeType: { type: token }
+          start: 0
+          length: 1
+  usePrePhraseSnapshot: true
+  action: { name: clearAndSetSelection }
+initialState:
+  documentContents: aaa bbb ccc ddd
+  selections:
+    - anchor: { line: 0, character: 3 }
+      active: { line: 0, character: 8 }
+  marks: {}
+finalState:
+  documentContents: aaa  ccc ddd
+  selections:
+    - anchor: { line: 0, character: 4 }
+      active: { line: 0, character: 4 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      modifiers:
+        [
+          {
+            type: ordinalScope,
+            scopeType: { type: token },
+            start: 0,
+            length: 1,
+          },
+        ],
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/ordinalScopes/clearLastPaint.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/ordinalScopes/clearLastPaint.yml
new file mode 100644
index 0000000000..075b92feb3
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/ordinalScopes/clearLastPaint.yml
@@ -0,0 +1,40 @@
+languageId: plaintext
+command:
+  spokenForm: clear last paint
+  version: 3
+  targets:
+    - type: primitive
+      modifiers:
+        - type: ordinalScope
+          scopeType: { type: customRegex, regex: '[^\s"''`]+' }
+          start: -1
+          length: 1
+  usePrePhraseSnapshot: true
+  action: { name: clearAndSetSelection }
+initialState:
+  documentContents: aaa-bbb ccc-ddd eee-fff ggg-hhh
+  selections:
+    - anchor: { line: 0, character: 11 }
+      active: { line: 0, character: 20 }
+  marks: {}
+finalState:
+  documentContents: aaa-bbb ccc-ddd  ggg-hhh
+  selections:
+    - anchor: { line: 0, character: 16 }
+      active: { line: 0, character: 16 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      modifiers:
+        [
+          {
+            type: ordinalScope,
+            scopeType: { type: customRegex, regex: '[^\s"''`]+' },
+            start: -1,
+            length: 1,
+          },
+        ],
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/ordinalScopes/clearLastPaint2.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/ordinalScopes/clearLastPaint2.yml
new file mode 100644
index 0000000000..a752f669ab
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/ordinalScopes/clearLastPaint2.yml
@@ -0,0 +1,40 @@
+languageId: plaintext
+command:
+  spokenForm: clear last paint
+  version: 3
+  targets:
+    - type: primitive
+      modifiers:
+        - type: ordinalScope
+          scopeType: { type: customRegex, regex: '[^\s"''`]+' }
+          start: -1
+          length: 1
+  usePrePhraseSnapshot: true
+  action: { name: clearAndSetSelection }
+initialState:
+  documentContents: aaa-bbb ccc-ddd eee-fff ggg-hhh
+  selections:
+    - anchor: { line: 0, character: 11 }
+      active: { line: 0, character: 11 }
+  marks: {}
+finalState:
+  documentContents: "aaa-bbb ccc-ddd eee-fff "
+  selections:
+    - anchor: { line: 0, character: 24 }
+      active: { line: 0, character: 24 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      modifiers:
+        [
+          {
+            type: ordinalScope,
+            scopeType: { type: customRegex, regex: '[^\s"''`]+' },
+            start: -1,
+            length: 1,
+          },
+        ],
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/ordinalScopes/clearLastToken.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/ordinalScopes/clearLastToken.yml
new file mode 100644
index 0000000000..7a921d974c
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/ordinalScopes/clearLastToken.yml
@@ -0,0 +1,40 @@
+languageId: plaintext
+command:
+  spokenForm: clear last token
+  version: 3
+  targets:
+    - type: primitive
+      modifiers:
+        - type: ordinalScope
+          scopeType: { type: token }
+          start: -1
+          length: 1
+  usePrePhraseSnapshot: true
+  action: { name: clearAndSetSelection }
+initialState:
+  documentContents: aaa bbb ccc ddd
+  selections:
+    - anchor: { line: 0, character: 5 }
+      active: { line: 0, character: 10 }
+  marks: {}
+finalState:
+  documentContents: aaa bbb  ddd
+  selections:
+    - anchor: { line: 0, character: 8 }
+      active: { line: 0, character: 8 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      modifiers:
+        [
+          {
+            type: ordinalScope,
+            scopeType: { type: token },
+            start: -1,
+            length: 1,
+          },
+        ],
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/ordinalScopes/clearLastToken2.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/ordinalScopes/clearLastToken2.yml
new file mode 100644
index 0000000000..7488df30e1
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/ordinalScopes/clearLastToken2.yml
@@ -0,0 +1,40 @@
+languageId: plaintext
+command:
+  spokenForm: clear last token
+  version: 3
+  targets:
+    - type: primitive
+      modifiers:
+        - type: ordinalScope
+          scopeType: { type: token }
+          start: -1
+          length: 1
+  usePrePhraseSnapshot: true
+  action: { name: clearAndSetSelection }
+initialState:
+  documentContents: aaa bbb ccc ddd
+  selections:
+    - anchor: { line: 0, character: 3 }
+      active: { line: 0, character: 8 }
+  marks: {}
+finalState:
+  documentContents: aaa  ccc ddd
+  selections:
+    - anchor: { line: 0, character: 4 }
+      active: { line: 0, character: 4 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      modifiers:
+        [
+          {
+            type: ordinalScope,
+            scopeType: { type: token },
+            start: -1,
+            length: 1,
+          },
+        ],
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/positions/bringArgMadeAndGustToEndOfJustThis.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/positions/bringArgMadeAndGustToEndOfJustThis.yml
new file mode 100644
index 0000000000..7e35e18576
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/positions/bringArgMadeAndGustToEndOfJustThis.yml
@@ -0,0 +1,74 @@
+languageId: typescript
+command:
+  spokenForm: bring arg made and gust to end of just this
+  version: 2
+  targets:
+    - type: list
+      elements:
+        - type: primitive
+          mark: { type: decoratedSymbol, symbolColor: default, character: m }
+          modifiers:
+            - type: containingScope
+              scopeType: { type: argumentOrParameter }
+        - type: primitive
+          mark: { type: decoratedSymbol, symbolColor: default, character: g }
+    - type: primitive
+      mark: { type: cursor }
+      modifiers:
+        - { type: position, position: end }
+        - { type: toRawSelection }
+  usePrePhraseSnapshot: true
+  action: { name: replaceWithTarget }
+initialState:
+  documentContents: |-
+    function whatever(name: string, age: number, inclose: boolean) {
+
+    }
+  selections:
+    - anchor: { line: 1, character: 4 }
+      active: { line: 1, character: 4 }
+  marks:
+    default.m:
+      start: { line: 0, character: 18 }
+      end: { line: 0, character: 22 }
+    default.g:
+      start: { line: 0, character: 32 }
+      end: { line: 0, character: 35 }
+finalState:
+  documentContents: |-
+    function whatever(name: string, age: number, inclose: boolean) {
+        name: string, age: number
+    }
+  selections:
+    - anchor: { line: 1, character: 29 }
+      active: { line: 1, character: 29 }
+fullTargets:
+  [
+    {
+      type: list,
+      elements:
+        [
+          {
+            type: primitive,
+            mark: { type: decoratedSymbol, symbolColor: default, character: m },
+            modifiers:
+              &ref_0 [
+                {
+                  type: containingScope,
+                  scopeType: { type: argumentOrParameter },
+                },
+              ],
+          },
+          {
+            type: primitive,
+            mark: { type: decoratedSymbol, symbolColor: default, character: g },
+            modifiers: *ref_0,
+          },
+        ],
+    },
+    {
+      type: primitive,
+      mark: { type: cursor },
+      modifiers: [{ type: position, position: end }, { type: toRawSelection }],
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/positions/bringBlockAirBeforeBatAndDrumAndAfterBatAndDrum.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/positions/bringBlockAirBeforeBatAndDrumAndAfterBatAndDrum.yml
new file mode 100644
index 0000000000..c232678089
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/positions/bringBlockAirBeforeBatAndDrumAndAfterBatAndDrum.yml
@@ -0,0 +1,107 @@
+languageId: plaintext
+command:
+  spokenForm: bring block air before bat and drum and after bat and drum
+  version: 2
+  targets:
+    - type: primitive
+      mark: { type: decoratedSymbol, symbolColor: default, character: a }
+      modifiers:
+        - type: containingScope
+          scopeType: { type: paragraph }
+    - type: list
+      elements:
+        - type: primitive
+          mark: { type: decoratedSymbol, symbolColor: default, character: b }
+          modifiers:
+            - { type: position, position: before }
+        - type: primitive
+          mark: { type: decoratedSymbol, symbolColor: default, character: d }
+        - type: primitive
+          mark: { type: decoratedSymbol, symbolColor: default, character: b }
+          modifiers:
+            - { type: position, position: after }
+        - type: primitive
+          mark: { type: decoratedSymbol, symbolColor: default, character: d }
+  usePrePhraseSnapshot: true
+  action: { name: replaceWithTarget }
+initialState:
+  documentContents: |-
+    aaa
+
+        bbb
+            ccc
+
+            ddd
+        eee
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+  marks:
+    default.a:
+      start: { line: 0, character: 0 }
+      end: { line: 0, character: 3 }
+    default.b:
+      start: { line: 2, character: 4 }
+      end: { line: 2, character: 7 }
+    default.d:
+      start: { line: 5, character: 8 }
+      end: { line: 5, character: 11 }
+finalState:
+  documentContents: |-
+    aaa
+
+        aaa
+
+        bbb
+            ccc
+
+        aaa
+
+        aaa
+
+            ddd
+        eee
+
+        aaa
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: decoratedSymbol, symbolColor: default, character: a },
+      modifiers:
+        [&ref_0 { type: containingScope, scopeType: { type: paragraph } }],
+    },
+    {
+      type: list,
+      elements:
+        [
+          {
+            type: primitive,
+            mark: { type: decoratedSymbol, symbolColor: default, character: b },
+            modifiers: [*ref_0],
+            positionModifier: { type: position, position: before },
+          },
+          {
+            type: primitive,
+            mark: { type: decoratedSymbol, symbolColor: default, character: d },
+            modifiers: [*ref_0],
+            positionModifier: { type: position, position: before },
+          },
+          {
+            type: primitive,
+            mark: { type: decoratedSymbol, symbolColor: default, character: b },
+            modifiers: [*ref_0],
+            positionModifier: { type: position, position: after },
+          },
+          {
+            type: primitive,
+            mark: { type: decoratedSymbol, symbolColor: default, character: d },
+            modifiers: [*ref_0],
+            positionModifier: { type: position, position: after },
+          },
+        ],
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/positions/bringFunkAirAfterBat.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/positions/bringFunkAirAfterBat.yml
new file mode 100644
index 0000000000..c8a07111d2
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/positions/bringFunkAirAfterBat.yml
@@ -0,0 +1,66 @@
+languageId: python
+command:
+  spokenForm: bring funk air after bat
+  version: 2
+  targets:
+    - type: primitive
+      mark: { type: decoratedSymbol, symbolColor: default, character: a }
+      modifiers:
+        - type: containingScope
+          scopeType: { type: namedFunction }
+    - type: primitive
+      mark: { type: decoratedSymbol, symbolColor: default, character: b }
+      modifiers:
+        - { type: position, position: after }
+  usePrePhraseSnapshot: true
+  action: { name: replaceWithTarget }
+initialState:
+  documentContents: |2
+        def aaa():
+
+            pass
+
+        def bbb():
+
+            pass
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+  marks:
+    default.a:
+      start: { line: 0, character: 8 }
+      end: { line: 0, character: 11 }
+    default.b:
+      start: { line: 4, character: 8 }
+      end: { line: 4, character: 11 }
+finalState:
+  documentContents: |2
+        def aaa():
+
+            pass
+
+        def bbb():
+
+            pass
+
+        def aaa():
+
+            pass
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: decoratedSymbol, symbolColor: default, character: a },
+      modifiers:
+        [&ref_0 { type: containingScope, scopeType: { type: namedFunction } }],
+    },
+    {
+      type: primitive,
+      mark: { type: decoratedSymbol, symbolColor: default, character: b },
+      modifiers: [*ref_0],
+      positionModifier: { type: position, position: after },
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/positions/bringFunkBatBeforeAir.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/positions/bringFunkBatBeforeAir.yml
new file mode 100644
index 0000000000..f7d9f22ab5
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/positions/bringFunkBatBeforeAir.yml
@@ -0,0 +1,66 @@
+languageId: python
+command:
+  spokenForm: bring funk bat before air
+  version: 2
+  targets:
+    - type: primitive
+      mark: { type: decoratedSymbol, symbolColor: default, character: b }
+      modifiers:
+        - type: containingScope
+          scopeType: { type: namedFunction }
+    - type: primitive
+      mark: { type: decoratedSymbol, symbolColor: default, character: a }
+      modifiers:
+        - { type: position, position: before }
+  usePrePhraseSnapshot: true
+  action: { name: replaceWithTarget }
+initialState:
+  documentContents: |2
+        def aaa():
+
+            pass
+
+        def bbb():
+
+            pass
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+  marks:
+    default.b:
+      start: { line: 4, character: 8 }
+      end: { line: 4, character: 11 }
+    default.a:
+      start: { line: 0, character: 8 }
+      end: { line: 0, character: 11 }
+finalState:
+  documentContents: |2
+        def bbb():
+
+            pass
+
+        def aaa():
+
+            pass
+
+        def bbb():
+
+            pass
+  selections:
+    - anchor: { line: 4, character: 0 }
+      active: { line: 4, character: 0 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: decoratedSymbol, symbolColor: default, character: b },
+      modifiers:
+        [&ref_0 { type: containingScope, scopeType: { type: namedFunction } }],
+    },
+    {
+      type: primitive,
+      mark: { type: decoratedSymbol, symbolColor: default, character: a },
+      modifiers: [*ref_0],
+      positionModifier: { type: position, position: before },
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/positions/bringHarpAfterLineOatsAndWhale.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/positions/bringHarpAfterLineOatsAndWhale.yml
new file mode 100644
index 0000000000..9fa5829d4f
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/positions/bringHarpAfterLineOatsAndWhale.yml
@@ -0,0 +1,75 @@
+languageId: typescript
+command:
+  spokenForm: bring harp after line oats and whale
+  version: 2
+  targets:
+    - type: primitive
+      mark: { type: decoratedSymbol, symbolColor: default, character: h }
+    - type: list
+      elements:
+        - type: primitive
+          mark: { type: decoratedSymbol, symbolColor: default, character: o }
+          modifiers:
+            - { type: position, position: after }
+            - type: containingScope
+              scopeType: { type: line }
+        - type: primitive
+          mark: { type: decoratedSymbol, symbolColor: default, character: w }
+  usePrePhraseSnapshot: true
+  action: { name: replaceWithTarget }
+initialState:
+  documentContents: |-
+    const whatever = "hello";
+
+    const whatever = "hello";
+  selections:
+    - anchor: { line: 2, character: 24 }
+      active: { line: 2, character: 24 }
+  marks:
+    default.h:
+      start: { line: 0, character: 6 }
+      end: { line: 0, character: 14 }
+    default.o:
+      start: { line: 0, character: 18 }
+      end: { line: 0, character: 23 }
+    default.w:
+      start: { line: 2, character: 6 }
+      end: { line: 2, character: 14 }
+finalState:
+  documentContents: |-
+    const whatever = "hello";
+    whatever
+
+    const whatever = "hello";
+    whatever
+  selections:
+    - anchor: { line: 3, character: 24 }
+      active: { line: 3, character: 24 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: decoratedSymbol, symbolColor: default, character: h },
+      modifiers: [],
+    },
+    {
+      type: list,
+      elements:
+        [
+          {
+            type: primitive,
+            mark: { type: decoratedSymbol, symbolColor: default, character: o },
+            modifiers:
+              &ref_0 [
+                { type: position, position: after },
+                { type: containingScope, scopeType: { type: line } },
+              ],
+          },
+          {
+            type: primitive,
+            mark: { type: decoratedSymbol, symbolColor: default, character: w },
+            modifiers: *ref_0,
+          },
+        ],
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/positions/bringHarpToAfterFile.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/positions/bringHarpToAfterFile.yml
new file mode 100644
index 0000000000..20fbed99d2
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/positions/bringHarpToAfterFile.yml
@@ -0,0 +1,47 @@
+languageId: plaintext
+command:
+  spokenForm: bring harp to after file
+  version: 2
+  action: { name: replaceWithTarget }
+  targets:
+    - type: primitive
+      mark: { type: decoratedSymbol, symbolColor: default, character: h }
+    - type: primitive
+      modifiers:
+        - { type: position, position: after }
+        - type: containingScope
+          scopeType: { type: document }
+  usePrePhraseSnapshot: true
+initialState:
+  documentContents: hello world
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+  marks:
+    default.h:
+      start: { line: 0, character: 0 }
+      end: { line: 0, character: 5 }
+finalState:
+  documentContents: |-
+    hello world
+    hello
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: decoratedSymbol, symbolColor: default, character: h },
+      modifiers: [],
+    },
+    {
+      type: primitive,
+      mark: { type: decoratedSymbol, symbolColor: default, character: h },
+      modifiers:
+        [
+          { type: position, position: after },
+          { type: containingScope, scopeType: document },
+        ],
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/positions/bringStateFineToAfterBatt.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/positions/bringStateFineToAfterBatt.yml
new file mode 100644
index 0000000000..cbb866194e
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/positions/bringStateFineToAfterBatt.yml
@@ -0,0 +1,54 @@
+languageId: typescript
+command:
+  spokenForm: bring state fine to after batt
+  version: 2
+  targets:
+    - type: primitive
+      mark: { type: decoratedSymbol, symbolColor: default, character: f }
+      modifiers:
+        - type: containingScope
+          scopeType: { type: statement }
+    - type: primitive
+      mark: { type: decoratedSymbol, symbolColor: default, character: b }
+      modifiers:
+        - { type: position, position: after }
+        - type: containingScope
+          scopeType: { type: statement }
+  usePrePhraseSnapshot: true
+  action: { name: replaceWithTarget }
+initialState:
+  documentContents: |
+    let foo;
+    let bar;
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+  marks:
+    default.f:
+      start: { line: 0, character: 4 }
+      end: { line: 0, character: 7 }
+    default.b:
+      start: { line: 1, character: 4 }
+      end: { line: 1, character: 7 }
+finalState:
+  documentContents: |
+    let foo;
+    let bar;
+    let foo;
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: decoratedSymbol, symbolColor: default, character: f },
+      modifiers:
+        [&ref_0 { type: containingScope, scopeType: { type: statement } }],
+    },
+    {
+      type: primitive,
+      mark: { type: decoratedSymbol, symbolColor: default, character: b },
+      modifiers: [*ref_0, { type: position, position: after }],
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/positions/bringWhaleToBeforeFile.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/positions/bringWhaleToBeforeFile.yml
new file mode 100644
index 0000000000..6ef0d3ed6f
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/positions/bringWhaleToBeforeFile.yml
@@ -0,0 +1,47 @@
+languageId: plaintext
+command:
+  spokenForm: bring whale to before file
+  version: 2
+  action: { name: replaceWithTarget }
+  targets:
+    - type: primitive
+      mark: { type: decoratedSymbol, symbolColor: default, character: w }
+    - type: primitive
+      modifiers:
+        - { type: position, position: before }
+        - type: containingScope
+          scopeType: { type: document }
+  usePrePhraseSnapshot: true
+initialState:
+  documentContents: hello world
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+  marks:
+    default.w:
+      start: { line: 0, character: 6 }
+      end: { line: 0, character: 11 }
+finalState:
+  documentContents: |-
+    world
+    hello world
+  selections:
+    - anchor: { line: 1, character: 0 }
+      active: { line: 1, character: 0 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: decoratedSymbol, symbolColor: default, character: w },
+      modifiers: [],
+    },
+    {
+      type: primitive,
+      mark: { type: decoratedSymbol, symbolColor: default, character: w },
+      modifiers:
+        [
+          { type: position, position: before },
+          { type: containingScope, scopeType: document },
+        ],
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/positions/chuckAfterHarp.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/positions/chuckAfterHarp.yml
new file mode 100644
index 0000000000..04170b47ec
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/positions/chuckAfterHarp.yml
@@ -0,0 +1,42 @@
+languageId: plaintext
+command:
+  version: 1
+  spokenForm: chuck after harp
+  action: remove
+  targets:
+    - type: primitive
+      position: after
+      mark: { type: decoratedSymbol, symbolColor: default, character: h }
+initialState:
+  documentContents: |
+    "hello "
+    " hello"
+    " hello "
+    return a.b
+  selections:
+    - anchor: { line: 4, character: 0 }
+      active: { line: 4, character: 0 }
+  marks:
+    default.h:
+      start: { line: 2, character: 2 }
+      end: { line: 2, character: 7 }
+finalState:
+  documentContents: |
+    "hello "
+    " hello"
+    " hello"
+    return a.b
+  selections:
+    - anchor: { line: 4, character: 0 }
+      active: { line: 4, character: 0 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: decoratedSymbol, symbolColor: default, character: h },
+      selectionType: token,
+      position: after,
+      insideOutsideType: outside,
+      modifier: { type: identity },
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/positions/chuckAfterLineVest.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/positions/chuckAfterLineVest.yml
new file mode 100644
index 0000000000..181eb59f1f
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/positions/chuckAfterLineVest.yml
@@ -0,0 +1,42 @@
+languageId: plaintext
+command:
+  version: 1
+  spokenForm: chuck after line vest
+  action: remove
+  targets:
+    - type: primitive
+      position: after
+      selectionType: line
+      mark: { type: decoratedSymbol, symbolColor: default, character: v }
+initialState:
+  documentContents: |-
+
+    const value = "Hello world";
+
+        const value = "Hello world";
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+  marks:
+    default.v:
+      start: { line: 1, character: 6 }
+      end: { line: 1, character: 11 }
+finalState:
+  documentContents: |-
+
+    const value = "Hello world";
+        const value = "Hello world";
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: decoratedSymbol, symbolColor: default, character: v },
+      selectionType: line,
+      position: after,
+      modifier: { type: identity },
+      insideOutsideType: outside,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/positions/chuckAfterLook.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/positions/chuckAfterLook.yml
new file mode 100644
index 0000000000..cd44ef5810
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/positions/chuckAfterLook.yml
@@ -0,0 +1,42 @@
+languageId: plaintext
+command:
+  version: 1
+  spokenForm: chuck after look
+  action: remove
+  targets:
+    - type: primitive
+      position: after
+      mark: { type: decoratedSymbol, symbolColor: default, character: l }
+initialState:
+  documentContents: |
+    "hello "
+    " hello"
+    " hello "
+    return a.b
+  selections:
+    - anchor: { line: 4, character: 0 }
+      active: { line: 4, character: 0 }
+  marks:
+    default.l:
+      start: { line: 0, character: 1 }
+      end: { line: 0, character: 6 }
+finalState:
+  documentContents: |
+    "hello"
+    " hello"
+    " hello "
+    return a.b
+  selections:
+    - anchor: { line: 4, character: 0 }
+      active: { line: 4, character: 0 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: decoratedSymbol, symbolColor: default, character: l },
+      selectionType: token,
+      position: after,
+      insideOutsideType: outside,
+      modifier: { type: identity },
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/positions/chuckAfterVest.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/positions/chuckAfterVest.yml
new file mode 100644
index 0000000000..5a2e10c682
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/positions/chuckAfterVest.yml
@@ -0,0 +1,38 @@
+languageId: plaintext
+command:
+  version: 1
+  spokenForm: chuck after vest
+  action: remove
+  targets:
+    - type: primitive
+      position: after
+      mark: { type: decoratedSymbol, symbolColor: default, character: v }
+initialState:
+  documentContents: |
+
+    const value = "Hello world";
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+  marks:
+    default.v:
+      start: { line: 1, character: 6 }
+      end: { line: 1, character: 11 }
+finalState:
+  documentContents: |
+
+    const value= "Hello world";
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: decoratedSymbol, symbolColor: default, character: v },
+      selectionType: token,
+      position: after,
+      modifier: { type: identity },
+      insideOutsideType: outside,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/positions/chuckAfterWhale.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/positions/chuckAfterWhale.yml
new file mode 100644
index 0000000000..9cfe20a1c4
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/positions/chuckAfterWhale.yml
@@ -0,0 +1,29 @@
+languageId: plaintext
+command:
+  spokenForm: chuck after whale
+  version: 2
+  targets:
+    - type: primitive
+      mark: { type: decoratedSymbol, symbolColor: default, character: w }
+      modifiers:
+        - { type: position, position: after }
+  usePrePhraseSnapshot: true
+  action: { name: remove }
+initialState:
+  documentContents: hello world whatever
+  selections:
+    - anchor: { line: 0, character: 20 }
+      active: { line: 0, character: 20 }
+  marks:
+    default.w:
+      start: { line: 0, character: 6 }
+      end: { line: 0, character: 11 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: decoratedSymbol, symbolColor: default, character: w },
+      modifiers: [{ type: position, position: after }],
+    },
+  ]
+thrownError: { name: UnsupportedError }
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/positions/chuckAir.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/positions/chuckAir.yml
new file mode 100644
index 0000000000..3745dcb9c5
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/positions/chuckAir.yml
@@ -0,0 +1,41 @@
+languageId: plaintext
+command:
+  version: 1
+  spokenForm: chuck air
+  action: remove
+  targets:
+    - type: primitive
+      mark: { type: decoratedSymbol, symbolColor: default, character: a }
+initialState:
+  documentContents: |
+    "hello "
+    " hello"
+    " hello "
+    return a.b
+  selections:
+    - anchor: { line: 4, character: 0 }
+      active: { line: 4, character: 0 }
+  marks:
+    default.a:
+      start: { line: 3, character: 7 }
+      end: { line: 3, character: 8 }
+finalState:
+  documentContents: |
+    "hello "
+    " hello"
+    " hello "
+    return.b
+  selections:
+    - anchor: { line: 4, character: 0 }
+      active: { line: 4, character: 0 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: decoratedSymbol, symbolColor: default, character: a },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: outside,
+      modifier: { type: identity },
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/positions/chuckBeforeAir.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/positions/chuckBeforeAir.yml
new file mode 100644
index 0000000000..b335bc9062
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/positions/chuckBeforeAir.yml
@@ -0,0 +1,42 @@
+languageId: plaintext
+command:
+  version: 1
+  spokenForm: chuck before air
+  action: remove
+  targets:
+    - type: primitive
+      position: before
+      mark: { type: decoratedSymbol, symbolColor: default, character: a }
+initialState:
+  documentContents: |
+    "hello "
+    " hello"
+    " hello "
+    return a.b
+  selections:
+    - anchor: { line: 4, character: 0 }
+      active: { line: 4, character: 0 }
+  marks:
+    default.a:
+      start: { line: 3, character: 7 }
+      end: { line: 3, character: 8 }
+finalState:
+  documentContents: |
+    "hello "
+    " hello"
+    " hello "
+    returna.b
+  selections:
+    - anchor: { line: 4, character: 0 }
+      active: { line: 4, character: 0 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: decoratedSymbol, symbolColor: default, character: a },
+      selectionType: token,
+      position: before,
+      insideOutsideType: outside,
+      modifier: { type: identity },
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/positions/chuckBeforeEach.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/positions/chuckBeforeEach.yml
new file mode 100644
index 0000000000..1fb7ac46f1
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/positions/chuckBeforeEach.yml
@@ -0,0 +1,42 @@
+languageId: plaintext
+command:
+  version: 1
+  spokenForm: chuck before each
+  action: remove
+  targets:
+    - type: primitive
+      position: before
+      mark: { type: decoratedSymbol, symbolColor: default, character: e }
+initialState:
+  documentContents: |
+    "hello "
+    " hello"
+    " hello "
+    return a.b
+  selections:
+    - anchor: { line: 4, character: 0 }
+      active: { line: 4, character: 0 }
+  marks:
+    default.e:
+      start: { line: 1, character: 2 }
+      end: { line: 1, character: 7 }
+finalState:
+  documentContents: |
+    "hello "
+    "hello"
+    " hello "
+    return a.b
+  selections:
+    - anchor: { line: 4, character: 0 }
+      active: { line: 4, character: 0 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: decoratedSymbol, symbolColor: default, character: e },
+      selectionType: token,
+      position: before,
+      insideOutsideType: outside,
+      modifier: { type: identity },
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/positions/chuckBeforeHarp.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/positions/chuckBeforeHarp.yml
new file mode 100644
index 0000000000..a3e9e8085b
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/positions/chuckBeforeHarp.yml
@@ -0,0 +1,42 @@
+languageId: plaintext
+command:
+  version: 1
+  spokenForm: chuck before harp
+  action: remove
+  targets:
+    - type: primitive
+      position: before
+      mark: { type: decoratedSymbol, symbolColor: default, character: h }
+initialState:
+  documentContents: |
+    "hello "
+    " hello"
+    " hello "
+    return a.b
+  selections:
+    - anchor: { line: 4, character: 0 }
+      active: { line: 4, character: 0 }
+  marks:
+    default.h:
+      start: { line: 2, character: 2 }
+      end: { line: 2, character: 7 }
+finalState:
+  documentContents: |
+    "hello "
+    " hello"
+    "hello "
+    return a.b
+  selections:
+    - anchor: { line: 4, character: 0 }
+      active: { line: 4, character: 0 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: decoratedSymbol, symbolColor: default, character: h },
+      selectionType: token,
+      position: before,
+      insideOutsideType: outside,
+      modifier: { type: identity },
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/positions/chuckBeforeLineAir.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/positions/chuckBeforeLineAir.yml
new file mode 100644
index 0000000000..3a84cb12cc
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/positions/chuckBeforeLineAir.yml
@@ -0,0 +1,42 @@
+languageId: plaintext
+command:
+  version: 1
+  spokenForm: chuck before line air
+  action: remove
+  targets:
+    - type: primitive
+      position: before
+      selectionType: line
+      mark: { type: decoratedSymbol, symbolColor: default, character: a }
+initialState:
+  documentContents: |-
+
+    const value = "Hello world";
+
+        const value = "Hello world";
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+  marks:
+    default.a:
+      start: { line: 3, character: 10 }
+      end: { line: 3, character: 15 }
+finalState:
+  documentContents: |-
+
+    const value = "Hello world";
+        const value = "Hello world";
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: decoratedSymbol, symbolColor: default, character: a },
+      selectionType: line,
+      position: before,
+      modifier: { type: identity },
+      insideOutsideType: outside,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/positions/chuckBeforeVest.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/positions/chuckBeforeVest.yml
new file mode 100644
index 0000000000..71990b76ed
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/positions/chuckBeforeVest.yml
@@ -0,0 +1,38 @@
+languageId: plaintext
+command:
+  version: 1
+  spokenForm: chuck before vest
+  action: remove
+  targets:
+    - type: primitive
+      position: before
+      mark: { type: decoratedSymbol, symbolColor: default, character: v }
+initialState:
+  documentContents: |
+
+    const value = "Hello world";
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+  marks:
+    default.v:
+      start: { line: 1, character: 6 }
+      end: { line: 1, character: 11 }
+finalState:
+  documentContents: |
+
+    constvalue = "Hello world";
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: decoratedSymbol, symbolColor: default, character: v },
+      selectionType: token,
+      position: before,
+      modifier: { type: identity },
+      insideOutsideType: outside,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/positions/chuckBeforeWhale.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/positions/chuckBeforeWhale.yml
new file mode 100644
index 0000000000..3a59c39bc1
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/positions/chuckBeforeWhale.yml
@@ -0,0 +1,29 @@
+languageId: plaintext
+command:
+  spokenForm: chuck before whale
+  version: 2
+  targets:
+    - type: primitive
+      mark: { type: decoratedSymbol, symbolColor: default, character: w }
+      modifiers:
+        - { type: position, position: before }
+  usePrePhraseSnapshot: true
+  action: { name: remove }
+initialState:
+  documentContents: hello world whatever
+  selections:
+    - anchor: { line: 0, character: 20 }
+      active: { line: 0, character: 20 }
+  marks:
+    default.w:
+      start: { line: 0, character: 6 }
+      end: { line: 0, character: 11 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: decoratedSymbol, symbolColor: default, character: w },
+      modifiers: [{ type: position, position: before }],
+    },
+  ]
+thrownError: { name: UnsupportedError }
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/positions/chuckEndOfWhale.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/positions/chuckEndOfWhale.yml
new file mode 100644
index 0000000000..cc05930af7
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/positions/chuckEndOfWhale.yml
@@ -0,0 +1,29 @@
+languageId: plaintext
+command:
+  spokenForm: chuck end of whale
+  version: 2
+  targets:
+    - type: primitive
+      mark: { type: decoratedSymbol, symbolColor: default, character: w }
+      modifiers:
+        - { type: position, position: end }
+  usePrePhraseSnapshot: true
+  action: { name: remove }
+initialState:
+  documentContents: hello world whatever
+  selections:
+    - anchor: { line: 0, character: 20 }
+      active: { line: 0, character: 20 }
+  marks:
+    default.w:
+      start: { line: 0, character: 6 }
+      end: { line: 0, character: 11 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: decoratedSymbol, symbolColor: default, character: w },
+      modifiers: [{ type: position, position: end }],
+    },
+  ]
+thrownError: { name: UnsupportedError }
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/positions/chuckLeadingBlockAir.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/positions/chuckLeadingBlockAir.yml
new file mode 100644
index 0000000000..e6e43d24a1
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/positions/chuckLeadingBlockAir.yml
@@ -0,0 +1,46 @@
+languageId: plaintext
+command:
+  spokenForm: chuck leading block air
+  version: 2
+  targets:
+    - type: primitive
+      mark: { type: decoratedSymbol, symbolColor: default, character: a }
+      modifiers:
+        - { type: leading }
+        - type: containingScope
+          scopeType: { type: paragraph }
+  usePrePhraseSnapshot: true
+  action: { name: remove }
+initialState:
+  documentContents: |-
+
+    const value = "Hello world";
+
+        const value = "Hello world";
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+  marks:
+    default.a:
+      start: { line: 3, character: 10 }
+      end: { line: 3, character: 15 }
+finalState:
+  documentContents: |-
+
+    const value = "Hello world";
+        const value = "Hello world";
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: decoratedSymbol, symbolColor: default, character: a },
+      modifiers:
+        [
+          { type: position, position: before },
+          { type: containingScope, scopeType: { type: paragraph } },
+        ],
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/positions/chuckPastEndOfLine.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/positions/chuckPastEndOfLine.yml
new file mode 100644
index 0000000000..a30d18e351
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/positions/chuckPastEndOfLine.yml
@@ -0,0 +1,57 @@
+languageId: plaintext
+command:
+  version: 1
+  spokenForm: chuck past end of line
+  action: remove
+  targets:
+    - type: range
+      start: { type: primitive, isImplicit: true }
+      end:
+        {
+          type: primitive,
+          position: after,
+          insideOutsideType: inside,
+          selectionType: line,
+        }
+      excludeStart: false
+      excludeEnd: false
+initialState:
+  documentContents: hello there
+  selections:
+    - anchor: { line: 0, character: 2 }
+      active: { line: 0, character: 2 }
+  marks: {}
+finalState:
+  documentContents: he
+  selections:
+    - anchor: { line: 0, character: 2 }
+      active: { line: 0, character: 2 }
+fullTargets:
+  [
+    {
+      type: range,
+      excludeStart: false,
+      excludeEnd: false,
+      start:
+        {
+          type: primitive,
+          mark: { type: cursor },
+          selectionType: token,
+          position: contents,
+          modifier: { type: identity },
+          insideOutsideType: outside,
+        },
+      end:
+        {
+          type: primitive,
+          mark: { type: cursor },
+          selectionType: line,
+          position: after,
+          modifier: { type: identity },
+          insideOutsideType: inside,
+        },
+    },
+  ]
+ide:
+  messages:
+    - { type: warning, id: deprecatedPositionInference }
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/positions/chuckPastEndOfLook.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/positions/chuckPastEndOfLook.yml
new file mode 100644
index 0000000000..7d43e5f80e
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/positions/chuckPastEndOfLook.yml
@@ -0,0 +1,55 @@
+languageId: plaintext
+command:
+  version: 1
+  spokenForm: chuck past end of look
+  action: remove
+  targets:
+    - type: range
+      start: { type: primitive, isImplicit: true }
+      end:
+        type: primitive
+        position: after
+        insideOutsideType: inside
+        mark: { type: decoratedSymbol, symbolColor: default, character: l }
+      excludeStart: false
+      excludeEnd: false
+initialState:
+  documentContents: hello there
+  selections:
+    - anchor: { line: 0, character: 2 }
+      active: { line: 0, character: 2 }
+  marks:
+    default.l:
+      start: { line: 0, character: 0 }
+      end: { line: 0, character: 5 }
+finalState:
+  documentContents: he there
+  selections:
+    - anchor: { line: 0, character: 2 }
+      active: { line: 0, character: 2 }
+fullTargets:
+  [
+    {
+      type: range,
+      excludeStart: false,
+      excludeEnd: false,
+      start:
+        {
+          type: primitive,
+          mark: { type: cursor },
+          selectionType: token,
+          position: contents,
+          modifier: { type: identity },
+          insideOutsideType: outside,
+        },
+      end:
+        {
+          type: primitive,
+          mark: { type: decoratedSymbol, symbolColor: default, character: l },
+          selectionType: token,
+          position: after,
+          modifier: { type: identity },
+          insideOutsideType: inside,
+        },
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/positions/chuckPastStartOfTrap.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/positions/chuckPastStartOfTrap.yml
new file mode 100644
index 0000000000..2a45e48eab
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/positions/chuckPastStartOfTrap.yml
@@ -0,0 +1,55 @@
+languageId: plaintext
+command:
+  version: 1
+  spokenForm: chuck past start of trap
+  action: remove
+  targets:
+    - type: range
+      start: { type: primitive, isImplicit: true }
+      end:
+        type: primitive
+        position: before
+        insideOutsideType: inside
+        mark: { type: decoratedSymbol, symbolColor: default, character: t }
+      excludeStart: false
+      excludeEnd: false
+initialState:
+  documentContents: hello there
+  selections:
+    - anchor: { line: 0, character: 8 }
+      active: { line: 0, character: 8 }
+  marks:
+    default.t:
+      start: { line: 0, character: 6 }
+      end: { line: 0, character: 11 }
+finalState:
+  documentContents: hello ere
+  selections:
+    - anchor: { line: 0, character: 6 }
+      active: { line: 0, character: 6 }
+fullTargets:
+  [
+    {
+      type: range,
+      excludeStart: false,
+      excludeEnd: false,
+      start:
+        {
+          type: primitive,
+          mark: { type: cursor },
+          selectionType: token,
+          position: contents,
+          modifier: { type: identity },
+          insideOutsideType: outside,
+        },
+      end:
+        {
+          type: primitive,
+          mark: { type: decoratedSymbol, symbolColor: default, character: t },
+          selectionType: token,
+          position: before,
+          modifier: { type: identity },
+          insideOutsideType: inside,
+        },
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/positions/chuckStartOfWhale.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/positions/chuckStartOfWhale.yml
new file mode 100644
index 0000000000..f4a7fd7ef0
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/positions/chuckStartOfWhale.yml
@@ -0,0 +1,29 @@
+languageId: plaintext
+command:
+  spokenForm: chuck start of whale
+  version: 2
+  targets:
+    - type: primitive
+      mark: { type: decoratedSymbol, symbolColor: default, character: w }
+      modifiers:
+        - { type: position, position: start }
+  usePrePhraseSnapshot: true
+  action: { name: remove }
+initialState:
+  documentContents: hello world whatever
+  selections:
+    - anchor: { line: 0, character: 20 }
+      active: { line: 0, character: 20 }
+  marks:
+    default.w:
+      start: { line: 0, character: 6 }
+      end: { line: 0, character: 11 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: decoratedSymbol, symbolColor: default, character: w },
+      modifiers: [{ type: position, position: start }],
+    },
+  ]
+thrownError: { name: UnsupportedError }
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/positions/chuckTrailingBlockVest.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/positions/chuckTrailingBlockVest.yml
new file mode 100644
index 0000000000..025544a392
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/positions/chuckTrailingBlockVest.yml
@@ -0,0 +1,46 @@
+languageId: plaintext
+command:
+  spokenForm: chuck trailing block vest
+  version: 2
+  targets:
+    - type: primitive
+      mark: { type: decoratedSymbol, symbolColor: default, character: v }
+      modifiers:
+        - { type: trailing }
+        - type: containingScope
+          scopeType: { type: paragraph }
+  usePrePhraseSnapshot: true
+  action: { name: remove }
+initialState:
+  documentContents: |-
+
+    const value = "Hello world";
+
+        const value = "Hello world";
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+  marks:
+    default.v:
+      start: { line: 1, character: 6 }
+      end: { line: 1, character: 11 }
+finalState:
+  documentContents: |-
+
+    const value = "Hello world";
+        const value = "Hello world";
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: decoratedSymbol, symbolColor: default, character: v },
+      modifiers:
+        [
+          { type: position, position: after },
+          { type: containingScope, scopeType: { type: paragraph } },
+        ],
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/positions/replaceAfterVestWithHallo.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/positions/replaceAfterVestWithHallo.yml
new file mode 100644
index 0000000000..5b3b53a469
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/positions/replaceAfterVestWithHallo.yml
@@ -0,0 +1,40 @@
+languageId: plaintext
+command:
+  version: 1
+  spokenForm: replace after vest with hallo
+  action: replace
+  targets:
+    - type: primitive
+      position: after
+      mark: { type: decoratedSymbol, symbolColor: default, character: v }
+  extraArgs:
+    - [hallo]
+initialState:
+  documentContents: |
+
+    const value = "Hello world";
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+  marks:
+    default.v:
+      start: { line: 1, character: 6 }
+      end: { line: 1, character: 11 }
+finalState:
+  documentContents: |
+
+    const value hallo = "Hello world";
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: decoratedSymbol, symbolColor: default, character: v },
+      selectionType: token,
+      position: after,
+      modifier: { type: identity },
+      insideOutsideType: null,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/positions/replaceBeforeVestWithHello.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/positions/replaceBeforeVestWithHello.yml
new file mode 100644
index 0000000000..9c39e35357
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/positions/replaceBeforeVestWithHello.yml
@@ -0,0 +1,40 @@
+languageId: plaintext
+command:
+  version: 1
+  spokenForm: replace before vest with hello
+  action: replace
+  targets:
+    - type: primitive
+      position: before
+      mark: { type: decoratedSymbol, symbolColor: default, character: v }
+  extraArgs:
+    - [hello]
+initialState:
+  documentContents: |
+
+    const value = "Hello world";
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+  marks:
+    default.v:
+      start: { line: 1, character: 6 }
+      end: { line: 1, character: 11 }
+finalState:
+  documentContents: |
+
+    const hello value = "Hello world";
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: decoratedSymbol, symbolColor: default, character: v },
+      selectionType: token,
+      position: before,
+      modifier: { type: identity },
+      insideOutsideType: null,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/positions/replaceEndOfVestWithHello.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/positions/replaceEndOfVestWithHello.yml
new file mode 100644
index 0000000000..bf70a479fd
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/positions/replaceEndOfVestWithHello.yml
@@ -0,0 +1,41 @@
+languageId: plaintext
+command:
+  version: 1
+  spokenForm: replace end of vest with hello
+  action: replace
+  targets:
+    - type: primitive
+      position: after
+      insideOutsideType: inside
+      mark: { type: decoratedSymbol, symbolColor: default, character: v }
+  extraArgs:
+    - [hello]
+initialState:
+  documentContents: |
+
+    const value = "Hello world";
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+  marks:
+    default.v:
+      start: { line: 1, character: 6 }
+      end: { line: 1, character: 11 }
+finalState:
+  documentContents: |
+
+    const valuehello = "Hello world";
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: decoratedSymbol, symbolColor: default, character: v },
+      selectionType: token,
+      position: after,
+      modifier: { type: identity },
+      insideOutsideType: inside,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/positions/replaceStartOfVestWithHello.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/positions/replaceStartOfVestWithHello.yml
new file mode 100644
index 0000000000..0f7eb2b29e
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/positions/replaceStartOfVestWithHello.yml
@@ -0,0 +1,41 @@
+languageId: plaintext
+command:
+  version: 1
+  spokenForm: replace start of vest with hello
+  action: replace
+  targets:
+    - type: primitive
+      position: before
+      insideOutsideType: inside
+      mark: { type: decoratedSymbol, symbolColor: default, character: v }
+  extraArgs:
+    - [hello]
+initialState:
+  documentContents: |
+
+    const value = "Hello world";
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+  marks:
+    default.v:
+      start: { line: 1, character: 6 }
+      end: { line: 1, character: 11 }
+finalState:
+  documentContents: |
+
+    const hellovalue = "Hello world";
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: decoratedSymbol, symbolColor: default, character: v },
+      selectionType: token,
+      position: before,
+      modifier: { type: identity },
+      insideOutsideType: inside,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/positions/takeAfterWhale.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/positions/takeAfterWhale.yml
new file mode 100644
index 0000000000..1c751439db
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/positions/takeAfterWhale.yml
@@ -0,0 +1,33 @@
+languageId: plaintext
+command:
+  spokenForm: take after whale
+  version: 2
+  targets:
+    - type: primitive
+      mark: { type: decoratedSymbol, symbolColor: default, character: w }
+      modifiers:
+        - { type: position, position: after }
+  usePrePhraseSnapshot: true
+  action: { name: setSelection }
+initialState:
+  documentContents: hello world whatever
+  selections:
+    - anchor: { line: 0, character: 20 }
+      active: { line: 0, character: 20 }
+  marks:
+    default.w:
+      start: { line: 0, character: 6 }
+      end: { line: 0, character: 11 }
+finalState:
+  documentContents: hello world whatever
+  selections:
+    - anchor: { line: 0, character: 11 }
+      active: { line: 0, character: 11 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: decoratedSymbol, symbolColor: default, character: w },
+      modifiers: [{ type: position, position: after }],
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/positions/takeBeforeWhale.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/positions/takeBeforeWhale.yml
new file mode 100644
index 0000000000..72ee34bbee
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/positions/takeBeforeWhale.yml
@@ -0,0 +1,33 @@
+languageId: plaintext
+command:
+  spokenForm: take before whale
+  version: 2
+  targets:
+    - type: primitive
+      mark: { type: decoratedSymbol, symbolColor: default, character: w }
+      modifiers:
+        - { type: position, position: before }
+  usePrePhraseSnapshot: true
+  action: { name: setSelection }
+initialState:
+  documentContents: hello world whatever
+  selections:
+    - anchor: { line: 0, character: 20 }
+      active: { line: 0, character: 20 }
+  marks:
+    default.w:
+      start: { line: 0, character: 6 }
+      end: { line: 0, character: 11 }
+finalState:
+  documentContents: hello world whatever
+  selections:
+    - anchor: { line: 0, character: 6 }
+      active: { line: 0, character: 6 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: decoratedSymbol, symbolColor: default, character: w },
+      modifiers: [{ type: position, position: before }],
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/positions/takeEndOfWhale.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/positions/takeEndOfWhale.yml
new file mode 100644
index 0000000000..ab39baf040
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/positions/takeEndOfWhale.yml
@@ -0,0 +1,33 @@
+languageId: plaintext
+command:
+  spokenForm: take end of whale
+  version: 2
+  targets:
+    - type: primitive
+      mark: { type: decoratedSymbol, symbolColor: default, character: w }
+      modifiers:
+        - { type: position, position: end }
+  usePrePhraseSnapshot: true
+  action: { name: setSelection }
+initialState:
+  documentContents: hello world whatever
+  selections:
+    - anchor: { line: 0, character: 20 }
+      active: { line: 0, character: 20 }
+  marks:
+    default.w:
+      start: { line: 0, character: 6 }
+      end: { line: 0, character: 11 }
+finalState:
+  documentContents: hello world whatever
+  selections:
+    - anchor: { line: 0, character: 11 }
+      active: { line: 0, character: 11 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: decoratedSymbol, symbolColor: default, character: w },
+      modifiers: [{ type: position, position: end }],
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/positions/takeStartOfWhale.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/positions/takeStartOfWhale.yml
new file mode 100644
index 0000000000..27880dea3a
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/positions/takeStartOfWhale.yml
@@ -0,0 +1,33 @@
+languageId: plaintext
+command:
+  spokenForm: take start of whale
+  version: 2
+  targets:
+    - type: primitive
+      mark: { type: decoratedSymbol, symbolColor: default, character: w }
+      modifiers:
+        - { type: position, position: start }
+  usePrePhraseSnapshot: true
+  action: { name: setSelection }
+initialState:
+  documentContents: hello world whatever
+  selections:
+    - anchor: { line: 0, character: 20 }
+      active: { line: 0, character: 20 }
+  marks:
+    default.w:
+      start: { line: 0, character: 6 }
+      end: { line: 0, character: 11 }
+finalState:
+  documentContents: hello world whatever
+  selections:
+    - anchor: { line: 0, character: 6 }
+      active: { line: 0, character: 6 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: decoratedSymbol, symbolColor: default, character: w },
+      modifiers: [{ type: position, position: start }],
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/relativeScopes/clearFirstTokenRound.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/relativeScopes/clearFirstTokenRound.yml
new file mode 100644
index 0000000000..13eed7dbdb
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/relativeScopes/clearFirstTokenRound.yml
@@ -0,0 +1,54 @@
+languageId: plaintext
+command:
+  spokenForm: clear first token round
+  version: 3
+  targets:
+    - type: primitive
+      modifiers:
+        - type: ordinalScope
+          scopeType: { type: token }
+          start: 0
+          length: 1
+        - type: containingScope
+          scopeType: { type: surroundingPair, delimiter: parentheses }
+  usePrePhraseSnapshot: true
+  action: { name: clearAndSetSelection }
+initialState:
+  documentContents: |-
+    hello (
+        there
+        now
+    ) testing
+  selections:
+    - anchor: { line: 1, character: 4 }
+      active: { line: 1, character: 4 }
+  marks: {}
+finalState:
+  documentContents: |-
+    hello
+        there
+        now
+    ) testing
+  selections:
+    - anchor: { line: 0, character: 6 }
+      active: { line: 0, character: 6 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      modifiers:
+        [
+          {
+            type: ordinalScope,
+            scopeType: { type: token },
+            start: 0,
+            length: 1,
+          },
+          {
+            type: containingScope,
+            scopeType: { type: surroundingPair, delimiter: parentheses },
+          },
+        ],
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/relativeScopes/clearLastTokenRound.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/relativeScopes/clearLastTokenRound.yml
new file mode 100644
index 0000000000..151ebdaede
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/relativeScopes/clearLastTokenRound.yml
@@ -0,0 +1,54 @@
+languageId: plaintext
+command:
+  spokenForm: clear last token round
+  version: 3
+  targets:
+    - type: primitive
+      modifiers:
+        - type: ordinalScope
+          scopeType: { type: token }
+          start: -1
+          length: 1
+        - type: containingScope
+          scopeType: { type: surroundingPair, delimiter: parentheses }
+  usePrePhraseSnapshot: true
+  action: { name: clearAndSetSelection }
+initialState:
+  documentContents: |-
+    hello (
+        there
+        now
+    ) testing
+  selections:
+    - anchor: { line: 1, character: 4 }
+      active: { line: 1, character: 4 }
+  marks: {}
+finalState:
+  documentContents: |-
+    hello (
+        there
+        now
+     testing
+  selections:
+    - anchor: { line: 3, character: 0 }
+      active: { line: 3, character: 0 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      modifiers:
+        [
+          {
+            type: ordinalScope,
+            scopeType: { type: token },
+            start: -1,
+            length: 1,
+          },
+          {
+            type: containingScope,
+            scopeType: { type: surroundingPair, delimiter: parentheses },
+          },
+        ],
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/relativeScopes/clearLineBackward.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/relativeScopes/clearLineBackward.yml
new file mode 100644
index 0000000000..3fc2145b8e
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/relativeScopes/clearLineBackward.yml
@@ -0,0 +1,45 @@
+languageId: plaintext
+command:
+  spokenForm: clear line backward
+  version: 3
+  targets:
+    - type: primitive
+      modifiers:
+        - type: relativeScope
+          scopeType: { type: line }
+          offset: 0
+          length: 1
+          direction: backward
+  usePrePhraseSnapshot: true
+  action: { name: clearAndSetSelection }
+initialState:
+  documentContents: |-
+    aaa bbb
+    ccc ddd
+  selections:
+    - anchor: { line: 1, character: 0 }
+      active: { line: 1, character: 0 }
+  marks: {}
+finalState:
+  documentContents: |
+    aaa bbb
+  selections:
+    - anchor: { line: 1, character: 0 }
+      active: { line: 1, character: 0 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      modifiers:
+        [
+          {
+            type: relativeScope,
+            scopeType: { type: line },
+            offset: 0,
+            length: 1,
+            direction: backward,
+          },
+        ],
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/relativeScopes/clearNextToken.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/relativeScopes/clearNextToken.yml
new file mode 100644
index 0000000000..b2a8b40904
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/relativeScopes/clearNextToken.yml
@@ -0,0 +1,42 @@
+languageId: plaintext
+command:
+  spokenForm: clear next token
+  version: 3
+  targets:
+    - type: primitive
+      modifiers:
+        - type: relativeScope
+          scopeType: { type: token }
+          offset: 1
+          length: 1
+          direction: forward
+  usePrePhraseSnapshot: true
+  action: { name: clearAndSetSelection }
+initialState:
+  documentContents: .foo bar
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 1 }
+  marks: {}
+finalState:
+  documentContents: . bar
+  selections:
+    - anchor: { line: 0, character: 1 }
+      active: { line: 0, character: 1 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      modifiers:
+        [
+          {
+            type: relativeScope,
+            scopeType: { type: token },
+            offset: 1,
+            length: 1,
+            direction: forward,
+          },
+        ],
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/relativeScopes/clearNextToken2.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/relativeScopes/clearNextToken2.yml
new file mode 100644
index 0000000000..d71eb7a0d2
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/relativeScopes/clearNextToken2.yml
@@ -0,0 +1,42 @@
+languageId: plaintext
+command:
+  spokenForm: clear next token
+  version: 3
+  targets:
+    - type: primitive
+      modifiers:
+        - type: relativeScope
+          scopeType: { type: token }
+          offset: 1
+          length: 1
+          direction: forward
+  usePrePhraseSnapshot: true
+  action: { name: clearAndSetSelection }
+initialState:
+  documentContents: .foo bar
+  selections:
+    - anchor: { line: 0, character: 1 }
+      active: { line: 0, character: 1 }
+  marks: {}
+finalState:
+  documentContents: ".foo "
+  selections:
+    - anchor: { line: 0, character: 5 }
+      active: { line: 0, character: 5 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      modifiers:
+        [
+          {
+            type: relativeScope,
+            scopeType: { type: token },
+            offset: 1,
+            length: 1,
+            direction: forward,
+          },
+        ],
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/relativeScopes/clearNextToken3.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/relativeScopes/clearNextToken3.yml
new file mode 100644
index 0000000000..7184afa6a7
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/relativeScopes/clearNextToken3.yml
@@ -0,0 +1,48 @@
+languageId: markdown
+command:
+  spokenForm: clear next token
+  version: 3
+  targets:
+    - type: primitive
+      modifiers:
+        - type: relativeScope
+          scopeType: { type: token }
+          offset: 1
+          length: 1
+          direction: forward
+  usePrePhraseSnapshot: true
+  action: { name: clearAndSetSelection }
+initialState:
+  documentContents: |-
+    aaa
+    bbb
+    ccc
+  selections:
+    - anchor: { line: 0, character: 1 }
+      active: { line: 0, character: 1 }
+  marks: {}
+finalState:
+  documentContents: |-
+    aaa
+
+    ccc
+  selections:
+    - anchor: { line: 1, character: 0 }
+      active: { line: 1, character: 0 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      modifiers:
+        [
+          {
+            type: relativeScope,
+            scopeType: { type: token },
+            offset: 1,
+            length: 1,
+            direction: forward,
+          },
+        ],
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/relativeScopes/clearNextTokenRound.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/relativeScopes/clearNextTokenRound.yml
new file mode 100644
index 0000000000..713e42efe2
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/relativeScopes/clearNextTokenRound.yml
@@ -0,0 +1,56 @@
+languageId: plaintext
+command:
+  spokenForm: clear next token round
+  version: 3
+  targets:
+    - type: primitive
+      modifiers:
+        - type: relativeScope
+          scopeType: { type: token }
+          offset: 1
+          length: 1
+          direction: forward
+        - type: containingScope
+          scopeType: { type: surroundingPair, delimiter: parentheses }
+  usePrePhraseSnapshot: true
+  action: { name: clearAndSetSelection }
+initialState:
+  documentContents: |-
+    hello (
+        there
+        now
+    ) testing
+  selections:
+    - anchor: { line: 1, character: 4 }
+      active: { line: 1, character: 4 }
+  marks: {}
+finalState:
+  documentContents: |-
+    hello (
+        there
+        now
+    )
+  selections:
+    - anchor: { line: 3, character: 2 }
+      active: { line: 3, character: 2 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      modifiers:
+        [
+          {
+            type: relativeScope,
+            scopeType: { type: token },
+            offset: 1,
+            length: 1,
+            direction: forward,
+          },
+          {
+            type: containingScope,
+            scopeType: { type: surroundingPair, delimiter: parentheses },
+          },
+        ],
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/relativeScopes/clearNextTwoToken.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/relativeScopes/clearNextTwoToken.yml
new file mode 100644
index 0000000000..bcf6e2114c
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/relativeScopes/clearNextTwoToken.yml
@@ -0,0 +1,42 @@
+languageId: plaintext
+command:
+  spokenForm: clear next two token
+  version: 3
+  targets:
+    - type: primitive
+      modifiers:
+        - type: relativeScope
+          scopeType: { type: token }
+          offset: 1
+          length: 2
+          direction: forward
+  usePrePhraseSnapshot: true
+  action: { name: clearAndSetSelection }
+initialState:
+  documentContents: aaa bbb ccc ddd
+  selections:
+    - anchor: { line: 0, character: 6 }
+      active: { line: 0, character: 6 }
+  marks: {}
+finalState:
+  documentContents: "aaa bbb "
+  selections:
+    - anchor: { line: 0, character: 8 }
+      active: { line: 0, character: 8 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      modifiers:
+        [
+          {
+            type: relativeScope,
+            scopeType: { type: token },
+            offset: 1,
+            length: 2,
+            direction: forward,
+          },
+        ],
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/relativeScopes/clearNextTwoToken2.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/relativeScopes/clearNextTwoToken2.yml
new file mode 100644
index 0000000000..08b18e9e8b
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/relativeScopes/clearNextTwoToken2.yml
@@ -0,0 +1,42 @@
+languageId: plaintext
+command:
+  spokenForm: clear next two token
+  version: 3
+  targets:
+    - type: primitive
+      modifiers:
+        - type: relativeScope
+          scopeType: { type: token }
+          offset: 1
+          length: 2
+          direction: forward
+  usePrePhraseSnapshot: true
+  action: { name: clearAndSetSelection }
+initialState:
+  documentContents: aaa  bbb ccc
+  selections:
+    - anchor: { line: 0, character: 4 }
+      active: { line: 0, character: 4 }
+  marks: {}
+finalState:
+  documentContents: "aaa  "
+  selections:
+    - anchor: { line: 0, character: 5 }
+      active: { line: 0, character: 5 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      modifiers:
+        [
+          {
+            type: relativeScope,
+            scopeType: { type: token },
+            offset: 1,
+            length: 2,
+            direction: forward,
+          },
+        ],
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/relativeScopes/clearNextTwoTokens.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/relativeScopes/clearNextTwoTokens.yml
new file mode 100644
index 0000000000..827ca53117
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/relativeScopes/clearNextTwoTokens.yml
@@ -0,0 +1,46 @@
+languageId: markdown
+command:
+  spokenForm: clear next two tokens
+  version: 3
+  targets:
+    - type: primitive
+      modifiers:
+        - type: relativeScope
+          scopeType: { type: token }
+          offset: 1
+          length: 2
+          direction: forward
+  usePrePhraseSnapshot: true
+  action: { name: clearAndSetSelection }
+initialState:
+  documentContents: |-
+    aaa
+    bbb
+    ccc
+  selections:
+    - anchor: { line: 0, character: 1 }
+      active: { line: 0, character: 1 }
+  marks: {}
+finalState:
+  documentContents: |
+    aaa
+  selections:
+    - anchor: { line: 1, character: 0 }
+      active: { line: 1, character: 0 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      modifiers:
+        [
+          {
+            type: relativeScope,
+            scopeType: { type: token },
+            offset: 1,
+            length: 2,
+            direction: forward,
+          },
+        ],
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/relativeScopes/clearOneLines.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/relativeScopes/clearOneLines.yml
new file mode 100644
index 0000000000..4d2750b0e5
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/relativeScopes/clearOneLines.yml
@@ -0,0 +1,46 @@
+languageId: plaintext
+command:
+  spokenForm: clear one lines
+  version: 3
+  targets:
+    - type: primitive
+      modifiers:
+        - type: relativeScope
+          scopeType: { type: line }
+          offset: 0
+          length: 1
+          direction: forward
+  usePrePhraseSnapshot: true
+  action: { name: clearAndSetSelection }
+initialState:
+  documentContents: |-
+    aaa bbb
+    ccc ddd
+  selections:
+    - anchor: { line: 0, character: 7 }
+      active: { line: 0, character: 7 }
+  marks: {}
+finalState:
+  documentContents: |-
+
+    ccc ddd
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      modifiers:
+        [
+          {
+            type: relativeScope,
+            scopeType: { type: line },
+            offset: 0,
+            length: 1,
+            direction: forward,
+          },
+        ],
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/relativeScopes/clearOneToken.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/relativeScopes/clearOneToken.yml
new file mode 100644
index 0000000000..ecce98423c
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/relativeScopes/clearOneToken.yml
@@ -0,0 +1,38 @@
+languageId: plaintext
+command:
+  spokenForm: clear one token
+  version: 3
+  targets:
+    - type: primitive
+      modifiers:
+        - type: relativeScope
+          scopeType: { type: token }
+          offset: 0
+          length: 1
+          direction: forward
+  usePrePhraseSnapshot: true
+  action: { name: clearAndSetSelection }
+initialState:
+  documentContents: aaa bbb ccc ddd eee fff
+  selections:
+    - anchor: { line: 0, character: 9 }
+      active: { line: 0, character: 13 }
+  marks: {}
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      modifiers:
+        [
+          {
+            type: relativeScope,
+            scopeType: { type: token },
+            offset: 0,
+            length: 1,
+            direction: forward,
+          },
+        ],
+    },
+  ]
+thrownError: { name: TooFewScopesError }
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/relativeScopes/clearOneTokens.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/relativeScopes/clearOneTokens.yml
new file mode 100644
index 0000000000..9a2a4f0c92
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/relativeScopes/clearOneTokens.yml
@@ -0,0 +1,42 @@
+languageId: plaintext
+command:
+  spokenForm: clear one tokens
+  version: 3
+  targets:
+    - type: primitive
+      modifiers:
+        - type: relativeScope
+          scopeType: { type: token }
+          offset: 0
+          length: 1
+          direction: forward
+  usePrePhraseSnapshot: true
+  action: { name: clearAndSetSelection }
+initialState:
+  documentContents: aaa bbb
+  selections:
+    - anchor: { line: 0, character: 3 }
+      active: { line: 0, character: 3 }
+  marks: {}
+finalState:
+  documentContents: " bbb"
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      modifiers:
+        [
+          {
+            type: relativeScope,
+            scopeType: { type: token },
+            offset: 0,
+            length: 1,
+            direction: forward,
+          },
+        ],
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/relativeScopes/clearPreviousToken.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/relativeScopes/clearPreviousToken.yml
new file mode 100644
index 0000000000..1e9a7a6504
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/relativeScopes/clearPreviousToken.yml
@@ -0,0 +1,48 @@
+languageId: markdown
+command:
+  spokenForm: clear previous token
+  version: 3
+  targets:
+    - type: primitive
+      modifiers:
+        - type: relativeScope
+          scopeType: { type: token }
+          offset: 1
+          length: 1
+          direction: backward
+  usePrePhraseSnapshot: true
+  action: { name: clearAndSetSelection }
+initialState:
+  documentContents: |-
+    aaa
+    bbb
+    ccc
+  selections:
+    - anchor: { line: 2, character: 1 }
+      active: { line: 2, character: 1 }
+  marks: {}
+finalState:
+  documentContents: |-
+    aaa
+
+    ccc
+  selections:
+    - anchor: { line: 1, character: 0 }
+      active: { line: 1, character: 0 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      modifiers:
+        [
+          {
+            type: relativeScope,
+            scopeType: { type: token },
+            offset: 1,
+            length: 1,
+            direction: backward,
+          },
+        ],
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/relativeScopes/clearPreviousTokenRound.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/relativeScopes/clearPreviousTokenRound.yml
new file mode 100644
index 0000000000..5802d4c5a8
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/relativeScopes/clearPreviousTokenRound.yml
@@ -0,0 +1,56 @@
+languageId: plaintext
+command:
+  spokenForm: clear previous token round
+  version: 3
+  targets:
+    - type: primitive
+      modifiers:
+        - type: relativeScope
+          scopeType: { type: token }
+          offset: 1
+          length: 1
+          direction: backward
+        - type: containingScope
+          scopeType: { type: surroundingPair, delimiter: parentheses }
+  usePrePhraseSnapshot: true
+  action: { name: clearAndSetSelection }
+initialState:
+  documentContents: |-
+    hello (
+        there
+        now
+    ) testing
+  selections:
+    - anchor: { line: 1, character: 4 }
+      active: { line: 1, character: 4 }
+  marks: {}
+finalState:
+  documentContents: |2-
+     (
+        there
+        now
+    ) testing
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      modifiers:
+        [
+          {
+            type: relativeScope,
+            scopeType: { type: token },
+            offset: 1,
+            length: 1,
+            direction: backward,
+          },
+          {
+            type: containingScope,
+            scopeType: { type: surroundingPair, delimiter: parentheses },
+          },
+        ],
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/relativeScopes/clearPreviousTwoToken.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/relativeScopes/clearPreviousTwoToken.yml
new file mode 100644
index 0000000000..ca247e7174
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/relativeScopes/clearPreviousTwoToken.yml
@@ -0,0 +1,42 @@
+languageId: plaintext
+command:
+  spokenForm: clear previous two token
+  version: 3
+  targets:
+    - type: primitive
+      modifiers:
+        - type: relativeScope
+          scopeType: { type: token }
+          offset: 1
+          length: 2
+          direction: backward
+  usePrePhraseSnapshot: true
+  action: { name: clearAndSetSelection }
+initialState:
+  documentContents: aaa bbb  ccc
+  selections:
+    - anchor: { line: 0, character: 8 }
+      active: { line: 0, character: 8 }
+  marks: {}
+finalState:
+  documentContents: "  ccc"
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      modifiers:
+        [
+          {
+            type: relativeScope,
+            scopeType: { type: token },
+            offset: 1,
+            length: 2,
+            direction: backward,
+          },
+        ],
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/relativeScopes/clearPreviousTwoToken2.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/relativeScopes/clearPreviousTwoToken2.yml
new file mode 100644
index 0000000000..a81e49d4fc
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/relativeScopes/clearPreviousTwoToken2.yml
@@ -0,0 +1,42 @@
+languageId: plaintext
+command:
+  spokenForm: clear previous two token
+  version: 3
+  targets:
+    - type: primitive
+      modifiers:
+        - type: relativeScope
+          scopeType: { type: token }
+          offset: 1
+          length: 2
+          direction: backward
+  usePrePhraseSnapshot: true
+  action: { name: clearAndSetSelection }
+initialState:
+  documentContents: aaa bbb ccc
+  selections:
+    - anchor: { line: 0, character: 10 }
+      active: { line: 0, character: 10 }
+  marks: {}
+finalState:
+  documentContents: " ccc"
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      modifiers:
+        [
+          {
+            type: relativeScope,
+            scopeType: { type: token },
+            offset: 1,
+            length: 2,
+            direction: backward,
+          },
+        ],
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/relativeScopes/clearPreviousTwoToken3.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/relativeScopes/clearPreviousTwoToken3.yml
new file mode 100644
index 0000000000..5f64edf0a6
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/relativeScopes/clearPreviousTwoToken3.yml
@@ -0,0 +1,38 @@
+languageId: plaintext
+command:
+  spokenForm: clear previous two token
+  version: 3
+  targets:
+    - type: primitive
+      modifiers:
+        - type: relativeScope
+          scopeType: { type: token }
+          offset: 1
+          length: 2
+          direction: backward
+  usePrePhraseSnapshot: true
+  action: { name: clearAndSetSelection }
+initialState:
+  documentContents: aaa bbb ccc
+  selections:
+    - anchor: { line: 0, character: 6 }
+      active: { line: 0, character: 6 }
+  marks: {}
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      modifiers:
+        [
+          {
+            type: relativeScope,
+            scopeType: { type: token },
+            offset: 1,
+            length: 2,
+            direction: backward,
+          },
+        ],
+    },
+  ]
+thrownError: { name: OutOfRangeError }
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/relativeScopes/clearPreviousTwoTokens.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/relativeScopes/clearPreviousTwoTokens.yml
new file mode 100644
index 0000000000..ab190c2b66
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/relativeScopes/clearPreviousTwoTokens.yml
@@ -0,0 +1,47 @@
+languageId: markdown
+command:
+  spokenForm: clear previous two tokens
+  version: 3
+  targets:
+    - type: primitive
+      modifiers:
+        - type: relativeScope
+          scopeType: { type: token }
+          offset: 1
+          length: 2
+          direction: backward
+  usePrePhraseSnapshot: true
+  action: { name: clearAndSetSelection }
+initialState:
+  documentContents: |-
+    aaa
+    bbb
+    ccc
+  selections:
+    - anchor: { line: 2, character: 1 }
+      active: { line: 2, character: 1 }
+  marks: {}
+finalState:
+  documentContents: |-
+
+    ccc
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      modifiers:
+        [
+          {
+            type: relativeScope,
+            scopeType: { type: token },
+            offset: 1,
+            length: 2,
+            direction: backward,
+          },
+        ],
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/relativeScopes/clearSecondNextToken.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/relativeScopes/clearSecondNextToken.yml
new file mode 100644
index 0000000000..73f885692f
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/relativeScopes/clearSecondNextToken.yml
@@ -0,0 +1,47 @@
+languageId: markdown
+command:
+  spokenForm: clear second next token
+  version: 3
+  targets:
+    - type: primitive
+      modifiers:
+        - type: relativeScope
+          scopeType: { type: token }
+          offset: 2
+          length: 1
+          direction: forward
+  usePrePhraseSnapshot: true
+  action: { name: clearAndSetSelection }
+initialState:
+  documentContents: |-
+    aaa
+    bbb
+    ccc
+  selections:
+    - anchor: { line: 0, character: 1 }
+      active: { line: 0, character: 1 }
+  marks: {}
+finalState:
+  documentContents: |
+    aaa
+    bbb
+  selections:
+    - anchor: { line: 2, character: 0 }
+      active: { line: 2, character: 0 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      modifiers:
+        [
+          {
+            type: relativeScope,
+            scopeType: { type: token },
+            offset: 2,
+            length: 1,
+            direction: forward,
+          },
+        ],
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/relativeScopes/clearSecondPreviousToken.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/relativeScopes/clearSecondPreviousToken.yml
new file mode 100644
index 0000000000..ff403b9005
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/relativeScopes/clearSecondPreviousToken.yml
@@ -0,0 +1,48 @@
+languageId: markdown
+command:
+  spokenForm: clear second previous token
+  version: 3
+  targets:
+    - type: primitive
+      modifiers:
+        - type: relativeScope
+          scopeType: { type: token }
+          offset: 2
+          length: 1
+          direction: backward
+  usePrePhraseSnapshot: true
+  action: { name: clearAndSetSelection }
+initialState:
+  documentContents: |-
+    aaa
+    bbb
+    ccc
+  selections:
+    - anchor: { line: 2, character: 1 }
+      active: { line: 2, character: 1 }
+  marks: {}
+finalState:
+  documentContents: |-
+
+    bbb
+    ccc
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      modifiers:
+        [
+          {
+            type: relativeScope,
+            scopeType: { type: token },
+            offset: 2,
+            length: 1,
+            direction: backward,
+          },
+        ],
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/relativeScopes/clearThreeToken.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/relativeScopes/clearThreeToken.yml
new file mode 100644
index 0000000000..ab44cb0e17
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/relativeScopes/clearThreeToken.yml
@@ -0,0 +1,42 @@
+languageId: plaintext
+command:
+  spokenForm: clear three token
+  version: 3
+  targets:
+    - type: primitive
+      modifiers:
+        - type: relativeScope
+          scopeType: { type: token }
+          offset: 0
+          length: 3
+          direction: forward
+  usePrePhraseSnapshot: true
+  action: { name: clearAndSetSelection }
+initialState:
+  documentContents: aaa bbb ccc ddd eee fff
+  selections:
+    - anchor: { line: 0, character: 9 }
+      active: { line: 0, character: 13 }
+  marks: {}
+finalState:
+  documentContents: aaa bbb  fff
+  selections:
+    - anchor: { line: 0, character: 8 }
+      active: { line: 0, character: 8 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      modifiers:
+        [
+          {
+            type: relativeScope,
+            scopeType: { type: token },
+            offset: 0,
+            length: 3,
+            direction: forward,
+          },
+        ],
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/relativeScopes/clearThreeTokenBackward.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/relativeScopes/clearThreeTokenBackward.yml
new file mode 100644
index 0000000000..889361ebe0
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/relativeScopes/clearThreeTokenBackward.yml
@@ -0,0 +1,42 @@
+languageId: plaintext
+command:
+  spokenForm: clear three token backward
+  version: 3
+  targets:
+    - type: primitive
+      modifiers:
+        - type: relativeScope
+          scopeType: { type: token }
+          offset: 0
+          length: 3
+          direction: backward
+  usePrePhraseSnapshot: true
+  action: { name: clearAndSetSelection }
+initialState:
+  documentContents: aaa bbb ccc ddd eee fff
+  selections:
+    - anchor: { line: 0, character: 9 }
+      active: { line: 0, character: 13 }
+  marks: {}
+finalState:
+  documentContents: aaa  eee fff
+  selections:
+    - anchor: { line: 0, character: 4 }
+      active: { line: 0, character: 4 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      modifiers:
+        [
+          {
+            type: relativeScope,
+            scopeType: { type: token },
+            offset: 0,
+            length: 3,
+            direction: backward,
+          },
+        ],
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/relativeScopes/clearTokenBackward.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/relativeScopes/clearTokenBackward.yml
new file mode 100644
index 0000000000..d87f55e150
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/relativeScopes/clearTokenBackward.yml
@@ -0,0 +1,42 @@
+languageId: plaintext
+command:
+  spokenForm: clear token backward
+  version: 3
+  targets:
+    - type: primitive
+      modifiers:
+        - type: relativeScope
+          scopeType: { type: token }
+          offset: 0
+          length: 1
+          direction: backward
+  usePrePhraseSnapshot: true
+  action: { name: clearAndSetSelection }
+initialState:
+  documentContents: foo.
+  selections:
+    - anchor: { line: 0, character: 3 }
+      active: { line: 0, character: 3 }
+  marks: {}
+finalState:
+  documentContents: .
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      modifiers:
+        [
+          {
+            type: relativeScope,
+            scopeType: { type: token },
+            offset: 0,
+            length: 1,
+            direction: backward,
+          },
+        ],
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/relativeScopes/clearTokenBackward2.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/relativeScopes/clearTokenBackward2.yml
new file mode 100644
index 0000000000..155deea06b
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/relativeScopes/clearTokenBackward2.yml
@@ -0,0 +1,42 @@
+languageId: plaintext
+command:
+  spokenForm: clear token backward
+  version: 3
+  targets:
+    - type: primitive
+      modifiers:
+        - type: relativeScope
+          scopeType: { type: token }
+          offset: 0
+          length: 1
+          direction: backward
+  usePrePhraseSnapshot: true
+  action: { name: clearAndSetSelection }
+initialState:
+  documentContents: aaa bbb
+  selections:
+    - anchor: { line: 0, character: 4 }
+      active: { line: 0, character: 4 }
+  marks: {}
+finalState:
+  documentContents: "aaa "
+  selections:
+    - anchor: { line: 0, character: 4 }
+      active: { line: 0, character: 4 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      modifiers:
+        [
+          {
+            type: relativeScope,
+            scopeType: { type: token },
+            offset: 0,
+            length: 1,
+            direction: backward,
+          },
+        ],
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/relativeScopes/clearTwoLinesBackward.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/relativeScopes/clearTwoLinesBackward.yml
new file mode 100644
index 0000000000..2f796788e0
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/relativeScopes/clearTwoLinesBackward.yml
@@ -0,0 +1,44 @@
+languageId: plaintext
+command:
+  spokenForm: clear two lines backward
+  version: 3
+  targets:
+    - type: primitive
+      modifiers:
+        - type: relativeScope
+          scopeType: { type: line }
+          offset: 0
+          length: 2
+          direction: backward
+  usePrePhraseSnapshot: true
+  action: { name: clearAndSetSelection }
+initialState:
+  documentContents: |-
+    aaa bbb
+    ccc ddd
+  selections:
+    - anchor: { line: 1, character: 0 }
+      active: { line: 1, character: 0 }
+  marks: {}
+finalState:
+  documentContents: ""
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      modifiers:
+        [
+          {
+            type: relativeScope,
+            scopeType: { type: line },
+            offset: 0,
+            length: 2,
+            direction: backward,
+          },
+        ],
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/relativeScopes/clearTwoToken.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/relativeScopes/clearTwoToken.yml
new file mode 100644
index 0000000000..cf95d93e86
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/relativeScopes/clearTwoToken.yml
@@ -0,0 +1,42 @@
+languageId: plaintext
+command:
+  spokenForm: clear two token
+  version: 3
+  targets:
+    - type: primitive
+      modifiers:
+        - type: relativeScope
+          scopeType: { type: token }
+          offset: 0
+          length: 2
+          direction: forward
+  usePrePhraseSnapshot: true
+  action: { name: clearAndSetSelection }
+initialState:
+  documentContents: aaa bbb ccc ddd eee fff
+  selections:
+    - anchor: { line: 0, character: 9 }
+      active: { line: 0, character: 13 }
+  marks: {}
+finalState:
+  documentContents: aaa bbb  eee fff
+  selections:
+    - anchor: { line: 0, character: 8 }
+      active: { line: 0, character: 8 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      modifiers:
+        [
+          {
+            type: relativeScope,
+            scopeType: { type: token },
+            offset: 0,
+            length: 2,
+            direction: forward,
+          },
+        ],
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/relativeScopes/clearTwoToken2.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/relativeScopes/clearTwoToken2.yml
new file mode 100644
index 0000000000..0630bf0fb7
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/relativeScopes/clearTwoToken2.yml
@@ -0,0 +1,42 @@
+languageId: plaintext
+command:
+  spokenForm: clear two token
+  version: 3
+  targets:
+    - type: primitive
+      modifiers:
+        - type: relativeScope
+          scopeType: { type: token }
+          offset: 0
+          length: 2
+          direction: forward
+  usePrePhraseSnapshot: true
+  action: { name: clearAndSetSelection }
+initialState:
+  documentContents: aaa bbb ccc
+  selections:
+    - anchor: { line: 0, character: 5 }
+      active: { line: 0, character: 5 }
+  marks: {}
+finalState:
+  documentContents: "aaa "
+  selections:
+    - anchor: { line: 0, character: 4 }
+      active: { line: 0, character: 4 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      modifiers:
+        [
+          {
+            type: relativeScope,
+            scopeType: { type: token },
+            offset: 0,
+            length: 2,
+            direction: forward,
+          },
+        ],
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/relativeScopes/clearTwoToken3.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/relativeScopes/clearTwoToken3.yml
new file mode 100644
index 0000000000..57f4c580bb
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/relativeScopes/clearTwoToken3.yml
@@ -0,0 +1,38 @@
+languageId: plaintext
+command:
+  spokenForm: clear two token
+  version: 3
+  targets:
+    - type: primitive
+      modifiers:
+        - type: relativeScope
+          scopeType: { type: token }
+          offset: 0
+          length: 2
+          direction: forward
+  usePrePhraseSnapshot: true
+  action: { name: clearAndSetSelection }
+initialState:
+  documentContents: aaa  bbb ccc
+  selections:
+    - anchor: { line: 0, character: 4 }
+      active: { line: 0, character: 4 }
+  marks: {}
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      modifiers:
+        [
+          {
+            type: relativeScope,
+            scopeType: { type: token },
+            offset: 0,
+            length: 2,
+            direction: forward,
+          },
+        ],
+    },
+  ]
+thrownError: { name: NoContainingScopeError }
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/relativeScopes/clearTwoToken4.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/relativeScopes/clearTwoToken4.yml
new file mode 100644
index 0000000000..d7cc178e86
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/relativeScopes/clearTwoToken4.yml
@@ -0,0 +1,38 @@
+languageId: plaintext
+command:
+  spokenForm: clear two token
+  version: 3
+  targets:
+    - type: primitive
+      modifiers:
+        - type: relativeScope
+          scopeType: { type: token }
+          offset: 0
+          length: 2
+          direction: forward
+  usePrePhraseSnapshot: true
+  action: { name: clearAndSetSelection }
+initialState:
+  documentContents: aaa bbb ccc
+  selections:
+    - anchor: { line: 0, character: 9 }
+      active: { line: 0, character: 9 }
+  marks: {}
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      modifiers:
+        [
+          {
+            type: relativeScope,
+            scopeType: { type: token },
+            offset: 0,
+            length: 2,
+            direction: forward,
+          },
+        ],
+    },
+  ]
+thrownError: { name: OutOfRangeError }
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/relativeScopes/clearTwoTokenBackward.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/relativeScopes/clearTwoTokenBackward.yml
new file mode 100644
index 0000000000..e05209f00c
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/relativeScopes/clearTwoTokenBackward.yml
@@ -0,0 +1,42 @@
+languageId: plaintext
+command:
+  spokenForm: clear two token backward
+  version: 3
+  targets:
+    - type: primitive
+      modifiers:
+        - type: relativeScope
+          scopeType: { type: token }
+          offset: 0
+          length: 2
+          direction: backward
+  usePrePhraseSnapshot: true
+  action: { name: clearAndSetSelection }
+initialState:
+  documentContents: aaa bbb ccc
+  selections:
+    - anchor: { line: 0, character: 5 }
+      active: { line: 0, character: 5 }
+  marks: {}
+finalState:
+  documentContents: " ccc"
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      modifiers:
+        [
+          {
+            type: relativeScope,
+            scopeType: { type: token },
+            offset: 0,
+            length: 2,
+            direction: backward,
+          },
+        ],
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/relativeScopes/clearTwoTokenBackward2.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/relativeScopes/clearTwoTokenBackward2.yml
new file mode 100644
index 0000000000..90dd095b36
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/relativeScopes/clearTwoTokenBackward2.yml
@@ -0,0 +1,38 @@
+languageId: plaintext
+command:
+  spokenForm: clear two token backward
+  version: 3
+  targets:
+    - type: primitive
+      modifiers:
+        - type: relativeScope
+          scopeType: { type: token }
+          offset: 0
+          length: 2
+          direction: backward
+  usePrePhraseSnapshot: true
+  action: { name: clearAndSetSelection }
+initialState:
+  documentContents: aaa bbb  ccc
+  selections:
+    - anchor: { line: 0, character: 8 }
+      active: { line: 0, character: 8 }
+  marks: {}
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      modifiers:
+        [
+          {
+            type: relativeScope,
+            scopeType: { type: token },
+            offset: 0,
+            length: 2,
+            direction: backward,
+          },
+        ],
+    },
+  ]
+thrownError: { name: NoContainingScopeError }
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/relativeScopes/clearTwoTokens.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/relativeScopes/clearTwoTokens.yml
new file mode 100644
index 0000000000..06e960055b
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/relativeScopes/clearTwoTokens.yml
@@ -0,0 +1,42 @@
+languageId: plaintext
+command:
+  spokenForm: clear two tokens
+  version: 3
+  targets:
+    - type: primitive
+      modifiers:
+        - type: relativeScope
+          scopeType: { type: token }
+          offset: 0
+          length: 2
+          direction: forward
+  usePrePhraseSnapshot: true
+  action: { name: clearAndSetSelection }
+initialState:
+  documentContents: aaa bbb. ccc
+  selections:
+    - anchor: { line: 0, character: 7 }
+      active: { line: 0, character: 7 }
+  marks: {}
+finalState:
+  documentContents: aaa bbb
+  selections:
+    - anchor: { line: 0, character: 7 }
+      active: { line: 0, character: 7 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      modifiers:
+        [
+          {
+            type: relativeScope,
+            scopeType: { type: token },
+            offset: 0,
+            length: 2,
+            direction: forward,
+          },
+        ],
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/relativeScopes/clearTwoTokens2.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/relativeScopes/clearTwoTokens2.yml
new file mode 100644
index 0000000000..8da60c0891
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/relativeScopes/clearTwoTokens2.yml
@@ -0,0 +1,42 @@
+languageId: plaintext
+command:
+  spokenForm: clear two tokens
+  version: 3
+  targets:
+    - type: primitive
+      modifiers:
+        - type: relativeScope
+          scopeType: { type: token }
+          offset: 0
+          length: 2
+          direction: forward
+  usePrePhraseSnapshot: true
+  action: { name: clearAndSetSelection }
+initialState:
+  documentContents: aaa bbb. ccc
+  selections:
+    - anchor: { line: 0, character: 4 }
+      active: { line: 0, character: 7 }
+  marks: {}
+finalState:
+  documentContents: aaa  ccc
+  selections:
+    - anchor: { line: 0, character: 4 }
+      active: { line: 0, character: 4 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      modifiers:
+        [
+          {
+            type: relativeScope,
+            scopeType: { type: token },
+            offset: 0,
+            length: 2,
+            direction: forward,
+          },
+        ],
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/relativeScopes/clearTwoTokens3.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/relativeScopes/clearTwoTokens3.yml
new file mode 100644
index 0000000000..8e6fd77995
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/relativeScopes/clearTwoTokens3.yml
@@ -0,0 +1,42 @@
+languageId: plaintext
+command:
+  spokenForm: clear two tokens
+  version: 3
+  targets:
+    - type: primitive
+      modifiers:
+        - type: relativeScope
+          scopeType: { type: token }
+          offset: 0
+          length: 2
+          direction: forward
+  usePrePhraseSnapshot: false
+  action: { name: clearAndSetSelection }
+initialState:
+  documentContents: aaa bbb. ccc
+  selections:
+    - anchor: { line: 0, character: 7 }
+      active: { line: 0, character: 8 }
+  marks: {}
+finalState:
+  documentContents: aaa bbb
+  selections:
+    - anchor: { line: 0, character: 7 }
+      active: { line: 0, character: 7 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      modifiers:
+        [
+          {
+            type: relativeScope,
+            scopeType: { type: token },
+            offset: 0,
+            length: 2,
+            direction: forward,
+          },
+        ],
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/relativeScopes/clearTwoTokens4.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/relativeScopes/clearTwoTokens4.yml
new file mode 100644
index 0000000000..ea971b1206
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/relativeScopes/clearTwoTokens4.yml
@@ -0,0 +1,42 @@
+languageId: plaintext
+command:
+  spokenForm: clear two tokens
+  version: 3
+  targets:
+    - type: primitive
+      modifiers:
+        - type: relativeScope
+          scopeType: { type: token }
+          offset: 0
+          length: 2
+          direction: forward
+  usePrePhraseSnapshot: false
+  action: { name: clearAndSetSelection }
+initialState:
+  documentContents: aaa .bbb ccc
+  selections:
+    - anchor: { line: 0, character: 5 }
+      active: { line: 0, character: 5 }
+  marks: {}
+finalState:
+  documentContents: aaa .
+  selections:
+    - anchor: { line: 0, character: 5 }
+      active: { line: 0, character: 5 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      modifiers:
+        [
+          {
+            type: relativeScope,
+            scopeType: { type: token },
+            offset: 0,
+            length: 2,
+            direction: forward,
+          },
+        ],
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/relativeScopes/clearTwoTokens5.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/relativeScopes/clearTwoTokens5.yml
new file mode 100644
index 0000000000..afc442aa9c
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/relativeScopes/clearTwoTokens5.yml
@@ -0,0 +1,42 @@
+languageId: plaintext
+command:
+  spokenForm: clear two tokens
+  version: 3
+  targets:
+    - type: primitive
+      modifiers:
+        - type: relativeScope
+          scopeType: { type: token }
+          offset: 0
+          length: 2
+          direction: forward
+  usePrePhraseSnapshot: false
+  action: { name: clearAndSetSelection }
+initialState:
+  documentContents: aaa .bbb ccc
+  selections:
+    - anchor: { line: 0, character: 4 }
+      active: { line: 0, character: 5 }
+  marks: {}
+finalState:
+  documentContents: aaa  ccc
+  selections:
+    - anchor: { line: 0, character: 4 }
+      active: { line: 0, character: 4 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      modifiers:
+        [
+          {
+            type: relativeScope,
+            scopeType: { type: token },
+            offset: 0,
+            length: 2,
+            direction: forward,
+          },
+        ],
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/relativeScopes/clearTwoTokens6.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/relativeScopes/clearTwoTokens6.yml
new file mode 100644
index 0000000000..40db11add5
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/relativeScopes/clearTwoTokens6.yml
@@ -0,0 +1,42 @@
+languageId: plaintext
+command:
+  spokenForm: clear two tokens
+  version: 3
+  targets:
+    - type: primitive
+      modifiers:
+        - type: relativeScope
+          scopeType: { type: token }
+          offset: 0
+          length: 2
+          direction: forward
+  usePrePhraseSnapshot: false
+  action: { name: clearAndSetSelection }
+initialState:
+  documentContents: aaa .bbb ccc
+  selections:
+    - anchor: { line: 0, character: 5 }
+      active: { line: 0, character: 8 }
+  marks: {}
+finalState:
+  documentContents: aaa .
+  selections:
+    - anchor: { line: 0, character: 5 }
+      active: { line: 0, character: 5 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      modifiers:
+        [
+          {
+            type: relativeScope,
+            scopeType: { type: token },
+            offset: 0,
+            length: 2,
+            direction: forward,
+          },
+        ],
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/relativeScopes/clearTwoTokens7.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/relativeScopes/clearTwoTokens7.yml
new file mode 100644
index 0000000000..bc05b5bb52
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/relativeScopes/clearTwoTokens7.yml
@@ -0,0 +1,47 @@
+languageId: markdown
+command:
+  spokenForm: clear two tokens
+  version: 3
+  targets:
+    - type: primitive
+      modifiers:
+        - type: relativeScope
+          scopeType: { type: token }
+          offset: 0
+          length: 2
+          direction: forward
+  usePrePhraseSnapshot: true
+  action: { name: clearAndSetSelection }
+initialState:
+  documentContents: |-
+    aaa
+    bbb
+    ccc
+  selections:
+    - anchor: { line: 0, character: 1 }
+      active: { line: 0, character: 1 }
+  marks: {}
+finalState:
+  documentContents: |-
+
+    ccc
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      modifiers:
+        [
+          {
+            type: relativeScope,
+            scopeType: { type: token },
+            offset: 0,
+            length: 2,
+            direction: forward,
+          },
+        ],
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/relativeScopes/clearTwoTokens8.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/relativeScopes/clearTwoTokens8.yml
new file mode 100644
index 0000000000..acba000c56
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/relativeScopes/clearTwoTokens8.yml
@@ -0,0 +1,42 @@
+languageId: plaintext
+command:
+  spokenForm: clear two tokens
+  version: 3
+  targets:
+    - type: primitive
+      modifiers:
+        - type: relativeScope
+          scopeType: { type: token }
+          offset: 0
+          length: 2
+          direction: forward
+  usePrePhraseSnapshot: true
+  action: { name: clearAndSetSelection }
+initialState:
+  documentContents: aaa bbb ccc
+  selections:
+    - anchor: { line: 0, character: 3 }
+      active: { line: 0, character: 3 }
+  marks: {}
+finalState:
+  documentContents: " ccc"
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      modifiers:
+        [
+          {
+            type: relativeScope,
+            scopeType: { type: token },
+            offset: 0,
+            length: 2,
+            direction: forward,
+          },
+        ],
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/relativeScopes/clearTwoTokensBackward.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/relativeScopes/clearTwoTokensBackward.yml
new file mode 100644
index 0000000000..460da7b189
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/relativeScopes/clearTwoTokensBackward.yml
@@ -0,0 +1,42 @@
+languageId: plaintext
+command:
+  spokenForm: clear two tokens backward
+  version: 3
+  targets:
+    - type: primitive
+      modifiers:
+        - type: relativeScope
+          scopeType: { type: token }
+          offset: 0
+          length: 2
+          direction: backward
+  usePrePhraseSnapshot: true
+  action: { name: clearAndSetSelection }
+initialState:
+  documentContents: aaa bbb. ccc
+  selections:
+    - anchor: { line: 0, character: 7 }
+      active: { line: 0, character: 7 }
+  marks: {}
+finalState:
+  documentContents: . ccc
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      modifiers:
+        [
+          {
+            type: relativeScope,
+            scopeType: { type: token },
+            offset: 0,
+            length: 2,
+            direction: backward,
+          },
+        ],
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/relativeScopes/clearTwoTokensBackward2.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/relativeScopes/clearTwoTokensBackward2.yml
new file mode 100644
index 0000000000..bc4f4d9721
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/relativeScopes/clearTwoTokensBackward2.yml
@@ -0,0 +1,42 @@
+languageId: plaintext
+command:
+  spokenForm: clear two tokens backward
+  version: 3
+  targets:
+    - type: primitive
+      modifiers:
+        - type: relativeScope
+          scopeType: { type: token }
+          offset: 0
+          length: 2
+          direction: backward
+  usePrePhraseSnapshot: false
+  action: { name: clearAndSetSelection }
+initialState:
+  documentContents: aaa bbb. ccc
+  selections:
+    - anchor: { line: 0, character: 7 }
+      active: { line: 0, character: 8 }
+  marks: {}
+finalState:
+  documentContents: aaa  ccc
+  selections:
+    - anchor: { line: 0, character: 4 }
+      active: { line: 0, character: 4 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      modifiers:
+        [
+          {
+            type: relativeScope,
+            scopeType: { type: token },
+            offset: 0,
+            length: 2,
+            direction: backward,
+          },
+        ],
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/relativeScopes/clearTwoTokensBackward3.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/relativeScopes/clearTwoTokensBackward3.yml
new file mode 100644
index 0000000000..be8850af2a
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/relativeScopes/clearTwoTokensBackward3.yml
@@ -0,0 +1,42 @@
+languageId: plaintext
+command:
+  spokenForm: clear two tokens backward
+  version: 3
+  targets:
+    - type: primitive
+      modifiers:
+        - type: relativeScope
+          scopeType: { type: token }
+          offset: 0
+          length: 2
+          direction: backward
+  usePrePhraseSnapshot: false
+  action: { name: clearAndSetSelection }
+initialState:
+  documentContents: aaa bbb. ccc
+  selections:
+    - anchor: { line: 0, character: 4 }
+      active: { line: 0, character: 7 }
+  marks: {}
+finalState:
+  documentContents: . ccc
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      modifiers:
+        [
+          {
+            type: relativeScope,
+            scopeType: { type: token },
+            offset: 0,
+            length: 2,
+            direction: backward,
+          },
+        ],
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/relativeScopes/clearTwoTokensBackward4.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/relativeScopes/clearTwoTokensBackward4.yml
new file mode 100644
index 0000000000..a9e423ed83
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/relativeScopes/clearTwoTokensBackward4.yml
@@ -0,0 +1,42 @@
+languageId: plaintext
+command:
+  spokenForm: clear two tokens backward
+  version: 3
+  targets:
+    - type: primitive
+      modifiers:
+        - type: relativeScope
+          scopeType: { type: token }
+          offset: 0
+          length: 2
+          direction: backward
+  usePrePhraseSnapshot: true
+  action: { name: clearAndSetSelection }
+initialState:
+  documentContents: aaa .bbb ccc
+  selections:
+    - anchor: { line: 0, character: 5 }
+      active: { line: 0, character: 5 }
+  marks: {}
+finalState:
+  documentContents: bbb ccc
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      modifiers:
+        [
+          {
+            type: relativeScope,
+            scopeType: { type: token },
+            offset: 0,
+            length: 2,
+            direction: backward,
+          },
+        ],
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/relativeScopes/clearTwoTokensBackward5.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/relativeScopes/clearTwoTokensBackward5.yml
new file mode 100644
index 0000000000..071956358e
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/relativeScopes/clearTwoTokensBackward5.yml
@@ -0,0 +1,42 @@
+languageId: plaintext
+command:
+  spokenForm: clear two tokens backward
+  version: 3
+  targets:
+    - type: primitive
+      modifiers:
+        - type: relativeScope
+          scopeType: { type: token }
+          offset: 0
+          length: 2
+          direction: backward
+  usePrePhraseSnapshot: false
+  action: { name: clearAndSetSelection }
+initialState:
+  documentContents: aaa .bbb ccc
+  selections:
+    - anchor: { line: 0, character: 5 }
+      active: { line: 0, character: 8 }
+  marks: {}
+finalState:
+  documentContents: aaa  ccc
+  selections:
+    - anchor: { line: 0, character: 4 }
+      active: { line: 0, character: 4 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      modifiers:
+        [
+          {
+            type: relativeScope,
+            scopeType: { type: token },
+            offset: 0,
+            length: 2,
+            direction: backward,
+          },
+        ],
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/relativeScopes/clearTwoTokensBackward6.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/relativeScopes/clearTwoTokensBackward6.yml
new file mode 100644
index 0000000000..6f6c73e14d
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/relativeScopes/clearTwoTokensBackward6.yml
@@ -0,0 +1,42 @@
+languageId: plaintext
+command:
+  spokenForm: clear two tokens backward
+  version: 3
+  targets:
+    - type: primitive
+      modifiers:
+        - type: relativeScope
+          scopeType: { type: token }
+          offset: 0
+          length: 2
+          direction: backward
+  usePrePhraseSnapshot: false
+  action: { name: clearAndSetSelection }
+initialState:
+  documentContents: aaa .bbb ccc
+  selections:
+    - anchor: { line: 0, character: 5 }
+      active: { line: 0, character: 4 }
+  marks: {}
+finalState:
+  documentContents: bbb ccc
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      modifiers:
+        [
+          {
+            type: relativeScope,
+            scopeType: { type: token },
+            offset: 0,
+            length: 2,
+            direction: backward,
+          },
+        ],
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/relativeScopes/clearTwoTokensBackward7.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/relativeScopes/clearTwoTokensBackward7.yml
new file mode 100644
index 0000000000..9e2b104433
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/relativeScopes/clearTwoTokensBackward7.yml
@@ -0,0 +1,46 @@
+languageId: markdown
+command:
+  spokenForm: clear two tokens backward
+  version: 3
+  targets:
+    - type: primitive
+      modifiers:
+        - type: relativeScope
+          scopeType: { type: token }
+          offset: 0
+          length: 2
+          direction: backward
+  usePrePhraseSnapshot: true
+  action: { name: clearAndSetSelection }
+initialState:
+  documentContents: |-
+    aaa
+    bbb
+    ccc
+  selections:
+    - anchor: { line: 2, character: 1 }
+      active: { line: 2, character: 1 }
+  marks: {}
+finalState:
+  documentContents: |
+    aaa
+  selections:
+    - anchor: { line: 1, character: 0 }
+      active: { line: 1, character: 0 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      modifiers:
+        [
+          {
+            type: relativeScope,
+            scopeType: { type: token },
+            offset: 0,
+            length: 2,
+            direction: backward,
+          },
+        ],
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/relativeScopes/clearTwoTokensBackward8.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/relativeScopes/clearTwoTokensBackward8.yml
new file mode 100644
index 0000000000..5608bb3e1e
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/relativeScopes/clearTwoTokensBackward8.yml
@@ -0,0 +1,42 @@
+languageId: plaintext
+command:
+  spokenForm: clear two tokens backward
+  version: 3
+  targets:
+    - type: primitive
+      modifiers:
+        - type: relativeScope
+          scopeType: { type: token }
+          offset: 0
+          length: 2
+          direction: backward
+  usePrePhraseSnapshot: true
+  action: { name: clearAndSetSelection }
+initialState:
+  documentContents: aaa bbb ccc
+  selections:
+    - anchor: { line: 0, character: 8 }
+      active: { line: 0, character: 8 }
+  marks: {}
+finalState:
+  documentContents: "aaa "
+  selections:
+    - anchor: { line: 0, character: 4 }
+      active: { line: 0, character: 4 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      modifiers:
+        [
+          {
+            type: relativeScope,
+            scopeType: { type: token },
+            offset: 0,
+            length: 2,
+            direction: backward,
+          },
+        ],
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/scopes/character/clearCar.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/scopes/character/clearCar.yml
new file mode 100644
index 0000000000..c2304a4524
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/scopes/character/clearCar.yml
@@ -0,0 +1,32 @@
+languageId: plaintext
+command:
+  spokenForm: clear car
+  version: 3
+  targets:
+    - type: primitive
+      modifiers:
+        - type: containingScope
+          scopeType: { type: character }
+  usePrePhraseSnapshot: true
+  action: { name: clearAndSetSelection }
+initialState:
+  documentContents: |2
+
+  selections:
+    - anchor: { line: 0, character: 1 }
+      active: { line: 0, character: 1 }
+  marks: {}
+finalState:
+  documentContents: |+
+
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      modifiers: [{ type: containingScope, scopeType: { type: character } }],
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/scopes/character/clearCar2.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/scopes/character/clearCar2.yml
new file mode 100644
index 0000000000..a4e90c36c2
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/scopes/character/clearCar2.yml
@@ -0,0 +1,27 @@
+languageId: plaintext
+command:
+  spokenForm: clear car
+  version: 3
+  targets:
+    - type: primitive
+      modifiers:
+        - type: containingScope
+          scopeType: { type: character }
+  usePrePhraseSnapshot: false
+  action: { name: clearAndSetSelection }
+initialState:
+  documentContents: |+
+
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+  marks: {}
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      modifiers: [{ type: containingScope, scopeType: { type: character } }],
+    },
+  ]
+thrownError: { name: NoContainingScopeError }
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/scopes/character/clearCar3.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/scopes/character/clearCar3.yml
new file mode 100644
index 0000000000..5387dd7236
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/scopes/character/clearCar3.yml
@@ -0,0 +1,30 @@
+languageId: plaintext
+command:
+  spokenForm: clear car
+  version: 3
+  targets:
+    - type: primitive
+      modifiers:
+        - type: containingScope
+          scopeType: { type: character }
+  usePrePhraseSnapshot: true
+  action: { name: clearAndSetSelection }
+initialState:
+  documentContents: ". "
+  selections:
+    - anchor: { line: 0, character: 1 }
+      active: { line: 0, character: 1 }
+  marks: {}
+finalState:
+  documentContents: " "
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      modifiers: [{ type: containingScope, scopeType: { type: character } }],
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/scopes/character/clearCar4.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/scopes/character/clearCar4.yml
new file mode 100644
index 0000000000..5c4cb25b1b
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/scopes/character/clearCar4.yml
@@ -0,0 +1,30 @@
+languageId: plaintext
+command:
+  spokenForm: clear car
+  version: 3
+  targets:
+    - type: primitive
+      modifiers:
+        - type: containingScope
+          scopeType: { type: character }
+  usePrePhraseSnapshot: false
+  action: { name: clearAndSetSelection }
+initialState:
+  documentContents: "8."
+  selections:
+    - anchor: { line: 0, character: 1 }
+      active: { line: 0, character: 1 }
+  marks: {}
+finalState:
+  documentContents: .
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      modifiers: [{ type: containingScope, scopeType: { type: character } }],
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/scopes/character/clearNextCar.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/scopes/character/clearNextCar.yml
new file mode 100644
index 0000000000..001a6428ba
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/scopes/character/clearNextCar.yml
@@ -0,0 +1,38 @@
+languageId: plaintext
+command:
+  spokenForm: clear next car
+  version: 3
+  targets:
+    - type: primitive
+      modifiers:
+        - type: relativeScope
+          scopeType: { type: character }
+          offset: 1
+          length: 1
+          direction: forward
+  usePrePhraseSnapshot: true
+  action: { name: clearAndSetSelection }
+initialState:
+  documentContents: a
+  selections:
+    - anchor: { line: 0, character: 1 }
+      active: { line: 0, character: 1 }
+  marks: {}
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      modifiers:
+        [
+          {
+            type: relativeScope,
+            scopeType: { type: character },
+            offset: 1,
+            length: 1,
+            direction: forward,
+          },
+        ],
+    },
+  ]
+thrownError: { name: OutOfRangeError }
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/scopes/character/clearPreviousCar.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/scopes/character/clearPreviousCar.yml
new file mode 100644
index 0000000000..079a2a7269
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/scopes/character/clearPreviousCar.yml
@@ -0,0 +1,38 @@
+languageId: plaintext
+command:
+  spokenForm: clear previous car
+  version: 3
+  targets:
+    - type: primitive
+      modifiers:
+        - type: relativeScope
+          scopeType: { type: character }
+          offset: 1
+          length: 1
+          direction: backward
+  usePrePhraseSnapshot: true
+  action: { name: clearAndSetSelection }
+initialState:
+  documentContents: a
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+  marks: {}
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      modifiers:
+        [
+          {
+            type: relativeScope,
+            scopeType: { type: character },
+            offset: 1,
+            length: 1,
+            direction: backward,
+          },
+        ],
+    },
+  ]
+thrownError: { name: OutOfRangeError }
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/scopes/character/clearTwentiethNextCar.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/scopes/character/clearTwentiethNextCar.yml
new file mode 100644
index 0000000000..fc07417ba0
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/scopes/character/clearTwentiethNextCar.yml
@@ -0,0 +1,42 @@
+languageId: plaintext
+command:
+  spokenForm: clear twentieth next car
+  version: 3
+  targets:
+    - type: primitive
+      modifiers:
+        - type: relativeScope
+          scopeType: { type: character }
+          offset: 20
+          length: 1
+          direction: forward
+  usePrePhraseSnapshot: true
+  action: { name: clearAndSetSelection }
+initialState:
+  documentContents: abcdefghijklmnopqrstuvwxyz
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+  marks: {}
+finalState:
+  documentContents: abcdefghijklmnopqrstvwxyz
+  selections:
+    - anchor: { line: 0, character: 20 }
+      active: { line: 0, character: 20 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      modifiers:
+        [
+          {
+            type: relativeScope,
+            scopeType: { type: character },
+            offset: 20,
+            length: 1,
+            direction: forward,
+          },
+        ],
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/scopes/character/ditchFirstCarLeadingBat.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/scopes/character/ditchFirstCarLeadingBat.yml
new file mode 100644
index 0000000000..0005db60d2
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/scopes/character/ditchFirstCarLeadingBat.yml
@@ -0,0 +1,48 @@
+languageId: plaintext
+command:
+  spokenForm: ditch first car leading bat
+  version: 3
+  targets:
+    - type: primitive
+      modifiers:
+        - type: ordinalScope
+          scopeType: { type: character }
+          start: 0
+          length: 1
+        - { type: leading }
+      mark: { type: decoratedSymbol, symbolColor: default, character: b }
+  usePrePhraseSnapshot: true
+  action: { name: remove }
+initialState:
+  documentContents: |
+    aaa  bbb
+  selections:
+    - anchor: { line: 1, character: 0 }
+      active: { line: 1, character: 0 }
+  marks:
+    default.b:
+      start: { line: 0, character: 5 }
+      end: { line: 0, character: 8 }
+finalState:
+  documentContents: |
+    aaa bbb
+  selections:
+    - anchor: { line: 1, character: 0 }
+      active: { line: 1, character: 0 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: decoratedSymbol, symbolColor: default, character: b },
+      modifiers:
+        [
+          {
+            type: ordinalScope,
+            scopeType: { type: character },
+            start: 0,
+            length: 1,
+          },
+          { type: leading },
+        ],
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/scopes/character/takeCarForward.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/scopes/character/takeCarForward.yml
new file mode 100644
index 0000000000..7ca5eb3652
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/scopes/character/takeCarForward.yml
@@ -0,0 +1,44 @@
+languageId: plaintext
+command:
+  spokenForm: take car forward
+  version: 3
+  targets:
+    - type: primitive
+      modifiers:
+        - type: relativeScope
+          scopeType: { type: character }
+          offset: 0
+          length: 1
+          direction: forward
+  usePrePhraseSnapshot: true
+  action: { name: setSelection }
+initialState:
+  documentContents: |
+    a
+  selections:
+    - anchor: { line: 0, character: 1 }
+      active: { line: 0, character: 1 }
+  marks: {}
+finalState:
+  documentContents: |
+    a
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 1 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      modifiers:
+        [
+          {
+            type: relativeScope,
+            scopeType: { type: character },
+            offset: 0,
+            length: 1,
+            direction: forward,
+          },
+        ],
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/scopes/character/takeEveryCarFile.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/scopes/character/takeEveryCarFile.yml
new file mode 100644
index 0000000000..d377d84cfb
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/scopes/character/takeEveryCarFile.yml
@@ -0,0 +1,66 @@
+languageId: plaintext
+command:
+  spokenForm: take every car file
+  version: 3
+  targets:
+    - type: primitive
+      modifiers:
+        - type: everyScope
+          scopeType: { type: character }
+        - type: containingScope
+          scopeType: { type: document }
+  usePrePhraseSnapshot: true
+  action: { name: setSelection }
+initialState:
+  documentContents: |
+    aaa bbb
+    ccc ddd
+  selections:
+    - anchor: { line: 2, character: 0 }
+      active: { line: 2, character: 0 }
+  marks: {}
+finalState:
+  documentContents: |
+    aaa bbb
+    ccc ddd
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 1 }
+    - anchor: { line: 0, character: 1 }
+      active: { line: 0, character: 2 }
+    - anchor: { line: 0, character: 2 }
+      active: { line: 0, character: 3 }
+    - anchor: { line: 0, character: 3 }
+      active: { line: 0, character: 4 }
+    - anchor: { line: 0, character: 4 }
+      active: { line: 0, character: 5 }
+    - anchor: { line: 0, character: 5 }
+      active: { line: 0, character: 6 }
+    - anchor: { line: 0, character: 6 }
+      active: { line: 0, character: 7 }
+    - anchor: { line: 1, character: 0 }
+      active: { line: 1, character: 1 }
+    - anchor: { line: 1, character: 1 }
+      active: { line: 1, character: 2 }
+    - anchor: { line: 1, character: 2 }
+      active: { line: 1, character: 3 }
+    - anchor: { line: 1, character: 3 }
+      active: { line: 1, character: 4 }
+    - anchor: { line: 1, character: 4 }
+      active: { line: 1, character: 5 }
+    - anchor: { line: 1, character: 5 }
+      active: { line: 1, character: 6 }
+    - anchor: { line: 1, character: 6 }
+      active: { line: 1, character: 7 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      modifiers:
+        [
+          { type: everyScope, scopeType: { type: character } },
+          { type: containingScope, scopeType: { type: document } },
+        ],
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/scopes/clearEveryIdentifier.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/scopes/clearEveryIdentifier.yml
new file mode 100644
index 0000000000..149cf05d97
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/scopes/clearEveryIdentifier.yml
@@ -0,0 +1,32 @@
+languageId: plaintext
+command:
+  spokenForm: clear every identifier
+  version: 3
+  targets:
+    - type: primitive
+      modifiers:
+        - type: everyScope
+          scopeType: { type: identifier }
+  usePrePhraseSnapshot: true
+  action: { name: clearAndSetSelection }
+initialState:
+  documentContents: aaa bbb.
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+  marks: {}
+finalState:
+  documentContents: " ."
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+    - anchor: { line: 0, character: 1 }
+      active: { line: 0, character: 1 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      modifiers: [{ type: everyScope, scopeType: { type: identifier } }],
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/scopes/clearIdentifier.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/scopes/clearIdentifier.yml
new file mode 100644
index 0000000000..24d8c3b1be
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/scopes/clearIdentifier.yml
@@ -0,0 +1,30 @@
+languageId: plaintext
+command:
+  spokenForm: clear identifier
+  version: 3
+  targets:
+    - type: primitive
+      modifiers:
+        - type: containingScope
+          scopeType: { type: identifier }
+  usePrePhraseSnapshot: true
+  action: { name: clearAndSetSelection }
+initialState:
+  documentContents: foo.
+  selections:
+    - anchor: { line: 0, character: 3 }
+      active: { line: 0, character: 3 }
+  marks: {}
+finalState:
+  documentContents: .
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      modifiers: [{ type: containingScope, scopeType: { type: identifier } }],
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/scopes/clearIdentifier2.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/scopes/clearIdentifier2.yml
new file mode 100644
index 0000000000..8076a167e5
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/scopes/clearIdentifier2.yml
@@ -0,0 +1,26 @@
+languageId: plaintext
+command:
+  spokenForm: clear identifier
+  version: 3
+  targets:
+    - type: primitive
+      modifiers:
+        - type: containingScope
+          scopeType: { type: identifier }
+  usePrePhraseSnapshot: true
+  action: { name: clearAndSetSelection }
+initialState:
+  documentContents: .
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+  marks: {}
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      modifiers: [{ type: containingScope, scopeType: { type: identifier } }],
+    },
+  ]
+thrownError: { name: NoContainingScopeError }
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/scopes/clearLastIdentifier.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/scopes/clearLastIdentifier.yml
new file mode 100644
index 0000000000..7d01b2a574
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/scopes/clearLastIdentifier.yml
@@ -0,0 +1,40 @@
+languageId: plaintext
+command:
+  spokenForm: clear last identifier
+  version: 3
+  targets:
+    - type: primitive
+      modifiers:
+        - type: ordinalScope
+          scopeType: { type: identifier }
+          start: -1
+          length: 1
+  usePrePhraseSnapshot: true
+  action: { name: clearAndSetSelection }
+initialState:
+  documentContents: aaa bbb.
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+  marks: {}
+finalState:
+  documentContents: aaa .
+  selections:
+    - anchor: { line: 0, character: 4 }
+      active: { line: 0, character: 4 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      modifiers:
+        [
+          {
+            type: ordinalScope,
+            scopeType: { type: identifier },
+            start: -1,
+            length: 1,
+          },
+        ],
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/scopes/line/clearTwoLines.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/scopes/line/clearTwoLines.yml
new file mode 100644
index 0000000000..78ef68e375
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/scopes/line/clearTwoLines.yml
@@ -0,0 +1,44 @@
+languageId: plaintext
+command:
+  spokenForm: clear two lines
+  version: 3
+  targets:
+    - type: primitive
+      modifiers:
+        - type: relativeScope
+          scopeType: { type: line }
+          offset: 0
+          length: 2
+          direction: forward
+  usePrePhraseSnapshot: true
+  action: { name: clearAndSetSelection }
+initialState:
+  documentContents: |-
+    aaa bbb
+    ccc ddd
+  selections:
+    - anchor: { line: 0, character: 7 }
+      active: { line: 0, character: 7 }
+  marks: {}
+finalState:
+  documentContents: ""
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      modifiers:
+        [
+          {
+            type: relativeScope,
+            scopeType: { type: line },
+            offset: 0,
+            length: 2,
+            direction: forward,
+          },
+        ],
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/scopes/paragraph/chuckBlockAir.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/scopes/paragraph/chuckBlockAir.yml
new file mode 100644
index 0000000000..fe02c2448f
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/scopes/paragraph/chuckBlockAir.yml
@@ -0,0 +1,41 @@
+languageId: typescript
+command:
+  version: 1
+  spokenForm: chuck block air
+  action: remove
+  targets:
+    - type: primitive
+      selectionType: paragraph
+      mark: { type: decoratedSymbol, symbolColor: default, character: a }
+initialState:
+  documentContents: |
+
+    const value = "Hello world";
+
+    const value = "Hello world";
+    const value = "Hello world";
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+  marks:
+    default.a:
+      start: { line: 3, character: 6 }
+      end: { line: 3, character: 11 }
+finalState:
+  documentContents: |
+
+    const value = "Hello world";
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: decoratedSymbol, symbolColor: default, character: a },
+      selectionType: paragraph,
+      position: contents,
+      modifier: { type: identity },
+      insideOutsideType: outside,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/scopes/paragraph/chuckBlockAir2.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/scopes/paragraph/chuckBlockAir2.yml
new file mode 100644
index 0000000000..8f9ed9e45a
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/scopes/paragraph/chuckBlockAir2.yml
@@ -0,0 +1,41 @@
+languageId: typescript
+command:
+  version: 1
+  spokenForm: chuck block air
+  action: remove
+  targets:
+    - type: primitive
+      selectionType: paragraph
+      mark: { type: decoratedSymbol, symbolColor: default, character: a }
+initialState:
+  documentContents: |-
+
+    const value = "Hello world";
+
+    const value = "Hello world";
+    const value = "Hello world";
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+  marks:
+    default.a:
+      start: { line: 3, character: 6 }
+      end: { line: 3, character: 11 }
+finalState:
+  documentContents: |-
+
+    const value = "Hello world";
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: decoratedSymbol, symbolColor: default, character: a },
+      selectionType: paragraph,
+      position: contents,
+      modifier: { type: identity },
+      insideOutsideType: outside,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/scopes/paragraph/chuckBlockHarpBetweenFine.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/scopes/paragraph/chuckBlockHarpBetweenFine.yml
new file mode 100644
index 0000000000..fdd0cc36c5
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/scopes/paragraph/chuckBlockHarpBetweenFine.yml
@@ -0,0 +1,65 @@
+languageId: plaintext
+command:
+  spokenForm: chuck block harp between fine
+  version: 2
+  action: { name: remove }
+  targets:
+    - type: range
+      excludeAnchor: true
+      excludeActive: true
+      anchor:
+        type: primitive
+        mark: { type: decoratedSymbol, symbolColor: default, character: h }
+        modifiers:
+          - type: containingScope
+            scopeType: { type: paragraph }
+      active:
+        type: primitive
+        mark: { type: decoratedSymbol, symbolColor: default, character: f }
+  usePrePhraseSnapshot: true
+initialState:
+  documentContents: |
+
+    hello world
+
+
+    foo bar
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+  marks:
+    default.h:
+      start: { line: 1, character: 0 }
+      end: { line: 1, character: 5 }
+    default.f:
+      start: { line: 4, character: 0 }
+      end: { line: 4, character: 3 }
+finalState:
+  documentContents: |
+
+    hello world
+    foo bar
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+fullTargets:
+  [
+    {
+      type: range,
+      excludeAnchor: true,
+      excludeActive: true,
+      rangeType: continuous,
+      anchor:
+        {
+          type: primitive,
+          mark: { type: decoratedSymbol, symbolColor: default, character: h },
+          modifiers: &ref_0 [{ type: containingScope, scopeType: paragraph }],
+        },
+      active:
+        {
+          type: primitive,
+          mark: { type: decoratedSymbol, symbolColor: default, character: f },
+          modifiers: *ref_0,
+        },
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/scopes/paragraph/chuckBlockVest.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/scopes/paragraph/chuckBlockVest.yml
new file mode 100644
index 0000000000..d8a7077e6b
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/scopes/paragraph/chuckBlockVest.yml
@@ -0,0 +1,42 @@
+languageId: plaintext
+command:
+  version: 1
+  spokenForm: chuck block vest
+  action: remove
+  targets:
+    - type: primitive
+      selectionType: paragraph
+      mark: { type: decoratedSymbol, symbolColor: default, character: v }
+initialState:
+  documentContents: |
+
+    const value = "Hello world";
+
+    const value = "Hello world";
+    const value = "Hello world";
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+  marks:
+    default.v:
+      start: { line: 1, character: 6 }
+      end: { line: 1, character: 11 }
+finalState:
+  documentContents: |
+
+    const value = "Hello world";
+    const value = "Hello world";
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: decoratedSymbol, symbolColor: default, character: v },
+      selectionType: paragraph,
+      position: contents,
+      modifier: { type: identity },
+      insideOutsideType: outside,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/scopes/paragraph/clearBlock.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/scopes/paragraph/clearBlock.yml
new file mode 100644
index 0000000000..0533d6e4d6
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/scopes/paragraph/clearBlock.yml
@@ -0,0 +1,34 @@
+languageId: plaintext
+command:
+  spokenForm: clear block
+  version: 3
+  targets:
+    - type: primitive
+      modifiers:
+        - type: containingScope
+          scopeType: { type: paragraph }
+  usePrePhraseSnapshot: true
+  action: { name: clearAndSetSelection }
+initialState:
+  documentContents: |
+
+    aaa
+  selections:
+    - anchor: { line: 1, character: 0 }
+      active: { line: 1, character: 0 }
+  marks: {}
+finalState:
+  documentContents: |+
+
+
+  selections:
+    - anchor: { line: 1, character: 0 }
+      active: { line: 1, character: 0 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      modifiers: [{ type: containingScope, scopeType: { type: paragraph } }],
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/scopes/paragraph/clearBlock2.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/scopes/paragraph/clearBlock2.yml
new file mode 100644
index 0000000000..139d16d8e4
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/scopes/paragraph/clearBlock2.yml
@@ -0,0 +1,34 @@
+languageId: plaintext
+command:
+  spokenForm: clear block
+  version: 3
+  targets:
+    - type: primitive
+      modifiers:
+        - type: containingScope
+          scopeType: { type: paragraph }
+  usePrePhraseSnapshot: true
+  action: { name: clearAndSetSelection }
+initialState:
+  documentContents: |
+
+    aaa
+  selections:
+    - anchor: { line: 1, character: 2 }
+      active: { line: 1, character: 2 }
+  marks: {}
+finalState:
+  documentContents: |+
+
+
+  selections:
+    - anchor: { line: 1, character: 0 }
+      active: { line: 1, character: 0 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      modifiers: [{ type: containingScope, scopeType: { type: paragraph } }],
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/scopes/paragraph/clearBlock3.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/scopes/paragraph/clearBlock3.yml
new file mode 100644
index 0000000000..0e17a4d40c
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/scopes/paragraph/clearBlock3.yml
@@ -0,0 +1,34 @@
+languageId: plaintext
+command:
+  spokenForm: clear block
+  version: 3
+  targets:
+    - type: primitive
+      modifiers:
+        - type: containingScope
+          scopeType: { type: paragraph }
+  usePrePhraseSnapshot: true
+  action: { name: clearAndSetSelection }
+initialState:
+  documentContents: |
+
+    aaa
+  selections:
+    - anchor: { line: 1, character: 3 }
+      active: { line: 1, character: 3 }
+  marks: {}
+finalState:
+  documentContents: |+
+
+
+  selections:
+    - anchor: { line: 1, character: 0 }
+      active: { line: 1, character: 0 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      modifiers: [{ type: containingScope, scopeType: { type: paragraph } }],
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/scopes/paragraph/clearNextBlock.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/scopes/paragraph/clearNextBlock.yml
new file mode 100644
index 0000000000..e930723123
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/scopes/paragraph/clearNextBlock.yml
@@ -0,0 +1,50 @@
+languageId: plaintext
+command:
+  spokenForm: clear next block
+  version: 3
+  targets:
+    - type: primitive
+      modifiers:
+        - type: relativeScope
+          scopeType: { type: paragraph }
+          offset: 1
+          length: 1
+          direction: forward
+  usePrePhraseSnapshot: true
+  action: { name: clearAndSetSelection }
+initialState:
+  documentContents: |
+
+    aaa
+
+    bbb
+  selections:
+    - anchor: { line: 1, character: 0 }
+      active: { line: 1, character: 0 }
+  marks: {}
+finalState:
+  documentContents: |+
+
+    aaa
+
+
+  selections:
+    - anchor: { line: 3, character: 0 }
+      active: { line: 3, character: 0 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      modifiers:
+        [
+          {
+            type: relativeScope,
+            scopeType: { type: paragraph },
+            offset: 1,
+            length: 1,
+            direction: forward,
+          },
+        ],
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/scopes/paragraph/clearNextBlock2.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/scopes/paragraph/clearNextBlock2.yml
new file mode 100644
index 0000000000..0a360488ed
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/scopes/paragraph/clearNextBlock2.yml
@@ -0,0 +1,50 @@
+languageId: plaintext
+command:
+  spokenForm: clear next block
+  version: 3
+  targets:
+    - type: primitive
+      modifiers:
+        - type: relativeScope
+          scopeType: { type: paragraph }
+          offset: 1
+          length: 1
+          direction: forward
+  usePrePhraseSnapshot: true
+  action: { name: clearAndSetSelection }
+initialState:
+  documentContents: |
+
+    aaa
+
+    bbb
+  selections:
+    - anchor: { line: 1, character: 1 }
+      active: { line: 1, character: 1 }
+  marks: {}
+finalState:
+  documentContents: |+
+
+    aaa
+
+
+  selections:
+    - anchor: { line: 3, character: 0 }
+      active: { line: 3, character: 0 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      modifiers:
+        [
+          {
+            type: relativeScope,
+            scopeType: { type: paragraph },
+            offset: 1,
+            length: 1,
+            direction: forward,
+          },
+        ],
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/scopes/paragraph/clearNextBlock3.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/scopes/paragraph/clearNextBlock3.yml
new file mode 100644
index 0000000000..9f65962a74
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/scopes/paragraph/clearNextBlock3.yml
@@ -0,0 +1,50 @@
+languageId: plaintext
+command:
+  spokenForm: clear next block
+  version: 3
+  targets:
+    - type: primitive
+      modifiers:
+        - type: relativeScope
+          scopeType: { type: paragraph }
+          offset: 1
+          length: 1
+          direction: forward
+  usePrePhraseSnapshot: true
+  action: { name: clearAndSetSelection }
+initialState:
+  documentContents: |
+
+    aaa
+
+    bbb
+  selections:
+    - anchor: { line: 1, character: 3 }
+      active: { line: 1, character: 3 }
+  marks: {}
+finalState:
+  documentContents: |+
+
+    aaa
+
+
+  selections:
+    - anchor: { line: 3, character: 0 }
+      active: { line: 3, character: 0 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      modifiers:
+        [
+          {
+            type: relativeScope,
+            scopeType: { type: paragraph },
+            offset: 1,
+            length: 1,
+            direction: forward,
+          },
+        ],
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/scopes/paragraph/clearPreviousBlock.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/scopes/paragraph/clearPreviousBlock.yml
new file mode 100644
index 0000000000..df54097a1c
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/scopes/paragraph/clearPreviousBlock.yml
@@ -0,0 +1,50 @@
+languageId: plaintext
+command:
+  spokenForm: clear previous block
+  version: 3
+  targets:
+    - type: primitive
+      modifiers:
+        - type: relativeScope
+          scopeType: { type: paragraph }
+          offset: 1
+          length: 1
+          direction: backward
+  usePrePhraseSnapshot: true
+  action: { name: clearAndSetSelection }
+initialState:
+  documentContents: |
+
+    aaa
+
+    bbb
+  selections:
+    - anchor: { line: 3, character: 0 }
+      active: { line: 3, character: 0 }
+  marks: {}
+finalState:
+  documentContents: |
+
+
+
+    bbb
+  selections:
+    - anchor: { line: 1, character: 0 }
+      active: { line: 1, character: 0 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      modifiers:
+        [
+          {
+            type: relativeScope,
+            scopeType: { type: paragraph },
+            offset: 1,
+            length: 1,
+            direction: backward,
+          },
+        ],
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/scopes/paragraph/clearPreviousBlock2.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/scopes/paragraph/clearPreviousBlock2.yml
new file mode 100644
index 0000000000..a582af279e
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/scopes/paragraph/clearPreviousBlock2.yml
@@ -0,0 +1,50 @@
+languageId: plaintext
+command:
+  spokenForm: clear previous block
+  version: 3
+  targets:
+    - type: primitive
+      modifiers:
+        - type: relativeScope
+          scopeType: { type: paragraph }
+          offset: 1
+          length: 1
+          direction: backward
+  usePrePhraseSnapshot: true
+  action: { name: clearAndSetSelection }
+initialState:
+  documentContents: |
+
+    aaa
+
+    bbb
+  selections:
+    - anchor: { line: 3, character: 1 }
+      active: { line: 3, character: 1 }
+  marks: {}
+finalState:
+  documentContents: |
+
+
+
+    bbb
+  selections:
+    - anchor: { line: 1, character: 0 }
+      active: { line: 1, character: 0 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      modifiers:
+        [
+          {
+            type: relativeScope,
+            scopeType: { type: paragraph },
+            offset: 1,
+            length: 1,
+            direction: backward,
+          },
+        ],
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/scopes/paragraph/clearPreviousBlock3.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/scopes/paragraph/clearPreviousBlock3.yml
new file mode 100644
index 0000000000..4f2f99daae
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/scopes/paragraph/clearPreviousBlock3.yml
@@ -0,0 +1,50 @@
+languageId: plaintext
+command:
+  spokenForm: clear previous block
+  version: 3
+  targets:
+    - type: primitive
+      modifiers:
+        - type: relativeScope
+          scopeType: { type: paragraph }
+          offset: 1
+          length: 1
+          direction: backward
+  usePrePhraseSnapshot: true
+  action: { name: clearAndSetSelection }
+initialState:
+  documentContents: |
+
+    aaa
+
+    bbb
+  selections:
+    - anchor: { line: 3, character: 3 }
+      active: { line: 3, character: 3 }
+  marks: {}
+finalState:
+  documentContents: |
+
+
+
+    bbb
+  selections:
+    - anchor: { line: 1, character: 0 }
+      active: { line: 1, character: 0 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      modifiers:
+        [
+          {
+            type: relativeScope,
+            scopeType: { type: paragraph },
+            offset: 1,
+            length: 1,
+            direction: backward,
+          },
+        ],
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/scopes/paragraph/clearTwoBlocks.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/scopes/paragraph/clearTwoBlocks.yml
new file mode 100644
index 0000000000..7a05646aa6
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/scopes/paragraph/clearTwoBlocks.yml
@@ -0,0 +1,48 @@
+languageId: plaintext
+command:
+  spokenForm: clear two blocks
+  version: 3
+  targets:
+    - type: primitive
+      modifiers:
+        - type: relativeScope
+          scopeType: { type: paragraph }
+          offset: 0
+          length: 2
+          direction: forward
+  usePrePhraseSnapshot: true
+  action: { name: clearAndSetSelection }
+initialState:
+  documentContents: |
+
+    aaa
+
+    bbb
+  selections:
+    - anchor: { line: 1, character: 0 }
+      active: { line: 1, character: 0 }
+  marks: {}
+finalState:
+  documentContents: |+
+
+
+  selections:
+    - anchor: { line: 1, character: 0 }
+      active: { line: 1, character: 0 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      modifiers:
+        [
+          {
+            type: relativeScope,
+            scopeType: { type: paragraph },
+            offset: 0,
+            length: 2,
+            direction: forward,
+          },
+        ],
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/scopes/paragraph/clearTwoBlocks2.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/scopes/paragraph/clearTwoBlocks2.yml
new file mode 100644
index 0000000000..2033a97c15
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/scopes/paragraph/clearTwoBlocks2.yml
@@ -0,0 +1,48 @@
+languageId: plaintext
+command:
+  spokenForm: clear two blocks
+  version: 3
+  targets:
+    - type: primitive
+      modifiers:
+        - type: relativeScope
+          scopeType: { type: paragraph }
+          offset: 0
+          length: 2
+          direction: forward
+  usePrePhraseSnapshot: true
+  action: { name: clearAndSetSelection }
+initialState:
+  documentContents: |
+
+    aaa
+
+    bbb
+  selections:
+    - anchor: { line: 1, character: 1 }
+      active: { line: 1, character: 1 }
+  marks: {}
+finalState:
+  documentContents: |+
+
+
+  selections:
+    - anchor: { line: 1, character: 0 }
+      active: { line: 1, character: 0 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      modifiers:
+        [
+          {
+            type: relativeScope,
+            scopeType: { type: paragraph },
+            offset: 0,
+            length: 2,
+            direction: forward,
+          },
+        ],
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/scopes/paragraph/clearTwoBlocks3.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/scopes/paragraph/clearTwoBlocks3.yml
new file mode 100644
index 0000000000..ef1774b9ed
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/scopes/paragraph/clearTwoBlocks3.yml
@@ -0,0 +1,48 @@
+languageId: plaintext
+command:
+  spokenForm: clear two blocks
+  version: 3
+  targets:
+    - type: primitive
+      modifiers:
+        - type: relativeScope
+          scopeType: { type: paragraph }
+          offset: 0
+          length: 2
+          direction: forward
+  usePrePhraseSnapshot: true
+  action: { name: clearAndSetSelection }
+initialState:
+  documentContents: |
+
+    aaa
+
+    bbb
+  selections:
+    - anchor: { line: 1, character: 3 }
+      active: { line: 1, character: 3 }
+  marks: {}
+finalState:
+  documentContents: |+
+
+
+  selections:
+    - anchor: { line: 1, character: 0 }
+      active: { line: 1, character: 0 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      modifiers:
+        [
+          {
+            type: relativeScope,
+            scopeType: { type: paragraph },
+            offset: 0,
+            length: 2,
+            direction: forward,
+          },
+        ],
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/scopes/paragraph/clearTwoBlocksBackward.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/scopes/paragraph/clearTwoBlocksBackward.yml
new file mode 100644
index 0000000000..b48db9ec8b
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/scopes/paragraph/clearTwoBlocksBackward.yml
@@ -0,0 +1,48 @@
+languageId: plaintext
+command:
+  spokenForm: clear two blocks backward
+  version: 3
+  targets:
+    - type: primitive
+      modifiers:
+        - type: relativeScope
+          scopeType: { type: paragraph }
+          offset: 0
+          length: 2
+          direction: backward
+  usePrePhraseSnapshot: true
+  action: { name: clearAndSetSelection }
+initialState:
+  documentContents: |
+
+    aaa
+
+    bbb
+  selections:
+    - anchor: { line: 3, character: 0 }
+      active: { line: 3, character: 0 }
+  marks: {}
+finalState:
+  documentContents: |+
+
+
+  selections:
+    - anchor: { line: 1, character: 0 }
+      active: { line: 1, character: 0 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      modifiers:
+        [
+          {
+            type: relativeScope,
+            scopeType: { type: paragraph },
+            offset: 0,
+            length: 2,
+            direction: backward,
+          },
+        ],
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/scopes/paragraph/clearTwoBlocksBackward2.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/scopes/paragraph/clearTwoBlocksBackward2.yml
new file mode 100644
index 0000000000..cbba6ba1dd
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/scopes/paragraph/clearTwoBlocksBackward2.yml
@@ -0,0 +1,48 @@
+languageId: plaintext
+command:
+  spokenForm: clear two blocks backward
+  version: 3
+  targets:
+    - type: primitive
+      modifiers:
+        - type: relativeScope
+          scopeType: { type: paragraph }
+          offset: 0
+          length: 2
+          direction: backward
+  usePrePhraseSnapshot: true
+  action: { name: clearAndSetSelection }
+initialState:
+  documentContents: |
+
+    aaa
+
+    bbb
+  selections:
+    - anchor: { line: 3, character: 1 }
+      active: { line: 3, character: 1 }
+  marks: {}
+finalState:
+  documentContents: |+
+
+
+  selections:
+    - anchor: { line: 1, character: 0 }
+      active: { line: 1, character: 0 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      modifiers:
+        [
+          {
+            type: relativeScope,
+            scopeType: { type: paragraph },
+            offset: 0,
+            length: 2,
+            direction: backward,
+          },
+        ],
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/scopes/paragraph/clearTwoBlocksBackward3.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/scopes/paragraph/clearTwoBlocksBackward3.yml
new file mode 100644
index 0000000000..eedc5d510e
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/scopes/paragraph/clearTwoBlocksBackward3.yml
@@ -0,0 +1,48 @@
+languageId: plaintext
+command:
+  spokenForm: clear two blocks backward
+  version: 3
+  targets:
+    - type: primitive
+      modifiers:
+        - type: relativeScope
+          scopeType: { type: paragraph }
+          offset: 0
+          length: 2
+          direction: backward
+  usePrePhraseSnapshot: true
+  action: { name: clearAndSetSelection }
+initialState:
+  documentContents: |
+
+    aaa
+
+    bbb
+  selections:
+    - anchor: { line: 3, character: 3 }
+      active: { line: 3, character: 3 }
+  marks: {}
+finalState:
+  documentContents: |+
+
+
+  selections:
+    - anchor: { line: 1, character: 0 }
+      active: { line: 1, character: 0 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      modifiers:
+        [
+          {
+            type: relativeScope,
+            scopeType: { type: paragraph },
+            offset: 0,
+            length: 2,
+            direction: backward,
+          },
+        ],
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/scopes/paragraph/drinkBlock.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/scopes/paragraph/drinkBlock.yml
new file mode 100644
index 0000000000..df87449f43
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/scopes/paragraph/drinkBlock.yml
@@ -0,0 +1,36 @@
+languageId: plaintext
+command:
+  spokenForm: drink block
+  version: 2
+  targets:
+    - type: primitive
+      modifiers:
+        - type: containingScope
+          scopeType: { type: paragraph }
+  usePrePhraseSnapshot: true
+  action: { name: editNewLineBefore }
+initialState:
+  documentContents: |2
+        hello there
+        hello there
+  selections:
+    - anchor: { line: 1, character: 4 }
+      active: { line: 1, character: 9 }
+  marks: {}
+finalState:
+  documentContents: |2
+
+
+        hello there
+        hello there
+  selections:
+    - anchor: { line: 0, character: 4 }
+      active: { line: 0, character: 4 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      modifiers: [{ type: containingScope, scopeType: { type: paragraph } }],
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/scopes/paragraph/pourBlock.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/scopes/paragraph/pourBlock.yml
new file mode 100644
index 0000000000..66b2d27b28
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/scopes/paragraph/pourBlock.yml
@@ -0,0 +1,35 @@
+languageId: plaintext
+command:
+  spokenForm: pour block
+  version: 2
+  targets:
+    - type: primitive
+      modifiers:
+        - type: containingScope
+          scopeType: { type: paragraph }
+  usePrePhraseSnapshot: true
+  action: { name: editNewLineAfter }
+initialState:
+  documentContents: |2
+        hello there
+        hello there
+  selections:
+    - anchor: { line: 1, character: 4 }
+      active: { line: 1, character: 9 }
+  marks: {}
+finalState:
+  documentContents: |2
+        hello there
+        hello there
+
+  selections:
+    - anchor: { line: 3, character: 4 }
+      active: { line: 3, character: 4 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      modifiers: [{ type: containingScope, scopeType: { type: paragraph } }],
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/scopes/paragraph/takeBlockAir.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/scopes/paragraph/takeBlockAir.yml
new file mode 100644
index 0000000000..4d92412055
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/scopes/paragraph/takeBlockAir.yml
@@ -0,0 +1,44 @@
+languageId: typescript
+command:
+  version: 1
+  spokenForm: take block air
+  action: setSelection
+  targets:
+    - type: primitive
+      selectionType: paragraph
+      mark: { type: decoratedSymbol, symbolColor: default, character: a }
+initialState:
+  documentContents: |
+
+    const value = "Hello world";
+
+    const value = "Hello world";
+    const value = "Hello world";
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+  marks:
+    default.a:
+      start: { line: 3, character: 6 }
+      end: { line: 3, character: 11 }
+finalState:
+  documentContents: |
+
+    const value = "Hello world";
+
+    const value = "Hello world";
+    const value = "Hello world";
+  selections:
+    - anchor: { line: 3, character: 0 }
+      active: { line: 4, character: 28 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: decoratedSymbol, symbolColor: default, character: a },
+      selectionType: paragraph,
+      position: contents,
+      modifier: { type: identity },
+      insideOutsideType: inside,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/scopes/paragraph/takeEveryBlock.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/scopes/paragraph/takeEveryBlock.yml
new file mode 100644
index 0000000000..5716bfd7fc
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/scopes/paragraph/takeEveryBlock.yml
@@ -0,0 +1,44 @@
+languageId: plaintext
+command:
+  spokenForm: take every block
+  version: 2
+  action: { name: setSelection }
+  targets:
+    - type: primitive
+      modifiers:
+        - type: everyScope
+          scopeType: { type: paragraph }
+  usePrePhraseSnapshot: true
+initialState:
+  documentContents: |
+
+    a
+
+    b   c
+    d   e
+    f   g
+  selections:
+    - anchor: { line: 6, character: 0 }
+      active: { line: 6, character: 0 }
+  marks: {}
+finalState:
+  documentContents: |
+
+    a
+
+    b   c
+    d   e
+    f   g
+  selections:
+    - anchor: { line: 1, character: 0 }
+      active: { line: 1, character: 1 }
+    - anchor: { line: 3, character: 0 }
+      active: { line: 5, character: 5 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      modifiers: [{ type: everyScope, scopeType: paragraph }],
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/scopes/paragraph/takeEveryBlock2.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/scopes/paragraph/takeEveryBlock2.yml
new file mode 100644
index 0000000000..c2e97cc33d
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/scopes/paragraph/takeEveryBlock2.yml
@@ -0,0 +1,44 @@
+languageId: plaintext
+command:
+  spokenForm: take every block
+  version: 2
+  action: { name: setSelection }
+  targets:
+    - type: primitive
+      modifiers:
+        - type: everyScope
+          scopeType: { type: paragraph }
+  usePrePhraseSnapshot: true
+initialState:
+  documentContents: |
+
+    a
+
+    b   c
+    d   e
+    f   g
+  selections:
+    - anchor: { line: 4, character: 5 }
+      active: { line: 1, character: 0 }
+  marks: {}
+finalState:
+  documentContents: |
+
+    a
+
+    b   c
+    d   e
+    f   g
+  selections:
+    - anchor: { line: 1, character: 1 }
+      active: { line: 1, character: 0 }
+    - anchor: { line: 5, character: 5 }
+      active: { line: 3, character: 0 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      modifiers: [{ type: everyScope, scopeType: paragraph }],
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/scopes/paragraph/takeEveryBlock3.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/scopes/paragraph/takeEveryBlock3.yml
new file mode 100644
index 0000000000..85b2b896ba
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/scopes/paragraph/takeEveryBlock3.yml
@@ -0,0 +1,44 @@
+languageId: plaintext
+command:
+  spokenForm: take every block
+  version: 2
+  action: { name: setSelection }
+  targets:
+    - type: primitive
+      modifiers:
+        - type: everyScope
+          scopeType: { type: paragraph }
+  usePrePhraseSnapshot: true
+initialState:
+  documentContents: |
+
+    a
+
+    b   c
+    d   e
+    f   g
+  selections:
+    - anchor: { line: 1, character: 0 }
+      active: { line: 4, character: 5 }
+  marks: {}
+finalState:
+  documentContents: |
+
+    a
+
+    b   c
+    d   e
+    f   g
+  selections:
+    - anchor: { line: 1, character: 0 }
+      active: { line: 1, character: 1 }
+    - anchor: { line: 3, character: 0 }
+      active: { line: 5, character: 5 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      modifiers: [{ type: everyScope, scopeType: paragraph }],
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/scopes/token/clearTokenBackward.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/scopes/token/clearTokenBackward.yml
new file mode 100644
index 0000000000..6b26bc3e9f
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/scopes/token/clearTokenBackward.yml
@@ -0,0 +1,42 @@
+languageId: plaintext
+command:
+  spokenForm: clear token backward
+  version: 3
+  targets:
+    - type: primitive
+      modifiers:
+        - type: relativeScope
+          scopeType: { type: token }
+          offset: 0
+          length: 1
+          direction: backward
+  usePrePhraseSnapshot: true
+  action: { name: clearAndSetSelection }
+initialState:
+  documentContents: aaa.
+  selections:
+    - anchor: { line: 0, character: 3 }
+      active: { line: 0, character: 3 }
+  marks: {}
+finalState:
+  documentContents: .
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      modifiers:
+        [
+          {
+            type: relativeScope,
+            scopeType: { type: token },
+            offset: 0,
+            length: 1,
+            direction: backward,
+          },
+        ],
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/scopes/token/clearTokenBackward2.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/scopes/token/clearTokenBackward2.yml
new file mode 100644
index 0000000000..1e44a4d9bb
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/scopes/token/clearTokenBackward2.yml
@@ -0,0 +1,42 @@
+languageId: plaintext
+command:
+  spokenForm: clear token backward
+  version: 3
+  targets:
+    - type: primitive
+      modifiers:
+        - type: relativeScope
+          scopeType: { type: token }
+          offset: 0
+          length: 1
+          direction: backward
+  usePrePhraseSnapshot: true
+  action: { name: clearAndSetSelection }
+initialState:
+  documentContents: .aaa
+  selections:
+    - anchor: { line: 0, character: 1 }
+      active: { line: 0, character: 1 }
+  marks: {}
+finalState:
+  documentContents: aaa
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      modifiers:
+        [
+          {
+            type: relativeScope,
+            scopeType: { type: token },
+            offset: 0,
+            length: 1,
+            direction: backward,
+          },
+        ],
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/scopes/token/clearTokenForward.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/scopes/token/clearTokenForward.yml
new file mode 100644
index 0000000000..9d0f43d5bd
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/scopes/token/clearTokenForward.yml
@@ -0,0 +1,42 @@
+languageId: plaintext
+command:
+  spokenForm: clear token forward
+  version: 3
+  targets:
+    - type: primitive
+      modifiers:
+        - type: relativeScope
+          scopeType: { type: token }
+          offset: 0
+          length: 1
+          direction: forward
+  usePrePhraseSnapshot: true
+  action: { name: clearAndSetSelection }
+initialState:
+  documentContents: aaa.
+  selections:
+    - anchor: { line: 0, character: 3 }
+      active: { line: 0, character: 3 }
+  marks: {}
+finalState:
+  documentContents: aaa
+  selections:
+    - anchor: { line: 0, character: 3 }
+      active: { line: 0, character: 3 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      modifiers:
+        [
+          {
+            type: relativeScope,
+            scopeType: { type: token },
+            offset: 0,
+            length: 1,
+            direction: forward,
+          },
+        ],
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/scopes/token/clearTokenForward2.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/scopes/token/clearTokenForward2.yml
new file mode 100644
index 0000000000..577b31a1e7
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/scopes/token/clearTokenForward2.yml
@@ -0,0 +1,42 @@
+languageId: plaintext
+command:
+  spokenForm: clear token forward
+  version: 3
+  targets:
+    - type: primitive
+      modifiers:
+        - type: relativeScope
+          scopeType: { type: token }
+          offset: 0
+          length: 1
+          direction: forward
+  usePrePhraseSnapshot: true
+  action: { name: clearAndSetSelection }
+initialState:
+  documentContents: .aaa
+  selections:
+    - anchor: { line: 0, character: 1 }
+      active: { line: 0, character: 1 }
+  marks: {}
+finalState:
+  documentContents: .
+  selections:
+    - anchor: { line: 0, character: 1 }
+      active: { line: 0, character: 1 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      modifiers:
+        [
+          {
+            type: relativeScope,
+            scopeType: { type: token },
+            offset: 0,
+            length: 1,
+            direction: forward,
+          },
+        ],
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/scopes/token/ditchFine.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/scopes/token/ditchFine.yml
new file mode 100644
index 0000000000..1d59ad7ce7
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/scopes/token/ditchFine.yml
@@ -0,0 +1,33 @@
+languageId: plaintext
+command:
+  spokenForm: ditch fine
+  version: 3
+  targets:
+    - type: primitive
+      mark: { type: decoratedSymbol, symbolColor: default, character: f }
+  usePrePhraseSnapshot: true
+  action: { name: remove }
+initialState:
+  documentContents: |2
+        foo
+  selections:
+    - anchor: { line: 1, character: 0 }
+      active: { line: 1, character: 0 }
+  marks:
+    default.f:
+      start: { line: 0, character: 4 }
+      end: { line: 0, character: 7 }
+finalState:
+  documentContents: |+
+
+  selections:
+    - anchor: { line: 1, character: 0 }
+      active: { line: 1, character: 0 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: decoratedSymbol, symbolColor: default, character: f },
+      modifiers: [],
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/scopes/token/ditchFinePastBat.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/scopes/token/ditchFinePastBat.yml
new file mode 100644
index 0000000000..a70fc42a5d
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/scopes/token/ditchFinePastBat.yml
@@ -0,0 +1,57 @@
+languageId: plaintext
+command:
+  spokenForm: ditch fine past bat
+  version: 3
+  targets:
+    - type: range
+      anchor:
+        type: primitive
+        mark: { type: decoratedSymbol, symbolColor: default, character: f }
+      active:
+        type: primitive
+        mark: { type: decoratedSymbol, symbolColor: default, character: b }
+      excludeAnchor: false
+      excludeActive: false
+  usePrePhraseSnapshot: true
+  action: { name: remove }
+initialState:
+  documentContents: |2
+        foo
+        bar.
+  selections:
+    - anchor: { line: 2, character: 0 }
+      active: { line: 2, character: 0 }
+  marks:
+    default.f:
+      start: { line: 0, character: 4 }
+      end: { line: 0, character: 7 }
+    default.b:
+      start: { line: 1, character: 4 }
+      end: { line: 1, character: 7 }
+finalState:
+  documentContents: |2
+        .
+  selections:
+    - anchor: { line: 1, character: 0 }
+      active: { line: 1, character: 0 }
+fullTargets:
+  [
+    {
+      type: range,
+      excludeAnchor: false,
+      excludeActive: false,
+      rangeType: continuous,
+      anchor:
+        {
+          type: primitive,
+          mark: { type: decoratedSymbol, symbolColor: default, character: f },
+          modifiers: [],
+        },
+      active:
+        {
+          type: primitive,
+          mark: { type: decoratedSymbol, symbolColor: default, character: b },
+          modifiers: [],
+        },
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/scopes/token/ditchFinePastPoint.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/scopes/token/ditchFinePastPoint.yml
new file mode 100644
index 0000000000..86de11a48b
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/scopes/token/ditchFinePastPoint.yml
@@ -0,0 +1,57 @@
+languageId: plaintext
+command:
+  spokenForm: ditch fine past point
+  version: 3
+  targets:
+    - type: range
+      anchor:
+        type: primitive
+        mark: { type: decoratedSymbol, symbolColor: default, character: f }
+      active:
+        type: primitive
+        mark: { type: decoratedSymbol, symbolColor: default, character: . }
+      excludeAnchor: false
+      excludeActive: false
+  usePrePhraseSnapshot: true
+  action: { name: remove }
+initialState:
+  documentContents: |2
+       foo
+       bar.
+  selections:
+    - anchor: { line: 2, character: 0 }
+      active: { line: 2, character: 0 }
+  marks:
+    default.f:
+      start: { line: 0, character: 3 }
+      end: { line: 0, character: 6 }
+    default..:
+      start: { line: 1, character: 6 }
+      end: { line: 1, character: 7 }
+finalState:
+  documentContents: |+
+
+  selections:
+    - anchor: { line: 1, character: 0 }
+      active: { line: 1, character: 0 }
+fullTargets:
+  [
+    {
+      type: range,
+      excludeAnchor: false,
+      excludeActive: false,
+      rangeType: continuous,
+      anchor:
+        {
+          type: primitive,
+          mark: { type: decoratedSymbol, symbolColor: default, character: f },
+          modifiers: [],
+        },
+      active:
+        {
+          type: primitive,
+          mark: { type: decoratedSymbol, symbolColor: default, character: . },
+          modifiers: [],
+        },
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/scopes/token/ditchFinePastPoint2.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/scopes/token/ditchFinePastPoint2.yml
new file mode 100644
index 0000000000..86de11a48b
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/scopes/token/ditchFinePastPoint2.yml
@@ -0,0 +1,57 @@
+languageId: plaintext
+command:
+  spokenForm: ditch fine past point
+  version: 3
+  targets:
+    - type: range
+      anchor:
+        type: primitive
+        mark: { type: decoratedSymbol, symbolColor: default, character: f }
+      active:
+        type: primitive
+        mark: { type: decoratedSymbol, symbolColor: default, character: . }
+      excludeAnchor: false
+      excludeActive: false
+  usePrePhraseSnapshot: true
+  action: { name: remove }
+initialState:
+  documentContents: |2
+       foo
+       bar.
+  selections:
+    - anchor: { line: 2, character: 0 }
+      active: { line: 2, character: 0 }
+  marks:
+    default.f:
+      start: { line: 0, character: 3 }
+      end: { line: 0, character: 6 }
+    default..:
+      start: { line: 1, character: 6 }
+      end: { line: 1, character: 7 }
+finalState:
+  documentContents: |+
+
+  selections:
+    - anchor: { line: 1, character: 0 }
+      active: { line: 1, character: 0 }
+fullTargets:
+  [
+    {
+      type: range,
+      excludeAnchor: false,
+      excludeActive: false,
+      rangeType: continuous,
+      anchor:
+        {
+          type: primitive,
+          mark: { type: decoratedSymbol, symbolColor: default, character: f },
+          modifiers: [],
+        },
+      active:
+        {
+          type: primitive,
+          mark: { type: decoratedSymbol, symbolColor: default, character: . },
+          modifiers: [],
+        },
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/scopes/token/takeToken.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/scopes/token/takeToken.yml
new file mode 100644
index 0000000000..cd8da27780
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/scopes/token/takeToken.yml
@@ -0,0 +1,26 @@
+languageId: plaintext
+command:
+  spokenForm: take token
+  version: 3
+  targets:
+    - type: primitive
+      modifiers:
+        - type: containingScope
+          scopeType: { type: token }
+  usePrePhraseSnapshot: true
+  action: { name: setSelection }
+initialState:
+  documentContents: a b
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 2 }
+  marks: {}
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      modifiers: [{ type: containingScope, scopeType: { type: token } }],
+    },
+  ]
+thrownError: { name: NoContainingScopeError }
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/scopes/token/takeToken2.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/scopes/token/takeToken2.yml
new file mode 100644
index 0000000000..fecff6117b
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/scopes/token/takeToken2.yml
@@ -0,0 +1,26 @@
+languageId: plaintext
+command:
+  spokenForm: take token
+  version: 3
+  targets:
+    - type: primitive
+      modifiers:
+        - type: containingScope
+          scopeType: { type: token }
+  usePrePhraseSnapshot: true
+  action: { name: setSelection }
+initialState:
+  documentContents: a b
+  selections:
+    - anchor: { line: 0, character: 3 }
+      active: { line: 0, character: 1 }
+  marks: {}
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      modifiers: [{ type: containingScope, scopeType: { type: token } }],
+    },
+  ]
+thrownError: { name: NoContainingScopeError }
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/selectionTypes/bringHarpToAfterFile.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/selectionTypes/bringHarpToAfterFile.yml
new file mode 100644
index 0000000000..3152f5456f
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/selectionTypes/bringHarpToAfterFile.yml
@@ -0,0 +1,48 @@
+languageId: plaintext
+command:
+  spokenForm: bring harp to after file
+  version: 2
+  action: { name: replaceWithTarget }
+  targets:
+    - type: primitive
+      mark: { type: decoratedSymbol, symbolColor: default, character: h }
+      modifiers: []
+    - type: primitive
+      modifiers:
+        - { type: position, position: after }
+        - type: containingScope
+          scopeType: { type: document }
+  usePrePhraseSnapshot: true
+initialState:
+  documentContents: hello world
+  selections:
+    - anchor: { line: 0, character: 11 }
+      active: { line: 0, character: 11 }
+  marks:
+    default.h:
+      start: { line: 0, character: 0 }
+      end: { line: 0, character: 5 }
+finalState:
+  documentContents: |-
+    hello world
+    hello
+  selections:
+    - anchor: { line: 0, character: 11 }
+      active: { line: 0, character: 11 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: decoratedSymbol, symbolColor: default, character: h },
+      modifiers: [],
+    },
+    {
+      type: primitive,
+      mark: { type: decoratedSymbol, symbolColor: default, character: h },
+      modifiers:
+        [
+          { type: position, position: after },
+          { type: containingScope, scopeType: document },
+        ],
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/selectionTypes/bringWhaleToBeforeFile.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/selectionTypes/bringWhaleToBeforeFile.yml
new file mode 100644
index 0000000000..70b240ab19
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/selectionTypes/bringWhaleToBeforeFile.yml
@@ -0,0 +1,48 @@
+languageId: plaintext
+command:
+  spokenForm: bring whale to before file
+  version: 2
+  action: { name: replaceWithTarget }
+  targets:
+    - type: primitive
+      mark: { type: decoratedSymbol, symbolColor: default, character: w }
+      modifiers: []
+    - type: primitive
+      modifiers:
+        - { type: position, position: before }
+        - type: containingScope
+          scopeType: { type: document }
+  usePrePhraseSnapshot: true
+initialState:
+  documentContents: hello world
+  selections:
+    - anchor: { line: 0, character: 11 }
+      active: { line: 0, character: 11 }
+  marks:
+    default.w:
+      start: { line: 0, character: 6 }
+      end: { line: 0, character: 11 }
+finalState:
+  documentContents: |-
+    world
+    hello world
+  selections:
+    - anchor: { line: 1, character: 11 }
+      active: { line: 1, character: 11 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: decoratedSymbol, symbolColor: default, character: w },
+      modifiers: [],
+    },
+    {
+      type: primitive,
+      mark: { type: decoratedSymbol, symbolColor: default, character: w },
+      modifiers:
+        [
+          { type: position, position: before },
+          { type: containingScope, scopeType: document },
+        ],
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/selectionTypes/changeEveryPaint.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/selectionTypes/changeEveryPaint.yml
new file mode 100644
index 0000000000..3a7f17fb0a
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/selectionTypes/changeEveryPaint.yml
@@ -0,0 +1,33 @@
+languageId: plaintext
+command:
+  spokenForm: change every paint
+  version: 2
+  targets:
+    - type: primitive
+      modifiers:
+        - type: everyScope
+          scopeType: { type: nonWhitespaceSequence }
+  usePrePhraseSnapshot: true
+  action: { name: clearAndSetSelection }
+initialState:
+  documentContents: aa|aa-().c_d bb|bb-().''
+  selections:
+    - anchor: { line: 0, character: 1 }
+      active: { line: 0, character: 1 }
+  marks: {}
+finalState:
+  documentContents: " "
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+    - anchor: { line: 0, character: 1 }
+      active: { line: 0, character: 1 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      modifiers:
+        [{ type: everyScope, scopeType: { type: nonWhitespaceSequence } }],
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/selectionTypes/changeEveryPaint2.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/selectionTypes/changeEveryPaint2.yml
new file mode 100644
index 0000000000..806ef60f39
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/selectionTypes/changeEveryPaint2.yml
@@ -0,0 +1,33 @@
+languageId: plaintext
+command:
+  spokenForm: change every paint
+  version: 2
+  targets:
+    - type: primitive
+      modifiers:
+        - type: everyScope
+          scopeType: { type: nonWhitespaceSequence }
+  usePrePhraseSnapshot: true
+  action: { name: clearAndSetSelection }
+initialState:
+  documentContents: foo(aa|aa-().c_d bb|bb-().'')
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+  marks: {}
+finalState:
+  documentContents: " "
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+    - anchor: { line: 0, character: 1 }
+      active: { line: 0, character: 1 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      modifiers:
+        [{ type: everyScope, scopeType: { type: nonWhitespaceSequence } }],
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/selectionTypes/changeEveryPaint3.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/selectionTypes/changeEveryPaint3.yml
new file mode 100644
index 0000000000..025a411392
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/selectionTypes/changeEveryPaint3.yml
@@ -0,0 +1,33 @@
+languageId: plaintext
+command:
+  spokenForm: change every paint
+  version: 2
+  targets:
+    - type: primitive
+      modifiers:
+        - type: everyScope
+          scopeType: { type: nonWhitespaceSequence }
+  usePrePhraseSnapshot: true
+  action: { name: clearAndSetSelection }
+initialState:
+  documentContents: foo(aa|aa-().c_d bb|bb-().'')
+  selections:
+    - anchor: { line: 0, character: 4 }
+      active: { line: 0, character: 28 }
+  marks: {}
+finalState:
+  documentContents: " "
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+    - anchor: { line: 0, character: 1 }
+      active: { line: 0, character: 1 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      modifiers:
+        [{ type: everyScope, scopeType: { type: nonWhitespaceSequence } }],
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/selectionTypes/changeEveryPaintInsideParen2.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/selectionTypes/changeEveryPaintInsideParen2.yml
new file mode 100644
index 0000000000..3ae4512f80
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/selectionTypes/changeEveryPaintInsideParen2.yml
@@ -0,0 +1,41 @@
+languageId: plaintext
+command:
+  spokenForm: change every paint inside paren
+  version: 2
+  targets:
+    - type: primitive
+      mark: { type: decoratedSymbol, symbolColor: default, character: ( }
+      modifiers:
+        - type: everyScope
+          scopeType: { type: nonWhitespaceSequence }
+        - { type: interiorOnly }
+  usePrePhraseSnapshot: true
+  action: { name: clearAndSetSelection }
+initialState:
+  documentContents: foo(aa|aa-().c_d bb|bb-().'') { return 1; }
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+  marks:
+    default.(:
+      start: { line: 0, character: 3 }
+      end: { line: 0, character: 4 }
+finalState:
+  documentContents: "  { return 1; }"
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+    - anchor: { line: 0, character: 1 }
+      active: { line: 0, character: 1 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: decoratedSymbol, symbolColor: default, character: ( },
+      modifiers:
+        [
+          { type: everyScope, scopeType: { type: nonWhitespaceSequence } },
+          { type: interiorOnly },
+        ],
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/selectionTypes/changeEveryPaintPairParen2.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/selectionTypes/changeEveryPaintPairParen2.yml
new file mode 100644
index 0000000000..ff1afac167
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/selectionTypes/changeEveryPaintPairParen2.yml
@@ -0,0 +1,45 @@
+languageId: plaintext
+command:
+  spokenForm: change every paint pair paren
+  version: 2
+  targets:
+    - type: primitive
+      mark: { type: decoratedSymbol, symbolColor: default, character: ( }
+      modifiers:
+        - type: everyScope
+          scopeType: { type: nonWhitespaceSequence }
+        - type: containingScope
+          scopeType: { type: surroundingPair, delimiter: any }
+  usePrePhraseSnapshot: true
+  action: { name: clearAndSetSelection }
+initialState:
+  documentContents: foo(aa|aa-().c_d bb|bb-().'') { return 1; }
+  selections:
+    - anchor: { line: 0, character: 1 }
+      active: { line: 0, character: 1 }
+  marks:
+    default.(:
+      start: { line: 0, character: 3 }
+      end: { line: 0, character: 4 }
+finalState:
+  documentContents: "  { return 1; }"
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+    - anchor: { line: 0, character: 1 }
+      active: { line: 0, character: 1 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: decoratedSymbol, symbolColor: default, character: ( },
+      modifiers:
+        [
+          { type: everyScope, scopeType: { type: nonWhitespaceSequence } },
+          {
+            type: containingScope,
+            scopeType: { type: surroundingPair, delimiter: any },
+          },
+        ],
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/selectionTypes/changeEveryShortPaint.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/selectionTypes/changeEveryShortPaint.yml
new file mode 100644
index 0000000000..00b83f3c67
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/selectionTypes/changeEveryShortPaint.yml
@@ -0,0 +1,40 @@
+languageId: python
+command:
+  spokenForm: change every short paint
+  version: 2
+  targets:
+    - type: primitive
+      modifiers:
+        - type: everyScope
+          scopeType: { type: boundedNonWhitespaceSequence }
+  usePrePhraseSnapshot: true
+  action: { name: clearAndSetSelection }
+initialState:
+  documentContents: several different words
+  selections:
+    - anchor: { line: 0, character: 5 }
+      active: { line: 0, character: 5 }
+  marks: {}
+finalState:
+  documentContents: "  "
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+    - anchor: { line: 0, character: 1 }
+      active: { line: 0, character: 1 }
+    - anchor: { line: 0, character: 2 }
+      active: { line: 0, character: 2 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      modifiers:
+        [
+          {
+            type: everyScope,
+            scopeType: { type: boundedNonWhitespaceSequence },
+          },
+        ],
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/selectionTypes/changeEveryShortPaint2.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/selectionTypes/changeEveryShortPaint2.yml
new file mode 100644
index 0000000000..6e952951e4
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/selectionTypes/changeEveryShortPaint2.yml
@@ -0,0 +1,40 @@
+languageId: plaintext
+command:
+  spokenForm: change every short paint
+  version: 2
+  targets:
+    - type: primitive
+      modifiers:
+        - type: everyScope
+          scopeType: { type: boundedNonWhitespaceSequence }
+  usePrePhraseSnapshot: true
+  action: { name: clearAndSetSelection }
+initialState:
+  documentContents: some.text.here some-other-text word()[]
+  selections:
+    - anchor: { line: 0, character: 20 }
+      active: { line: 0, character: 20 }
+  marks: {}
+finalState:
+  documentContents: "  "
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+    - anchor: { line: 0, character: 1 }
+      active: { line: 0, character: 1 }
+    - anchor: { line: 0, character: 2 }
+      active: { line: 0, character: 2 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      modifiers:
+        [
+          {
+            type: everyScope,
+            scopeType: { type: boundedNonWhitespaceSequence },
+          },
+        ],
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/selectionTypes/changeEveryShortPaint3.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/selectionTypes/changeEveryShortPaint3.yml
new file mode 100644
index 0000000000..77cb076263
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/selectionTypes/changeEveryShortPaint3.yml
@@ -0,0 +1,38 @@
+languageId: plaintext
+command:
+  spokenForm: change every short paint
+  version: 2
+  targets:
+    - type: primitive
+      modifiers:
+        - type: everyScope
+          scopeType: { type: boundedNonWhitespaceSequence }
+  usePrePhraseSnapshot: true
+  action: { name: clearAndSetSelection }
+initialState:
+  documentContents: '"aa|aa-().c_d" (bb|bb-().'''')'
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+  marks: {}
+finalState:
+  documentContents: " "
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+    - anchor: { line: 0, character: 1 }
+      active: { line: 0, character: 1 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      modifiers:
+        [
+          {
+            type: everyScope,
+            scopeType: { type: boundedNonWhitespaceSequence },
+          },
+        ],
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/selectionTypes/changeEveryShortPaint4.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/selectionTypes/changeEveryShortPaint4.yml
new file mode 100644
index 0000000000..ab05a238b7
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/selectionTypes/changeEveryShortPaint4.yml
@@ -0,0 +1,38 @@
+languageId: plaintext
+command:
+  spokenForm: change every short paint
+  version: 2
+  targets:
+    - type: primitive
+      modifiers:
+        - type: everyScope
+          scopeType: { type: boundedNonWhitespaceSequence }
+  usePrePhraseSnapshot: true
+  action: { name: clearAndSetSelection }
+initialState:
+  documentContents: foo(aa|aa-().c_d bb|bb-().'')
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+  marks: {}
+finalState:
+  documentContents: " "
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+    - anchor: { line: 0, character: 1 }
+      active: { line: 0, character: 1 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      modifiers:
+        [
+          {
+            type: everyScope,
+            scopeType: { type: boundedNonWhitespaceSequence },
+          },
+        ],
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/selectionTypes/changeEveryShortPaintInsideParen.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/selectionTypes/changeEveryShortPaintInsideParen.yml
new file mode 100644
index 0000000000..301f9dd5aa
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/selectionTypes/changeEveryShortPaintInsideParen.yml
@@ -0,0 +1,44 @@
+languageId: plaintext
+command:
+  spokenForm: change every short paint inside paren
+  version: 2
+  targets:
+    - type: primitive
+      mark: { type: decoratedSymbol, symbolColor: default, character: ( }
+      modifiers:
+        - type: everyScope
+          scopeType: { type: boundedNonWhitespaceSequence }
+        - { type: interiorOnly }
+  usePrePhraseSnapshot: true
+  action: { name: clearAndSetSelection }
+initialState:
+  documentContents: foo(aa|aa-().c_d bb|bb-().'')
+  selections:
+    - anchor: { line: 0, character: 1 }
+      active: { line: 0, character: 1 }
+  marks:
+    default.(:
+      start: { line: 0, character: 3 }
+      end: { line: 0, character: 4 }
+finalState:
+  documentContents: foo( )
+  selections:
+    - anchor: { line: 0, character: 4 }
+      active: { line: 0, character: 4 }
+    - anchor: { line: 0, character: 5 }
+      active: { line: 0, character: 5 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: decoratedSymbol, symbolColor: default, character: ( },
+      modifiers:
+        [
+          {
+            type: everyScope,
+            scopeType: { type: boundedNonWhitespaceSequence },
+          },
+          { type: interiorOnly },
+        ],
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/selectionTypes/changeEveryShortPaintPairParen.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/selectionTypes/changeEveryShortPaintPairParen.yml
new file mode 100644
index 0000000000..f026ac5d46
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/selectionTypes/changeEveryShortPaintPairParen.yml
@@ -0,0 +1,48 @@
+languageId: plaintext
+command:
+  spokenForm: change every short paint pair paren
+  version: 2
+  targets:
+    - type: primitive
+      mark: { type: decoratedSymbol, symbolColor: default, character: ( }
+      modifiers:
+        - type: everyScope
+          scopeType: { type: boundedNonWhitespaceSequence }
+        - type: containingScope
+          scopeType: { type: surroundingPair, delimiter: any }
+  usePrePhraseSnapshot: true
+  action: { name: clearAndSetSelection }
+initialState:
+  documentContents: foo(aa|aa-().c_d bb|bb-().'')
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+  marks:
+    default.(:
+      start: { line: 0, character: 3 }
+      end: { line: 0, character: 4 }
+finalState:
+  documentContents: foo( )
+  selections:
+    - anchor: { line: 0, character: 4 }
+      active: { line: 0, character: 4 }
+    - anchor: { line: 0, character: 5 }
+      active: { line: 0, character: 5 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: decoratedSymbol, symbolColor: default, character: ( },
+      modifiers:
+        [
+          {
+            type: everyScope,
+            scopeType: { type: boundedNonWhitespaceSequence },
+          },
+          {
+            type: containingScope,
+            scopeType: { type: surroundingPair, delimiter: any },
+          },
+        ],
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/selectionTypes/changeShortPaintParen.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/selectionTypes/changeShortPaintParen.yml
new file mode 100644
index 0000000000..0a725c5bf6
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/selectionTypes/changeShortPaintParen.yml
@@ -0,0 +1,39 @@
+command:
+  spokenForm: change short paint paren
+  version: 2
+  targets:
+    - type: primitive
+      mark: { type: decoratedSymbol, symbolColor: default, character: ( }
+      modifiers:
+        - type: containingScope
+          scopeType: { type: boundedNonWhitespaceSequence }
+  usePrePhraseSnapshot: true
+  action: { name: clearAndSetSelection }
+initialState:
+  documentContents: foo(aa|aa-.c_d bb|bb-.'')
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+  marks:
+    default.(:
+      start: { line: 0, character: 3 }
+      end: { line: 0, character: 4 }
+finalState:
+  documentContents: " bb|bb-.'')"
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: decoratedSymbol, symbolColor: default, character: ( },
+      modifiers:
+        [
+          {
+            type: containingScope,
+            scopeType: { type: boundedNonWhitespaceSequence },
+          },
+        ],
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/selectionTypes/chuckDot.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/selectionTypes/chuckDot.yml
new file mode 100644
index 0000000000..cf08762538
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/selectionTypes/chuckDot.yml
@@ -0,0 +1,31 @@
+languageId: plaintext
+command:
+  spokenForm: chuck dot
+  version: 3
+  targets:
+    - type: primitive
+      mark: { type: decoratedSymbol, symbolColor: default, character: . }
+  usePrePhraseSnapshot: true
+  action: { name: remove }
+initialState:
+  documentContents: "  .a"
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+  marks:
+    default..:
+      start: { line: 0, character: 2 }
+      end: { line: 0, character: 3 }
+finalState:
+  documentContents: "  a"
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: decoratedSymbol, symbolColor: default, character: . },
+      modifiers: [],
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/selectionTypes/chuckDot2.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/selectionTypes/chuckDot2.yml
new file mode 100644
index 0000000000..d38e3462e6
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/selectionTypes/chuckDot2.yml
@@ -0,0 +1,31 @@
+languageId: plaintext
+command:
+  spokenForm: chuck dot
+  version: 3
+  targets:
+    - type: primitive
+      mark: { type: decoratedSymbol, symbolColor: default, character: . }
+  usePrePhraseSnapshot: true
+  action: { name: remove }
+initialState:
+  documentContents: "  ."
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+  marks:
+    default..:
+      start: { line: 0, character: 2 }
+      end: { line: 0, character: 3 }
+finalState:
+  documentContents: ""
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: decoratedSymbol, symbolColor: default, character: . },
+      modifiers: [],
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/selectionTypes/chuckDot3.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/selectionTypes/chuckDot3.yml
new file mode 100644
index 0000000000..c4e42a6e1e
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/selectionTypes/chuckDot3.yml
@@ -0,0 +1,31 @@
+languageId: plaintext
+command:
+  spokenForm: chuck dot
+  version: 3
+  targets:
+    - type: primitive
+      mark: { type: decoratedSymbol, symbolColor: default, character: . }
+  usePrePhraseSnapshot: true
+  action: { name: remove }
+initialState:
+  documentContents: "  . a"
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+  marks:
+    default..:
+      start: { line: 0, character: 2 }
+      end: { line: 0, character: 3 }
+finalState:
+  documentContents: "  a"
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: decoratedSymbol, symbolColor: default, character: . },
+      modifiers: [],
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/selectionTypes/chuckEveryShortPaint.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/selectionTypes/chuckEveryShortPaint.yml
new file mode 100644
index 0000000000..bf98b9d910
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/selectionTypes/chuckEveryShortPaint.yml
@@ -0,0 +1,36 @@
+languageId: plaintext
+command:
+  spokenForm: chuck every short paint
+  version: 2
+  targets:
+    - type: primitive
+      modifiers:
+        - type: everyScope
+          scopeType: { type: boundedNonWhitespaceSequence }
+  usePrePhraseSnapshot: true
+  action: { name: remove }
+initialState:
+  documentContents: some.text.here some-other-text word()[]
+  selections:
+    - anchor: { line: 0, character: 20 }
+      active: { line: 0, character: 20 }
+  marks: {}
+finalState:
+  documentContents: ""
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      modifiers:
+        [
+          {
+            type: everyScope,
+            scopeType: { type: boundedNonWhitespaceSequence },
+          },
+        ],
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/selectionTypes/chuckFile.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/selectionTypes/chuckFile.yml
new file mode 100644
index 0000000000..e6dce20283
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/selectionTypes/chuckFile.yml
@@ -0,0 +1,31 @@
+languageId: typescript
+command:
+  version: 1
+  spokenForm: chuck file
+  action: remove
+  targets:
+    - { type: primitive, selectionType: document }
+initialState:
+  documentContents: |
+
+    const value = "Hello world";
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+  marks: {}
+finalState:
+  documentContents: ""
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: document,
+      position: contents,
+      modifier: { type: identity },
+      insideOutsideType: outside,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/selectionTypes/chuckFile2.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/selectionTypes/chuckFile2.yml
new file mode 100644
index 0000000000..a47ba3810b
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/selectionTypes/chuckFile2.yml
@@ -0,0 +1,36 @@
+languageId: plaintext
+command:
+  spokenForm: chuck file
+  version: 2
+  action: { name: remove }
+  targets:
+    - type: primitive
+      modifiers:
+        - type: containingScope
+          scopeType: { type: document }
+  usePrePhraseSnapshot: true
+initialState:
+  documentContents: |2+
+
+
+        foo
+
+        bar
+
+  selections:
+    - anchor: { line: 6, character: 0 }
+      active: { line: 6, character: 0 }
+  marks: {}
+finalState:
+  documentContents: ""
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      modifiers: [{ type: containingScope, scopeType: document }],
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/selectionTypes/chuckLastTwoItem.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/selectionTypes/chuckLastTwoItem.yml
new file mode 100644
index 0000000000..08b89a5332
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/selectionTypes/chuckLastTwoItem.yml
@@ -0,0 +1,40 @@
+languageId: plaintext
+command:
+  spokenForm: chuck last two item
+  version: 3
+  targets:
+    - type: primitive
+      modifiers:
+        - type: ordinalScope
+          scopeType: { type: collectionItem }
+          start: -2
+          length: 2
+  usePrePhraseSnapshot: true
+  action: { name: remove }
+initialState:
+  documentContents: a, b, c, d
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+  marks: {}
+finalState:
+  documentContents: a, b
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      modifiers:
+        [
+          {
+            type: ordinalScope,
+            scopeType: { type: collectionItem },
+            start: -2,
+            length: 2,
+          },
+        ],
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/selectionTypes/chuckLineVest.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/selectionTypes/chuckLineVest.yml
new file mode 100644
index 0000000000..bca373755e
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/selectionTypes/chuckLineVest.yml
@@ -0,0 +1,37 @@
+languageId: typescript
+command:
+  version: 1
+  spokenForm: chuck line vest
+  action: remove
+  targets:
+    - type: primitive
+      selectionType: line
+      mark: { type: decoratedSymbol, symbolColor: default, character: v }
+initialState:
+  documentContents: |
+
+    const value = "Hello world";
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+  marks:
+    default.v:
+      start: { line: 1, character: 6 }
+      end: { line: 1, character: 11 }
+finalState:
+  documentContents: |+
+
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: decoratedSymbol, symbolColor: default, character: v },
+      selectionType: line,
+      position: contents,
+      modifier: { type: identity },
+      insideOutsideType: outside,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/selectionTypes/chuckLineVest2.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/selectionTypes/chuckLineVest2.yml
new file mode 100644
index 0000000000..7ca1774bf5
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/selectionTypes/chuckLineVest2.yml
@@ -0,0 +1,39 @@
+languageId: typescript
+command:
+  version: 1
+  spokenForm: chuck line vest
+  action: remove
+  targets:
+    - type: primitive
+      selectionType: line
+      mark: { type: decoratedSymbol, symbolColor: default, character: v }
+initialState:
+  documentContents: |
+
+    const value = "Hello world";
+    const value = "Hello world";
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+  marks:
+    default.v:
+      start: { line: 1, character: 6 }
+      end: { line: 1, character: 11 }
+finalState:
+  documentContents: |
+
+    const value = "Hello world";
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: decoratedSymbol, symbolColor: default, character: v },
+      selectionType: line,
+      position: contents,
+      modifier: { type: identity },
+      insideOutsideType: outside,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/selectionTypes/chuckLinkMade.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/selectionTypes/chuckLinkMade.yml
new file mode 100644
index 0000000000..22765adf35
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/selectionTypes/chuckLinkMade.yml
@@ -0,0 +1,38 @@
+languageId: plaintext
+command:
+  version: 1
+  spokenForm: chuck link made
+  action: remove
+  targets:
+    - type: primitive
+      selectionType: url
+      mark: { type: decoratedSymbol, symbolColor: default, character: m }
+initialState:
+  documentContents: >
+    https://www.atomiccommits.io/consistent-hashing
+    https://www.atomiccommits.io/consistent-hashing#code
+  selections:
+    - anchor: { line: 1, character: 0 }
+      active: { line: 1, character: 0 }
+  marks:
+    default.m:
+      start: { line: 0, character: 12 }
+      end: { line: 0, character: 25 }
+finalState:
+  documentContents: |
+    https://www.atomiccommits.io/consistent-hashing#code
+  selections:
+    - anchor: { line: 1, character: 0 }
+      active: { line: 1, character: 0 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: decoratedSymbol, symbolColor: default, character: m },
+      selectionType: url,
+      position: contents,
+      insideOutsideType: outside,
+      modifier: { type: identity },
+      isImplicit: false,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/selectionTypes/chuckLinkMadePastLinkAir.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/selectionTypes/chuckLinkMadePastLinkAir.yml
new file mode 100644
index 0000000000..0bae4e8c90
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/selectionTypes/chuckLinkMadePastLinkAir.yml
@@ -0,0 +1,66 @@
+languageId: plaintext
+command:
+  version: 1
+  spokenForm: chuck link made past link air
+  action: remove
+  targets:
+    - type: range
+      start:
+        type: primitive
+        selectionType: url
+        mark: { type: decoratedSymbol, symbolColor: default, character: m }
+      end:
+        type: primitive
+        selectionType: url
+        mark: { type: decoratedSymbol, symbolColor: default, character: a }
+      excludeStart: false
+      excludeEnd: false
+initialState:
+  documentContents: >
+    https://www.atomiccommits.io/consistent-hashing
+    https://www.atomiccommits.io/consistent-hashing#code
+  selections:
+    - anchor: { line: 1, character: 0 }
+      active: { line: 1, character: 0 }
+  marks:
+    default.m:
+      start: { line: 0, character: 12 }
+      end: { line: 0, character: 25 }
+    default.a:
+      start: { line: 0, character: 60 }
+      end: { line: 0, character: 73 }
+finalState:
+  documentContents: |+
+
+  selections:
+    - anchor: { line: 1, character: 0 }
+      active: { line: 1, character: 0 }
+fullTargets:
+  [
+    {
+      type: range,
+      excludeAnchor: false,
+      excludeActive: false,
+      rangeType: continuous,
+      anchor:
+        {
+          type: primitive,
+          mark: { type: decoratedSymbol, symbolColor: default, character: m },
+          selectionType: url,
+          position: contents,
+          insideOutsideType: outside,
+          modifier: { type: identity },
+          isImplicit: false,
+        },
+      active:
+        {
+          type: primitive,
+          mark: { type: decoratedSymbol, symbolColor: default, character: a },
+          selectionType: url,
+          position: contents,
+          insideOutsideType: outside,
+          modifier: { type: identity },
+          isImplicit: false,
+        },
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/selectionTypes/chuckLinkPit.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/selectionTypes/chuckLinkPit.yml
new file mode 100644
index 0000000000..923c936e68
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/selectionTypes/chuckLinkPit.yml
@@ -0,0 +1,37 @@
+languageId: plaintext
+command:
+  version: 1
+  spokenForm: chuck link pit
+  action: remove
+  targets:
+    - type: primitive
+      selectionType: url
+      mark: { type: decoratedSymbol, symbolColor: default, character: p }
+initialState:
+  documentContents: |
+    (https://www.atomiccommits.io/consistent-hashing#code)
+  selections:
+    - anchor: { line: 1, character: 0 }
+      active: { line: 1, character: 0 }
+  marks:
+    default.p:
+      start: { line: 0, character: 1 }
+      end: { line: 0, character: 6 }
+finalState:
+  documentContents: |
+    ()
+  selections:
+    - anchor: { line: 1, character: 0 }
+      active: { line: 1, character: 0 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: decoratedSymbol, symbolColor: default, character: p },
+      selectionType: url,
+      position: contents,
+      insideOutsideType: outside,
+      modifier: { type: identity },
+      isImplicit: false,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/selectionTypes/chuckPaintBatt.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/selectionTypes/chuckPaintBatt.yml
new file mode 100644
index 0000000000..46df5fd415
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/selectionTypes/chuckPaintBatt.yml
@@ -0,0 +1,37 @@
+languageId: plaintext
+command:
+  version: 1
+  spokenForm: chuck paint batt
+  action: remove
+  targets:
+    - type: primitive
+      selectionType: nonWhitespaceSequence
+      mark: { type: decoratedSymbol, symbolColor: default, character: b }
+initialState:
+  documentContents: |
+    const r = /a[b]*(c)/;
+  selections:
+    - anchor: { line: 1, character: 0 }
+      active: { line: 1, character: 0 }
+  marks:
+    default.b:
+      start: { line: 0, character: 13 }
+      end: { line: 0, character: 14 }
+finalState:
+  documentContents: |
+    const r =
+  selections:
+    - anchor: { line: 1, character: 0 }
+      active: { line: 1, character: 0 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: decoratedSymbol, symbolColor: default, character: b },
+      selectionType: nonWhitespaceSequence,
+      position: contents,
+      insideOutsideType: outside,
+      modifier: { type: identity },
+      isImplicit: false,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/selectionTypes/chuckSmallPaintAir.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/selectionTypes/chuckSmallPaintAir.yml
new file mode 100644
index 0000000000..01fc1c9731
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/selectionTypes/chuckSmallPaintAir.yml
@@ -0,0 +1,40 @@
+languageId: python
+command:
+  spokenForm: chuck small paint air
+  version: 2
+  targets:
+    - type: primitive
+      mark: { type: decoratedSymbol, symbolColor: default, character: a }
+      modifiers:
+        - type: containingScope
+          scopeType: { type: boundedNonWhitespaceSequence }
+  usePrePhraseSnapshot: true
+  action: { name: remove }
+initialState:
+  documentContents: some amount of text
+  selections:
+    - anchor: { line: 0, character: 19 }
+      active: { line: 0, character: 19 }
+  marks:
+    default.a:
+      start: { line: 0, character: 5 }
+      end: { line: 0, character: 11 }
+finalState:
+  documentContents: some of text
+  selections:
+    - anchor: { line: 0, character: 12 }
+      active: { line: 0, character: 12 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: decoratedSymbol, symbolColor: default, character: a },
+      modifiers:
+        [
+          {
+            type: containingScope,
+            scopeType: { type: boundedNonWhitespaceSequence },
+          },
+        ],
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/selectionTypes/chuckSmallPaintFine.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/selectionTypes/chuckSmallPaintFine.yml
new file mode 100644
index 0000000000..51d08359bb
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/selectionTypes/chuckSmallPaintFine.yml
@@ -0,0 +1,40 @@
+languageId: python
+command:
+  spokenForm: chuck small paint fine
+  version: 2
+  targets:
+    - type: primitive
+      mark: { type: decoratedSymbol, symbolColor: default, character: f }
+      modifiers:
+        - type: containingScope
+          scopeType: { type: boundedNonWhitespaceSequence }
+  usePrePhraseSnapshot: true
+  action: { name: remove }
+initialState:
+  documentContents: "[foo[0], bar]"
+  selections:
+    - anchor: { line: 0, character: 3 }
+      active: { line: 0, character: 3 }
+  marks:
+    default.f:
+      start: { line: 0, character: 1 }
+      end: { line: 0, character: 4 }
+finalState:
+  documentContents: "[bar]"
+  selections:
+    - anchor: { line: 0, character: 1 }
+      active: { line: 0, character: 1 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: decoratedSymbol, symbolColor: default, character: f },
+      modifiers:
+        [
+          {
+            type: containingScope,
+            scopeType: { type: boundedNonWhitespaceSequence },
+          },
+        ],
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/selectionTypes/chuckSmallPaintFine2.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/selectionTypes/chuckSmallPaintFine2.yml
new file mode 100644
index 0000000000..f6c109a0ca
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/selectionTypes/chuckSmallPaintFine2.yml
@@ -0,0 +1,40 @@
+languageId: python
+command:
+  spokenForm: chuck small paint fine
+  version: 2
+  targets:
+    - type: primitive
+      mark: { type: decoratedSymbol, symbolColor: default, character: f }
+      modifiers:
+        - type: containingScope
+          scopeType: { type: boundedNonWhitespaceSequence }
+  usePrePhraseSnapshot: true
+  action: { name: remove }
+initialState:
+  documentContents: "[baz, foo[0], bar]"
+  selections:
+    - anchor: { line: 0, character: 6 }
+      active: { line: 0, character: 6 }
+  marks:
+    default.f:
+      start: { line: 0, character: 6 }
+      end: { line: 0, character: 9 }
+finalState:
+  documentContents: "[baz, bar]"
+  selections:
+    - anchor: { line: 0, character: 6 }
+      active: { line: 0, character: 6 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: decoratedSymbol, symbolColor: default, character: f },
+      modifiers:
+        [
+          {
+            type: containingScope,
+            scopeType: { type: boundedNonWhitespaceSequence },
+          },
+        ],
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/selectionTypes/chuckSmallPaintSoap2.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/selectionTypes/chuckSmallPaintSoap2.yml
new file mode 100644
index 0000000000..0a6c0e2dbc
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/selectionTypes/chuckSmallPaintSoap2.yml
@@ -0,0 +1,40 @@
+languageId: python
+command:
+  spokenForm: chuck small paint soap
+  version: 2
+  targets:
+    - type: primitive
+      mark: { type: decoratedSymbol, symbolColor: default, character: s }
+      modifiers:
+        - type: containingScope
+          scopeType: { type: boundedNonWhitespaceSequence }
+  usePrePhraseSnapshot: true
+  action: { name: remove }
+initialState:
+  documentContents: f.o(some() text)
+  selections:
+    - anchor: { line: 0, character: 16 }
+      active: { line: 0, character: 16 }
+  marks:
+    default.s:
+      start: { line: 0, character: 4 }
+      end: { line: 0, character: 8 }
+finalState:
+  documentContents: f.o(text)
+  selections:
+    - anchor: { line: 0, character: 9 }
+      active: { line: 0, character: 9 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: decoratedSymbol, symbolColor: default, character: s },
+      modifiers:
+        [
+          {
+            type: containingScope,
+            scopeType: { type: boundedNonWhitespaceSequence },
+          },
+        ],
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/selectionTypes/chuckSmallPaintZero.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/selectionTypes/chuckSmallPaintZero.yml
new file mode 100644
index 0000000000..33ace7efd4
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/selectionTypes/chuckSmallPaintZero.yml
@@ -0,0 +1,40 @@
+languageId: python
+command:
+  spokenForm: chuck small paint zero
+  version: 2
+  targets:
+    - type: primitive
+      mark: { type: decoratedSymbol, symbolColor: default, character: "0" }
+      modifiers:
+        - type: containingScope
+          scopeType: { type: boundedNonWhitespaceSequence }
+  usePrePhraseSnapshot: true
+  action: { name: remove }
+initialState:
+  documentContents: "[foo[0], bar]"
+  selections:
+    - anchor: { line: 0, character: 3 }
+      active: { line: 0, character: 3 }
+  marks:
+    default.0:
+      start: { line: 0, character: 5 }
+      end: { line: 0, character: 6 }
+finalState:
+  documentContents: "[foo[], bar]"
+  selections:
+    - anchor: { line: 0, character: 3 }
+      active: { line: 0, character: 3 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: decoratedSymbol, symbolColor: default, character: "0" },
+      modifiers:
+        [
+          {
+            type: containingScope,
+            scopeType: { type: boundedNonWhitespaceSequence },
+          },
+        ],
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/selectionTypes/chuckTokenVest.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/selectionTypes/chuckTokenVest.yml
new file mode 100644
index 0000000000..9be5f9b492
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/selectionTypes/chuckTokenVest.yml
@@ -0,0 +1,38 @@
+languageId: typescript
+command:
+  version: 1
+  spokenForm: chuck token vest
+  action: remove
+  targets:
+    - type: primitive
+      selectionType: token
+      mark: { type: decoratedSymbol, symbolColor: default, character: v }
+initialState:
+  documentContents: |
+
+    const value   = "Hello.world  ";
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+  marks:
+    default.v:
+      start: { line: 1, character: 6 }
+      end: { line: 1, character: 11 }
+finalState:
+  documentContents: |
+
+    const = "Hello.world  ";
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: decoratedSymbol, symbolColor: default, character: v },
+      selectionType: token,
+      position: contents,
+      modifier: { type: identity },
+      insideOutsideType: outside,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/selectionTypes/chuckWord.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/selectionTypes/chuckWord.yml
new file mode 100644
index 0000000000..cbec8c2472
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/selectionTypes/chuckWord.yml
@@ -0,0 +1,30 @@
+languageId: plaintext
+command:
+  spokenForm: chuck word
+  version: 3
+  targets:
+    - type: primitive
+      modifiers:
+        - type: containingScope
+          scopeType: { type: word }
+  usePrePhraseSnapshot: true
+  action: { name: remove }
+initialState:
+  documentContents: aaa_bbb_ccc
+  selections:
+    - anchor: { line: 0, character: 5 }
+      active: { line: 0, character: 5 }
+  marks: {}
+finalState:
+  documentContents: aaa_ccc
+  selections:
+    - anchor: { line: 0, character: 4 }
+      active: { line: 0, character: 4 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      modifiers: [{ type: containingScope, scopeType: { type: word } }],
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/selectionTypes/chuckWord2.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/selectionTypes/chuckWord2.yml
new file mode 100644
index 0000000000..c125844a80
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/selectionTypes/chuckWord2.yml
@@ -0,0 +1,30 @@
+languageId: plaintext
+command:
+  spokenForm: chuck word
+  version: 3
+  targets:
+    - type: primitive
+      modifiers:
+        - type: containingScope
+          scopeType: { type: word }
+  usePrePhraseSnapshot: true
+  action: { name: remove }
+initialState:
+  documentContents: aaaBbbCcc
+  selections:
+    - anchor: { line: 0, character: 4 }
+      active: { line: 0, character: 4 }
+  marks: {}
+finalState:
+  documentContents: aaaCcc
+  selections:
+    - anchor: { line: 0, character: 3 }
+      active: { line: 0, character: 3 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      modifiers: [{ type: containingScope, scopeType: { type: word } }],
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/selectionTypes/clearCar.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/selectionTypes/clearCar.yml
new file mode 100644
index 0000000000..f1a96c4464
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/selectionTypes/clearCar.yml
@@ -0,0 +1,30 @@
+languageId: plaintext
+command:
+  spokenForm: clear car
+  version: 3
+  targets:
+    - type: primitive
+      modifiers:
+        - type: containingScope
+          scopeType: { type: character }
+  usePrePhraseSnapshot: true
+  action: { name: clearAndSetSelection }
+initialState:
+  documentContents: aaaBbbCcc
+  selections:
+    - anchor: { line: 0, character: 4 }
+      active: { line: 0, character: 4 }
+  marks: {}
+finalState:
+  documentContents: aaaBbCcc
+  selections:
+    - anchor: { line: 0, character: 4 }
+      active: { line: 0, character: 4 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      modifiers: [{ type: containingScope, scopeType: { type: character } }],
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/selectionTypes/clearCar2.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/selectionTypes/clearCar2.yml
new file mode 100644
index 0000000000..5dcaeb02e2
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/selectionTypes/clearCar2.yml
@@ -0,0 +1,30 @@
+languageId: plaintext
+command:
+  spokenForm: clear car
+  version: 3
+  targets:
+    - type: primitive
+      modifiers:
+        - type: containingScope
+          scopeType: { type: character }
+  usePrePhraseSnapshot: true
+  action: { name: clearAndSetSelection }
+initialState:
+  documentContents: aaaBbbCcc
+  selections:
+    - anchor: { line: 0, character: 3 }
+      active: { line: 0, character: 4 }
+  marks: {}
+finalState:
+  documentContents: aaabbCcc
+  selections:
+    - anchor: { line: 0, character: 3 }
+      active: { line: 0, character: 3 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      modifiers: [{ type: containingScope, scopeType: { type: character } }],
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/selectionTypes/clearCar3.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/selectionTypes/clearCar3.yml
new file mode 100644
index 0000000000..1968da2a35
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/selectionTypes/clearCar3.yml
@@ -0,0 +1,30 @@
+languageId: plaintext
+command:
+  spokenForm: clear car
+  version: 3
+  targets:
+    - type: primitive
+      modifiers:
+        - type: containingScope
+          scopeType: { type: character }
+  usePrePhraseSnapshot: true
+  action: { name: clearAndSetSelection }
+initialState:
+  documentContents: aaaBbbCcc
+  selections:
+    - anchor: { line: 0, character: 2 }
+      active: { line: 0, character: 4 }
+  marks: {}
+finalState:
+  documentContents: aabbCcc
+  selections:
+    - anchor: { line: 0, character: 2 }
+      active: { line: 0, character: 2 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      modifiers: [{ type: containingScope, scopeType: { type: character } }],
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/selectionTypes/clearCar4.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/selectionTypes/clearCar4.yml
new file mode 100644
index 0000000000..7298499929
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/selectionTypes/clearCar4.yml
@@ -0,0 +1,30 @@
+languageId: plaintext
+command:
+  spokenForm: clear car
+  version: 3
+  targets:
+    - type: primitive
+      modifiers:
+        - type: containingScope
+          scopeType: { type: character }
+  usePrePhraseSnapshot: true
+  action: { name: clearAndSetSelection }
+initialState:
+  documentContents: " a"
+  selections:
+    - anchor: { line: 0, character: 1 }
+      active: { line: 0, character: 1 }
+  marks: {}
+finalState:
+  documentContents: " "
+  selections:
+    - anchor: { line: 0, character: 1 }
+      active: { line: 0, character: 1 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      modifiers: [{ type: containingScope, scopeType: { type: character } }],
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/selectionTypes/clearCar5.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/selectionTypes/clearCar5.yml
new file mode 100644
index 0000000000..5714f75114
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/selectionTypes/clearCar5.yml
@@ -0,0 +1,30 @@
+languageId: plaintext
+command:
+  spokenForm: clear car
+  version: 3
+  targets:
+    - type: primitive
+      modifiers:
+        - type: containingScope
+          scopeType: { type: character }
+  usePrePhraseSnapshot: true
+  action: { name: clearAndSetSelection }
+initialState:
+  documentContents: "a "
+  selections:
+    - anchor: { line: 0, character: 1 }
+      active: { line: 0, character: 1 }
+  marks: {}
+finalState:
+  documentContents: " "
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      modifiers: [{ type: containingScope, scopeType: { type: character } }],
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/selectionTypes/clearContent.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/selectionTypes/clearContent.yml
new file mode 100644
index 0000000000..306de4ba75
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/selectionTypes/clearContent.yml
@@ -0,0 +1,42 @@
+languageId: markdown
+command:
+  spokenForm: clear content
+  version: 3
+  targets:
+    - type: primitive
+      modifiers:
+        - { type: keepContentFilter }
+  usePrePhraseSnapshot: true
+  action: { name: clearAndSetSelection }
+initialState:
+  documentContents: |-
+
+    a
+
+    b
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+    - anchor: { line: 1, character: 0 }
+      active: { line: 1, character: 1 }
+    - anchor: { line: 2, character: 0 }
+      active: { line: 2, character: 1 }
+    - anchor: { line: 3, character: 0 }
+      active: { line: 3, character: 1 }
+  marks: {}
+finalState:
+  documentContents: |2
+
+  selections:
+    - anchor: { line: 1, character: 0 }
+      active: { line: 1, character: 0 }
+    - anchor: { line: 3, character: 0 }
+      active: { line: 3, character: 0 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      modifiers: [{ type: keepContentFilter }],
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/selectionTypes/clearCore.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/selectionTypes/clearCore.yml
new file mode 100644
index 0000000000..babe61398b
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/selectionTypes/clearCore.yml
@@ -0,0 +1,29 @@
+languageId: plaintext
+command:
+  spokenForm: clear core
+  version: 2
+  targets:
+    - type: primitive
+      modifiers:
+        - { type: interiorOnly }
+  usePrePhraseSnapshot: true
+  action: { name: clearAndSetSelection }
+initialState:
+  documentContents: (    )
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+  marks: {}
+finalState:
+  documentContents: ()
+  selections:
+    - anchor: { line: 0, character: 1 }
+      active: { line: 0, character: 1 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      modifiers: [{ type: interiorOnly }],
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/selectionTypes/clearCore2.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/selectionTypes/clearCore2.yml
new file mode 100644
index 0000000000..14abbf9acd
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/selectionTypes/clearCore2.yml
@@ -0,0 +1,29 @@
+languageId: plaintext
+command:
+  spokenForm: clear core
+  version: 2
+  targets:
+    - type: primitive
+      modifiers:
+        - { type: interiorOnly }
+  usePrePhraseSnapshot: true
+  action: { name: clearAndSetSelection }
+initialState:
+  documentContents: ()
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+  marks: {}
+finalState:
+  documentContents: ()
+  selections:
+    - anchor: { line: 0, character: 1 }
+      active: { line: 0, character: 1 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      modifiers: [{ type: interiorOnly }],
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/selectionTypes/clearCustomRegex.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/selectionTypes/clearCustomRegex.yml
new file mode 100644
index 0000000000..f84fe662f4
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/selectionTypes/clearCustomRegex.yml
@@ -0,0 +1,36 @@
+languageId: plaintext
+command:
+  spokenForm: clear custom regex
+  version: 2
+  targets:
+    - type: primitive
+      modifiers:
+        - type: containingScope
+          scopeType: { type: customRegex, regex: '[\w/_.]+' }
+  usePrePhraseSnapshot: true
+  action: { name: clearAndSetSelection }
+initialState:
+  documentContents: aa.bb/cc_dd123(  )
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+  marks: {}
+finalState:
+  documentContents: (  )
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      modifiers:
+        [
+          {
+            type: containingScope,
+            scopeType: { type: customRegex, regex: '[\w/_.]+' },
+          },
+        ],
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/selectionTypes/clearEmpty.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/selectionTypes/clearEmpty.yml
new file mode 100644
index 0000000000..0bd55bcbec
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/selectionTypes/clearEmpty.yml
@@ -0,0 +1,45 @@
+languageId: markdown
+command:
+  spokenForm: clear empty
+  version: 3
+  targets:
+    - type: primitive
+      modifiers:
+        - { type: keepEmptyFilter }
+  usePrePhraseSnapshot: true
+  action: { name: clearAndSetSelection }
+initialState:
+  documentContents: |-
+
+    a
+
+    b
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+    - anchor: { line: 1, character: 0 }
+      active: { line: 1, character: 1 }
+    - anchor: { line: 2, character: 0 }
+      active: { line: 2, character: 1 }
+    - anchor: { line: 3, character: 0 }
+      active: { line: 3, character: 1 }
+  marks: {}
+finalState:
+  documentContents: |-
+
+    a
+
+    b
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+    - anchor: { line: 2, character: 0 }
+      active: { line: 2, character: 0 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      modifiers: [{ type: keepEmptyFilter }],
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/selectionTypes/clearEveryCustomRegex.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/selectionTypes/clearEveryCustomRegex.yml
new file mode 100644
index 0000000000..12224723b5
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/selectionTypes/clearEveryCustomRegex.yml
@@ -0,0 +1,38 @@
+languageId: plaintext
+command:
+  spokenForm: clear every custom regex
+  version: 2
+  targets:
+    - type: primitive
+      modifiers:
+        - type: everyScope
+          scopeType: { type: customRegex, regex: '[\w/_.]+' }
+  usePrePhraseSnapshot: true
+  action: { name: clearAndSetSelection }
+initialState:
+  documentContents: aa.bb/cc_dd123 aa.bb/cc_dd123(  )
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+  marks: {}
+finalState:
+  documentContents: " (  )"
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+    - anchor: { line: 0, character: 1 }
+      active: { line: 0, character: 1 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      modifiers:
+        [
+          {
+            type: containingScope,
+            scopeType: { type: customRegex, regex: '[\w/_.]+' },
+          },
+        ],
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/selectionTypes/clearEveryShortPaint.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/selectionTypes/clearEveryShortPaint.yml
new file mode 100644
index 0000000000..04204443db
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/selectionTypes/clearEveryShortPaint.yml
@@ -0,0 +1,38 @@
+languageId: plaintext
+command:
+  spokenForm: clear every short paint
+  version: 2
+  targets:
+    - type: primitive
+      modifiers:
+        - type: everyScope
+          scopeType: { type: boundedNonWhitespaceSequence }
+  usePrePhraseSnapshot: true
+  action: { name: clearAndSetSelection }
+initialState:
+  documentContents: "{foo.bar(hello-world, whatever-now)} test-this"
+  selections:
+    - anchor: { line: 0, character: 11 }
+      active: { line: 0, character: 11 }
+  marks: {}
+finalState:
+  documentContents: "{foo.bar( )} test-this"
+  selections:
+    - anchor: { line: 0, character: 9 }
+      active: { line: 0, character: 9 }
+    - anchor: { line: 0, character: 10 }
+      active: { line: 0, character: 10 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      modifiers:
+        [
+          {
+            type: everyScope,
+            scopeType: { type: boundedNonWhitespaceSequence },
+          },
+        ],
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/selectionTypes/clearEveryShortPaint2.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/selectionTypes/clearEveryShortPaint2.yml
new file mode 100644
index 0000000000..2d9264d38e
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/selectionTypes/clearEveryShortPaint2.yml
@@ -0,0 +1,38 @@
+languageId: plaintext
+command:
+  spokenForm: clear every short paint
+  version: 2
+  targets:
+    - type: primitive
+      modifiers:
+        - type: everyScope
+          scopeType: { type: boundedNonWhitespaceSequence }
+  usePrePhraseSnapshot: true
+  action: { name: clearAndSetSelection }
+initialState:
+  documentContents: "{foo.bar(hello-world, whatever-now)} test-this"
+  selections:
+    - anchor: { line: 0, character: 8 }
+      active: { line: 0, character: 8 }
+  marks: {}
+finalState:
+  documentContents: "{ } test-this"
+  selections:
+    - anchor: { line: 0, character: 1 }
+      active: { line: 0, character: 1 }
+    - anchor: { line: 0, character: 2 }
+      active: { line: 0, character: 2 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      modifiers:
+        [
+          {
+            type: everyScope,
+            scopeType: { type: boundedNonWhitespaceSequence },
+          },
+        ],
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/selectionTypes/clearFirstTwoItem.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/selectionTypes/clearFirstTwoItem.yml
new file mode 100644
index 0000000000..fbf88044f9
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/selectionTypes/clearFirstTwoItem.yml
@@ -0,0 +1,40 @@
+languageId: plaintext
+command:
+  spokenForm: clear first two item
+  version: 3
+  targets:
+    - type: primitive
+      modifiers:
+        - type: ordinalScope
+          scopeType: { type: collectionItem }
+          start: 0
+          length: 2
+  usePrePhraseSnapshot: true
+  action: { name: clearAndSetSelection }
+initialState:
+  documentContents: a, b, c, d
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+  marks: {}
+finalState:
+  documentContents: ", c, d"
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      modifiers:
+        [
+          {
+            type: ordinalScope,
+            scopeType: { type: collectionItem },
+            start: 0,
+            length: 2,
+          },
+        ],
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/selectionTypes/clearHeadCore.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/selectionTypes/clearHeadCore.yml
new file mode 100644
index 0000000000..abe7c44772
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/selectionTypes/clearHeadCore.yml
@@ -0,0 +1,31 @@
+languageId: plaintext
+command:
+  spokenForm: clear head core
+  version: 2
+  targets:
+    - type: primitive
+      modifiers:
+        - type: extendThroughStartOf
+          modifiers:
+            - { type: interiorOnly }
+  usePrePhraseSnapshot: true
+  action: { name: clearAndSetSelection }
+initialState:
+  documentContents: foo(bar baz)
+  selections:
+    - anchor: { line: 0, character: 10 }
+      active: { line: 0, character: 10 }
+  marks: {}
+finalState:
+  documentContents: foo(z)
+  selections:
+    - anchor: { line: 0, character: 4 }
+      active: { line: 0, character: 4 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      modifiers: [{ type: extendThroughStartOf }, { type: interiorOnly }],
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/selectionTypes/clearHeadCoreCurly.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/selectionTypes/clearHeadCoreCurly.yml
new file mode 100644
index 0000000000..cb3d2572a1
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/selectionTypes/clearHeadCoreCurly.yml
@@ -0,0 +1,53 @@
+languageId: plaintext
+command:
+  spokenForm: clear head core curly
+  version: 2
+  targets:
+    - type: primitive
+      modifiers:
+        - type: extendThroughStartOf
+          modifiers:
+            - { type: interiorOnly }
+            - type: containingScope
+              scopeType: { type: surroundingPair, delimiter: curlyBrackets }
+  usePrePhraseSnapshot: true
+  action: { name: clearAndSetSelection }
+initialState:
+  documentContents: |-
+    {
+        foo(bar baz)
+    }
+  selections:
+    - anchor: { line: 1, character: 14 }
+      active: { line: 1, character: 14 }
+  marks: {}
+finalState:
+  documentContents: |-
+    {
+        z)
+    }
+  selections:
+    - anchor: { line: 1, character: 4 }
+      active: { line: 1, character: 4 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      modifiers:
+        [
+          {
+            type: extendThroughStartOf,
+            modifiers:
+              [
+                { type: interiorOnly },
+                {
+                  type: containingScope,
+                  scopeType:
+                    { type: surroundingPair, delimiter: curlyBrackets },
+                },
+              ],
+          },
+        ],
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/selectionTypes/clearHeadFunk.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/selectionTypes/clearHeadFunk.yml
new file mode 100644
index 0000000000..91bab13f59
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/selectionTypes/clearHeadFunk.yml
@@ -0,0 +1,41 @@
+languageId: typescript
+command:
+  spokenForm: clear head funk
+  version: 2
+  targets:
+    - type: primitive
+      modifiers:
+        - type: extendThroughStartOf
+          modifiers:
+            - type: containingScope
+              scopeType: { type: namedFunction }
+  usePrePhraseSnapshot: true
+  action: { name: clearAndSetSelection }
+initialState:
+  documentContents: |-
+    function whatever() {
+
+    }
+  selections:
+    - anchor: { line: 1, character: 4 }
+      active: { line: 1, character: 4 }
+  marks: {}
+finalState:
+  documentContents: |-
+
+    }
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      modifiers:
+        [
+          { type: extendThroughStartOf },
+          { type: containingScope, scopeType: { type: namedFunction } },
+        ],
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/selectionTypes/clearLastTwoItem.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/selectionTypes/clearLastTwoItem.yml
new file mode 100644
index 0000000000..06e45dfad6
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/selectionTypes/clearLastTwoItem.yml
@@ -0,0 +1,40 @@
+languageId: plaintext
+command:
+  spokenForm: clear last two item
+  version: 3
+  targets:
+    - type: primitive
+      modifiers:
+        - type: ordinalScope
+          scopeType: { type: collectionItem }
+          start: -2
+          length: 2
+  usePrePhraseSnapshot: true
+  action: { name: clearAndSetSelection }
+initialState:
+  documentContents: a, b, c, d
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+  marks: {}
+finalState:
+  documentContents: "a, b, "
+  selections:
+    - anchor: { line: 0, character: 6 }
+      active: { line: 0, character: 6 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      modifiers:
+        [
+          {
+            type: ordinalScope,
+            scopeType: { type: collectionItem },
+            start: -2,
+            length: 2,
+          },
+        ],
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/selectionTypes/clearLeading.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/selectionTypes/clearLeading.yml
new file mode 100644
index 0000000000..b72f58d8d1
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/selectionTypes/clearLeading.yml
@@ -0,0 +1,23 @@
+languageId: plaintext
+command:
+  spokenForm: clear leading
+  version: 2
+  targets:
+    - type: primitive
+      modifiers:
+        - { type: leading }
+  usePrePhraseSnapshot: true
+  action: { name: clearAndSetSelection }
+initialState:
+  documentContents: aaa bbb ccc
+  selections:
+    - anchor: { line: 0, character: 6 }
+      active: { line: 0, character: 6 }
+  marks: {}
+finalState:
+  documentContents: aaabbb ccc
+  selections:
+    - anchor: { line: 0, character: 3 }
+      active: { line: 0, character: 3 }
+fullTargets:
+  [{ type: primitive, mark: { type: cursor }, modifiers: [{ type: leading }] }]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/selectionTypes/clearLinePair.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/selectionTypes/clearLinePair.yml
new file mode 100644
index 0000000000..6e4ffb5d7b
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/selectionTypes/clearLinePair.yml
@@ -0,0 +1,36 @@
+languageId: plaintext
+command:
+  spokenForm: clear line pair
+  version: 2
+  action: { name: clearAndSetSelection }
+  targets:
+    - type: primitive
+      modifiers:
+        - type: containingScope
+          scopeType: { type: line }
+        - type: containingScope
+          scopeType: { type: surroundingPair, delimiter: any }
+  usePrePhraseSnapshot: true
+initialState:
+  documentContents: foo (bar) baz
+  selections:
+    - anchor: { line: 0, character: 7 }
+      active: { line: 0, character: 7 }
+  marks: {}
+finalState:
+  documentContents: ""
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      modifiers:
+        [
+          { type: containingScope, scopeType: line },
+          { type: surroundingPair, delimiter: any },
+        ],
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/selectionTypes/clearNextFile.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/selectionTypes/clearNextFile.yml
new file mode 100644
index 0000000000..285194994a
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/selectionTypes/clearNextFile.yml
@@ -0,0 +1,38 @@
+languageId: plaintext
+command:
+  spokenForm: clear next file
+  version: 3
+  targets:
+    - type: primitive
+      modifiers:
+        - type: relativeScope
+          scopeType: { type: document }
+          offset: 1
+          length: 1
+          direction: forward
+  usePrePhraseSnapshot: true
+  action: { name: clearAndSetSelection }
+initialState:
+  documentContents: aaa
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+  marks: {}
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      modifiers:
+        [
+          {
+            type: relativeScope,
+            scopeType: { type: document },
+            offset: 1,
+            length: 1,
+            direction: forward,
+          },
+        ],
+    },
+  ]
+thrownError: { name: OutOfRangeError }
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/selectionTypes/clearNextFunk.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/selectionTypes/clearNextFunk.yml
new file mode 100644
index 0000000000..d0af8bfd70
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/selectionTypes/clearNextFunk.yml
@@ -0,0 +1,39 @@
+languageId: typescript
+command:
+  spokenForm: clear next funk
+  version: 2
+  targets:
+    - type: primitive
+      modifiers:
+        - type: relativeScope
+          scopeType: { type: namedFunction }
+          offset: 1
+          length: 1
+          direction: forward
+  usePrePhraseSnapshot: true
+  action: { name: clearAndSetSelection }
+initialState:
+  documentContents: |-
+    function foo() {}
+
+    function bar() {}
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+  marks: {}
+finalState:
+  documentContents: |+
+    function foo() {}
+
+  selections:
+    - anchor: { line: 2, character: 0 }
+      active: { line: 2, character: 0 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      modifiers:
+        [{ type: nextContainingScope, scopeType: { type: namedFunction } }],
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/selectionTypes/clearNextToken.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/selectionTypes/clearNextToken.yml
new file mode 100644
index 0000000000..94e0840e09
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/selectionTypes/clearNextToken.yml
@@ -0,0 +1,42 @@
+languageId: plaintext
+command:
+  spokenForm: clear next token
+  version: 3
+  targets:
+    - type: primitive
+      modifiers:
+        - type: relativeScope
+          scopeType: { type: token }
+          offset: 1
+          length: 1
+          direction: forward
+  usePrePhraseSnapshot: true
+  action: { name: clearAndSetSelection }
+initialState:
+  documentContents: a  b
+  selections:
+    - anchor: { line: 0, character: 2 }
+      active: { line: 0, character: 2 }
+  marks: {}
+finalState:
+  documentContents: "a  "
+  selections:
+    - anchor: { line: 0, character: 3 }
+      active: { line: 0, character: 3 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      modifiers:
+        [
+          {
+            type: relativeScope,
+            scopeType: { type: token },
+            offset: 1,
+            length: 1,
+            direction: forward,
+          },
+        ],
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/selectionTypes/clearNextWord.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/selectionTypes/clearNextWord.yml
new file mode 100644
index 0000000000..fdc08d19c3
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/selectionTypes/clearNextWord.yml
@@ -0,0 +1,42 @@
+languageId: plaintext
+command:
+  spokenForm: clear next word
+  version: 3
+  targets:
+    - type: primitive
+      modifiers:
+        - type: relativeScope
+          scopeType: { type: word }
+          offset: 1
+          length: 1
+          direction: forward
+  usePrePhraseSnapshot: true
+  action: { name: clearAndSetSelection }
+initialState:
+  documentContents: aaaBbbCccDdd
+  selections:
+    - anchor: { line: 0, character: 6 }
+      active: { line: 0, character: 6 }
+  marks: {}
+finalState:
+  documentContents: aaaBbbCcc
+  selections:
+    - anchor: { line: 0, character: 9 }
+      active: { line: 0, character: 9 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      modifiers:
+        [
+          {
+            type: relativeScope,
+            scopeType: { type: word },
+            offset: 1,
+            length: 1,
+            direction: forward,
+          },
+        ],
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/selectionTypes/clearNextWord2.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/selectionTypes/clearNextWord2.yml
new file mode 100644
index 0000000000..5e7b83ba11
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/selectionTypes/clearNextWord2.yml
@@ -0,0 +1,42 @@
+languageId: plaintext
+command:
+  spokenForm: clear next word
+  version: 3
+  targets:
+    - type: primitive
+      modifiers:
+        - type: relativeScope
+          scopeType: { type: word }
+          offset: 1
+          length: 1
+          direction: forward
+  usePrePhraseSnapshot: true
+  action: { name: clearAndSetSelection }
+initialState:
+  documentContents: aaaBbbCccDdd
+  selections:
+    - anchor: { line: 0, character: 6 }
+      active: { line: 0, character: 7 }
+  marks: {}
+finalState:
+  documentContents: aaaBbbCcc
+  selections:
+    - anchor: { line: 0, character: 9 }
+      active: { line: 0, character: 9 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      modifiers:
+        [
+          {
+            type: relativeScope,
+            scopeType: { type: word },
+            offset: 1,
+            length: 1,
+            direction: forward,
+          },
+        ],
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/selectionTypes/clearNextWord3.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/selectionTypes/clearNextWord3.yml
new file mode 100644
index 0000000000..74a051da8e
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/selectionTypes/clearNextWord3.yml
@@ -0,0 +1,42 @@
+languageId: plaintext
+command:
+  spokenForm: clear next word
+  version: 3
+  targets:
+    - type: primitive
+      modifiers:
+        - type: relativeScope
+          scopeType: { type: word }
+          offset: 1
+          length: 1
+          direction: forward
+  usePrePhraseSnapshot: true
+  action: { name: clearAndSetSelection }
+initialState:
+  documentContents: aaaBbbCccDdd
+  selections:
+    - anchor: { line: 0, character: 5 }
+      active: { line: 0, character: 7 }
+  marks: {}
+finalState:
+  documentContents: aaaBbbCcc
+  selections:
+    - anchor: { line: 0, character: 9 }
+      active: { line: 0, character: 9 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      modifiers:
+        [
+          {
+            type: relativeScope,
+            scopeType: { type: word },
+            offset: 1,
+            length: 1,
+            direction: forward,
+          },
+        ],
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/selectionTypes/clearPaint.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/selectionTypes/clearPaint.yml
new file mode 100644
index 0000000000..cb7a5228d1
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/selectionTypes/clearPaint.yml
@@ -0,0 +1,34 @@
+languageId: plaintext
+command:
+  version: 1
+  spokenForm: clear paint
+  action: clearAndSetSelection
+  targets:
+    - { type: primitive, selectionType: nonWhitespaceSequence }
+initialState:
+  documentContents: |
+    const r = /a[b]*(c)/;
+
+    // a/b/c /d
+  selections:
+    - anchor: { line: 2, character: 6 }
+      active: { line: 0, character: 13 }
+  marks: {}
+finalState:
+  documentContents: |
+    const r =  /d
+  selections:
+    - anchor: { line: 0, character: 10 }
+      active: { line: 0, character: 10 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: nonWhitespaceSequence,
+      position: contents,
+      insideOutsideType: inside,
+      modifier: { type: identity },
+      isImplicit: false,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/selectionTypes/clearPaintBatt.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/selectionTypes/clearPaintBatt.yml
new file mode 100644
index 0000000000..db1e47377d
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/selectionTypes/clearPaintBatt.yml
@@ -0,0 +1,37 @@
+languageId: plaintext
+command:
+  version: 1
+  spokenForm: clear paint batt
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      selectionType: nonWhitespaceSequence
+      mark: { type: decoratedSymbol, symbolColor: default, character: b }
+initialState:
+  documentContents: |
+    const r = /a[b]*(c)/;
+  selections:
+    - anchor: { line: 1, character: 0 }
+      active: { line: 1, character: 0 }
+  marks:
+    default.b:
+      start: { line: 0, character: 13 }
+      end: { line: 0, character: 14 }
+finalState:
+  documentContents: |
+    const r =
+  selections:
+    - anchor: { line: 0, character: 10 }
+      active: { line: 0, character: 10 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: decoratedSymbol, symbolColor: default, character: b },
+      selectionType: nonWhitespaceSequence,
+      position: contents,
+      insideOutsideType: inside,
+      modifier: { type: identity },
+      isImplicit: false,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/selectionTypes/clearPaintBattPastBlueBatt.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/selectionTypes/clearPaintBattPastBlueBatt.yml
new file mode 100644
index 0000000000..ddf3c12c7d
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/selectionTypes/clearPaintBattPastBlueBatt.yml
@@ -0,0 +1,66 @@
+languageId: plaintext
+command:
+  version: 1
+  spokenForm: clear paint batt past blue batt
+  action: clearAndSetSelection
+  targets:
+    - type: range
+      start:
+        type: primitive
+        selectionType: nonWhitespaceSequence
+        mark: { type: decoratedSymbol, symbolColor: default, character: b }
+      end:
+        type: primitive
+        mark: { type: decoratedSymbol, symbolColor: blue, character: b }
+      excludeStart: false
+      excludeEnd: false
+initialState:
+  documentContents: |
+    const r = /a[b]*(c)/;
+
+    // a/b/c /d
+  selections:
+    - anchor: { line: 3, character: 0 }
+      active: { line: 3, character: 0 }
+  marks:
+    default.b:
+      start: { line: 2, character: 5 }
+      end: { line: 2, character: 6 }
+    blue.b:
+      start: { line: 0, character: 13 }
+      end: { line: 0, character: 14 }
+finalState:
+  documentContents: |
+    const r =  /d
+  selections:
+    - anchor: { line: 0, character: 10 }
+      active: { line: 0, character: 10 }
+fullTargets:
+  [
+    {
+      type: range,
+      excludeAnchor: false,
+      excludeActive: false,
+      rangeType: continuous,
+      anchor:
+        {
+          type: primitive,
+          mark: { type: decoratedSymbol, symbolColor: default, character: b },
+          selectionType: nonWhitespaceSequence,
+          position: contents,
+          insideOutsideType: inside,
+          modifier: { type: identity },
+          isImplicit: false,
+        },
+      active:
+        {
+          type: primitive,
+          mark: { type: decoratedSymbol, symbolColor: blue, character: b },
+          selectionType: nonWhitespaceSequence,
+          position: contents,
+          insideOutsideType: inside,
+          modifier: { type: identity },
+          isImplicit: false,
+        },
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/selectionTypes/clearPreviousFunk.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/selectionTypes/clearPreviousFunk.yml
new file mode 100644
index 0000000000..b2b398c218
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/selectionTypes/clearPreviousFunk.yml
@@ -0,0 +1,40 @@
+languageId: typescript
+command:
+  spokenForm: clear previous funk
+  version: 2
+  targets:
+    - type: primitive
+      modifiers:
+        - type: relativeScope
+          scopeType: { type: namedFunction }
+          offset: 1
+          length: 1
+          direction: backward
+  usePrePhraseSnapshot: true
+  action: { name: clearAndSetSelection }
+initialState:
+  documentContents: |-
+    function foo() {}
+
+    function bar() {}
+  selections:
+    - anchor: { line: 2, character: 0 }
+      active: { line: 2, character: 0 }
+  marks: {}
+finalState:
+  documentContents: |-
+
+
+    function bar() {}
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      modifiers:
+        [{ type: previousContainingScope, scopeType: { type: namedFunction } }],
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/selectionTypes/clearPreviousToken.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/selectionTypes/clearPreviousToken.yml
new file mode 100644
index 0000000000..34de1caf63
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/selectionTypes/clearPreviousToken.yml
@@ -0,0 +1,42 @@
+languageId: plaintext
+command:
+  spokenForm: clear previous token
+  version: 3
+  targets:
+    - type: primitive
+      modifiers:
+        - type: relativeScope
+          scopeType: { type: token }
+          offset: 1
+          length: 1
+          direction: backward
+  usePrePhraseSnapshot: true
+  action: { name: clearAndSetSelection }
+initialState:
+  documentContents: a  b
+  selections:
+    - anchor: { line: 0, character: 2 }
+      active: { line: 0, character: 2 }
+  marks: {}
+finalState:
+  documentContents: "  b"
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      modifiers:
+        [
+          {
+            type: relativeScope,
+            scopeType: { type: token },
+            offset: 1,
+            length: 1,
+            direction: backward,
+          },
+        ],
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/selectionTypes/clearPreviousWord.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/selectionTypes/clearPreviousWord.yml
new file mode 100644
index 0000000000..470e3b9bf6
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/selectionTypes/clearPreviousWord.yml
@@ -0,0 +1,42 @@
+languageId: plaintext
+command:
+  spokenForm: clear previous word
+  version: 3
+  targets:
+    - type: primitive
+      modifiers:
+        - type: relativeScope
+          scopeType: { type: word }
+          offset: 1
+          length: 1
+          direction: backward
+  usePrePhraseSnapshot: true
+  action: { name: clearAndSetSelection }
+initialState:
+  documentContents: aaaBbbCccDdd
+  selections:
+    - anchor: { line: 0, character: 6 }
+      active: { line: 0, character: 6 }
+  marks: {}
+finalState:
+  documentContents: BbbCccDdd
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      modifiers:
+        [
+          {
+            type: relativeScope,
+            scopeType: { type: word },
+            offset: 1,
+            length: 1,
+            direction: backward,
+          },
+        ],
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/selectionTypes/clearPreviousWord2.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/selectionTypes/clearPreviousWord2.yml
new file mode 100644
index 0000000000..4100115dd8
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/selectionTypes/clearPreviousWord2.yml
@@ -0,0 +1,42 @@
+languageId: plaintext
+command:
+  spokenForm: clear previous word
+  version: 3
+  targets:
+    - type: primitive
+      modifiers:
+        - type: relativeScope
+          scopeType: { type: word }
+          offset: 1
+          length: 1
+          direction: backward
+  usePrePhraseSnapshot: true
+  action: { name: clearAndSetSelection }
+initialState:
+  documentContents: aaaBbbCccDdd
+  selections:
+    - anchor: { line: 0, character: 6 }
+      active: { line: 0, character: 7 }
+  marks: {}
+finalState:
+  documentContents: aaaCccDdd
+  selections:
+    - anchor: { line: 0, character: 3 }
+      active: { line: 0, character: 3 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      modifiers:
+        [
+          {
+            type: relativeScope,
+            scopeType: { type: word },
+            offset: 1,
+            length: 1,
+            direction: backward,
+          },
+        ],
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/selectionTypes/clearPreviousWord3.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/selectionTypes/clearPreviousWord3.yml
new file mode 100644
index 0000000000..db41075c10
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/selectionTypes/clearPreviousWord3.yml
@@ -0,0 +1,42 @@
+languageId: plaintext
+command:
+  spokenForm: clear previous word
+  version: 3
+  targets:
+    - type: primitive
+      modifiers:
+        - type: relativeScope
+          scopeType: { type: word }
+          offset: 1
+          length: 1
+          direction: backward
+  usePrePhraseSnapshot: true
+  action: { name: clearAndSetSelection }
+initialState:
+  documentContents: aaaBbbCccDdd
+  selections:
+    - anchor: { line: 0, character: 5 }
+      active: { line: 0, character: 7 }
+  marks: {}
+finalState:
+  documentContents: BbbCccDdd
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      modifiers:
+        [
+          {
+            type: relativeScope,
+            scopeType: { type: word },
+            offset: 1,
+            length: 1,
+            direction: backward,
+          },
+        ],
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/selectionTypes/clearRowTwoPastFour.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/selectionTypes/clearRowTwoPastFour.yml
new file mode 100644
index 0000000000..3516eb355d
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/selectionTypes/clearRowTwoPastFour.yml
@@ -0,0 +1,50 @@
+languageId: plaintext
+command:
+  spokenForm: clear row two past four
+  version: 3
+  targets:
+    - type: primitive
+      mark:
+        type: range
+        anchor: { type: lineNumber, lineNumberType: modulo100, lineNumber: 1 }
+        active: { type: lineNumber, lineNumberType: modulo100, lineNumber: 3 }
+        excludeAnchor: false
+        excludeActive: false
+  usePrePhraseSnapshot: true
+  action: { name: clearAndSetSelection }
+initialState:
+  documentContents: |-
+    a
+    b
+    c
+    d
+    e
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+  marks: {}
+finalState:
+  documentContents: |-
+    a
+
+    e
+  selections:
+    - anchor: { line: 1, character: 0 }
+      active: { line: 1, character: 0 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark:
+        {
+          type: range,
+          anchor:
+            { type: lineNumber, lineNumberType: modulo100, lineNumber: 1 },
+          active:
+            { type: lineNumber, lineNumberType: modulo100, lineNumber: 3 },
+          excludeAnchor: false,
+          excludeActive: false,
+        },
+      modifiers: [],
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/selectionTypes/clearRowTwoUntilFour.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/selectionTypes/clearRowTwoUntilFour.yml
new file mode 100644
index 0000000000..6c89329e28
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/selectionTypes/clearRowTwoUntilFour.yml
@@ -0,0 +1,51 @@
+languageId: plaintext
+command:
+  spokenForm: clear row two until four
+  version: 3
+  targets:
+    - type: primitive
+      mark:
+        type: range
+        anchor: { type: lineNumber, lineNumberType: modulo100, lineNumber: 1 }
+        active: { type: lineNumber, lineNumberType: modulo100, lineNumber: 3 }
+        excludeAnchor: false
+        excludeActive: true
+  usePrePhraseSnapshot: true
+  action: { name: clearAndSetSelection }
+initialState:
+  documentContents: |-
+    a
+    b
+    c
+    d
+    e
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+  marks: {}
+finalState:
+  documentContents: |-
+    a
+
+    d
+    e
+  selections:
+    - anchor: { line: 1, character: 0 }
+      active: { line: 1, character: 0 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark:
+        {
+          type: range,
+          anchor:
+            { type: lineNumber, lineNumberType: modulo100, lineNumber: 1 },
+          active:
+            { type: lineNumber, lineNumberType: modulo100, lineNumber: 3 },
+          excludeAnchor: false,
+          excludeActive: true,
+        },
+      modifiers: [],
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/selectionTypes/clearSecondBetweenThirdItem.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/selectionTypes/clearSecondBetweenThirdItem.yml
new file mode 100644
index 0000000000..53b7365fd3
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/selectionTypes/clearSecondBetweenThirdItem.yml
@@ -0,0 +1,62 @@
+languageId: plaintext
+command:
+  spokenForm: clear second between third item
+  version: 3
+  targets:
+    - type: primitive
+      modifiers:
+        - type: range
+          anchor:
+            type: ordinalScope
+            scopeType: { type: collectionItem }
+            start: 1
+            length: 1
+          active:
+            type: ordinalScope
+            scopeType: { type: collectionItem }
+            start: 2
+            length: 1
+          excludeAnchor: true
+          excludeActive: true
+  usePrePhraseSnapshot: true
+  action: { name: clearAndSetSelection }
+initialState:
+  documentContents: a, b, c, d
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+  marks: {}
+finalState:
+  documentContents: a, bc, d
+  selections:
+    - anchor: { line: 0, character: 4 }
+      active: { line: 0, character: 4 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      modifiers:
+        [
+          {
+            type: range,
+            anchor:
+              {
+                type: ordinalScope,
+                scopeType: { type: collectionItem },
+                start: 1,
+                length: 1,
+              },
+            active:
+              {
+                type: ordinalScope,
+                scopeType: { type: collectionItem },
+                start: 2,
+                length: 1,
+              },
+            excludeAnchor: true,
+            excludeActive: true,
+          },
+        ],
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/selectionTypes/clearSecondItem.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/selectionTypes/clearSecondItem.yml
new file mode 100644
index 0000000000..122af4bbc0
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/selectionTypes/clearSecondItem.yml
@@ -0,0 +1,40 @@
+languageId: plaintext
+command:
+  spokenForm: clear second item
+  version: 3
+  targets:
+    - type: primitive
+      modifiers:
+        - type: ordinalScope
+          scopeType: { type: collectionItem }
+          start: 1
+          length: 1
+  usePrePhraseSnapshot: true
+  action: { name: clearAndSetSelection }
+initialState:
+  documentContents: a, b, c, d
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+  marks: {}
+finalState:
+  documentContents: a, , c, d
+  selections:
+    - anchor: { line: 0, character: 3 }
+      active: { line: 0, character: 3 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      modifiers:
+        [
+          {
+            type: ordinalScope,
+            scopeType: { type: collectionItem },
+            start: 1,
+            length: 1,
+          },
+        ],
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/selectionTypes/clearSecondLastWord.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/selectionTypes/clearSecondLastWord.yml
new file mode 100644
index 0000000000..2320aaf9c3
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/selectionTypes/clearSecondLastWord.yml
@@ -0,0 +1,40 @@
+languageId: plaintext
+command:
+  spokenForm: clear second last word
+  version: 3
+  targets:
+    - type: primitive
+      modifiers:
+        - type: ordinalScope
+          scopeType: { type: word }
+          start: -2
+          length: 1
+  usePrePhraseSnapshot: true
+  action: { name: clearAndSetSelection }
+initialState:
+  documentContents: aaaBbbCccDdd
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+  marks: {}
+finalState:
+  documentContents: aaaBbbDdd
+  selections:
+    - anchor: { line: 0, character: 6 }
+      active: { line: 0, character: 6 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      modifiers:
+        [
+          {
+            type: ordinalScope,
+            scopeType: { type: word },
+            start: -2,
+            length: 1,
+          },
+        ],
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/selectionTypes/clearSecondNextWord.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/selectionTypes/clearSecondNextWord.yml
new file mode 100644
index 0000000000..8df2dea0f2
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/selectionTypes/clearSecondNextWord.yml
@@ -0,0 +1,42 @@
+languageId: plaintext
+command:
+  spokenForm: clear second next word
+  version: 3
+  targets:
+    - type: primitive
+      modifiers:
+        - type: relativeScope
+          scopeType: { type: word }
+          offset: 2
+          length: 1
+          direction: forward
+  usePrePhraseSnapshot: true
+  action: { name: clearAndSetSelection }
+initialState:
+  documentContents: aaaBbbCccDdd
+  selections:
+    - anchor: { line: 0, character: 4 }
+      active: { line: 0, character: 4 }
+  marks: {}
+finalState:
+  documentContents: aaaBbbCcc
+  selections:
+    - anchor: { line: 0, character: 9 }
+      active: { line: 0, character: 9 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      modifiers:
+        [
+          {
+            type: relativeScope,
+            scopeType: { type: word },
+            offset: 2,
+            length: 1,
+            direction: forward,
+          },
+        ],
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/selectionTypes/clearSecondPastThirdItem.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/selectionTypes/clearSecondPastThirdItem.yml
new file mode 100644
index 0000000000..ba5a80ae87
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/selectionTypes/clearSecondPastThirdItem.yml
@@ -0,0 +1,62 @@
+languageId: plaintext
+command:
+  spokenForm: clear second past third item
+  version: 3
+  targets:
+    - type: primitive
+      modifiers:
+        - type: range
+          anchor:
+            type: ordinalScope
+            scopeType: { type: collectionItem }
+            start: 1
+            length: 1
+          active:
+            type: ordinalScope
+            scopeType: { type: collectionItem }
+            start: 2
+            length: 1
+          excludeAnchor: false
+          excludeActive: false
+  usePrePhraseSnapshot: true
+  action: { name: clearAndSetSelection }
+initialState:
+  documentContents: a, b, c, d
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+  marks: {}
+finalState:
+  documentContents: a, , d
+  selections:
+    - anchor: { line: 0, character: 3 }
+      active: { line: 0, character: 3 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      modifiers:
+        [
+          {
+            type: range,
+            anchor:
+              {
+                type: ordinalScope,
+                scopeType: { type: collectionItem },
+                start: 1,
+                length: 1,
+              },
+            active:
+              {
+                type: ordinalScope,
+                scopeType: { type: collectionItem },
+                start: 2,
+                length: 1,
+              },
+            excludeAnchor: false,
+            excludeActive: false,
+          },
+        ],
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/selectionTypes/clearSecondUntilFourthItem.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/selectionTypes/clearSecondUntilFourthItem.yml
new file mode 100644
index 0000000000..b433a67a73
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/selectionTypes/clearSecondUntilFourthItem.yml
@@ -0,0 +1,62 @@
+languageId: plaintext
+command:
+  spokenForm: clear second until fourth item
+  version: 3
+  targets:
+    - type: primitive
+      modifiers:
+        - type: range
+          anchor:
+            type: ordinalScope
+            scopeType: { type: collectionItem }
+            start: 1
+            length: 1
+          active:
+            type: ordinalScope
+            scopeType: { type: collectionItem }
+            start: 3
+            length: 1
+          excludeAnchor: false
+          excludeActive: true
+  usePrePhraseSnapshot: true
+  action: { name: clearAndSetSelection }
+initialState:
+  documentContents: a, b, c, d
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+  marks: {}
+finalState:
+  documentContents: a, d
+  selections:
+    - anchor: { line: 0, character: 3 }
+      active: { line: 0, character: 3 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      modifiers:
+        [
+          {
+            type: range,
+            anchor:
+              {
+                type: ordinalScope,
+                scopeType: { type: collectionItem },
+                start: 1,
+                length: 1,
+              },
+            active:
+              {
+                type: ordinalScope,
+                scopeType: { type: collectionItem },
+                start: 3,
+                length: 1,
+              },
+            excludeAnchor: false,
+            excludeActive: true,
+          },
+        ],
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/selectionTypes/clearShortPaint.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/selectionTypes/clearShortPaint.yml
new file mode 100644
index 0000000000..f5d2a37a14
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/selectionTypes/clearShortPaint.yml
@@ -0,0 +1,36 @@
+languageId: plaintext
+command:
+  spokenForm: clear short paint
+  version: 2
+  targets:
+    - type: primitive
+      modifiers:
+        - type: containingScope
+          scopeType: { type: boundedNonWhitespaceSequence }
+  usePrePhraseSnapshot: true
+  action: { name: clearAndSetSelection }
+initialState:
+  documentContents: "{foo.bar(hello-world, whatever-now)} test-this"
+  selections:
+    - anchor: { line: 0, character: 9 }
+      active: { line: 0, character: 9 }
+  marks: {}
+finalState:
+  documentContents: "{foo.bar( whatever-now)} test-this"
+  selections:
+    - anchor: { line: 0, character: 9 }
+      active: { line: 0, character: 9 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      modifiers:
+        [
+          {
+            type: containingScope,
+            scopeType: { type: boundedNonWhitespaceSequence },
+          },
+        ],
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/selectionTypes/clearShortPaint2.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/selectionTypes/clearShortPaint2.yml
new file mode 100644
index 0000000000..34bf394fb0
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/selectionTypes/clearShortPaint2.yml
@@ -0,0 +1,36 @@
+languageId: plaintext
+command:
+  spokenForm: clear short paint
+  version: 2
+  targets:
+    - type: primitive
+      modifiers:
+        - type: containingScope
+          scopeType: { type: boundedNonWhitespaceSequence }
+  usePrePhraseSnapshot: true
+  action: { name: clearAndSetSelection }
+initialState:
+  documentContents: "{foo.bar(hello-world, whatever-now)} test-this"
+  selections:
+    - anchor: { line: 0, character: 8 }
+      active: { line: 0, character: 8 }
+  marks: {}
+finalState:
+  documentContents: "{ whatever-now)} test-this"
+  selections:
+    - anchor: { line: 0, character: 1 }
+      active: { line: 0, character: 1 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      modifiers:
+        [
+          {
+            type: containingScope,
+            scopeType: { type: boundedNonWhitespaceSequence },
+          },
+        ],
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/selectionTypes/clearShortPaint3.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/selectionTypes/clearShortPaint3.yml
new file mode 100644
index 0000000000..6b43fb1a29
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/selectionTypes/clearShortPaint3.yml
@@ -0,0 +1,36 @@
+languageId: plaintext
+command:
+  spokenForm: clear short paint
+  version: 2
+  targets:
+    - type: primitive
+      modifiers:
+        - type: containingScope
+          scopeType: { type: boundedNonWhitespaceSequence }
+  usePrePhraseSnapshot: true
+  action: { name: clearAndSetSelection }
+initialState:
+  documentContents: "{foo.bar(hello-world, whatever-now)} test-this"
+  selections:
+    - anchor: { line: 0, character: 6 }
+      active: { line: 0, character: 11 }
+  marks: {}
+finalState:
+  documentContents: "{ whatever-now)} test-this"
+  selections:
+    - anchor: { line: 0, character: 1 }
+      active: { line: 0, character: 1 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      modifiers:
+        [
+          {
+            type: containingScope,
+            scopeType: { type: boundedNonWhitespaceSequence },
+          },
+        ],
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/selectionTypes/clearShortPaintLeper.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/selectionTypes/clearShortPaintLeper.yml
new file mode 100644
index 0000000000..1b0ecd9d83
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/selectionTypes/clearShortPaintLeper.yml
@@ -0,0 +1,40 @@
+languageId: plaintext
+command:
+  spokenForm: clear short paint leper
+  version: 2
+  targets:
+    - type: primitive
+      mark: { type: decoratedSymbol, symbolColor: default, character: ( }
+      modifiers:
+        - type: containingScope
+          scopeType: { type: boundedNonWhitespaceSequence }
+  usePrePhraseSnapshot: true
+  action: { name: clearAndSetSelection }
+initialState:
+  documentContents: "{foo.bar(hello-world, whatever-now)} test-this"
+  selections:
+    - anchor: { line: 0, character: 14 }
+      active: { line: 0, character: 14 }
+  marks:
+    default.(:
+      start: { line: 0, character: 8 }
+      end: { line: 0, character: 9 }
+finalState:
+  documentContents: "{ whatever-now)} test-this"
+  selections:
+    - anchor: { line: 0, character: 1 }
+      active: { line: 0, character: 1 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: decoratedSymbol, symbolColor: default, character: ( },
+      modifiers:
+        [
+          {
+            type: containingScope,
+            scopeType: { type: boundedNonWhitespaceSequence },
+          },
+        ],
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/selectionTypes/clearTrailing.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/selectionTypes/clearTrailing.yml
new file mode 100644
index 0000000000..89a2fea6ae
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/selectionTypes/clearTrailing.yml
@@ -0,0 +1,23 @@
+languageId: plaintext
+command:
+  spokenForm: clear trailing
+  version: 2
+  targets:
+    - type: primitive
+      modifiers:
+        - { type: trailing }
+  usePrePhraseSnapshot: true
+  action: { name: clearAndSetSelection }
+initialState:
+  documentContents: aaa bbb ccc
+  selections:
+    - anchor: { line: 0, character: 6 }
+      active: { line: 0, character: 6 }
+  marks: {}
+finalState:
+  documentContents: aaa bbbccc
+  selections:
+    - anchor: { line: 0, character: 7 }
+      active: { line: 0, character: 7 }
+fullTargets:
+  [{ type: primitive, mark: { type: cursor }, modifiers: [{ type: trailing }] }]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/selectionTypes/clearWord.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/selectionTypes/clearWord.yml
new file mode 100644
index 0000000000..c556f8b204
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/selectionTypes/clearWord.yml
@@ -0,0 +1,30 @@
+languageId: plaintext
+command:
+  spokenForm: clear word
+  version: 3
+  targets:
+    - type: primitive
+      modifiers:
+        - type: containingScope
+          scopeType: { type: word }
+  usePrePhraseSnapshot: true
+  action: { name: clearAndSetSelection }
+initialState:
+  documentContents: aaaBbbCcc
+  selections:
+    - anchor: { line: 0, character: 4 }
+      active: { line: 0, character: 4 }
+  marks: {}
+finalState:
+  documentContents: aaaCcc
+  selections:
+    - anchor: { line: 0, character: 3 }
+      active: { line: 0, character: 3 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      modifiers: [{ type: containingScope, scopeType: { type: word } }],
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/selectionTypes/clearWord2.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/selectionTypes/clearWord2.yml
new file mode 100644
index 0000000000..a4749b7e58
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/selectionTypes/clearWord2.yml
@@ -0,0 +1,30 @@
+languageId: plaintext
+command:
+  spokenForm: clear word
+  version: 3
+  targets:
+    - type: primitive
+      modifiers:
+        - type: containingScope
+          scopeType: { type: word }
+  usePrePhraseSnapshot: true
+  action: { name: clearAndSetSelection }
+initialState:
+  documentContents: aaaBbbCcc
+  selections:
+    - anchor: { line: 0, character: 3 }
+      active: { line: 0, character: 4 }
+  marks: {}
+finalState:
+  documentContents: aaaCcc
+  selections:
+    - anchor: { line: 0, character: 3 }
+      active: { line: 0, character: 3 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      modifiers: [{ type: containingScope, scopeType: { type: word } }],
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/selectionTypes/clearWord3.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/selectionTypes/clearWord3.yml
new file mode 100644
index 0000000000..1d627fad6c
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/selectionTypes/clearWord3.yml
@@ -0,0 +1,30 @@
+languageId: plaintext
+command:
+  spokenForm: clear word
+  version: 3
+  targets:
+    - type: primitive
+      modifiers:
+        - type: containingScope
+          scopeType: { type: word }
+  usePrePhraseSnapshot: true
+  action: { name: clearAndSetSelection }
+initialState:
+  documentContents: aaaBbbCcc
+  selections:
+    - anchor: { line: 0, character: 2 }
+      active: { line: 0, character: 4 }
+  marks: {}
+finalState:
+  documentContents: Ccc
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      modifiers: [{ type: containingScope, scopeType: { type: word } }],
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/selectionTypes/clearWord4.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/selectionTypes/clearWord4.yml
new file mode 100644
index 0000000000..ae9df83278
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/selectionTypes/clearWord4.yml
@@ -0,0 +1,30 @@
+languageId: plaintext
+command:
+  spokenForm: clear word
+  version: 3
+  targets:
+    - type: primitive
+      modifiers:
+        - type: containingScope
+          scopeType: { type: word }
+  usePrePhraseSnapshot: true
+  action: { name: clearAndSetSelection }
+initialState:
+  documentContents: aaaBbbCcc
+  selections:
+    - anchor: { line: 0, character: 3 }
+      active: { line: 0, character: 6 }
+  marks: {}
+finalState:
+  documentContents: aaaCcc
+  selections:
+    - anchor: { line: 0, character: 3 }
+      active: { line: 0, character: 3 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      modifiers: [{ type: containingScope, scopeType: { type: word } }],
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/selectionTypes/clearWord5.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/selectionTypes/clearWord5.yml
new file mode 100644
index 0000000000..3172f3c251
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/selectionTypes/clearWord5.yml
@@ -0,0 +1,30 @@
+languageId: plaintext
+command:
+  spokenForm: clear word
+  version: 3
+  targets:
+    - type: primitive
+      modifiers:
+        - type: containingScope
+          scopeType: { type: word }
+  usePrePhraseSnapshot: true
+  action: { name: clearAndSetSelection }
+initialState:
+  documentContents: aaaBbbCcc
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+  marks: {}
+finalState:
+  documentContents: BbbCcc
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      modifiers: [{ type: containingScope, scopeType: { type: word } }],
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/selectionTypes/clearWord6.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/selectionTypes/clearWord6.yml
new file mode 100644
index 0000000000..299bd1bfb6
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/selectionTypes/clearWord6.yml
@@ -0,0 +1,30 @@
+languageId: plaintext
+command:
+  spokenForm: clear word
+  version: 3
+  targets:
+    - type: primitive
+      modifiers:
+        - type: containingScope
+          scopeType: { type: word }
+  usePrePhraseSnapshot: true
+  action: { name: clearAndSetSelection }
+initialState:
+  documentContents: aaaBbbCcc
+  selections:
+    - anchor: { line: 0, character: 3 }
+      active: { line: 0, character: 3 }
+  marks: {}
+finalState:
+  documentContents: aaaCcc
+  selections:
+    - anchor: { line: 0, character: 3 }
+      active: { line: 0, character: 3 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      modifiers: [{ type: containingScope, scopeType: { type: word } }],
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/selectionTypes/clearWord7.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/selectionTypes/clearWord7.yml
new file mode 100644
index 0000000000..d710e02e67
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/selectionTypes/clearWord7.yml
@@ -0,0 +1,30 @@
+languageId: plaintext
+command:
+  spokenForm: clear word
+  version: 3
+  targets:
+    - type: primitive
+      modifiers:
+        - type: containingScope
+          scopeType: { type: word }
+  usePrePhraseSnapshot: true
+  action: { name: clearAndSetSelection }
+initialState:
+  documentContents: aaaBbbCcc
+  selections:
+    - anchor: { line: 0, character: 9 }
+      active: { line: 0, character: 9 }
+  marks: {}
+finalState:
+  documentContents: aaaBbb
+  selections:
+    - anchor: { line: 0, character: 6 }
+      active: { line: 0, character: 6 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      modifiers: [{ type: containingScope, scopeType: { type: word } }],
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/selectionTypes/drinkCell.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/selectionTypes/drinkCell.yml
new file mode 100644
index 0000000000..b7f821cece
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/selectionTypes/drinkCell.yml
@@ -0,0 +1,36 @@
+languageId: python
+postCommandSleepTimeMs: 400
+command:
+  version: 1
+  spokenForm: drink cell
+  action: editNewLineBefore
+  targets:
+    - { type: primitive, selectionType: notebookCell }
+initialState:
+  documentContents: |-
+    # %%
+    print("hello")
+  selections:
+    - anchor: { line: 1, character: 12 }
+      active: { line: 1, character: 12 }
+  marks: {}
+finalState:
+  documentContents: |-
+    # %%
+
+    # %%
+    print("hello")
+  selections:
+    - anchor: { line: 1, character: 0 }
+      active: { line: 1, character: 0 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: notebookCell,
+      position: contents,
+      insideOutsideType: inside,
+      modifier: { type: identity },
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/selectionTypes/drinkCellEach.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/selectionTypes/drinkCellEach.yml
new file mode 100644
index 0000000000..39396ceff6
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/selectionTypes/drinkCellEach.yml
@@ -0,0 +1,48 @@
+languageId: python
+postEditorOpenSleepTimeMs: 250
+postCommandSleepTimeMs: 400
+command:
+  version: 1
+  spokenForm: drink cell each
+  action: editNewLineBefore
+  targets:
+    - type: primitive
+      selectionType: notebookCell
+      mark: { type: decoratedSymbol, symbolColor: default, character: e }
+initialState:
+  documentContents: |-
+    # %%
+    print("hello")
+
+    # %%
+    print("hello")
+  selections:
+    - anchor: { line: 4, character: 12 }
+      active: { line: 4, character: 12 }
+  marks:
+    default.e:
+      start: { line: 1, character: 7 }
+      end: { line: 1, character: 12 }
+finalState:
+  documentContents: |-
+    # %%
+
+    # %%
+    print("hello")
+
+    # %%
+    print("hello")
+  selections:
+    - anchor: { line: 1, character: 0 }
+      active: { line: 1, character: 0 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: decoratedSymbol, symbolColor: default, character: e },
+      selectionType: notebookCell,
+      position: contents,
+      insideOutsideType: inside,
+      modifier: { type: identity },
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/selectionTypes/drinkEveryArg.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/selectionTypes/drinkEveryArg.yml
new file mode 100644
index 0000000000..bea5d111de
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/selectionTypes/drinkEveryArg.yml
@@ -0,0 +1,41 @@
+languageId: typescript
+command:
+  spokenForm: drink every arg
+  version: 2
+  targets:
+    - type: primitive
+      modifiers:
+        - type: everyScope
+          scopeType: { type: argumentOrParameter }
+  usePrePhraseSnapshot: true
+  action: { name: editNewLineBefore }
+initialState:
+  documentContents: |-
+    function whatever(a: number, b: number, c: number) {
+
+    }
+  selections:
+    - anchor: { line: 0, character: 29 }
+      active: { line: 0, character: 29 }
+  marks: {}
+finalState:
+  documentContents: |-
+    function whatever(, a: number, , b: number, , c: number) {
+
+    }
+  selections:
+    - anchor: { line: 0, character: 18 }
+      active: { line: 0, character: 18 }
+    - anchor: { line: 0, character: 31 }
+      active: { line: 0, character: 31 }
+    - anchor: { line: 0, character: 44 }
+      active: { line: 0, character: 44 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      modifiers:
+        [{ type: everyScope, scopeType: { type: argumentOrParameter } }],
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/selectionTypes/drinkJustFine.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/selectionTypes/drinkJustFine.yml
new file mode 100644
index 0000000000..fa0cc55ee2
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/selectionTypes/drinkJustFine.yml
@@ -0,0 +1,33 @@
+languageId: plaintext
+command:
+  spokenForm: drink just fine
+  version: 2
+  action: { name: editNewLineBefore }
+  targets:
+    - type: primitive
+      mark: { type: decoratedSymbol, symbolColor: default, character: f }
+      modifiers:
+        - { type: toRawSelection }
+  usePrePhraseSnapshot: true
+initialState:
+  documentContents: foo
+  selections:
+    - anchor: { line: 0, character: 3 }
+      active: { line: 0, character: 3 }
+  marks:
+    default.f:
+      start: { line: 0, character: 0 }
+      end: { line: 0, character: 3 }
+finalState:
+  documentContents: foo
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: decoratedSymbol, symbolColor: default, character: f },
+      modifiers: [{ type: toRawSelection }],
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/selectionTypes/drinkToken.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/selectionTypes/drinkToken.yml
new file mode 100644
index 0000000000..171a97d23e
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/selectionTypes/drinkToken.yml
@@ -0,0 +1,30 @@
+languageId: python
+command:
+  spokenForm: drink token
+  version: 2
+  action: { name: editNewLineBefore }
+  targets:
+    - type: primitive
+      modifiers:
+        - type: containingScope
+          scopeType: { type: token }
+  usePrePhraseSnapshot: true
+initialState:
+  documentContents: foo
+  selections:
+    - anchor: { line: 0, character: 2 }
+      active: { line: 0, character: 2 }
+  marks: {}
+finalState:
+  documentContents: " foo"
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      modifiers: [{ type: containingScope, scopeType: token }],
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/selectionTypes/pourCell.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/selectionTypes/pourCell.yml
new file mode 100644
index 0000000000..757a383792
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/selectionTypes/pourCell.yml
@@ -0,0 +1,35 @@
+languageId: python
+postCommandSleepTimeMs: 400
+command:
+  version: 1
+  spokenForm: pour cell
+  action: editNewLineAfter
+  targets:
+    - { type: primitive, selectionType: notebookCell }
+initialState:
+  documentContents: |-
+    # %%
+    print("hello")
+  selections:
+    - anchor: { line: 1, character: 12 }
+      active: { line: 1, character: 12 }
+  marks: {}
+finalState:
+  documentContents: |
+    # %%
+    print("hello")
+    # %%
+  selections:
+    - anchor: { line: 3, character: 0 }
+      active: { line: 3, character: 0 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: notebookCell,
+      position: contents,
+      insideOutsideType: inside,
+      modifier: { type: identity },
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/selectionTypes/pourCellEach.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/selectionTypes/pourCellEach.yml
new file mode 100644
index 0000000000..ec65b8b825
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/selectionTypes/pourCellEach.yml
@@ -0,0 +1,48 @@
+languageId: python
+postEditorOpenSleepTimeMs: 250
+postCommandSleepTimeMs: 400
+command:
+  version: 1
+  spokenForm: pour cell each
+  action: editNewLineAfter
+  targets:
+    - type: primitive
+      selectionType: notebookCell
+      mark: { type: decoratedSymbol, symbolColor: default, character: e }
+initialState:
+  documentContents: |-
+    # %%
+    print("hello")
+
+    # %%
+    print("hello")
+  selections:
+    - anchor: { line: 4, character: 12 }
+      active: { line: 4, character: 12 }
+  marks:
+    default.e:
+      start: { line: 1, character: 7 }
+      end: { line: 1, character: 12 }
+finalState:
+  documentContents: |-
+    # %%
+    print("hello")
+
+    # %%
+
+    # %%
+    print("hello")
+  selections:
+    - anchor: { line: 4, character: 0 }
+      active: { line: 4, character: 0 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: decoratedSymbol, symbolColor: default, character: e },
+      selectionType: notebookCell,
+      position: contents,
+      insideOutsideType: inside,
+      modifier: { type: identity },
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/selectionTypes/pourEveryArg.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/selectionTypes/pourEveryArg.yml
new file mode 100644
index 0000000000..1705e14b39
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/selectionTypes/pourEveryArg.yml
@@ -0,0 +1,41 @@
+languageId: typescript
+command:
+  spokenForm: pour every arg
+  version: 2
+  targets:
+    - type: primitive
+      modifiers:
+        - type: everyScope
+          scopeType: { type: argumentOrParameter }
+  usePrePhraseSnapshot: true
+  action: { name: editNewLineAfter }
+initialState:
+  documentContents: |-
+    function whatever(a: number, b: number, c: number) {
+
+    }
+  selections:
+    - anchor: { line: 0, character: 29 }
+      active: { line: 0, character: 29 }
+  marks: {}
+finalState:
+  documentContents: |-
+    function whatever(a: number, , b: number, , c: number, ) {
+
+    }
+  selections:
+    - anchor: { line: 0, character: 29 }
+      active: { line: 0, character: 29 }
+    - anchor: { line: 0, character: 42 }
+      active: { line: 0, character: 42 }
+    - anchor: { line: 0, character: 55 }
+      active: { line: 0, character: 55 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      modifiers:
+        [{ type: everyScope, scopeType: { type: argumentOrParameter } }],
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/selectionTypes/takeEveryCar.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/selectionTypes/takeEveryCar.yml
new file mode 100644
index 0000000000..9060e70a0d
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/selectionTypes/takeEveryCar.yml
@@ -0,0 +1,46 @@
+languageId: plaintext
+command:
+  spokenForm: take every car
+  version: 3
+  targets:
+    - type: primitive
+      modifiers:
+        - type: everyScope
+          scopeType: { type: character }
+  usePrePhraseSnapshot: true
+  action: { name: setSelection }
+initialState:
+  documentContents: aaaBbbCcc
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+  marks: {}
+finalState:
+  documentContents: aaaBbbCcc
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 1 }
+    - anchor: { line: 0, character: 1 }
+      active: { line: 0, character: 2 }
+    - anchor: { line: 0, character: 2 }
+      active: { line: 0, character: 3 }
+    - anchor: { line: 0, character: 3 }
+      active: { line: 0, character: 4 }
+    - anchor: { line: 0, character: 4 }
+      active: { line: 0, character: 5 }
+    - anchor: { line: 0, character: 5 }
+      active: { line: 0, character: 6 }
+    - anchor: { line: 0, character: 6 }
+      active: { line: 0, character: 7 }
+    - anchor: { line: 0, character: 7 }
+      active: { line: 0, character: 8 }
+    - anchor: { line: 0, character: 8 }
+      active: { line: 0, character: 9 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      modifiers: [{ type: everyScope, scopeType: { type: character } }],
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/selectionTypes/takeEveryCarBlock.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/selectionTypes/takeEveryCarBlock.yml
new file mode 100644
index 0000000000..2745b5f7b5
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/selectionTypes/takeEveryCarBlock.yml
@@ -0,0 +1,58 @@
+languageId: plaintext
+command:
+  spokenForm: take every car block
+  version: 3
+  targets:
+    - type: primitive
+      modifiers:
+        - type: everyScope
+          scopeType: { type: character }
+        - type: containingScope
+          scopeType: { type: paragraph }
+  usePrePhraseSnapshot: true
+  action: { name: setSelection }
+initialState:
+  documentContents: |-
+    a*a
+    b-b
+    c/c
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+  marks: {}
+finalState:
+  documentContents: |-
+    a*a
+    b-b
+    c/c
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 1 }
+    - anchor: { line: 0, character: 1 }
+      active: { line: 0, character: 2 }
+    - anchor: { line: 0, character: 2 }
+      active: { line: 0, character: 3 }
+    - anchor: { line: 1, character: 0 }
+      active: { line: 1, character: 1 }
+    - anchor: { line: 1, character: 1 }
+      active: { line: 1, character: 2 }
+    - anchor: { line: 1, character: 2 }
+      active: { line: 1, character: 3 }
+    - anchor: { line: 2, character: 0 }
+      active: { line: 2, character: 1 }
+    - anchor: { line: 2, character: 1 }
+      active: { line: 2, character: 2 }
+    - anchor: { line: 2, character: 2 }
+      active: { line: 2, character: 3 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      modifiers:
+        [
+          { type: everyScope, scopeType: { type: character } },
+          { type: containingScope, scopeType: { type: paragraph } },
+        ],
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/selectionTypes/takeEveryFile.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/selectionTypes/takeEveryFile.yml
new file mode 100644
index 0000000000..5bbc25c74d
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/selectionTypes/takeEveryFile.yml
@@ -0,0 +1,42 @@
+languageId: plaintext
+command:
+  spokenForm: take every file
+  version: 2
+  targets:
+    - type: primitive
+      modifiers:
+        - type: everyScope
+          scopeType: { type: document }
+  usePrePhraseSnapshot: true
+  action: { name: setSelection }
+initialState:
+  documentContents: |2+
+
+
+        foo
+
+        bar
+
+  selections:
+    - anchor: { line: 6, character: 0 }
+      active: { line: 6, character: 0 }
+  marks: {}
+finalState:
+  documentContents: |2+
+
+
+        foo
+
+        bar
+
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 6, character: 0 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      modifiers: [{ type: everyScope, scopeType: { type: document } }],
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/selectionTypes/takeEveryLine.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/selectionTypes/takeEveryLine.yml
new file mode 100644
index 0000000000..8a7f45da7a
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/selectionTypes/takeEveryLine.yml
@@ -0,0 +1,54 @@
+languageId: plaintext
+command:
+  spokenForm: take every line
+  version: 2
+  action: { name: setSelection }
+  targets:
+    - type: primitive
+      modifiers:
+        - type: everyScope
+          scopeType: { type: line }
+  usePrePhraseSnapshot: true
+initialState:
+  documentContents: |
+
+    a
+
+    b   c
+    d   e
+    f   g
+  selections:
+    - anchor: { line: 6, character: 0 }
+      active: { line: 6, character: 0 }
+  marks: {}
+finalState:
+  documentContents: |
+
+    a
+
+    b   c
+    d   e
+    f   g
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+    - anchor: { line: 1, character: 0 }
+      active: { line: 1, character: 1 }
+    - anchor: { line: 2, character: 0 }
+      active: { line: 2, character: 0 }
+    - anchor: { line: 3, character: 0 }
+      active: { line: 3, character: 5 }
+    - anchor: { line: 4, character: 0 }
+      active: { line: 4, character: 5 }
+    - anchor: { line: 5, character: 0 }
+      active: { line: 5, character: 5 }
+    - anchor: { line: 6, character: 0 }
+      active: { line: 6, character: 0 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      modifiers: [{ type: everyScope, scopeType: line }],
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/selectionTypes/takeEveryLine2.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/selectionTypes/takeEveryLine2.yml
new file mode 100644
index 0000000000..55e3aadfa4
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/selectionTypes/takeEveryLine2.yml
@@ -0,0 +1,48 @@
+languageId: plaintext
+command:
+  spokenForm: take every line
+  version: 2
+  action: { name: setSelection }
+  targets:
+    - type: primitive
+      modifiers:
+        - type: everyScope
+          scopeType: { type: line }
+  usePrePhraseSnapshot: true
+initialState:
+  documentContents: |
+
+    a
+
+    b   c
+    d   e
+    f   g
+  selections:
+    - anchor: { line: 4, character: 5 }
+      active: { line: 1, character: 0 }
+  marks: {}
+finalState:
+  documentContents: |
+
+    a
+
+    b   c
+    d   e
+    f   g
+  selections:
+    - anchor: { line: 1, character: 1 }
+      active: { line: 1, character: 0 }
+    - anchor: { line: 2, character: 0 }
+      active: { line: 2, character: 0 }
+    - anchor: { line: 3, character: 5 }
+      active: { line: 3, character: 0 }
+    - anchor: { line: 4, character: 5 }
+      active: { line: 4, character: 0 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      modifiers: [{ type: everyScope, scopeType: line }],
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/selectionTypes/takeEveryLine3.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/selectionTypes/takeEveryLine3.yml
new file mode 100644
index 0000000000..ff5130e06b
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/selectionTypes/takeEveryLine3.yml
@@ -0,0 +1,48 @@
+languageId: plaintext
+command:
+  spokenForm: take every line
+  version: 2
+  action: { name: setSelection }
+  targets:
+    - type: primitive
+      modifiers:
+        - type: everyScope
+          scopeType: { type: line }
+  usePrePhraseSnapshot: true
+initialState:
+  documentContents: |
+
+    a
+
+    b   c
+    d   e
+    f   g
+  selections:
+    - anchor: { line: 1, character: 0 }
+      active: { line: 4, character: 5 }
+  marks: {}
+finalState:
+  documentContents: |
+
+    a
+
+    b   c
+    d   e
+    f   g
+  selections:
+    - anchor: { line: 1, character: 0 }
+      active: { line: 1, character: 1 }
+    - anchor: { line: 2, character: 0 }
+      active: { line: 2, character: 0 }
+    - anchor: { line: 3, character: 0 }
+      active: { line: 3, character: 5 }
+    - anchor: { line: 4, character: 0 }
+      active: { line: 4, character: 5 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      modifiers: [{ type: everyScope, scopeType: line }],
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/selectionTypes/takeEveryShortPaint.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/selectionTypes/takeEveryShortPaint.yml
new file mode 100644
index 0000000000..fdb4099095
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/selectionTypes/takeEveryShortPaint.yml
@@ -0,0 +1,40 @@
+languageId: plaintext
+command:
+  spokenForm: take every short paint
+  version: 2
+  targets:
+    - type: primitive
+      modifiers:
+        - type: everyScope
+          scopeType: { type: boundedNonWhitespaceSequence }
+  usePrePhraseSnapshot: true
+  action: { name: setSelection }
+initialState:
+  documentContents: foo[0](bar.test, baz-other-test) something[]
+  selections:
+    - anchor: { line: 0, character: 33 }
+      active: { line: 0, character: 33 }
+  marks: {}
+finalState:
+  documentContents: foo[0](bar.test, baz-other-test) something[]
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 16 }
+    - anchor: { line: 0, character: 17 }
+      active: { line: 0, character: 32 }
+    - anchor: { line: 0, character: 33 }
+      active: { line: 0, character: 44 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      modifiers:
+        [
+          {
+            type: everyScope,
+            scopeType: { type: boundedNonWhitespaceSequence },
+          },
+        ],
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/selectionTypes/takeEveryShortPaint2.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/selectionTypes/takeEveryShortPaint2.yml
new file mode 100644
index 0000000000..af09aa8c90
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/selectionTypes/takeEveryShortPaint2.yml
@@ -0,0 +1,38 @@
+languageId: plaintext
+command:
+  spokenForm: take every short paint
+  version: 2
+  targets:
+    - type: primitive
+      modifiers:
+        - type: everyScope
+          scopeType: { type: boundedNonWhitespaceSequence }
+  usePrePhraseSnapshot: true
+  action: { name: setSelection }
+initialState:
+  documentContents: foo[0](bar.test, baz-other-test) something[]
+  selections:
+    - anchor: { line: 0, character: 29 }
+      active: { line: 0, character: 29 }
+  marks: {}
+finalState:
+  documentContents: foo[0](bar.test, baz-other-test) something[]
+  selections:
+    - anchor: { line: 0, character: 7 }
+      active: { line: 0, character: 16 }
+    - anchor: { line: 0, character: 17 }
+      active: { line: 0, character: 31 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      modifiers:
+        [
+          {
+            type: everyScope,
+            scopeType: { type: boundedNonWhitespaceSequence },
+          },
+        ],
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/selectionTypes/takeEveryShortPaint3.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/selectionTypes/takeEveryShortPaint3.yml
new file mode 100644
index 0000000000..ceeb729a6e
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/selectionTypes/takeEveryShortPaint3.yml
@@ -0,0 +1,40 @@
+languageId: plaintext
+command:
+  spokenForm: take every short paint
+  version: 2
+  targets:
+    - type: primitive
+      modifiers:
+        - type: everyScope
+          scopeType: { type: boundedNonWhitespaceSequence }
+  usePrePhraseSnapshot: true
+  action: { name: setSelection }
+initialState:
+  documentContents: foo[0](bar.test, baz-other-test) something[]
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+  marks: {}
+finalState:
+  documentContents: foo[0](bar.test, baz-other-test) something[]
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 16 }
+    - anchor: { line: 0, character: 17 }
+      active: { line: 0, character: 32 }
+    - anchor: { line: 0, character: 33 }
+      active: { line: 0, character: 44 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      modifiers:
+        [
+          {
+            type: everyScope,
+            scopeType: { type: boundedNonWhitespaceSequence },
+          },
+        ],
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/selectionTypes/takeEveryWord.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/selectionTypes/takeEveryWord.yml
new file mode 100644
index 0000000000..63cc5bdf9e
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/selectionTypes/takeEveryWord.yml
@@ -0,0 +1,34 @@
+languageId: plaintext
+command:
+  spokenForm: take every word
+  version: 3
+  targets:
+    - type: primitive
+      modifiers:
+        - type: everyScope
+          scopeType: { type: word }
+  usePrePhraseSnapshot: true
+  action: { name: setSelection }
+initialState:
+  documentContents: aaaBbbCcc
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+  marks: {}
+finalState:
+  documentContents: aaaBbbCcc
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 3 }
+    - anchor: { line: 0, character: 3 }
+      active: { line: 0, character: 6 }
+    - anchor: { line: 0, character: 6 }
+      active: { line: 0, character: 9 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      modifiers: [{ type: everyScope, scopeType: { type: word } }],
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/selectionTypes/takeFile.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/selectionTypes/takeFile.yml
new file mode 100644
index 0000000000..7f874c4e5d
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/selectionTypes/takeFile.yml
@@ -0,0 +1,42 @@
+languageId: plaintext
+command:
+  spokenForm: take file
+  version: 2
+  targets:
+    - type: primitive
+      modifiers:
+        - type: containingScope
+          scopeType: { type: document }
+  usePrePhraseSnapshot: true
+  action: { name: setSelection }
+initialState:
+  documentContents: |2+
+
+
+        foo
+
+        bar
+
+  selections:
+    - anchor: { line: 6, character: 0 }
+      active: { line: 6, character: 0 }
+  marks: {}
+finalState:
+  documentContents: |2+
+
+
+        foo
+
+        bar
+
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 6, character: 0 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      modifiers: [{ type: containingScope, scopeType: { type: document } }],
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/selectionTypes/takeLineVest.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/selectionTypes/takeLineVest.yml
new file mode 100644
index 0000000000..8494d4ca8d
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/selectionTypes/takeLineVest.yml
@@ -0,0 +1,38 @@
+languageId: typescript
+command:
+  version: 1
+  spokenForm: take line vest
+  action: setSelection
+  targets:
+    - type: primitive
+      selectionType: line
+      mark: { type: decoratedSymbol, symbolColor: default, character: v }
+initialState:
+  documentContents: |
+
+    const value = "Hello world";
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+  marks:
+    default.v:
+      start: { line: 1, character: 6 }
+      end: { line: 1, character: 11 }
+finalState:
+  documentContents: |
+
+    const value = "Hello world";
+  selections:
+    - anchor: { line: 1, character: 0 }
+      active: { line: 1, character: 28 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: decoratedSymbol, symbolColor: default, character: v },
+      selectionType: line,
+      position: contents,
+      modifier: { type: identity },
+      insideOutsideType: inside,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/selectionTypes/takeShortPaint.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/selectionTypes/takeShortPaint.yml
new file mode 100644
index 0000000000..25ed0dbfd4
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/selectionTypes/takeShortPaint.yml
@@ -0,0 +1,36 @@
+languageId: plaintext
+command:
+  spokenForm: take short paint
+  version: 2
+  targets:
+    - type: primitive
+      modifiers:
+        - type: containingScope
+          scopeType: { type: boundedNonWhitespaceSequence }
+  usePrePhraseSnapshot: true
+  action: { name: setSelection }
+initialState:
+  documentContents: foo[0](bar.test, baz-other-test) something[]
+  selections:
+    - anchor: { line: 0, character: 7 }
+      active: { line: 0, character: 7 }
+  marks: {}
+finalState:
+  documentContents: foo[0](bar.test, baz-other-test) something[]
+  selections:
+    - anchor: { line: 0, character: 7 }
+      active: { line: 0, character: 16 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      modifiers:
+        [
+          {
+            type: containingScope,
+            scopeType: { type: boundedNonWhitespaceSequence },
+          },
+        ],
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/selectionTypes/takeSmallPaintAir.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/selectionTypes/takeSmallPaintAir.yml
new file mode 100644
index 0000000000..925f833709
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/selectionTypes/takeSmallPaintAir.yml
@@ -0,0 +1,40 @@
+languageId: python
+command:
+  spokenForm: take small paint air
+  version: 2
+  targets:
+    - type: primitive
+      mark: { type: decoratedSymbol, symbolColor: default, character: a }
+      modifiers:
+        - type: containingScope
+          scopeType: { type: boundedNonWhitespaceSequence }
+  usePrePhraseSnapshot: true
+  action: { name: setSelection }
+initialState:
+  documentContents: some amount of text
+  selections:
+    - anchor: { line: 0, character: 19 }
+      active: { line: 0, character: 19 }
+  marks:
+    default.a:
+      start: { line: 0, character: 5 }
+      end: { line: 0, character: 11 }
+finalState:
+  documentContents: some amount of text
+  selections:
+    - anchor: { line: 0, character: 5 }
+      active: { line: 0, character: 11 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: decoratedSymbol, symbolColor: default, character: a },
+      modifiers:
+        [
+          {
+            type: containingScope,
+            scopeType: { type: boundedNonWhitespaceSequence },
+          },
+        ],
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/selectionTypes/takeSmallPaintFine.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/selectionTypes/takeSmallPaintFine.yml
new file mode 100644
index 0000000000..c511f8d16f
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/selectionTypes/takeSmallPaintFine.yml
@@ -0,0 +1,40 @@
+languageId: python
+command:
+  spokenForm: take small paint fine
+  version: 2
+  targets:
+    - type: primitive
+      mark: { type: decoratedSymbol, symbolColor: default, character: f }
+      modifiers:
+        - type: containingScope
+          scopeType: { type: boundedNonWhitespaceSequence }
+  usePrePhraseSnapshot: true
+  action: { name: setSelection }
+initialState:
+  documentContents: "[foo[0], bar]"
+  selections:
+    - anchor: { line: 0, character: 3 }
+      active: { line: 0, character: 3 }
+  marks:
+    default.f:
+      start: { line: 0, character: 1 }
+      end: { line: 0, character: 4 }
+finalState:
+  documentContents: "[foo[0], bar]"
+  selections:
+    - anchor: { line: 0, character: 1 }
+      active: { line: 0, character: 8 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: decoratedSymbol, symbolColor: default, character: f },
+      modifiers:
+        [
+          {
+            type: containingScope,
+            scopeType: { type: boundedNonWhitespaceSequence },
+          },
+        ],
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/selectionTypes/takeSmallPaintFine2.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/selectionTypes/takeSmallPaintFine2.yml
new file mode 100644
index 0000000000..d1bde687b7
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/selectionTypes/takeSmallPaintFine2.yml
@@ -0,0 +1,40 @@
+languageId: python
+command:
+  spokenForm: take small paint fine
+  version: 2
+  targets:
+    - type: primitive
+      mark: { type: decoratedSymbol, symbolColor: default, character: f }
+      modifiers:
+        - type: containingScope
+          scopeType: { type: boundedNonWhitespaceSequence }
+  usePrePhraseSnapshot: true
+  action: { name: setSelection }
+initialState:
+  documentContents: "[baz, foo[0], bar]"
+  selections:
+    - anchor: { line: 0, character: 6 }
+      active: { line: 0, character: 6 }
+  marks:
+    default.f:
+      start: { line: 0, character: 6 }
+      end: { line: 0, character: 9 }
+finalState:
+  documentContents: "[baz, foo[0], bar]"
+  selections:
+    - anchor: { line: 0, character: 6 }
+      active: { line: 0, character: 13 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: decoratedSymbol, symbolColor: default, character: f },
+      modifiers:
+        [
+          {
+            type: containingScope,
+            scopeType: { type: boundedNonWhitespaceSequence },
+          },
+        ],
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/selectionTypes/takeTokenVest.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/selectionTypes/takeTokenVest.yml
new file mode 100644
index 0000000000..ee195f011c
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/selectionTypes/takeTokenVest.yml
@@ -0,0 +1,38 @@
+languageId: typescript
+command:
+  version: 1
+  spokenForm: take token vest
+  action: setSelection
+  targets:
+    - type: primitive
+      selectionType: token
+      mark: { type: decoratedSymbol, symbolColor: default, character: v }
+initialState:
+  documentContents: |
+
+    const value   = "Hello.world  ";
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+  marks:
+    default.v:
+      start: { line: 1, character: 6 }
+      end: { line: 1, character: 11 }
+finalState:
+  documentContents: |
+
+    const value   = "Hello.world  ";
+  selections:
+    - anchor: { line: 1, character: 6 }
+      active: { line: 1, character: 11 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: decoratedSymbol, symbolColor: default, character: v },
+      selectionType: token,
+      position: contents,
+      modifier: { type: identity },
+      insideOutsideType: inside,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/spokenGrammar/bringLineBeforeWhale.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/spokenGrammar/bringLineBeforeWhale.yml
new file mode 100644
index 0000000000..8c89484a11
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/spokenGrammar/bringLineBeforeWhale.yml
@@ -0,0 +1,48 @@
+languageId: plaintext
+command:
+  spokenForm: bring line before whale
+  version: 2
+  targets:
+    - type: primitive
+      modifiers:
+        - type: containingScope
+          scopeType: { type: line }
+    - type: primitive
+      mark: { type: decoratedSymbol, symbolColor: default, character: w }
+      modifiers:
+        - { type: position, position: before }
+  usePrePhraseSnapshot: true
+  action: { name: replaceWithTarget }
+initialState:
+  documentContents: |-
+    hello world
+    whatever now
+  selections:
+    - anchor: { line: 1, character: 12 }
+      active: { line: 1, character: 12 }
+  marks:
+    default.w:
+      start: { line: 0, character: 6 }
+      end: { line: 0, character: 11 }
+finalState:
+  documentContents: |-
+    whatever now
+    hello world
+    whatever now
+  selections:
+    - anchor: { line: 2, character: 12 }
+      active: { line: 2, character: 12 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      modifiers: [&ref_0 { type: containingScope, scopeType: { type: line } }],
+    },
+    {
+      type: primitive,
+      mark: { type: decoratedSymbol, symbolColor: default, character: w },
+      modifiers: [*ref_0],
+      positionModifier: { type: position, position: before },
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/subtoken/chuckFirstCharVest.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/subtoken/chuckFirstCharVest.yml
new file mode 100644
index 0000000000..2d17794746
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/subtoken/chuckFirstCharVest.yml
@@ -0,0 +1,38 @@
+languageId: typescript
+command:
+  version: 1
+  spokenForm: chuck first char vest
+  action: remove
+  targets:
+    - type: primitive
+      modifier: { type: subpiece, pieceType: character, anchor: 0, active: 0 }
+      mark: { type: decoratedSymbol, symbolColor: default, character: v }
+initialState:
+  documentContents: |
+
+    const value_hello_str = "Hello world";
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+  marks:
+    default.v:
+      start: { line: 1, character: 6 }
+      end: { line: 1, character: 21 }
+finalState:
+  documentContents: |
+
+    const alue_hello_str = "Hello world";
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: decoratedSymbol, symbolColor: default, character: v },
+      selectionType: token,
+      position: contents,
+      modifier: { type: subpiece, pieceType: character, anchor: 0, active: 0 },
+      insideOutsideType: outside,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/subtoken/chuckFirstWordVest.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/subtoken/chuckFirstWordVest.yml
new file mode 100644
index 0000000000..e2442d37cc
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/subtoken/chuckFirstWordVest.yml
@@ -0,0 +1,38 @@
+languageId: typescript
+command:
+  version: 1
+  spokenForm: chuck first word vest
+  action: remove
+  targets:
+    - type: primitive
+      modifier: { type: subpiece, pieceType: word, anchor: 0, active: 0 }
+      mark: { type: decoratedSymbol, symbolColor: default, character: v }
+initialState:
+  documentContents: |
+
+    const value_hello_str = "Hello world";
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+  marks:
+    default.v:
+      start: { line: 1, character: 6 }
+      end: { line: 1, character: 21 }
+finalState:
+  documentContents: |
+
+    const hello_str = "Hello world";
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: decoratedSymbol, symbolColor: default, character: v },
+      selectionType: token,
+      position: contents,
+      modifier: { type: subpiece, pieceType: word, anchor: 0, active: 0 },
+      insideOutsideType: outside,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/subtoken/chuckLastCharVest.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/subtoken/chuckLastCharVest.yml
new file mode 100644
index 0000000000..b733fc2afd
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/subtoken/chuckLastCharVest.yml
@@ -0,0 +1,39 @@
+languageId: typescript
+command:
+  version: 1
+  spokenForm: chuck last char vest
+  action: remove
+  targets:
+    - type: primitive
+      modifier: { type: subpiece, pieceType: character, anchor: -1, active: -1 }
+      mark: { type: decoratedSymbol, symbolColor: default, character: v }
+initialState:
+  documentContents: |
+
+    const value_hello_str = "Hello world";
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+  marks:
+    default.v:
+      start: { line: 1, character: 6 }
+      end: { line: 1, character: 21 }
+finalState:
+  documentContents: |
+
+    const value_hello_st = "Hello world";
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: decoratedSymbol, symbolColor: default, character: v },
+      selectionType: token,
+      position: contents,
+      modifier:
+        { type: subpiece, pieceType: character, anchor: -1, active: -1 },
+      insideOutsideType: outside,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/subtoken/chuckLastWord.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/subtoken/chuckLastWord.yml
new file mode 100644
index 0000000000..fcdc54ddd3
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/subtoken/chuckLastWord.yml
@@ -0,0 +1,40 @@
+languageId: scss
+command:
+  spokenForm: chuck last word
+  version: 3
+  targets:
+    - type: primitive
+      modifiers:
+        - type: ordinalScope
+          scopeType: { type: word }
+          start: -1
+          length: 1
+  usePrePhraseSnapshot: true
+  action: { name: remove }
+initialState:
+  documentContents: "margin-top: 0;"
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+  marks: {}
+finalState:
+  documentContents: "margin: 0;"
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      modifiers:
+        [
+          {
+            type: ordinalScope,
+            scopeType: { type: word },
+            start: -1,
+            length: 1,
+          },
+        ],
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/subtoken/chuckLastWordVest.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/subtoken/chuckLastWordVest.yml
new file mode 100644
index 0000000000..6252de52c9
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/subtoken/chuckLastWordVest.yml
@@ -0,0 +1,38 @@
+languageId: typescript
+command:
+  version: 1
+  spokenForm: chuck last word vest
+  action: remove
+  targets:
+    - type: primitive
+      modifier: { type: subpiece, pieceType: word, anchor: -1, active: -1 }
+      mark: { type: decoratedSymbol, symbolColor: default, character: v }
+initialState:
+  documentContents: |
+
+    const value_hello_str = "Hello world";
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+  marks:
+    default.v:
+      start: { line: 1, character: 6 }
+      end: { line: 1, character: 21 }
+finalState:
+  documentContents: |
+
+    const value_hello = "Hello world";
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: decoratedSymbol, symbolColor: default, character: v },
+      selectionType: token,
+      position: contents,
+      modifier: { type: subpiece, pieceType: word, anchor: -1, active: -1 },
+      insideOutsideType: outside,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/subtoken/chuckSecondWordVest.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/subtoken/chuckSecondWordVest.yml
new file mode 100644
index 0000000000..fedc120895
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/subtoken/chuckSecondWordVest.yml
@@ -0,0 +1,38 @@
+languageId: typescript
+command:
+  version: 1
+  spokenForm: chuck second word vest
+  action: remove
+  targets:
+    - type: primitive
+      modifier: { type: subpiece, pieceType: word, anchor: 1, active: 1 }
+      mark: { type: decoratedSymbol, symbolColor: default, character: v }
+initialState:
+  documentContents: |
+
+    const value_hello_str = "Hello world";
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+  marks:
+    default.v:
+      start: { line: 1, character: 6 }
+      end: { line: 1, character: 21 }
+finalState:
+  documentContents: |
+
+    const value_str = "Hello world";
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: decoratedSymbol, symbolColor: default, character: v },
+      selectionType: token,
+      position: contents,
+      modifier: { type: subpiece, pieceType: word, anchor: 1, active: 1 },
+      insideOutsideType: outside,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/subtoken/chuckSixthCharVest.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/subtoken/chuckSixthCharVest.yml
new file mode 100644
index 0000000000..6e02df9c9a
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/subtoken/chuckSixthCharVest.yml
@@ -0,0 +1,38 @@
+languageId: typescript
+command:
+  version: 1
+  spokenForm: chuck sixth char vest
+  action: remove
+  targets:
+    - type: primitive
+      modifier: { type: subpiece, pieceType: character, anchor: 5, active: 5 }
+      mark: { type: decoratedSymbol, symbolColor: default, character: v }
+initialState:
+  documentContents: |
+
+    const value_hello_str = "Hello world";
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+  marks:
+    default.v:
+      start: { line: 1, character: 6 }
+      end: { line: 1, character: 21 }
+finalState:
+  documentContents: |
+
+    const valuehello_str = "Hello world";
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: decoratedSymbol, symbolColor: default, character: v },
+      selectionType: token,
+      position: contents,
+      modifier: { type: subpiece, pieceType: character, anchor: 5, active: 5 },
+      insideOutsideType: outside,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/subtoken/clearFirstCharVest.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/subtoken/clearFirstCharVest.yml
new file mode 100644
index 0000000000..feb5c6e65a
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/subtoken/clearFirstCharVest.yml
@@ -0,0 +1,38 @@
+languageId: typescript
+command:
+  version: 1
+  spokenForm: clear first char vest
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier: { type: subpiece, pieceType: character, anchor: 0, active: 0 }
+      mark: { type: decoratedSymbol, symbolColor: default, character: v }
+initialState:
+  documentContents: |
+
+    const value_hello_str = "Hello world";
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+  marks:
+    default.v:
+      start: { line: 1, character: 6 }
+      end: { line: 1, character: 21 }
+finalState:
+  documentContents: |
+
+    const alue_hello_str = "Hello world";
+  selections:
+    - anchor: { line: 1, character: 6 }
+      active: { line: 1, character: 6 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: decoratedSymbol, symbolColor: default, character: v },
+      selectionType: token,
+      position: contents,
+      modifier: { type: subpiece, pieceType: character, anchor: 0, active: 0 },
+      insideOutsideType: inside,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/subtoken/clearFirstWordVest.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/subtoken/clearFirstWordVest.yml
new file mode 100644
index 0000000000..d844004fb2
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/subtoken/clearFirstWordVest.yml
@@ -0,0 +1,38 @@
+languageId: typescript
+command:
+  version: 1
+  spokenForm: clear first word vest
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier: { type: subpiece, pieceType: word, anchor: 0, active: 0 }
+      mark: { type: decoratedSymbol, symbolColor: default, character: v }
+initialState:
+  documentContents: |
+
+    const value_hello_str = "Hello world";
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+  marks:
+    default.v:
+      start: { line: 1, character: 6 }
+      end: { line: 1, character: 21 }
+finalState:
+  documentContents: |
+
+    const _hello_str = "Hello world";
+  selections:
+    - anchor: { line: 1, character: 6 }
+      active: { line: 1, character: 6 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: decoratedSymbol, symbolColor: default, character: v },
+      selectionType: token,
+      position: contents,
+      modifier: { type: subpiece, pieceType: word, anchor: 0, active: 0 },
+      insideOutsideType: inside,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/subtoken/clearLastCharVest.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/subtoken/clearLastCharVest.yml
new file mode 100644
index 0000000000..ef966eb518
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/subtoken/clearLastCharVest.yml
@@ -0,0 +1,39 @@
+languageId: typescript
+command:
+  version: 1
+  spokenForm: clear last char vest
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier: { type: subpiece, pieceType: character, anchor: -1, active: -1 }
+      mark: { type: decoratedSymbol, symbolColor: default, character: v }
+initialState:
+  documentContents: |
+
+    const value_hello_str = "Hello world";
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+  marks:
+    default.v:
+      start: { line: 1, character: 6 }
+      end: { line: 1, character: 21 }
+finalState:
+  documentContents: |
+
+    const value_hello_st = "Hello world";
+  selections:
+    - anchor: { line: 1, character: 20 }
+      active: { line: 1, character: 20 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: decoratedSymbol, symbolColor: default, character: v },
+      selectionType: token,
+      position: contents,
+      modifier:
+        { type: subpiece, pieceType: character, anchor: -1, active: -1 },
+      insideOutsideType: inside,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/subtoken/clearLastWordVest.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/subtoken/clearLastWordVest.yml
new file mode 100644
index 0000000000..7d4650d53b
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/subtoken/clearLastWordVest.yml
@@ -0,0 +1,38 @@
+languageId: typescript
+command:
+  version: 1
+  spokenForm: clear last word vest
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier: { type: subpiece, pieceType: word, anchor: -1, active: -1 }
+      mark: { type: decoratedSymbol, symbolColor: default, character: v }
+initialState:
+  documentContents: |
+
+    const value_hello_str = "Hello world";
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+  marks:
+    default.v:
+      start: { line: 1, character: 6 }
+      end: { line: 1, character: 21 }
+finalState:
+  documentContents: |
+
+    const value_hello_ = "Hello world";
+  selections:
+    - anchor: { line: 1, character: 18 }
+      active: { line: 1, character: 18 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: decoratedSymbol, symbolColor: default, character: v },
+      selectionType: token,
+      position: contents,
+      modifier: { type: subpiece, pieceType: word, anchor: -1, active: -1 },
+      insideOutsideType: inside,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/subtoken/clearNextWord.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/subtoken/clearNextWord.yml
new file mode 100644
index 0000000000..c3eee854cb
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/subtoken/clearNextWord.yml
@@ -0,0 +1,42 @@
+languageId: plaintext
+command:
+  spokenForm: clear next word
+  version: 3
+  targets:
+    - type: primitive
+      modifiers:
+        - type: relativeScope
+          scopeType: { type: word }
+          offset: 1
+          length: 1
+          direction: forward
+  usePrePhraseSnapshot: true
+  action: { name: clearAndSetSelection }
+initialState:
+  documentContents: aaa  bbbCcc
+  selections:
+    - anchor: { line: 0, character: 4 }
+      active: { line: 0, character: 4 }
+  marks: {}
+finalState:
+  documentContents: aaa  Ccc
+  selections:
+    - anchor: { line: 0, character: 5 }
+      active: { line: 0, character: 5 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      modifiers:
+        [
+          {
+            type: relativeScope,
+            scopeType: { type: word },
+            offset: 1,
+            length: 1,
+            direction: forward,
+          },
+        ],
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/subtoken/clearSecondWordVest.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/subtoken/clearSecondWordVest.yml
new file mode 100644
index 0000000000..3f946b4fd5
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/subtoken/clearSecondWordVest.yml
@@ -0,0 +1,38 @@
+languageId: typescript
+command:
+  version: 1
+  spokenForm: clear second word vest
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier: { type: subpiece, pieceType: word, anchor: 1, active: 1 }
+      mark: { type: decoratedSymbol, symbolColor: default, character: v }
+initialState:
+  documentContents: |
+
+    const value_hello_str = "Hello world";
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+  marks:
+    default.v:
+      start: { line: 1, character: 6 }
+      end: { line: 1, character: 21 }
+finalState:
+  documentContents: |
+
+    const value__str = "Hello world";
+  selections:
+    - anchor: { line: 1, character: 12 }
+      active: { line: 1, character: 12 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: decoratedSymbol, symbolColor: default, character: v },
+      selectionType: token,
+      position: contents,
+      modifier: { type: subpiece, pieceType: word, anchor: 1, active: 1 },
+      insideOutsideType: inside,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/subtoken/clearSixthCharVest.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/subtoken/clearSixthCharVest.yml
new file mode 100644
index 0000000000..8a50b1decc
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/subtoken/clearSixthCharVest.yml
@@ -0,0 +1,38 @@
+languageId: typescript
+command:
+  version: 1
+  spokenForm: clear sixth char vest
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier: { type: subpiece, pieceType: character, anchor: 5, active: 5 }
+      mark: { type: decoratedSymbol, symbolColor: default, character: v }
+initialState:
+  documentContents: |
+
+    const value_hello_str = "Hello world";
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+  marks:
+    default.v:
+      start: { line: 1, character: 6 }
+      end: { line: 1, character: 21 }
+finalState:
+  documentContents: |
+
+    const valuehello_str = "Hello world";
+  selections:
+    - anchor: { line: 1, character: 11 }
+      active: { line: 1, character: 11 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: decoratedSymbol, symbolColor: default, character: v },
+      selectionType: token,
+      position: contents,
+      modifier: { type: subpiece, pieceType: character, anchor: 5, active: 5 },
+      insideOutsideType: inside,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/subtoken/clearSixthNextWord.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/subtoken/clearSixthNextWord.yml
new file mode 100644
index 0000000000..337acb5623
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/subtoken/clearSixthNextWord.yml
@@ -0,0 +1,46 @@
+languageId: plaintext
+command:
+  spokenForm: clear sixth next word
+  version: 3
+  targets:
+    - type: primitive
+      modifiers:
+        - type: relativeScope
+          scopeType: { type: word }
+          offset: 6
+          length: 1
+          direction: forward
+  usePrePhraseSnapshot: true
+  action: { name: clearAndSetSelection }
+initialState:
+  documentContents: |-
+    aaaBbb cccDdd
+    eeeFff gggHhh
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+  marks: {}
+finalState:
+  documentContents: |-
+    aaaBbb cccDdd
+    eeeFff Hhh
+  selections:
+    - anchor: { line: 1, character: 7 }
+      active: { line: 1, character: 7 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      modifiers:
+        [
+          {
+            type: relativeScope,
+            scopeType: { type: word },
+            offset: 6,
+            length: 1,
+            direction: forward,
+          },
+        ],
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/subtoken/ditchFourthWordLine.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/subtoken/ditchFourthWordLine.yml
new file mode 100644
index 0000000000..bc95aabe1f
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/subtoken/ditchFourthWordLine.yml
@@ -0,0 +1,43 @@
+languageId: plaintext
+command:
+  spokenForm: ditch fourth word line
+  version: 3
+  targets:
+    - type: primitive
+      modifiers:
+        - type: ordinalScope
+          scopeType: { type: word }
+          start: 3
+          length: 1
+        - type: containingScope
+          scopeType: { type: line }
+  usePrePhraseSnapshot: true
+  action: { name: remove }
+initialState:
+  documentContents: apiV1 api_v_1
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+  marks: {}
+finalState:
+  documentContents: apiV1 v_1
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      modifiers:
+        [
+          {
+            type: ordinalScope,
+            scopeType: { type: word },
+            start: 3,
+            length: 1,
+          },
+          { type: containingScope, scopeType: { type: line } },
+        ],
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/subtoken/ditchLastCar.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/subtoken/ditchLastCar.yml
new file mode 100644
index 0000000000..d4c8cb84d2
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/subtoken/ditchLastCar.yml
@@ -0,0 +1,44 @@
+languageId: plaintext
+command:
+  spokenForm: ditch last car
+  version: 2
+  targets:
+    - type: primitive
+      modifiers:
+        - type: ordinalRange
+          scopeType: { type: character }
+          anchor: -1
+          active: -1
+          excludeAnchor: false
+          excludeActive: false
+  usePrePhraseSnapshot: true
+  action: { name: remove }
+initialState:
+  documentContents: añ
+  selections:
+    - anchor: { line: 0, character: 3 }
+      active: { line: 0, character: 3 }
+  marks: {}
+finalState:
+  documentContents: a
+  selections:
+    - anchor: { line: 0, character: 1 }
+      active: { line: 0, character: 1 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      modifiers:
+        [
+          {
+            type: ordinalRange,
+            scopeType: { type: character },
+            anchor: -1,
+            active: -1,
+            excludeAnchor: false,
+            excludeActive: false,
+          },
+        ],
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/subtoken/ditchLastCar2.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/subtoken/ditchLastCar2.yml
new file mode 100644
index 0000000000..94a41c15a9
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/subtoken/ditchLastCar2.yml
@@ -0,0 +1,44 @@
+languageId: plaintext
+command:
+  spokenForm: ditch last car
+  version: 2
+  targets:
+    - type: primitive
+      modifiers:
+        - type: ordinalRange
+          scopeType: { type: character }
+          anchor: -1
+          active: -1
+          excludeAnchor: false
+          excludeActive: false
+  usePrePhraseSnapshot: true
+  action: { name: remove }
+initialState:
+  documentContents: aña
+  selections:
+    - anchor: { line: 0, character: 4 }
+      active: { line: 0, character: 4 }
+  marks: {}
+finalState:
+  documentContents: añ
+  selections:
+    - anchor: { line: 0, character: 3 }
+      active: { line: 0, character: 3 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      modifiers:
+        [
+          {
+            type: ordinalRange,
+            scopeType: { type: character },
+            anchor: -1,
+            active: -1,
+            excludeAnchor: false,
+            excludeActive: false,
+          },
+        ],
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/subtoken/ditchLastWordLine.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/subtoken/ditchLastWordLine.yml
new file mode 100644
index 0000000000..a324d437c3
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/subtoken/ditchLastWordLine.yml
@@ -0,0 +1,43 @@
+languageId: plaintext
+command:
+  spokenForm: ditch last word line
+  version: 3
+  targets:
+    - type: primitive
+      modifiers:
+        - type: ordinalScope
+          scopeType: { type: word }
+          start: -1
+          length: 1
+        - type: containingScope
+          scopeType: { type: line }
+  usePrePhraseSnapshot: true
+  action: { name: remove }
+initialState:
+  documentContents: apiV1 api_v_1
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+  marks: {}
+finalState:
+  documentContents: apiV1 api_v
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      modifiers:
+        [
+          {
+            type: ordinalScope,
+            scopeType: { type: word },
+            start: -1,
+            length: 1,
+          },
+          { type: containingScope, scopeType: { type: line } },
+        ],
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/subtoken/ditchSecondCar.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/subtoken/ditchSecondCar.yml
new file mode 100644
index 0000000000..9437f98080
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/subtoken/ditchSecondCar.yml
@@ -0,0 +1,44 @@
+languageId: plaintext
+command:
+  spokenForm: ditch second car
+  version: 2
+  targets:
+    - type: primitive
+      modifiers:
+        - type: ordinalRange
+          scopeType: { type: character }
+          anchor: 1
+          active: 1
+          excludeAnchor: false
+          excludeActive: false
+  usePrePhraseSnapshot: true
+  action: { name: remove }
+initialState:
+  documentContents: añ
+  selections:
+    - anchor: { line: 0, character: 3 }
+      active: { line: 0, character: 3 }
+  marks: {}
+finalState:
+  documentContents: a
+  selections:
+    - anchor: { line: 0, character: 1 }
+      active: { line: 0, character: 1 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      modifiers:
+        [
+          {
+            type: ordinalRange,
+            scopeType: { type: character },
+            anchor: 1,
+            active: 1,
+            excludeAnchor: false,
+            excludeActive: false,
+          },
+        ],
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/subtoken/ditchThirdWordLine.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/subtoken/ditchThirdWordLine.yml
new file mode 100644
index 0000000000..bbfca83d2c
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/subtoken/ditchThirdWordLine.yml
@@ -0,0 +1,43 @@
+languageId: plaintext
+command:
+  spokenForm: ditch third word line
+  version: 3
+  targets:
+    - type: primitive
+      modifiers:
+        - type: ordinalScope
+          scopeType: { type: word }
+          start: 2
+          length: 1
+        - type: containingScope
+          scopeType: { type: line }
+  usePrePhraseSnapshot: true
+  action: { name: remove }
+initialState:
+  documentContents: apiV1 api_v_1
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+  marks: {}
+finalState:
+  documentContents: apiV api_v_1
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      modifiers:
+        [
+          {
+            type: ordinalScope,
+            scopeType: { type: word },
+            start: 2,
+            length: 1,
+          },
+          { type: containingScope, scopeType: { type: line } },
+        ],
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/subtoken/takeEveryWordLine.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/subtoken/takeEveryWordLine.yml
new file mode 100644
index 0000000000..1cd38ba8a7
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/subtoken/takeEveryWordLine.yml
@@ -0,0 +1,46 @@
+languageId: plaintext
+command:
+  spokenForm: take every word line
+  version: 3
+  targets:
+    - type: primitive
+      modifiers:
+        - type: everyScope
+          scopeType: { type: word }
+        - type: containingScope
+          scopeType: { type: line }
+  usePrePhraseSnapshot: true
+  action: { name: setSelection }
+initialState:
+  documentContents: |-
+    aaaBbb cccDdd
+    eee
+  selections:
+    - anchor: { line: 0, character: 13 }
+      active: { line: 0, character: 13 }
+  marks: {}
+finalState:
+  documentContents: |-
+    aaaBbb cccDdd
+    eee
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 3 }
+    - anchor: { line: 0, character: 3 }
+      active: { line: 0, character: 6 }
+    - anchor: { line: 0, character: 7 }
+      active: { line: 0, character: 10 }
+    - anchor: { line: 0, character: 10 }
+      active: { line: 0, character: 13 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      modifiers:
+        [
+          { type: everyScope, scopeType: { type: word } },
+          { type: containingScope, scopeType: { type: line } },
+        ],
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/subtoken/takeEveryWordLine2.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/subtoken/takeEveryWordLine2.yml
new file mode 100644
index 0000000000..fd6c9df407
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/subtoken/takeEveryWordLine2.yml
@@ -0,0 +1,46 @@
+languageId: plaintext
+command:
+  spokenForm: take every word line
+  version: 3
+  targets:
+    - type: primitive
+      modifiers:
+        - type: everyScope
+          scopeType: { type: word }
+        - type: containingScope
+          scopeType: { type: line }
+  usePrePhraseSnapshot: true
+  action: { name: setSelection }
+initialState:
+  documentContents: apiV1 api_v_1
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+  marks: {}
+finalState:
+  documentContents: apiV1 api_v_1
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 3 }
+    - anchor: { line: 0, character: 3 }
+      active: { line: 0, character: 4 }
+    - anchor: { line: 0, character: 4 }
+      active: { line: 0, character: 5 }
+    - anchor: { line: 0, character: 6 }
+      active: { line: 0, character: 9 }
+    - anchor: { line: 0, character: 10 }
+      active: { line: 0, character: 11 }
+    - anchor: { line: 0, character: 12 }
+      active: { line: 0, character: 13 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      modifiers:
+        [
+          { type: everyScope, scopeType: { type: word } },
+          { type: containingScope, scopeType: { type: line } },
+        ],
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/subtoken/takeFirstChar.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/subtoken/takeFirstChar.yml
new file mode 100644
index 0000000000..61e85d6e2b
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/subtoken/takeFirstChar.yml
@@ -0,0 +1,31 @@
+languageId: typescript
+command:
+  version: 1
+  spokenForm: take first char
+  action: setSelection
+  targets:
+    - type: primitive
+      selectionType: token
+      modifier: { type: subpiece, pieceType: character, anchor: 0, active: 0 }
+initialState:
+  documentContents: //aa
+  selections:
+    - anchor: { line: 0, character: 2 }
+      active: { line: 0, character: 2 }
+  marks: {}
+finalState:
+  documentContents: //aa
+  selections:
+    - anchor: { line: 0, character: 2 }
+      active: { line: 0, character: 3 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursorToken },
+      selectionType: token,
+      position: contents,
+      modifier: { type: subpiece, pieceType: character, anchor: 0, active: 0 },
+      insideOutsideType: inside,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/subtoken/takeFirstChar2.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/subtoken/takeFirstChar2.yml
new file mode 100644
index 0000000000..d3988589cb
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/subtoken/takeFirstChar2.yml
@@ -0,0 +1,31 @@
+languageId: typescript
+command:
+  version: 1
+  spokenForm: take first char
+  action: setSelection
+  targets:
+    - type: primitive
+      selectionType: token
+      modifier: { type: subpiece, pieceType: character, anchor: 0, active: 0 }
+initialState:
+  documentContents: aa//
+  selections:
+    - anchor: { line: 0, character: 2 }
+      active: { line: 0, character: 2 }
+  marks: {}
+finalState:
+  documentContents: aa//
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 1 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursorToken },
+      selectionType: token,
+      position: contents,
+      modifier: { type: subpiece, pieceType: character, anchor: 0, active: 0 },
+      insideOutsideType: inside,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/subtoken/takeFirstChar3.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/subtoken/takeFirstChar3.yml
new file mode 100644
index 0000000000..9dee7ff94d
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/subtoken/takeFirstChar3.yml
@@ -0,0 +1,31 @@
+languageId: typescript
+command:
+  version: 1
+  spokenForm: take first char
+  action: setSelection
+  targets:
+    - type: primitive
+      selectionType: token
+      modifier: { type: subpiece, pieceType: character, anchor: 0, active: 0 }
+initialState:
+  documentContents: ///**
+  selections:
+    - anchor: { line: 0, character: 3 }
+      active: { line: 0, character: 3 }
+  marks: {}
+finalState:
+  documentContents: ///**
+  selections:
+    - anchor: { line: 0, character: 3 }
+      active: { line: 0, character: 4 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursorToken },
+      selectionType: token,
+      position: contents,
+      modifier: { type: subpiece, pieceType: character, anchor: 0, active: 0 },
+      insideOutsideType: inside,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/subtoken/takeFirstChar4.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/subtoken/takeFirstChar4.yml
new file mode 100644
index 0000000000..3c256033fa
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/subtoken/takeFirstChar4.yml
@@ -0,0 +1,31 @@
+languageId: typescript
+command:
+  version: 1
+  spokenForm: take first char
+  action: setSelection
+  targets:
+    - type: primitive
+      selectionType: token
+      modifier: { type: subpiece, pieceType: character, anchor: 0, active: 0 }
+initialState:
+  documentContents: //***
+  selections:
+    - anchor: { line: 0, character: 2 }
+      active: { line: 0, character: 2 }
+  marks: {}
+finalState:
+  documentContents: //***
+  selections:
+    - anchor: { line: 0, character: 2 }
+      active: { line: 0, character: 3 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursorToken },
+      selectionType: token,
+      position: contents,
+      modifier: { type: subpiece, pieceType: character, anchor: 0, active: 0 },
+      insideOutsideType: inside,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/subtoken/takeFirstChar5.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/subtoken/takeFirstChar5.yml
new file mode 100644
index 0000000000..925fa1e610
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/subtoken/takeFirstChar5.yml
@@ -0,0 +1,31 @@
+languageId: typescript
+command:
+  version: 1
+  spokenForm: take first char
+  action: setSelection
+  targets:
+    - type: primitive
+      selectionType: token
+      modifier: { type: subpiece, pieceType: character, anchor: 0, active: 0 }
+initialState:
+  documentContents: //**
+  selections:
+    - anchor: { line: 0, character: 2 }
+      active: { line: 0, character: 2 }
+  marks: {}
+finalState:
+  documentContents: //**
+  selections:
+    - anchor: { line: 0, character: 2 }
+      active: { line: 0, character: 3 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursorToken },
+      selectionType: token,
+      position: contents,
+      modifier: { type: subpiece, pieceType: character, anchor: 0, active: 0 },
+      insideOutsideType: inside,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/subtoken/takeFirstPastLastCharHarp.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/subtoken/takeFirstPastLastCharHarp.yml
new file mode 100644
index 0000000000..9904657c26
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/subtoken/takeFirstPastLastCharHarp.yml
@@ -0,0 +1,41 @@
+languageId: typescript
+command:
+  version: 1
+  spokenForm: take first past last char harp
+  action: setSelection
+  targets:
+    - type: primitive
+      selectionType: token
+      modifier: { type: subpiece, pieceType: character, anchor: 0, active: -1 }
+      mark: { type: decoratedSymbol, symbolColor: default, character: h }
+initialState:
+  documentContents: |+
+
+    const value = "HelloWorldWhatever";
+
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+  marks:
+    default.h:
+      start: { line: 1, character: 15 }
+      end: { line: 1, character: 33 }
+finalState:
+  documentContents: |+
+
+    const value = "HelloWorldWhatever";
+
+  selections:
+    - anchor: { line: 1, character: 15 }
+      active: { line: 1, character: 33 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: decoratedSymbol, symbolColor: default, character: h },
+      selectionType: token,
+      position: contents,
+      modifier: { type: subpiece, pieceType: character, anchor: 0, active: -1 },
+      insideOutsideType: inside,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/subtoken/takeFirstPastLastWordHarp.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/subtoken/takeFirstPastLastWordHarp.yml
new file mode 100644
index 0000000000..9f2c8cba4f
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/subtoken/takeFirstPastLastWordHarp.yml
@@ -0,0 +1,41 @@
+languageId: typescript
+command:
+  version: 1
+  spokenForm: take first past last word harp
+  action: setSelection
+  targets:
+    - type: primitive
+      selectionType: token
+      modifier: { type: subpiece, pieceType: word, anchor: 0, active: -1 }
+      mark: { type: decoratedSymbol, symbolColor: default, character: h }
+initialState:
+  documentContents: |+
+
+    const value = "HelloWorldWhatever";
+
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+  marks:
+    default.h:
+      start: { line: 1, character: 15 }
+      end: { line: 1, character: 33 }
+finalState:
+  documentContents: |+
+
+    const value = "HelloWorldWhatever";
+
+  selections:
+    - anchor: { line: 1, character: 15 }
+      active: { line: 1, character: 33 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: decoratedSymbol, symbolColor: default, character: h },
+      selectionType: token,
+      position: contents,
+      modifier: { type: subpiece, pieceType: word, anchor: 0, active: -1 },
+      insideOutsideType: inside,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/subtoken/takeFirstPastSecondWordHarp.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/subtoken/takeFirstPastSecondWordHarp.yml
new file mode 100644
index 0000000000..eb1ecf6c06
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/subtoken/takeFirstPastSecondWordHarp.yml
@@ -0,0 +1,41 @@
+languageId: typescript
+command:
+  version: 1
+  spokenForm: take first past second word harp
+  action: setSelection
+  targets:
+    - type: primitive
+      selectionType: token
+      modifier: { type: subpiece, pieceType: word, anchor: 0, active: 1 }
+      mark: { type: decoratedSymbol, symbolColor: default, character: h }
+initialState:
+  documentContents: |+
+
+    const value = "HelloWorldWhatever";
+
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+  marks:
+    default.h:
+      start: { line: 1, character: 15 }
+      end: { line: 1, character: 33 }
+finalState:
+  documentContents: |+
+
+    const value = "HelloWorldWhatever";
+
+  selections:
+    - anchor: { line: 1, character: 15 }
+      active: { line: 1, character: 25 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: decoratedSymbol, symbolColor: default, character: h },
+      selectionType: token,
+      position: contents,
+      modifier: { type: subpiece, pieceType: word, anchor: 0, active: 1 },
+      insideOutsideType: inside,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/subtoken/takeFirstThreeCharHarp.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/subtoken/takeFirstThreeCharHarp.yml
new file mode 100644
index 0000000000..061f30593d
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/subtoken/takeFirstThreeCharHarp.yml
@@ -0,0 +1,41 @@
+languageId: typescript
+command:
+  version: 1
+  spokenForm: take first three char harp
+  action: setSelection
+  targets:
+    - type: primitive
+      selectionType: token
+      modifier: { type: subpiece, pieceType: character, anchor: 0, active: 2 }
+      mark: { type: decoratedSymbol, symbolColor: default, character: h }
+initialState:
+  documentContents: |+
+
+    const value = "HelloWorldWhatever";
+
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+  marks:
+    default.h:
+      start: { line: 1, character: 15 }
+      end: { line: 1, character: 33 }
+finalState:
+  documentContents: |+
+
+    const value = "HelloWorldWhatever";
+
+  selections:
+    - anchor: { line: 1, character: 15 }
+      active: { line: 1, character: 18 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: decoratedSymbol, symbolColor: default, character: h },
+      selectionType: token,
+      position: contents,
+      modifier: { type: subpiece, pieceType: character, anchor: 0, active: 2 },
+      insideOutsideType: inside,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/subtoken/takeFirstTwoWordHarp.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/subtoken/takeFirstTwoWordHarp.yml
new file mode 100644
index 0000000000..1316c2484f
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/subtoken/takeFirstTwoWordHarp.yml
@@ -0,0 +1,41 @@
+languageId: typescript
+command:
+  version: 1
+  spokenForm: take first two word harp
+  action: setSelection
+  targets:
+    - type: primitive
+      selectionType: token
+      modifier: { type: subpiece, pieceType: word, anchor: 0, active: 1 }
+      mark: { type: decoratedSymbol, symbolColor: default, character: h }
+initialState:
+  documentContents: |+
+
+    const value = "HelloWorldWhatever";
+
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+  marks:
+    default.h:
+      start: { line: 1, character: 15 }
+      end: { line: 1, character: 33 }
+finalState:
+  documentContents: |+
+
+    const value = "HelloWorldWhatever";
+
+  selections:
+    - anchor: { line: 1, character: 15 }
+      active: { line: 1, character: 25 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: decoratedSymbol, symbolColor: default, character: h },
+      selectionType: token,
+      position: contents,
+      modifier: { type: subpiece, pieceType: word, anchor: 0, active: 1 },
+      insideOutsideType: inside,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/subtoken/takeFirstWord.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/subtoken/takeFirstWord.yml
new file mode 100644
index 0000000000..c113dde9bf
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/subtoken/takeFirstWord.yml
@@ -0,0 +1,31 @@
+languageId: typescript
+command:
+  version: 1
+  spokenForm: take first word
+  action: setSelection
+  targets:
+    - type: primitive
+      selectionType: token
+      modifier: { type: subpiece, pieceType: word, anchor: 0, active: 0 }
+initialState:
+  documentContents: ;helloThere;
+  selections:
+    - anchor: { line: 0, character: 11 }
+      active: { line: 0, character: 11 }
+  marks: {}
+finalState:
+  documentContents: ;helloThere;
+  selections:
+    - anchor: { line: 0, character: 1 }
+      active: { line: 0, character: 6 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursorToken },
+      selectionType: token,
+      position: contents,
+      modifier: { type: subpiece, pieceType: word, anchor: 0, active: 0 },
+      insideOutsideType: inside,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/subtoken/takeLastPastFirstCharHarp.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/subtoken/takeLastPastFirstCharHarp.yml
new file mode 100644
index 0000000000..e703579fde
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/subtoken/takeLastPastFirstCharHarp.yml
@@ -0,0 +1,41 @@
+languageId: typescript
+command:
+  version: 1
+  spokenForm: take last past first char harp
+  action: setSelection
+  targets:
+    - type: primitive
+      selectionType: token
+      modifier: { type: subpiece, pieceType: character, anchor: -1, active: 0 }
+      mark: { type: decoratedSymbol, symbolColor: default, character: h }
+initialState:
+  documentContents: |+
+
+    const value = "HelloWorldWhatever";
+
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+  marks:
+    default.h:
+      start: { line: 1, character: 15 }
+      end: { line: 1, character: 33 }
+finalState:
+  documentContents: |+
+
+    const value = "HelloWorldWhatever";
+
+  selections:
+    - anchor: { line: 1, character: 33 }
+      active: { line: 1, character: 15 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: decoratedSymbol, symbolColor: default, character: h },
+      selectionType: token,
+      position: contents,
+      modifier: { type: subpiece, pieceType: character, anchor: -1, active: 0 },
+      insideOutsideType: inside,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/subtoken/takeLastPastFirstWordHarp.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/subtoken/takeLastPastFirstWordHarp.yml
new file mode 100644
index 0000000000..6f549924b1
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/subtoken/takeLastPastFirstWordHarp.yml
@@ -0,0 +1,41 @@
+languageId: typescript
+command:
+  version: 1
+  spokenForm: take last past first word harp
+  action: setSelection
+  targets:
+    - type: primitive
+      selectionType: token
+      modifier: { type: subpiece, pieceType: word, anchor: -1, active: 0 }
+      mark: { type: decoratedSymbol, symbolColor: default, character: h }
+initialState:
+  documentContents: |+
+
+    const value = "HelloWorldWhatever";
+
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+  marks:
+    default.h:
+      start: { line: 1, character: 15 }
+      end: { line: 1, character: 33 }
+finalState:
+  documentContents: |+
+
+    const value = "HelloWorldWhatever";
+
+  selections:
+    - anchor: { line: 1, character: 33 }
+      active: { line: 1, character: 15 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: decoratedSymbol, symbolColor: default, character: h },
+      selectionType: token,
+      position: contents,
+      modifier: { type: subpiece, pieceType: word, anchor: -1, active: 0 },
+      insideOutsideType: inside,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/subtoken/takeLastThreeCharHarp.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/subtoken/takeLastThreeCharHarp.yml
new file mode 100644
index 0000000000..d4e70472ff
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/subtoken/takeLastThreeCharHarp.yml
@@ -0,0 +1,42 @@
+languageId: typescript
+command:
+  version: 1
+  spokenForm: take last three char harp
+  action: setSelection
+  targets:
+    - type: primitive
+      selectionType: token
+      modifier: { type: subpiece, pieceType: character, anchor: -3, active: -1 }
+      mark: { type: decoratedSymbol, symbolColor: default, character: h }
+initialState:
+  documentContents: |+
+
+    const value = "HelloWorldWhatever";
+
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+  marks:
+    default.h:
+      start: { line: 1, character: 15 }
+      end: { line: 1, character: 33 }
+finalState:
+  documentContents: |+
+
+    const value = "HelloWorldWhatever";
+
+  selections:
+    - anchor: { line: 1, character: 30 }
+      active: { line: 1, character: 33 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: decoratedSymbol, symbolColor: default, character: h },
+      selectionType: token,
+      position: contents,
+      modifier:
+        { type: subpiece, pieceType: character, anchor: -3, active: -1 },
+      insideOutsideType: inside,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/subtoken/takeLastTwoWordHarp.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/subtoken/takeLastTwoWordHarp.yml
new file mode 100644
index 0000000000..c6dd89150a
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/subtoken/takeLastTwoWordHarp.yml
@@ -0,0 +1,41 @@
+languageId: typescript
+command:
+  version: 1
+  spokenForm: take last two word harp
+  action: setSelection
+  targets:
+    - type: primitive
+      selectionType: token
+      modifier: { type: subpiece, pieceType: word, anchor: -2, active: -1 }
+      mark: { type: decoratedSymbol, symbolColor: default, character: h }
+initialState:
+  documentContents: |+
+
+    const value = "HelloWorldWhatever";
+
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+  marks:
+    default.h:
+      start: { line: 1, character: 15 }
+      end: { line: 1, character: 33 }
+finalState:
+  documentContents: |+
+
+    const value = "HelloWorldWhatever";
+
+  selections:
+    - anchor: { line: 1, character: 20 }
+      active: { line: 1, character: 33 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: decoratedSymbol, symbolColor: default, character: h },
+      selectionType: token,
+      position: contents,
+      modifier: { type: subpiece, pieceType: word, anchor: -2, active: -1 },
+      insideOutsideType: inside,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/subtoken/takeSecondCharLookPastSecondCharTrap.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/subtoken/takeSecondCharLookPastSecondCharTrap.yml
new file mode 100644
index 0000000000..f143f35cf5
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/subtoken/takeSecondCharLookPastSecondCharTrap.yml
@@ -0,0 +1,64 @@
+languageId: typescript
+command:
+  version: 1
+  spokenForm: take second char look past second char trap
+  action: setSelection
+  targets:
+    - type: range
+      start:
+        type: primitive
+        selectionType: token
+        modifier: { type: subpiece, pieceType: character, anchor: 1, active: 1 }
+        mark: { type: decoratedSymbol, symbolColor: default, character: l }
+      end:
+        type: primitive
+        selectionType: token
+        modifier: { type: subpiece, pieceType: character, anchor: 1, active: 1 }
+        mark: { type: decoratedSymbol, symbolColor: default, character: t }
+      excludeStart: false
+      excludeEnd: false
+initialState:
+  documentContents: "    hello there"
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+  marks:
+    default.l:
+      start: { line: 0, character: 4 }
+      end: { line: 0, character: 9 }
+    default.t:
+      start: { line: 0, character: 10 }
+      end: { line: 0, character: 15 }
+finalState:
+  documentContents: "    hello there"
+  selections:
+    - anchor: { line: 0, character: 5 }
+      active: { line: 0, character: 12 }
+fullTargets:
+  [
+    {
+      type: range,
+      excludeStart: false,
+      excludeEnd: false,
+      start:
+        {
+          type: primitive,
+          mark: { type: decoratedSymbol, symbolColor: default, character: l },
+          selectionType: token,
+          position: contents,
+          modifier:
+            { type: subpiece, pieceType: character, anchor: 1, active: 1 },
+          insideOutsideType: inside,
+        },
+      end:
+        {
+          type: primitive,
+          mark: { type: decoratedSymbol, symbolColor: default, character: t },
+          selectionType: token,
+          position: contents,
+          modifier:
+            { type: subpiece, pieceType: character, anchor: 1, active: 1 },
+          insideOutsideType: inside,
+        },
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/subtoken/takeSecondWord.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/subtoken/takeSecondWord.yml
new file mode 100644
index 0000000000..3814d1d9a1
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/subtoken/takeSecondWord.yml
@@ -0,0 +1,31 @@
+languageId: typescript
+command:
+  version: 1
+  spokenForm: take second word
+  action: setSelection
+  targets:
+    - type: primitive
+      selectionType: token
+      modifier: { type: subpiece, pieceType: word, anchor: 1, active: 1 }
+initialState:
+  documentContents: ;helloThere;
+  selections:
+    - anchor: { line: 0, character: 1 }
+      active: { line: 0, character: 1 }
+  marks: {}
+finalState:
+  documentContents: ;helloThere;
+  selections:
+    - anchor: { line: 0, character: 6 }
+      active: { line: 0, character: 11 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursorToken },
+      selectionType: token,
+      position: contents,
+      modifier: { type: subpiece, pieceType: word, anchor: 1, active: 1 },
+      insideOutsideType: inside,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/subtoken/takeThirdPastSecondWordHarp.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/subtoken/takeThirdPastSecondWordHarp.yml
new file mode 100644
index 0000000000..7700deec54
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/subtoken/takeThirdPastSecondWordHarp.yml
@@ -0,0 +1,41 @@
+languageId: typescript
+command:
+  version: 1
+  spokenForm: take third past second word harp
+  action: setSelection
+  targets:
+    - type: primitive
+      selectionType: token
+      modifier: { type: subpiece, pieceType: word, anchor: 2, active: 1 }
+      mark: { type: decoratedSymbol, symbolColor: default, character: h }
+initialState:
+  documentContents: |+
+
+    const value = "HelloWorldWhatever";
+
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+  marks:
+    default.h:
+      start: { line: 1, character: 15 }
+      end: { line: 1, character: 33 }
+finalState:
+  documentContents: |+
+
+    const value = "HelloWorldWhatever";
+
+  selections:
+    - anchor: { line: 1, character: 33 }
+      active: { line: 1, character: 20 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: decoratedSymbol, symbolColor: default, character: h },
+      selectionType: token,
+      position: contents,
+      modifier: { type: subpiece, pieceType: word, anchor: 2, active: 1 },
+      insideOutsideType: inside,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/chuckCore.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/chuckCore.yml
new file mode 100644
index 0000000000..86713b3a79
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/chuckCore.yml
@@ -0,0 +1,33 @@
+languageId: typescript
+command:
+  spokenForm: chuck core
+  version: 2
+  targets:
+    - type: primitive
+      modifiers:
+        - { type: interiorOnly }
+  usePrePhraseSnapshot: true
+  action: { name: remove }
+initialState:
+  documentContents: |-
+    [
+        "foo",
+        "bar"
+    ]
+  selections:
+    - anchor: { line: 1, character: 10 }
+      active: { line: 1, character: 10 }
+  marks: {}
+finalState:
+  documentContents: "[]"
+  selections:
+    - anchor: { line: 0, character: 1 }
+      active: { line: 0, character: 1 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      modifiers: [{ type: interiorOnly }],
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/chuckCore2.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/chuckCore2.yml
new file mode 100644
index 0000000000..37560926e2
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/chuckCore2.yml
@@ -0,0 +1,29 @@
+languageId: plaintext
+command:
+  spokenForm: chuck core
+  version: 2
+  targets:
+    - type: primitive
+      modifiers:
+        - { type: interiorOnly }
+  usePrePhraseSnapshot: true
+  action: { name: remove }
+initialState:
+  documentContents: ( hello )
+  selections:
+    - anchor: { line: 0, character: 6 }
+      active: { line: 0, character: 6 }
+  marks: {}
+finalState:
+  documentContents: ()
+  selections:
+    - anchor: { line: 0, character: 1 }
+      active: { line: 0, character: 1 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      modifiers: [{ type: interiorOnly }],
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/clearCoreRiskPastHarp.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/clearCoreRiskPastHarp.yml
new file mode 100644
index 0000000000..196bc02d9a
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/clearCoreRiskPastHarp.yml
@@ -0,0 +1,58 @@
+languageId: plaintext
+command:
+  spokenForm: clear core risk past harp
+  version: 2
+  targets:
+    - type: range
+      anchor:
+        type: primitive
+        modifiers:
+          - { type: interiorOnly }
+        mark: { type: decoratedSymbol, symbolColor: default, character: r }
+      active:
+        type: primitive
+        mark: { type: decoratedSymbol, symbolColor: default, character: h }
+      excludeAnchor: false
+      excludeActive: false
+  usePrePhraseSnapshot: true
+  action: { name: clearAndSetSelection }
+initialState:
+  documentContents: |-
+    ( hello world )
+    [ hello world ]
+  selections:
+    - anchor: { line: 1, character: 15 }
+      active: { line: 1, character: 15 }
+  marks:
+    default.r:
+      start: { line: 0, character: 8 }
+      end: { line: 0, character: 13 }
+    default.h:
+      start: { line: 1, character: 2 }
+      end: { line: 1, character: 7 }
+finalState:
+  documentContents: (  ]
+  selections:
+    - anchor: { line: 0, character: 2 }
+      active: { line: 0, character: 2 }
+fullTargets:
+  [
+    {
+      type: range,
+      excludeAnchor: false,
+      excludeActive: false,
+      rangeType: continuous,
+      anchor:
+        {
+          type: primitive,
+          mark: { type: decoratedSymbol, symbolColor: default, character: r },
+          modifiers: [{ type: interiorOnly }],
+        },
+      active:
+        {
+          type: primitive,
+          mark: { type: decoratedSymbol, symbolColor: default, character: h },
+          modifiers: [{ type: interiorOnly }],
+        },
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/ditchCoreEachPastWhale.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/ditchCoreEachPastWhale.yml
new file mode 100644
index 0000000000..ff7ea68826
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/ditchCoreEachPastWhale.yml
@@ -0,0 +1,59 @@
+languageId: plaintext
+command:
+  spokenForm: ditch core each past whale
+  version: 2
+  targets:
+    - type: range
+      anchor:
+        type: primitive
+        modifiers:
+          - { type: interiorOnly }
+        mark: { type: decoratedSymbol, symbolColor: default, character: e }
+      active:
+        type: primitive
+        mark: { type: decoratedSymbol, symbolColor: default, character: w }
+      excludeAnchor: false
+      excludeActive: false
+  usePrePhraseSnapshot: true
+  action: { name: remove }
+initialState:
+  documentContents: |
+    ( hello world )
+    ( hello world )
+  selections:
+    - anchor: { line: 2, character: 0 }
+      active: { line: 2, character: 0 }
+  marks:
+    default.e:
+      start: { line: 0, character: 2 }
+      end: { line: 0, character: 7 }
+    default.w:
+      start: { line: 1, character: 8 }
+      end: { line: 1, character: 13 }
+finalState:
+  documentContents: |
+    ()
+  selections:
+    - anchor: { line: 1, character: 0 }
+      active: { line: 1, character: 0 }
+fullTargets:
+  [
+    {
+      type: range,
+      excludeAnchor: false,
+      excludeActive: false,
+      rangeType: continuous,
+      anchor:
+        {
+          type: primitive,
+          mark: { type: decoratedSymbol, symbolColor: default, character: e },
+          modifiers: [{ type: interiorOnly }],
+        },
+      active:
+        {
+          type: primitive,
+          mark: { type: decoratedSymbol, symbolColor: default, character: w },
+          modifiers: [{ type: interiorOnly }],
+        },
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/html/clearBoundsBatt.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/html/clearBoundsBatt.yml
new file mode 100644
index 0000000000..27572e9a81
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/html/clearBoundsBatt.yml
@@ -0,0 +1,56 @@
+languageId: html
+command:
+  version: 1
+  spokenForm: clear bounds batt
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier:
+        {
+          type: surroundingPair,
+          delimiter: any,
+          delimiterInclusion: excludeInterior,
+        }
+      mark: { type: decoratedSymbol, symbolColor: default, character: b }
+initialState:
+  documentContents: |-
+    <html>
+        <body>
+            <hr/>
+        </body>
+    </html>
+  selections:
+    - anchor: { line: 4, character: 7 }
+      active: { line: 4, character: 7 }
+  marks:
+    default.b:
+      start: { line: 3, character: 6 }
+      end: { line: 3, character: 10 }
+finalState:
+  documentContents: |-
+    <html>
+        <body>
+            <hr/>
+        body
+    </html>
+  selections:
+    - anchor: { line: 3, character: 4 }
+      active: { line: 3, character: 4 }
+    - anchor: { line: 3, character: 8 }
+      active: { line: 3, character: 8 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: decoratedSymbol, symbolColor: default, character: b },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        {
+          type: surroundingPair,
+          delimiter: any,
+          delimiterInclusion: excludeInterior,
+        },
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/html/clearBoundsEach.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/html/clearBoundsEach.yml
new file mode 100644
index 0000000000..84cf772113
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/html/clearBoundsEach.yml
@@ -0,0 +1,51 @@
+languageId: html
+command:
+  version: 1
+  spokenForm: clear bounds each
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier:
+        {
+          type: surroundingPair,
+          delimiter: any,
+          delimiterInclusion: excludeInterior,
+        }
+      mark: { type: decoratedSymbol, symbolColor: default, character: e }
+initialState:
+  documentContents: |-
+    <html id="(hello)">
+    </html>
+  selections:
+    - anchor: { line: 1, character: 0 }
+      active: { line: 1, character: 0 }
+  marks:
+    default.e:
+      start: { line: 0, character: 11 }
+      end: { line: 0, character: 16 }
+finalState:
+  documentContents: |-
+    <html id="hello">
+    </html>
+  selections:
+    - anchor: { line: 0, character: 10 }
+      active: { line: 0, character: 10 }
+    - anchor: { line: 0, character: 15 }
+      active: { line: 0, character: 15 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: decoratedSymbol, symbolColor: default, character: e },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        {
+          type: surroundingPair,
+          delimiter: any,
+          delimiterInclusion: excludeInterior,
+        },
+      isImplicit: false,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/html/clearBoundsHarp.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/html/clearBoundsHarp.yml
new file mode 100644
index 0000000000..db8fea8497
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/html/clearBoundsHarp.yml
@@ -0,0 +1,52 @@
+languageId: html
+command:
+  version: 1
+  spokenForm: clear bounds harp
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier:
+        {
+          type: surroundingPair,
+          delimiter: any,
+          delimiterInclusion: excludeInterior,
+        }
+      mark: { type: decoratedSymbol, symbolColor: default, character: h }
+initialState:
+  documentContents: |-
+    <html id="(hello)">
+        <!-- (hello) -->
+    </html>
+  selections:
+    - anchor: { line: 2, character: 7 }
+      active: { line: 2, character: 7 }
+  marks:
+    default.h:
+      start: { line: 1, character: 10 }
+      end: { line: 1, character: 15 }
+finalState:
+  documentContents: |-
+    <html id="(hello)">
+        <!-- hello -->
+    </html>
+  selections:
+    - anchor: { line: 1, character: 9 }
+      active: { line: 1, character: 9 }
+    - anchor: { line: 1, character: 14 }
+      active: { line: 1, character: 14 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: decoratedSymbol, symbolColor: default, character: h },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        {
+          type: surroundingPair,
+          delimiter: any,
+          delimiterInclusion: excludeInterior,
+        },
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/html/clearBoundsOx.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/html/clearBoundsOx.yml
new file mode 100644
index 0000000000..b9c1ed88ca
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/html/clearBoundsOx.yml
@@ -0,0 +1,56 @@
+languageId: html
+command:
+  version: 1
+  spokenForm: clear bounds ox
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier:
+        {
+          type: surroundingPair,
+          delimiter: any,
+          delimiterInclusion: excludeInterior,
+        }
+      mark: { type: decoratedSymbol, symbolColor: default, character: o }
+initialState:
+  documentContents: |-
+    <html>
+        <body>
+            <hr/>
+        </body>
+    </html>
+  selections:
+    - anchor: { line: 4, character: 7 }
+      active: { line: 4, character: 7 }
+  marks:
+    default.o:
+      start: { line: 1, character: 5 }
+      end: { line: 1, character: 9 }
+finalState:
+  documentContents: |-
+    <html>
+        body
+            <hr/>
+        </body>
+    </html>
+  selections:
+    - anchor: { line: 1, character: 4 }
+      active: { line: 1, character: 4 }
+    - anchor: { line: 1, character: 8 }
+      active: { line: 1, character: 8 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: decoratedSymbol, symbolColor: default, character: o },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        {
+          type: surroundingPair,
+          delimiter: any,
+          delimiterInclusion: excludeInterior,
+        },
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/html/clearBoundsRam.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/html/clearBoundsRam.yml
new file mode 100644
index 0000000000..7425021f40
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/html/clearBoundsRam.yml
@@ -0,0 +1,56 @@
+languageId: html
+command:
+  version: 1
+  spokenForm: clear bounds ram
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier:
+        {
+          type: surroundingPair,
+          delimiter: any,
+          delimiterInclusion: excludeInterior,
+        }
+      mark: { type: decoratedSymbol, symbolColor: default, character: r }
+initialState:
+  documentContents: |-
+    <html>
+        <body>
+            <hr/>
+        </body>
+    </html>
+  selections:
+    - anchor: { line: 4, character: 7 }
+      active: { line: 4, character: 7 }
+  marks:
+    default.r:
+      start: { line: 2, character: 9 }
+      end: { line: 2, character: 11 }
+finalState:
+  documentContents: |-
+    <html>
+        <body>
+            hr
+        </body>
+    </html>
+  selections:
+    - anchor: { line: 2, character: 8 }
+      active: { line: 2, character: 8 }
+    - anchor: { line: 2, character: 10 }
+      active: { line: 2, character: 10 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: decoratedSymbol, symbolColor: default, character: r },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        {
+          type: surroundingPair,
+          delimiter: any,
+          delimiterInclusion: excludeInterior,
+        },
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/html/clearCurly.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/html/clearCurly.yml
new file mode 100644
index 0000000000..2de5ff9a1f
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/html/clearCurly.yml
@@ -0,0 +1,45 @@
+languageId: html
+command:
+  version: 1
+  spokenForm: clear curly
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier: { type: surroundingPair, delimiter: curlyBrackets }
+initialState:
+  documentContents: |
+    <html>
+      <head>
+        <style>
+          body { color: red; }
+        </style>
+      </head>
+    </html>
+  selections:
+    - anchor: { line: 3, character: 16 }
+      active: { line: 3, character: 16 }
+  marks: {}
+finalState:
+  documentContents: |
+    <html>
+      <head>
+        <style>
+          body
+        </style>
+      </head>
+    </html>
+  selections:
+    - anchor: { line: 3, character: 11 }
+      active: { line: 3, character: 11 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier: { type: surroundingPair, delimiter: curlyBrackets },
+      isImplicit: false,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/html/clearPair.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/html/clearPair.yml
new file mode 100644
index 0000000000..9b341871eb
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/html/clearPair.yml
@@ -0,0 +1,30 @@
+languageId: html
+command:
+  version: 1
+  spokenForm: clear pair
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier: { type: surroundingPair, delimiter: any }
+initialState:
+  documentContents: <hello/>
+  selections:
+    - anchor: { line: 0, character: 5 }
+      active: { line: 0, character: 5 }
+  marks: {}
+finalState:
+  documentContents: ""
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier: { type: surroundingPair, delimiter: any },
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/html/clearPair10.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/html/clearPair10.yml
new file mode 100644
index 0000000000..3eb82c2e93
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/html/clearPair10.yml
@@ -0,0 +1,30 @@
+languageId: html
+command:
+  version: 1
+  spokenForm: clear pair
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier: { type: surroundingPair, delimiter: any }
+initialState:
+  documentContents: <hello> <hello/>
+  selections:
+    - anchor: { line: 0, character: 4 }
+      active: { line: 0, character: 4 }
+  marks: {}
+finalState:
+  documentContents: " <hello/>"
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier: { type: surroundingPair, delimiter: any },
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/html/clearPair11.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/html/clearPair11.yml
new file mode 100644
index 0000000000..1aab5a9ff6
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/html/clearPair11.yml
@@ -0,0 +1,30 @@
+languageId: html
+command:
+  version: 1
+  spokenForm: clear pair
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier: { type: surroundingPair, delimiter: any }
+initialState:
+  documentContents: <hello> <hello/>
+  selections:
+    - anchor: { line: 0, character: 1 }
+      active: { line: 0, character: 1 }
+  marks: {}
+finalState:
+  documentContents: " <hello/>"
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier: { type: surroundingPair, delimiter: any },
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/html/clearPair12.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/html/clearPair12.yml
new file mode 100644
index 0000000000..40fe8211c0
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/html/clearPair12.yml
@@ -0,0 +1,30 @@
+languageId: html
+command:
+  version: 1
+  spokenForm: clear pair
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier: { type: surroundingPair, delimiter: any }
+initialState:
+  documentContents: <hello> <hello/>
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+  marks: {}
+finalState:
+  documentContents: " <hello/>"
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier: { type: surroundingPair, delimiter: any },
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/html/clearPair13.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/html/clearPair13.yml
new file mode 100644
index 0000000000..1919d6b0dc
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/html/clearPair13.yml
@@ -0,0 +1,30 @@
+languageId: html
+command:
+  version: 1
+  spokenForm: clear pair
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier: { type: surroundingPair, delimiter: any }
+initialState:
+  documentContents: <hello> <hello/>
+  selections:
+    - anchor: { line: 0, character: 9 }
+      active: { line: 0, character: 9 }
+  marks: {}
+finalState:
+  documentContents: "<hello> "
+  selections:
+    - anchor: { line: 0, character: 8 }
+      active: { line: 0, character: 8 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier: { type: surroundingPair, delimiter: any },
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/html/clearPair14.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/html/clearPair14.yml
new file mode 100644
index 0000000000..7986035319
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/html/clearPair14.yml
@@ -0,0 +1,30 @@
+languageId: html
+command:
+  version: 1
+  spokenForm: clear pair
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier: { type: surroundingPair, delimiter: any }
+initialState:
+  documentContents: <hello> <hello/>
+  selections:
+    - anchor: { line: 0, character: 11 }
+      active: { line: 0, character: 11 }
+  marks: {}
+finalState:
+  documentContents: "<hello> "
+  selections:
+    - anchor: { line: 0, character: 8 }
+      active: { line: 0, character: 8 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier: { type: surroundingPair, delimiter: any },
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/html/clearPair15.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/html/clearPair15.yml
new file mode 100644
index 0000000000..155e3ffbc4
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/html/clearPair15.yml
@@ -0,0 +1,30 @@
+languageId: html
+command:
+  version: 1
+  spokenForm: clear pair
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier: { type: surroundingPair, delimiter: any }
+initialState:
+  documentContents: <hello> <hello/>
+  selections:
+    - anchor: { line: 0, character: 14 }
+      active: { line: 0, character: 14 }
+  marks: {}
+finalState:
+  documentContents: "<hello> "
+  selections:
+    - anchor: { line: 0, character: 8 }
+      active: { line: 0, character: 8 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier: { type: surroundingPair, delimiter: any },
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/html/clearPair16.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/html/clearPair16.yml
new file mode 100644
index 0000000000..7875db46d8
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/html/clearPair16.yml
@@ -0,0 +1,30 @@
+languageId: html
+command:
+  version: 1
+  spokenForm: clear pair
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier: { type: surroundingPair, delimiter: any }
+initialState:
+  documentContents: <hello> <hello/>
+  selections:
+    - anchor: { line: 0, character: 15 }
+      active: { line: 0, character: 15 }
+  marks: {}
+finalState:
+  documentContents: "<hello> "
+  selections:
+    - anchor: { line: 0, character: 8 }
+      active: { line: 0, character: 8 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier: { type: surroundingPair, delimiter: any },
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/html/clearPair17.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/html/clearPair17.yml
new file mode 100644
index 0000000000..9b659d59d9
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/html/clearPair17.yml
@@ -0,0 +1,30 @@
+languageId: html
+command:
+  version: 1
+  spokenForm: clear pair
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier: { type: surroundingPair, delimiter: any }
+initialState:
+  documentContents: <hello> <hello/>
+  selections:
+    - anchor: { line: 0, character: 16 }
+      active: { line: 0, character: 16 }
+  marks: {}
+finalState:
+  documentContents: "<hello> "
+  selections:
+    - anchor: { line: 0, character: 8 }
+      active: { line: 0, character: 8 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier: { type: surroundingPair, delimiter: any },
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/html/clearPair2.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/html/clearPair2.yml
new file mode 100644
index 0000000000..ae7a2e50fe
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/html/clearPair2.yml
@@ -0,0 +1,30 @@
+languageId: html
+command:
+  version: 1
+  spokenForm: clear pair
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier: { type: surroundingPair, delimiter: any }
+initialState:
+  documentContents: <hello/>
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+  marks: {}
+finalState:
+  documentContents: ""
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier: { type: surroundingPair, delimiter: any },
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/html/clearPair3.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/html/clearPair3.yml
new file mode 100644
index 0000000000..248f0caa2d
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/html/clearPair3.yml
@@ -0,0 +1,30 @@
+languageId: html
+command:
+  version: 1
+  spokenForm: clear pair
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier: { type: surroundingPair, delimiter: any }
+initialState:
+  documentContents: <hello/>
+  selections:
+    - anchor: { line: 0, character: 1 }
+      active: { line: 0, character: 1 }
+  marks: {}
+finalState:
+  documentContents: ""
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier: { type: surroundingPair, delimiter: any },
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/html/clearPair4.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/html/clearPair4.yml
new file mode 100644
index 0000000000..808041b66d
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/html/clearPair4.yml
@@ -0,0 +1,30 @@
+languageId: html
+command:
+  version: 1
+  spokenForm: clear pair
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier: { type: surroundingPair, delimiter: any }
+initialState:
+  documentContents: <hello/>
+  selections:
+    - anchor: { line: 0, character: 6 }
+      active: { line: 0, character: 6 }
+  marks: {}
+finalState:
+  documentContents: ""
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier: { type: surroundingPair, delimiter: any },
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/html/clearPair5.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/html/clearPair5.yml
new file mode 100644
index 0000000000..ce5d7e4614
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/html/clearPair5.yml
@@ -0,0 +1,30 @@
+languageId: html
+command:
+  version: 1
+  spokenForm: clear pair
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier: { type: surroundingPair, delimiter: any }
+initialState:
+  documentContents: <hello/>
+  selections:
+    - anchor: { line: 0, character: 7 }
+      active: { line: 0, character: 7 }
+  marks: {}
+finalState:
+  documentContents: ""
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier: { type: surroundingPair, delimiter: any },
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/html/clearPair6.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/html/clearPair6.yml
new file mode 100644
index 0000000000..701d2120c4
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/html/clearPair6.yml
@@ -0,0 +1,30 @@
+languageId: html
+command:
+  version: 1
+  spokenForm: clear pair
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier: { type: surroundingPair, delimiter: any }
+initialState:
+  documentContents: <hello/>
+  selections:
+    - anchor: { line: 0, character: 8 }
+      active: { line: 0, character: 8 }
+  marks: {}
+finalState:
+  documentContents: ""
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier: { type: surroundingPair, delimiter: any },
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/html/clearPair7.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/html/clearPair7.yml
new file mode 100644
index 0000000000..00a863b88a
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/html/clearPair7.yml
@@ -0,0 +1,30 @@
+languageId: html
+command:
+  version: 1
+  spokenForm: clear pair
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier: { type: surroundingPair, delimiter: any }
+initialState:
+  documentContents: <hello><hello/>
+  selections:
+    - anchor: { line: 0, character: 7 }
+      active: { line: 0, character: 7 }
+  marks: {}
+finalState:
+  documentContents: <hello>
+  selections:
+    - anchor: { line: 0, character: 7 }
+      active: { line: 0, character: 7 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier: { type: surroundingPair, delimiter: any },
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/html/clearPair8.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/html/clearPair8.yml
new file mode 100644
index 0000000000..fd4712d073
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/html/clearPair8.yml
@@ -0,0 +1,30 @@
+languageId: html
+command:
+  version: 1
+  spokenForm: clear pair
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier: { type: surroundingPair, delimiter: any }
+initialState:
+  documentContents: <hello> <hello/>
+  selections:
+    - anchor: { line: 0, character: 7 }
+      active: { line: 0, character: 7 }
+  marks: {}
+finalState:
+  documentContents: " <hello/>"
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier: { type: surroundingPair, delimiter: any },
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/html/clearPair9.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/html/clearPair9.yml
new file mode 100644
index 0000000000..b6c7d8aea6
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/html/clearPair9.yml
@@ -0,0 +1,30 @@
+languageId: html
+command:
+  version: 1
+  spokenForm: clear pair
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier: { type: surroundingPair, delimiter: any }
+initialState:
+  documentContents: <hello> <hello/>
+  selections:
+    - anchor: { line: 0, character: 6 }
+      active: { line: 0, character: 6 }
+  marks: {}
+finalState:
+  documentContents: " <hello/>"
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier: { type: surroundingPair, delimiter: any },
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/html/clearPairBatt.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/html/clearPairBatt.yml
new file mode 100644
index 0000000000..3ec31c15d3
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/html/clearPairBatt.yml
@@ -0,0 +1,44 @@
+languageId: html
+command:
+  version: 1
+  spokenForm: clear pair batt
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier: { type: surroundingPair, delimiter: any }
+      mark: { type: decoratedSymbol, symbolColor: default, character: b }
+initialState:
+  documentContents: |-
+    <html>
+        <body>
+            <hr/>
+        </body>
+    </html>
+  selections:
+    - anchor: { line: 4, character: 7 }
+      active: { line: 4, character: 7 }
+  marks:
+    default.b:
+      start: { line: 3, character: 6 }
+      end: { line: 3, character: 10 }
+finalState:
+  documentContents: |-
+    <html>
+        <body>
+            <hr/>
+
+    </html>
+  selections:
+    - anchor: { line: 3, character: 4 }
+      active: { line: 3, character: 4 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: decoratedSymbol, symbolColor: default, character: b },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier: { type: surroundingPair, delimiter: any },
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/html/clearPairOx.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/html/clearPairOx.yml
new file mode 100644
index 0000000000..93e50506fa
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/html/clearPairOx.yml
@@ -0,0 +1,44 @@
+languageId: html
+command:
+  version: 1
+  spokenForm: clear pair ox
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier: { type: surroundingPair, delimiter: any }
+      mark: { type: decoratedSymbol, symbolColor: default, character: o }
+initialState:
+  documentContents: |-
+    <html>
+        <body>
+            <hr/>
+        </body>
+    </html>
+  selections:
+    - anchor: { line: 4, character: 7 }
+      active: { line: 4, character: 7 }
+  marks:
+    default.o:
+      start: { line: 1, character: 5 }
+      end: { line: 1, character: 9 }
+finalState:
+  documentContents: |-
+    <html>
+
+            <hr/>
+        </body>
+    </html>
+  selections:
+    - anchor: { line: 1, character: 4 }
+      active: { line: 1, character: 4 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: decoratedSymbol, symbolColor: default, character: o },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier: { type: surroundingPair, delimiter: any },
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/html/clearPairRam.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/html/clearPairRam.yml
new file mode 100644
index 0000000000..5f8e72cd9d
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/html/clearPairRam.yml
@@ -0,0 +1,44 @@
+languageId: html
+command:
+  version: 1
+  spokenForm: clear pair ram
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier: { type: surroundingPair, delimiter: any }
+      mark: { type: decoratedSymbol, symbolColor: default, character: r }
+initialState:
+  documentContents: |-
+    <html>
+        <body>
+            <hr/>
+        </body>
+    </html>
+  selections:
+    - anchor: { line: 4, character: 7 }
+      active: { line: 4, character: 7 }
+  marks:
+    default.r:
+      start: { line: 2, character: 9 }
+      end: { line: 2, character: 11 }
+finalState:
+  documentContents: |-
+    <html>
+        <body>
+
+        </body>
+    </html>
+  selections:
+    - anchor: { line: 2, character: 8 }
+      active: { line: 2, character: 8 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: decoratedSymbol, symbolColor: default, character: r },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier: { type: surroundingPair, delimiter: any },
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/html/clearRound.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/html/clearRound.yml
new file mode 100644
index 0000000000..c1b5286b7e
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/html/clearRound.yml
@@ -0,0 +1,41 @@
+languageId: html
+command:
+  version: 1
+  spokenForm: clear round
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier: { type: surroundingPair, delimiter: parentheses }
+initialState:
+  documentContents: |-
+    <html>
+        <body>
+            (hello)
+        </body>
+    </html>
+  selections:
+    - anchor: { line: 2, character: 11 }
+      active: { line: 2, character: 11 }
+  marks: {}
+finalState:
+  documentContents: |-
+    <html>
+        <body>
+
+        </body>
+    </html>
+  selections:
+    - anchor: { line: 2, character: 8 }
+      active: { line: 2, character: 8 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier: { type: surroundingPair, delimiter: parentheses },
+      isImplicit: false,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/html/clearRound2.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/html/clearRound2.yml
new file mode 100644
index 0000000000..8ee6d1f1aa
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/html/clearRound2.yml
@@ -0,0 +1,41 @@
+languageId: html
+command:
+  version: 1
+  spokenForm: clear round
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier: { type: surroundingPair, delimiter: parentheses }
+initialState:
+  documentContents: |-
+    <html>
+        <head>
+            <script>(hello)</script>
+        </head>
+    </html>
+  selections:
+    - anchor: { line: 2, character: 19 }
+      active: { line: 2, character: 19 }
+  marks: {}
+finalState:
+  documentContents: |-
+    <html>
+        <head>
+            <script></script>
+        </head>
+    </html>
+  selections:
+    - anchor: { line: 2, character: 16 }
+      active: { line: 2, character: 16 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier: { type: surroundingPair, delimiter: parentheses },
+      isImplicit: false,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/parseTree/clojure/clearBound.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/parseTree/clojure/clearBound.yml
new file mode 100644
index 0000000000..09e5bd25da
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/parseTree/clojure/clearBound.yml
@@ -0,0 +1,42 @@
+languageId: clojure
+command:
+  version: 1
+  spokenForm: clear bound
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier:
+        {
+          type: surroundingPair,
+          delimiter: any,
+          delimiterInclusion: excludeInterior,
+        }
+initialState:
+  documentContents: (hello)
+  selections:
+    - anchor: { line: 0, character: 5 }
+      active: { line: 0, character: 5 }
+  marks: {}
+finalState:
+  documentContents: hello
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+    - anchor: { line: 0, character: 5 }
+      active: { line: 0, character: 5 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        {
+          type: surroundingPair,
+          delimiter: any,
+          delimiterInclusion: excludeInterior,
+        },
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/parseTree/clojure/clearCore.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/parseTree/clojure/clearCore.yml
new file mode 100644
index 0000000000..a6bb78d3f6
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/parseTree/clojure/clearCore.yml
@@ -0,0 +1,40 @@
+languageId: clojure
+command:
+  version: 1
+  spokenForm: clear core
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier:
+        {
+          type: surroundingPair,
+          delimiter: any,
+          delimiterInclusion: interiorOnly,
+        }
+initialState:
+  documentContents: (hello)
+  selections:
+    - anchor: { line: 0, character: 5 }
+      active: { line: 0, character: 5 }
+  marks: {}
+finalState:
+  documentContents: ()
+  selections:
+    - anchor: { line: 0, character: 1 }
+      active: { line: 0, character: 1 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        {
+          type: surroundingPair,
+          delimiter: any,
+          delimiterInclusion: interiorOnly,
+        },
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/parseTree/clojure/clearCore2.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/parseTree/clojure/clearCore2.yml
new file mode 100644
index 0000000000..302fb9df20
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/parseTree/clojure/clearCore2.yml
@@ -0,0 +1,40 @@
+languageId: clojure
+command:
+  version: 1
+  spokenForm: clear core
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier:
+        {
+          type: surroundingPair,
+          delimiter: any,
+          delimiterInclusion: interiorOnly,
+        }
+initialState:
+  documentContents: '"hello"'
+  selections:
+    - anchor: { line: 0, character: 4 }
+      active: { line: 0, character: 4 }
+  marks: {}
+finalState:
+  documentContents: '""'
+  selections:
+    - anchor: { line: 0, character: 1 }
+      active: { line: 0, character: 1 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        {
+          type: surroundingPair,
+          delimiter: any,
+          delimiterInclusion: interiorOnly,
+        },
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/parseTree/clojure/clearPair.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/parseTree/clojure/clearPair.yml
new file mode 100644
index 0000000000..26c8cffaac
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/parseTree/clojure/clearPair.yml
@@ -0,0 +1,30 @@
+languageId: clojure
+command:
+  version: 1
+  spokenForm: clear pair
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier: { type: surroundingPair, delimiter: any }
+initialState:
+  documentContents: ;; (hello)
+  selections:
+    - anchor: { line: 0, character: 7 }
+      active: { line: 0, character: 7 }
+  marks: {}
+finalState:
+  documentContents: ";; "
+  selections:
+    - anchor: { line: 0, character: 3 }
+      active: { line: 0, character: 3 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier: { type: surroundingPair, delimiter: any },
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/parseTree/clojure/clearPair2.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/parseTree/clojure/clearPair2.yml
new file mode 100644
index 0000000000..c379c6d665
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/parseTree/clojure/clearPair2.yml
@@ -0,0 +1,30 @@
+languageId: clojure
+command:
+  version: 1
+  spokenForm: clear pair
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier: { type: surroundingPair, delimiter: any }
+initialState:
+  documentContents: (hello)
+  selections:
+    - anchor: { line: 0, character: 5 }
+      active: { line: 0, character: 5 }
+  marks: {}
+finalState:
+  documentContents: ""
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier: { type: surroundingPair, delimiter: any },
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/parseTree/clojure/clearPair3.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/parseTree/clojure/clearPair3.yml
new file mode 100644
index 0000000000..af406fb2e5
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/parseTree/clojure/clearPair3.yml
@@ -0,0 +1,30 @@
+languageId: clojure
+command:
+  version: 1
+  spokenForm: clear pair
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier: { type: surroundingPair, delimiter: any }
+initialState:
+  documentContents: '"hello"'
+  selections:
+    - anchor: { line: 0, character: 4 }
+      active: { line: 0, character: 4 }
+  marks: {}
+finalState:
+  documentContents: ""
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier: { type: surroundingPair, delimiter: any },
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/parseTree/clojure/clearPair4.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/parseTree/clojure/clearPair4.yml
new file mode 100644
index 0000000000..60d24a13b1
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/parseTree/clojure/clearPair4.yml
@@ -0,0 +1,30 @@
+languageId: clojure
+command:
+  version: 1
+  spokenForm: clear pair
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier: { type: surroundingPair, delimiter: any }
+initialState:
+  documentContents: '"(hello)"'
+  selections:
+    - anchor: { line: 0, character: 6 }
+      active: { line: 0, character: 6 }
+  marks: {}
+finalState:
+  documentContents: '""'
+  selections:
+    - anchor: { line: 0, character: 1 }
+      active: { line: 0, character: 1 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier: { type: surroundingPair, delimiter: any },
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/parseTree/cpp/clearOutside.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/parseTree/cpp/clearOutside.yml
new file mode 100644
index 0000000000..94e5c5e542
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/parseTree/cpp/clearOutside.yml
@@ -0,0 +1,35 @@
+languageId: cpp
+command:
+  version: 1
+  spokenForm: clear outside
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier: { type: surroundingPair, delimiter: any }
+initialState:
+  documentContents: '"hello"'
+  selections:
+    - anchor: { line: 0, character: 4 }
+      active: { line: 0, character: 4 }
+  marks: {}
+finalState:
+  documentContents: ""
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        {
+          type: surroundingPair,
+          delimiter: null,
+          delimiterInclusion: includeDelimiters,
+        },
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/parseTree/cpp/clearRound8.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/parseTree/cpp/clearRound8.yml
new file mode 100644
index 0000000000..9bfcd36786
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/parseTree/cpp/clearRound8.yml
@@ -0,0 +1,35 @@
+languageId: cpp
+command:
+  version: 1
+  spokenForm: clear round
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier: { type: surroundingPair, delimiter: parentheses }
+initialState:
+  documentContents: '"(hello)"'
+  selections:
+    - anchor: { line: 0, character: 5 }
+      active: { line: 0, character: 5 }
+  marks: {}
+finalState:
+  documentContents: '""'
+  selections:
+    - anchor: { line: 0, character: 1 }
+      active: { line: 0, character: 1 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        {
+          type: surroundingPair,
+          delimiter: parentheses,
+          delimiterInclusion: includeDelimiters,
+        },
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/parseTree/java/clearQuad3.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/parseTree/java/clearQuad3.yml
new file mode 100644
index 0000000000..6f7d31b5bf
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/parseTree/java/clearQuad3.yml
@@ -0,0 +1,35 @@
+languageId: java
+command:
+  version: 1
+  spokenForm: clear quad
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier: { type: surroundingPair, delimiter: doubleQuotes }
+initialState:
+  documentContents: '"hello"'
+  selections:
+    - anchor: { line: 0, character: 4 }
+      active: { line: 0, character: 4 }
+  marks: {}
+finalState:
+  documentContents: ""
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        {
+          type: surroundingPair,
+          delimiter: doubleQuotes,
+          delimiterInclusion: includeDelimiters,
+        },
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/parseTree/java/clearRound10.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/parseTree/java/clearRound10.yml
new file mode 100644
index 0000000000..45a62fdc14
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/parseTree/java/clearRound10.yml
@@ -0,0 +1,35 @@
+languageId: java
+command:
+  version: 1
+  spokenForm: clear round
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier: { type: surroundingPair, delimiter: parentheses }
+initialState:
+  documentContents: '"(hello)"'
+  selections:
+    - anchor: { line: 0, character: 5 }
+      active: { line: 0, character: 5 }
+  marks: {}
+finalState:
+  documentContents: '""'
+  selections:
+    - anchor: { line: 0, character: 1 }
+      active: { line: 0, character: 1 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        {
+          type: surroundingPair,
+          delimiter: parentheses,
+          delimiterInclusion: includeDelimiters,
+        },
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/parseTree/java/clearRound11.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/parseTree/java/clearRound11.yml
new file mode 100644
index 0000000000..b079de52c2
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/parseTree/java/clearRound11.yml
@@ -0,0 +1,35 @@
+languageId: java
+command:
+  version: 1
+  spokenForm: clear round
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier: { type: surroundingPair, delimiter: parentheses }
+initialState:
+  documentContents: ("hello")
+  selections:
+    - anchor: { line: 0, character: 5 }
+      active: { line: 0, character: 5 }
+  marks: {}
+finalState:
+  documentContents: ""
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        {
+          type: surroundingPair,
+          delimiter: parentheses,
+          delimiterInclusion: includeDelimiters,
+        },
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/parseTree/json/clearPair.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/parseTree/json/clearPair.yml
new file mode 100644
index 0000000000..d820f07e40
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/parseTree/json/clearPair.yml
@@ -0,0 +1,30 @@
+languageId: json
+command:
+  version: 1
+  spokenForm: clear pair
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier: { type: surroundingPair, delimiter: any }
+initialState:
+  documentContents: '"(hello)"'
+  selections:
+    - anchor: { line: 0, character: 5 }
+      active: { line: 0, character: 5 }
+  marks: {}
+finalState:
+  documentContents: '""'
+  selections:
+    - anchor: { line: 0, character: 1 }
+      active: { line: 0, character: 1 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier: { type: surroundingPair, delimiter: any },
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/parseTree/json/clearPair2.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/parseTree/json/clearPair2.yml
new file mode 100644
index 0000000000..19f559f691
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/parseTree/json/clearPair2.yml
@@ -0,0 +1,30 @@
+languageId: json
+command:
+  version: 1
+  spokenForm: clear pair
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier: { type: surroundingPair, delimiter: any }
+initialState:
+  documentContents: '"(hello)"'
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+  marks: {}
+finalState:
+  documentContents: ""
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier: { type: surroundingPair, delimiter: any },
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/parseTree/json/clearRound.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/parseTree/json/clearRound.yml
new file mode 100644
index 0000000000..9b5ad809fc
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/parseTree/json/clearRound.yml
@@ -0,0 +1,30 @@
+languageId: json
+command:
+  version: 1
+  spokenForm: clear round
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier: { type: surroundingPair, delimiter: parentheses }
+initialState:
+  documentContents: '"(hello)"'
+  selections:
+    - anchor: { line: 0, character: 5 }
+      active: { line: 0, character: 5 }
+  marks: {}
+finalState:
+  documentContents: '""'
+  selections:
+    - anchor: { line: 0, character: 1 }
+      active: { line: 0, character: 1 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier: { type: surroundingPair, delimiter: parentheses },
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/parseTree/json/clearRound2.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/parseTree/json/clearRound2.yml
new file mode 100644
index 0000000000..8b3cad48f8
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/parseTree/json/clearRound2.yml
@@ -0,0 +1,30 @@
+languageId: json
+command:
+  version: 1
+  spokenForm: clear round
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier: { type: surroundingPair, delimiter: parentheses }
+initialState:
+  documentContents: // (hello)
+  selections:
+    - anchor: { line: 0, character: 7 }
+      active: { line: 0, character: 7 }
+  marks: {}
+finalState:
+  documentContents: "// "
+  selections:
+    - anchor: { line: 0, character: 3 }
+      active: { line: 0, character: 3 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier: { type: surroundingPair, delimiter: parentheses },
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/parseTree/python/chuckMatching.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/parseTree/python/chuckMatching.yml
new file mode 100644
index 0000000000..8a72a52c0d
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/parseTree/python/chuckMatching.yml
@@ -0,0 +1,31 @@
+languageId: python
+command:
+  version: 1
+  spokenForm: clear matching
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier: { type: surroundingPair, delimiter: any }
+initialState:
+  documentContents: f"j{fdfhjkd}lkjlkj"
+  selections:
+    - anchor: { line: 0, character: 15 }
+      active: { line: 0, character: 15 }
+  marks: {}
+finalState:
+  documentContents: ""
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      modifier:
+        { type: surroundingPair, delimiter: null, delimitersOnly: false },
+      insideOutsideType: outside,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/parseTree/python/chuckMatching2.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/parseTree/python/chuckMatching2.yml
new file mode 100644
index 0000000000..5ed1a8a16c
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/parseTree/python/chuckMatching2.yml
@@ -0,0 +1,35 @@
+languageId: python
+command:
+  version: 1
+  spokenForm: clear matching
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier: { type: surroundingPair, delimiter: any }
+initialState:
+  documentContents: |
+    def fff(x, y):
+        pass
+  selections:
+    - anchor: { line: 0, character: 10 }
+      active: { line: 0, character: 10 }
+  marks: {}
+finalState:
+  documentContents: |
+    def fff:
+        pass
+  selections:
+    - anchor: { line: 0, character: 7 }
+      active: { line: 0, character: 7 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      modifier:
+        { type: surroundingPair, delimiter: null, delimitersOnly: false },
+      insideOutsideType: outside,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/parseTree/python/chuckMatching3.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/parseTree/python/chuckMatching3.yml
new file mode 100644
index 0000000000..f9eef83e09
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/parseTree/python/chuckMatching3.yml
@@ -0,0 +1,35 @@
+languageId: python
+command:
+  version: 1
+  spokenForm: clear matching
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier: { type: surroundingPair, delimiter: any }
+initialState:
+  documentContents: |-
+    """fds
+
+    dfsd
+    """
+  selections:
+    - anchor: { line: 1, character: 0 }
+      active: { line: 1, character: 0 }
+  marks: {}
+finalState:
+  documentContents: ""
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      modifier:
+        { type: surroundingPair, delimiter: null, delimitersOnly: false },
+      insideOutsideType: outside,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/parseTree/python/chuckPair.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/parseTree/python/chuckPair.yml
new file mode 100644
index 0000000000..f97088c802
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/parseTree/python/chuckPair.yml
@@ -0,0 +1,38 @@
+languageId: python
+command:
+  version: 1
+  spokenForm: clear pair
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier:
+        {
+          type: surroundingPair,
+          delimiter: any,
+          delimiterInclusion: excludeInterior,
+        }
+initialState:
+  documentContents: "{1: [(1), (2), (3)]}"
+  selections:
+    - anchor: { line: 0, character: 3 }
+      active: { line: 0, character: 3 }
+  marks: {}
+finalState:
+  documentContents: "1: [(1), (2), (3)]"
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+    - anchor: { line: 0, character: 18 }
+      active: { line: 0, character: 18 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      modifier:
+        { type: surroundingPair, delimiter: null, delimitersOnly: true },
+      insideOutsideType: outside,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/parseTree/python/chuckRound.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/parseTree/python/chuckRound.yml
new file mode 100644
index 0000000000..94c9481752
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/parseTree/python/chuckRound.yml
@@ -0,0 +1,39 @@
+languageId: python
+command:
+  version: 1
+  spokenForm: clear round
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier: { type: surroundingPair, delimiter: parentheses }
+initialState:
+  documentContents: |
+    class a(object):
+        pass
+  selections:
+    - anchor: { line: 0, character: 12 }
+      active: { line: 0, character: 12 }
+  marks: {}
+finalState:
+  documentContents: |
+    class a:
+        pass
+  selections:
+    - anchor: { line: 0, character: 7 }
+      active: { line: 0, character: 7 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      modifier:
+        {
+          type: surroundingPair,
+          delimiter: parentheses,
+          delimitersOnly: false,
+        },
+      insideOutsideType: outside,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/parseTree/python/clearCurly.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/parseTree/python/clearCurly.yml
new file mode 100644
index 0000000000..110d2be8b8
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/parseTree/python/clearCurly.yml
@@ -0,0 +1,40 @@
+languageId: python
+command:
+  version: 1
+  spokenForm: clear curly
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier:
+        {
+          type: surroundingPair,
+          delimiter: curlyBrackets,
+          delimiterInclusion: interiorOnly,
+        }
+initialState:
+  documentContents: "{1: [(1), (2), (3)]}"
+  selections:
+    - anchor: { line: 0, character: 9 }
+      active: { line: 0, character: 9 }
+  marks: {}
+finalState:
+  documentContents: "{}"
+  selections:
+    - anchor: { line: 0, character: 1 }
+      active: { line: 0, character: 1 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      modifier:
+        {
+          type: surroundingPair,
+          delimiter: curlyBrackets,
+          delimitersOnly: false,
+        },
+      insideOutsideType: inside,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/parseTree/python/clearCurly3.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/parseTree/python/clearCurly3.yml
new file mode 100644
index 0000000000..d2ce0e4682
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/parseTree/python/clearCurly3.yml
@@ -0,0 +1,43 @@
+languageId: python
+command:
+  version: 1
+  spokenForm: clear curly
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier: { type: surroundingPair, delimiter: curlyBrackets }
+initialState:
+  documentContents: |-
+    """
+    {
+        hello
+    }
+    """
+  selections:
+    - anchor: { line: 2, character: 7 }
+      active: { line: 2, character: 7 }
+  marks: {}
+finalState:
+  documentContents: |-
+    """
+
+    """
+  selections:
+    - anchor: { line: 1, character: 0 }
+      active: { line: 1, character: 0 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        {
+          type: surroundingPair,
+          delimiter: curlyBrackets,
+          delimiterInclusion: includeDelimiters,
+        },
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/parseTree/python/clearInside.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/parseTree/python/clearInside.yml
new file mode 100644
index 0000000000..e2bf9c1a87
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/parseTree/python/clearInside.yml
@@ -0,0 +1,42 @@
+languageId: python
+command:
+  version: 1
+  spokenForm: clear inside
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier:
+        {
+          type: surroundingPair,
+          delimiter: any,
+          delimiterInclusion: interiorOnly,
+        }
+initialState:
+  documentContents: |-
+    """fds
+
+    dfsd
+    """
+  selections:
+    - anchor: { line: 1, character: 0 }
+      active: { line: 1, character: 0 }
+  marks: {}
+finalState:
+  documentContents: |-
+    """
+    """
+  selections:
+    - anchor: { line: 0, character: 3 }
+      active: { line: 0, character: 3 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      modifier:
+        { type: surroundingPair, delimiter: null, delimitersOnly: false },
+      insideOutsideType: inside,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/parseTree/python/clearMatching.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/parseTree/python/clearMatching.yml
new file mode 100644
index 0000000000..97a2fca498
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/parseTree/python/clearMatching.yml
@@ -0,0 +1,40 @@
+languageId: python
+command:
+  version: 1
+  spokenForm: clear matching
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier:
+        {
+          type: surroundingPair,
+          delimiter: any,
+          delimiterInclusion: interiorOnly,
+        }
+initialState:
+  documentContents: |
+    class a(object):
+        pass
+  selections:
+    - anchor: { line: 0, character: 11 }
+      active: { line: 0, character: 11 }
+  marks: {}
+finalState:
+  documentContents: |
+    class a():
+        pass
+  selections:
+    - anchor: { line: 0, character: 8 }
+      active: { line: 0, character: 8 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      modifier:
+        { type: surroundingPair, delimiter: null, delimitersOnly: false },
+      insideOutsideType: inside,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/parseTree/python/clearMatching10.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/parseTree/python/clearMatching10.yml
new file mode 100644
index 0000000000..7976e18735
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/parseTree/python/clearMatching10.yml
@@ -0,0 +1,40 @@
+languageId: python
+command:
+  version: 1
+  spokenForm: clear matching
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier:
+        {
+          type: surroundingPair,
+          delimiter: any,
+          delimiterInclusion: interiorOnly,
+        }
+initialState:
+  documentContents: |-
+
+    "'jlkjl' 'fsd'"
+  selections:
+    - anchor: { line: 1, character: 8 }
+      active: { line: 1, character: 8 }
+  marks: {}
+finalState:
+  documentContents: |-
+
+    "'' 'fsd'"
+  selections:
+    - anchor: { line: 1, character: 2 }
+      active: { line: 1, character: 2 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      modifier:
+        { type: surroundingPair, delimiter: null, delimitersOnly: false },
+      insideOutsideType: inside,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/parseTree/python/clearMatching11.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/parseTree/python/clearMatching11.yml
new file mode 100644
index 0000000000..40b7513d44
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/parseTree/python/clearMatching11.yml
@@ -0,0 +1,40 @@
+languageId: python
+command:
+  version: 1
+  spokenForm: clear matching
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier:
+        {
+          type: surroundingPair,
+          delimiter: any,
+          delimiterInclusion: interiorOnly,
+        }
+initialState:
+  documentContents: |-
+
+    "'jlkjl' 'fsd'"
+  selections:
+    - anchor: { line: 1, character: 4 }
+      active: { line: 1, character: 4 }
+  marks: {}
+finalState:
+  documentContents: |-
+
+    "'' 'fsd'"
+  selections:
+    - anchor: { line: 1, character: 2 }
+      active: { line: 1, character: 2 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      modifier:
+        { type: surroundingPair, delimiter: null, delimitersOnly: false },
+      insideOutsideType: inside,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/parseTree/python/clearMatching2.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/parseTree/python/clearMatching2.yml
new file mode 100644
index 0000000000..790ad704e5
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/parseTree/python/clearMatching2.yml
@@ -0,0 +1,38 @@
+languageId: python
+command:
+  version: 1
+  spokenForm: clear matching
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier:
+        {
+          type: surroundingPair,
+          delimiter: any,
+          delimiterInclusion: interiorOnly,
+        }
+initialState:
+  documentContents: |
+    a[222]
+  selections:
+    - anchor: { line: 0, character: 3 }
+      active: { line: 0, character: 3 }
+  marks: {}
+finalState:
+  documentContents: |
+    a[]
+  selections:
+    - anchor: { line: 0, character: 2 }
+      active: { line: 0, character: 2 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      modifier:
+        { type: surroundingPair, delimiter: null, delimitersOnly: false },
+      insideOutsideType: inside,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/parseTree/python/clearMatching3.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/parseTree/python/clearMatching3.yml
new file mode 100644
index 0000000000..ce9b0af1b4
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/parseTree/python/clearMatching3.yml
@@ -0,0 +1,38 @@
+languageId: python
+command:
+  version: 1
+  spokenForm: clear matching
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier:
+        {
+          type: surroundingPair,
+          delimiter: any,
+          delimiterInclusion: interiorOnly,
+        }
+initialState:
+  documentContents: |
+    a[222]
+  selections:
+    - anchor: { line: 0, character: 2 }
+      active: { line: 0, character: 2 }
+  marks: {}
+finalState:
+  documentContents: |
+    a[]
+  selections:
+    - anchor: { line: 0, character: 2 }
+      active: { line: 0, character: 2 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      modifier:
+        { type: surroundingPair, delimiter: null, delimitersOnly: false },
+      insideOutsideType: inside,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/parseTree/python/clearMatching4.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/parseTree/python/clearMatching4.yml
new file mode 100644
index 0000000000..1505b305d8
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/parseTree/python/clearMatching4.yml
@@ -0,0 +1,38 @@
+languageId: python
+command:
+  version: 1
+  spokenForm: clear matching
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier:
+        {
+          type: surroundingPair,
+          delimiter: any,
+          delimiterInclusion: interiorOnly,
+        }
+initialState:
+  documentContents: |
+    a[222]
+  selections:
+    - anchor: { line: 0, character: 5 }
+      active: { line: 0, character: 5 }
+  marks: {}
+finalState:
+  documentContents: |
+    a[]
+  selections:
+    - anchor: { line: 0, character: 2 }
+      active: { line: 0, character: 2 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      modifier:
+        { type: surroundingPair, delimiter: null, delimitersOnly: false },
+      insideOutsideType: inside,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/parseTree/python/clearMatching5.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/parseTree/python/clearMatching5.yml
new file mode 100644
index 0000000000..2c1225fbe9
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/parseTree/python/clearMatching5.yml
@@ -0,0 +1,36 @@
+languageId: python
+command:
+  version: 1
+  spokenForm: clear matching
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier:
+        {
+          type: surroundingPair,
+          delimiter: any,
+          delimiterInclusion: interiorOnly,
+        }
+initialState:
+  documentContents: f"j{fdfhjkd}lkjlkj"
+  selections:
+    - anchor: { line: 0, character: 8 }
+      active: { line: 0, character: 8 }
+  marks: {}
+finalState:
+  documentContents: f"j{}lkjlkj"
+  selections:
+    - anchor: { line: 0, character: 4 }
+      active: { line: 0, character: 4 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      modifier:
+        { type: surroundingPair, delimiter: null, delimitersOnly: false },
+      insideOutsideType: inside,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/parseTree/python/clearMatching6.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/parseTree/python/clearMatching6.yml
new file mode 100644
index 0000000000..d866ac1d21
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/parseTree/python/clearMatching6.yml
@@ -0,0 +1,36 @@
+languageId: python
+command:
+  version: 1
+  spokenForm: clear matching
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier:
+        {
+          type: surroundingPair,
+          delimiter: any,
+          delimiterInclusion: interiorOnly,
+        }
+initialState:
+  documentContents: f"j{fdfhjkd}lkjlkj"
+  selections:
+    - anchor: { line: 0, character: 2 }
+      active: { line: 0, character: 2 }
+  marks: {}
+finalState:
+  documentContents: f""
+  selections:
+    - anchor: { line: 0, character: 2 }
+      active: { line: 0, character: 2 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      modifier:
+        { type: surroundingPair, delimiter: null, delimitersOnly: false },
+      insideOutsideType: inside,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/parseTree/python/clearMatching7.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/parseTree/python/clearMatching7.yml
new file mode 100644
index 0000000000..7acc526f11
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/parseTree/python/clearMatching7.yml
@@ -0,0 +1,36 @@
+languageId: python
+command:
+  version: 1
+  spokenForm: clear matching
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier:
+        {
+          type: surroundingPair,
+          delimiter: any,
+          delimiterInclusion: interiorOnly,
+        }
+initialState:
+  documentContents: f"j{fdfhjkd}lkjlkj"
+  selections:
+    - anchor: { line: 0, character: 15 }
+      active: { line: 0, character: 15 }
+  marks: {}
+finalState:
+  documentContents: f""
+  selections:
+    - anchor: { line: 0, character: 2 }
+      active: { line: 0, character: 2 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      modifier:
+        { type: surroundingPair, delimiter: null, delimitersOnly: false },
+      insideOutsideType: inside,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/parseTree/python/clearMatching8.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/parseTree/python/clearMatching8.yml
new file mode 100644
index 0000000000..46ce9e6010
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/parseTree/python/clearMatching8.yml
@@ -0,0 +1,40 @@
+languageId: python
+command:
+  version: 1
+  spokenForm: clear matching
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier:
+        {
+          type: surroundingPair,
+          delimiter: any,
+          delimiterInclusion: interiorOnly,
+        }
+initialState:
+  documentContents: |
+    def fff(x, y):
+        pass
+  selections:
+    - anchor: { line: 0, character: 10 }
+      active: { line: 0, character: 10 }
+  marks: {}
+finalState:
+  documentContents: |
+    def fff():
+        pass
+  selections:
+    - anchor: { line: 0, character: 8 }
+      active: { line: 0, character: 8 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      modifier:
+        { type: surroundingPair, delimiter: null, delimitersOnly: false },
+      insideOutsideType: inside,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/parseTree/python/clearOutside7.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/parseTree/python/clearOutside7.yml
new file mode 100644
index 0000000000..499d60f6c8
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/parseTree/python/clearOutside7.yml
@@ -0,0 +1,35 @@
+languageId: python
+command:
+  version: 1
+  spokenForm: clear outside
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier: { type: surroundingPair, delimiter: any }
+initialState:
+  documentContents: f"Hello, {name + 's'}!"
+  selections:
+    - anchor: { line: 0, character: 18 }
+      active: { line: 0, character: 18 }
+  marks: {}
+finalState:
+  documentContents: f"Hello, {name + }!"
+  selections:
+    - anchor: { line: 0, character: 17 }
+      active: { line: 0, character: 17 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        {
+          type: surroundingPair,
+          delimiter: null,
+          delimiterInclusion: includeDelimiters,
+        },
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/parseTree/python/clearOutside8.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/parseTree/python/clearOutside8.yml
new file mode 100644
index 0000000000..6b2d4b3c63
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/parseTree/python/clearOutside8.yml
@@ -0,0 +1,35 @@
+languageId: python
+command:
+  version: 1
+  spokenForm: clear outside
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier: { type: surroundingPair, delimiter: any }
+initialState:
+  documentContents: f"Hello, {name + 's'}!"
+  selections:
+    - anchor: { line: 0, character: 16 }
+      active: { line: 0, character: 16 }
+  marks: {}
+finalState:
+  documentContents: f"Hello, !"
+  selections:
+    - anchor: { line: 0, character: 9 }
+      active: { line: 0, character: 9 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        {
+          type: surroundingPair,
+          delimiter: null,
+          delimiterInclusion: includeDelimiters,
+        },
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/parseTree/python/clearPair.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/parseTree/python/clearPair.yml
new file mode 100644
index 0000000000..6e4081c1d8
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/parseTree/python/clearPair.yml
@@ -0,0 +1,38 @@
+languageId: python
+command:
+  version: 1
+  spokenForm: clear pair
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier:
+        {
+          type: surroundingPair,
+          delimiter: any,
+          delimiterInclusion: excludeInterior,
+        }
+initialState:
+  documentContents: "{1: [(1), (2), (3)]}"
+  selections:
+    - anchor: { line: 0, character: 9 }
+      active: { line: 0, character: 9 }
+  marks: {}
+finalState:
+  documentContents: "{1: (1), (2), (3)}"
+  selections:
+    - anchor: { line: 0, character: 4 }
+      active: { line: 0, character: 4 }
+    - anchor: { line: 0, character: 17 }
+      active: { line: 0, character: 17 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      modifier:
+        { type: surroundingPair, delimiter: null, delimitersOnly: true },
+      insideOutsideType: inside,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/parseTree/python/clearPair2.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/parseTree/python/clearPair2.yml
new file mode 100644
index 0000000000..6e4081c1d8
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/parseTree/python/clearPair2.yml
@@ -0,0 +1,38 @@
+languageId: python
+command:
+  version: 1
+  spokenForm: clear pair
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier:
+        {
+          type: surroundingPair,
+          delimiter: any,
+          delimiterInclusion: excludeInterior,
+        }
+initialState:
+  documentContents: "{1: [(1), (2), (3)]}"
+  selections:
+    - anchor: { line: 0, character: 9 }
+      active: { line: 0, character: 9 }
+  marks: {}
+finalState:
+  documentContents: "{1: (1), (2), (3)}"
+  selections:
+    - anchor: { line: 0, character: 4 }
+      active: { line: 0, character: 4 }
+    - anchor: { line: 0, character: 17 }
+      active: { line: 0, character: 17 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      modifier:
+        { type: surroundingPair, delimiter: null, delimitersOnly: true },
+      insideOutsideType: inside,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/parseTree/python/clearPair3.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/parseTree/python/clearPair3.yml
new file mode 100644
index 0000000000..6aa7fb79a9
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/parseTree/python/clearPair3.yml
@@ -0,0 +1,38 @@
+languageId: python
+command:
+  version: 1
+  spokenForm: clear pair
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier:
+        {
+          type: surroundingPair,
+          delimiter: any,
+          delimiterInclusion: excludeInterior,
+        }
+initialState:
+  documentContents: f"j{fdfhjkd}lkjlkj"
+  selections:
+    - anchor: { line: 0, character: 14 }
+      active: { line: 0, character: 14 }
+  marks: {}
+finalState:
+  documentContents: j{fdfhjkd}lkjlkj
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+    - anchor: { line: 0, character: 16 }
+      active: { line: 0, character: 16 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      modifier:
+        { type: surroundingPair, delimiter: null, delimitersOnly: true },
+      insideOutsideType: inside,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/parseTree/python/clearPair4.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/parseTree/python/clearPair4.yml
new file mode 100644
index 0000000000..dc9b4c77a3
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/parseTree/python/clearPair4.yml
@@ -0,0 +1,42 @@
+languageId: python
+command:
+  version: 1
+  spokenForm: clear pair
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier:
+        {
+          type: surroundingPair,
+          delimiter: any,
+          delimiterInclusion: excludeInterior,
+        }
+initialState:
+  documentContents: |
+    def fff(x, y):
+        pass
+  selections:
+    - anchor: { line: 0, character: 10 }
+      active: { line: 0, character: 10 }
+  marks: {}
+finalState:
+  documentContents: |
+    def fffx, y:
+        pass
+  selections:
+    - anchor: { line: 0, character: 7 }
+      active: { line: 0, character: 7 }
+    - anchor: { line: 0, character: 11 }
+      active: { line: 0, character: 11 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      modifier:
+        { type: surroundingPair, delimiter: null, delimitersOnly: true },
+      insideOutsideType: inside,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/parseTree/python/clearPairCurly.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/parseTree/python/clearPairCurly.yml
new file mode 100644
index 0000000000..aa71495316
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/parseTree/python/clearPairCurly.yml
@@ -0,0 +1,42 @@
+languageId: python
+command:
+  version: 1
+  spokenForm: clear pair curly
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier:
+        {
+          type: surroundingPair,
+          delimiter: curlyBrackets,
+          delimiterInclusion: excludeInterior,
+        }
+initialState:
+  documentContents: "{1: [(1), (2), (3)]}"
+  selections:
+    - anchor: { line: 0, character: 9 }
+      active: { line: 0, character: 9 }
+  marks: {}
+finalState:
+  documentContents: "1: [(1), (2), (3)]"
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+    - anchor: { line: 0, character: 18 }
+      active: { line: 0, character: 18 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      modifier:
+        {
+          type: surroundingPair,
+          delimiter: curlyBrackets,
+          delimitersOnly: true,
+        },
+      insideOutsideType: inside,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/parseTree/python/clearQuad2.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/parseTree/python/clearQuad2.yml
new file mode 100644
index 0000000000..fa176a98dd
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/parseTree/python/clearQuad2.yml
@@ -0,0 +1,40 @@
+languageId: python
+command:
+  version: 1
+  spokenForm: clear quad
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier: { type: surroundingPair, delimiter: doubleQuotes }
+initialState:
+  documentContents: |-
+    """
+    {
+        hello
+    }
+    """
+  selections:
+    - anchor: { line: 2, character: 7 }
+      active: { line: 2, character: 7 }
+  marks: {}
+finalState:
+  documentContents: ""
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        {
+          type: surroundingPair,
+          delimiter: doubleQuotes,
+          delimiterInclusion: includeDelimiters,
+        },
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/parseTree/python/clearQuad4.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/parseTree/python/clearQuad4.yml
new file mode 100644
index 0000000000..664876262a
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/parseTree/python/clearQuad4.yml
@@ -0,0 +1,35 @@
+languageId: python
+command:
+  version: 1
+  spokenForm: clear quad
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier: { type: surroundingPair, delimiter: doubleQuotes }
+initialState:
+  documentContents: f"Hello, {name}!"
+  selections:
+    - anchor: { line: 0, character: 12 }
+      active: { line: 0, character: 12 }
+  marks: {}
+finalState:
+  documentContents: ""
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        {
+          type: surroundingPair,
+          delimiter: doubleQuotes,
+          delimiterInclusion: includeDelimiters,
+        },
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/parseTree/python/clearRound.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/parseTree/python/clearRound.yml
new file mode 100644
index 0000000000..27d80b2f34
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/parseTree/python/clearRound.yml
@@ -0,0 +1,44 @@
+languageId: python
+command:
+  version: 1
+  spokenForm: clear round
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier:
+        {
+          type: surroundingPair,
+          delimiter: parentheses,
+          delimiterInclusion: interiorOnly,
+        }
+initialState:
+  documentContents: |
+    class a(object):
+        pass
+  selections:
+    - anchor: { line: 0, character: 11 }
+      active: { line: 0, character: 11 }
+  marks: {}
+finalState:
+  documentContents: |
+    class a():
+        pass
+  selections:
+    - anchor: { line: 0, character: 8 }
+      active: { line: 0, character: 8 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      modifier:
+        {
+          type: surroundingPair,
+          delimiter: parentheses,
+          delimitersOnly: false,
+        },
+      insideOutsideType: inside,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/parseTree/python/clearRound5.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/parseTree/python/clearRound5.yml
new file mode 100644
index 0000000000..dadbe8257c
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/parseTree/python/clearRound5.yml
@@ -0,0 +1,35 @@
+languageId: python
+command:
+  version: 1
+  spokenForm: clear round
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier: { type: surroundingPair, delimiter: parentheses }
+initialState:
+  documentContents: "'(hello)'"
+  selections:
+    - anchor: { line: 0, character: 5 }
+      active: { line: 0, character: 5 }
+  marks: {}
+finalState:
+  documentContents: "''"
+  selections:
+    - anchor: { line: 0, character: 1 }
+      active: { line: 0, character: 1 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        {
+          type: surroundingPair,
+          delimiter: parentheses,
+          delimiterInclusion: includeDelimiters,
+        },
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/parseTree/python/clearRound6.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/parseTree/python/clearRound6.yml
new file mode 100644
index 0000000000..e46fa7806e
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/parseTree/python/clearRound6.yml
@@ -0,0 +1,35 @@
+languageId: python
+command:
+  version: 1
+  spokenForm: clear round
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier: { type: surroundingPair, delimiter: parentheses }
+initialState:
+  documentContents: '"(hello)"'
+  selections:
+    - anchor: { line: 0, character: 4 }
+      active: { line: 0, character: 4 }
+  marks: {}
+finalState:
+  documentContents: '""'
+  selections:
+    - anchor: { line: 0, character: 1 }
+      active: { line: 0, character: 1 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        {
+          type: surroundingPair,
+          delimiter: parentheses,
+          delimiterInclusion: includeDelimiters,
+        },
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/parseTree/python/clearRound7.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/parseTree/python/clearRound7.yml
new file mode 100644
index 0000000000..a7e797255d
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/parseTree/python/clearRound7.yml
@@ -0,0 +1,35 @@
+languageId: python
+command:
+  version: 1
+  spokenForm: clear round
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier: { type: surroundingPair, delimiter: parentheses }
+initialState:
+  documentContents: f"(hello)"
+  selections:
+    - anchor: { line: 0, character: 5 }
+      active: { line: 0, character: 5 }
+  marks: {}
+finalState:
+  documentContents: f""
+  selections:
+    - anchor: { line: 0, character: 2 }
+      active: { line: 0, character: 2 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        {
+          type: surroundingPair,
+          delimiter: parentheses,
+          delimiterInclusion: includeDelimiters,
+        },
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/parseTree/python/clearSquare.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/parseTree/python/clearSquare.yml
new file mode 100644
index 0000000000..cb679071a6
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/parseTree/python/clearSquare.yml
@@ -0,0 +1,42 @@
+languageId: python
+command:
+  version: 1
+  spokenForm: clear square
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier:
+        {
+          type: surroundingPair,
+          delimiter: squareBrackets,
+          delimiterInclusion: interiorOnly,
+        }
+initialState:
+  documentContents: |
+    a[222]
+  selections:
+    - anchor: { line: 0, character: 3 }
+      active: { line: 0, character: 3 }
+  marks: {}
+finalState:
+  documentContents: |
+    a[]
+  selections:
+    - anchor: { line: 0, character: 2 }
+      active: { line: 0, character: 2 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      modifier:
+        {
+          type: surroundingPair,
+          delimiter: squareBrackets,
+          delimitersOnly: false,
+        },
+      insideOutsideType: inside,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/parseTree/python/clearSquare2.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/parseTree/python/clearSquare2.yml
new file mode 100644
index 0000000000..032fd766b4
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/parseTree/python/clearSquare2.yml
@@ -0,0 +1,40 @@
+languageId: python
+command:
+  version: 1
+  spokenForm: clear square
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier:
+        {
+          type: surroundingPair,
+          delimiter: squareBrackets,
+          delimiterInclusion: interiorOnly,
+        }
+initialState:
+  documentContents: "{1: [(1), (2), (3)]}"
+  selections:
+    - anchor: { line: 0, character: 9 }
+      active: { line: 0, character: 9 }
+  marks: {}
+finalState:
+  documentContents: "{1: []}"
+  selections:
+    - anchor: { line: 0, character: 5 }
+      active: { line: 0, character: 5 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      modifier:
+        {
+          type: surroundingPair,
+          delimiter: squareBrackets,
+          delimitersOnly: false,
+        },
+      insideOutsideType: inside,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/parseTree/shellscript/clearCurly4.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/parseTree/shellscript/clearCurly4.yml
new file mode 100644
index 0000000000..05237255db
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/parseTree/shellscript/clearCurly4.yml
@@ -0,0 +1,35 @@
+languageId: shellscript
+command:
+  version: 1
+  spokenForm: clear curly
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier: { type: surroundingPair, delimiter: curlyBrackets }
+initialState:
+  documentContents: '"${hello}"'
+  selections:
+    - anchor: { line: 0, character: 6 }
+      active: { line: 0, character: 6 }
+  marks: {}
+finalState:
+  documentContents: '""'
+  selections:
+    - anchor: { line: 0, character: 1 }
+      active: { line: 0, character: 1 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        {
+          type: surroundingPair,
+          delimiter: curlyBrackets,
+          delimiterInclusion: includeDelimiters,
+        },
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/parseTree/shellscript/clearOutside23.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/parseTree/shellscript/clearOutside23.yml
new file mode 100644
index 0000000000..1ba1df5c62
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/parseTree/shellscript/clearOutside23.yml
@@ -0,0 +1,35 @@
+languageId: shellscript
+command:
+  version: 1
+  spokenForm: clear outside
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier: { type: surroundingPair, delimiter: any }
+initialState:
+  documentContents: '"${hello}"'
+  selections:
+    - anchor: { line: 0, character: 6 }
+      active: { line: 0, character: 6 }
+  marks: {}
+finalState:
+  documentContents: '""'
+  selections:
+    - anchor: { line: 0, character: 1 }
+      active: { line: 0, character: 1 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        {
+          type: surroundingPair,
+          delimiter: any,
+          delimiterInclusion: includeDelimiters,
+        },
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/parseTree/shellscript/clearPair.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/parseTree/shellscript/clearPair.yml
new file mode 100644
index 0000000000..0339dd45f7
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/parseTree/shellscript/clearPair.yml
@@ -0,0 +1,30 @@
+languageId: shellscript
+command:
+  version: 1
+  spokenForm: clear pair
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier: { type: surroundingPair, delimiter: any }
+initialState:
+  documentContents: '"$(hello)"'
+  selections:
+    - anchor: { line: 0, character: 6 }
+      active: { line: 0, character: 6 }
+  marks: {}
+finalState:
+  documentContents: '""'
+  selections:
+    - anchor: { line: 0, character: 1 }
+      active: { line: 0, character: 1 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier: { type: surroundingPair, delimiter: any },
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/parseTree/shellscript/clearString5.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/parseTree/shellscript/clearString5.yml
new file mode 100644
index 0000000000..8b56a4ebfa
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/parseTree/shellscript/clearString5.yml
@@ -0,0 +1,35 @@
+languageId: shellscript
+command:
+  version: 1
+  spokenForm: clear string
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier: { type: surroundingPair, delimiter: string }
+initialState:
+  documentContents: '"${hello}"'
+  selections:
+    - anchor: { line: 0, character: 6 }
+      active: { line: 0, character: 6 }
+  marks: {}
+finalState:
+  documentContents: ""
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        {
+          type: surroundingPair,
+          delimiter: string,
+          delimiterInclusion: includeDelimiters,
+        },
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/parseTree/tsx/clearPair10.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/parseTree/tsx/clearPair10.yml
new file mode 100644
index 0000000000..0fba3743d2
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/parseTree/tsx/clearPair10.yml
@@ -0,0 +1,30 @@
+languageId: typescriptreact
+command:
+  version: 1
+  spokenForm: clear pair
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier: { type: surroundingPair, delimiter: any }
+initialState:
+  documentContents: (<hello></hello> )
+  selections:
+    - anchor: { line: 0, character: 1 }
+      active: { line: 0, character: 1 }
+  marks: {}
+finalState:
+  documentContents: (</hello> )
+  selections:
+    - anchor: { line: 0, character: 1 }
+      active: { line: 0, character: 1 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier: { type: surroundingPair, delimiter: any },
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/parseTree/tsx/clearPair11.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/parseTree/tsx/clearPair11.yml
new file mode 100644
index 0000000000..37fcdf7928
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/parseTree/tsx/clearPair11.yml
@@ -0,0 +1,30 @@
+languageId: typescriptreact
+command:
+  version: 1
+  spokenForm: clear pair
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier: { type: surroundingPair, delimiter: any }
+initialState:
+  documentContents: (<hello></hello> )
+  selections:
+    - anchor: { line: 0, character: 2 }
+      active: { line: 0, character: 2 }
+  marks: {}
+finalState:
+  documentContents: (</hello> )
+  selections:
+    - anchor: { line: 0, character: 1 }
+      active: { line: 0, character: 1 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier: { type: surroundingPair, delimiter: any },
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/parseTree/tsx/clearPair12.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/parseTree/tsx/clearPair12.yml
new file mode 100644
index 0000000000..245cf44bad
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/parseTree/tsx/clearPair12.yml
@@ -0,0 +1,30 @@
+languageId: typescriptreact
+command:
+  version: 1
+  spokenForm: clear pair
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier: { type: surroundingPair, delimiter: any }
+initialState:
+  documentContents: (<hello></hello> )
+  selections:
+    - anchor: { line: 0, character: 4 }
+      active: { line: 0, character: 4 }
+  marks: {}
+finalState:
+  documentContents: (</hello> )
+  selections:
+    - anchor: { line: 0, character: 1 }
+      active: { line: 0, character: 1 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier: { type: surroundingPair, delimiter: any },
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/parseTree/tsx/clearPair13.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/parseTree/tsx/clearPair13.yml
new file mode 100644
index 0000000000..23c15e6427
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/parseTree/tsx/clearPair13.yml
@@ -0,0 +1,30 @@
+languageId: typescriptreact
+command:
+  version: 1
+  spokenForm: clear pair
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier: { type: surroundingPair, delimiter: any }
+initialState:
+  documentContents: (<hello></hello> )
+  selections:
+    - anchor: { line: 0, character: 7 }
+      active: { line: 0, character: 7 }
+  marks: {}
+finalState:
+  documentContents: (</hello> )
+  selections:
+    - anchor: { line: 0, character: 1 }
+      active: { line: 0, character: 1 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier: { type: surroundingPair, delimiter: any },
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/parseTree/tsx/clearPair14.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/parseTree/tsx/clearPair14.yml
new file mode 100644
index 0000000000..a1bed64202
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/parseTree/tsx/clearPair14.yml
@@ -0,0 +1,30 @@
+languageId: typescriptreact
+command:
+  version: 1
+  spokenForm: clear pair
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier: { type: surroundingPair, delimiter: any }
+initialState:
+  documentContents: (<hello> </hello> )
+  selections:
+    - anchor: { line: 0, character: 8 }
+      active: { line: 0, character: 8 }
+  marks: {}
+finalState:
+  documentContents: ( </hello> )
+  selections:
+    - anchor: { line: 0, character: 1 }
+      active: { line: 0, character: 1 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier: { type: surroundingPair, delimiter: any },
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/parseTree/tsx/clearPair15.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/parseTree/tsx/clearPair15.yml
new file mode 100644
index 0000000000..ef238c40bb
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/parseTree/tsx/clearPair15.yml
@@ -0,0 +1,30 @@
+languageId: typescriptreact
+command:
+  version: 1
+  spokenForm: clear pair
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier: { type: surroundingPair, delimiter: any }
+initialState:
+  documentContents: (<hello></hello> )
+  selections:
+    - anchor: { line: 0, character: 8 }
+      active: { line: 0, character: 8 }
+  marks: {}
+finalState:
+  documentContents: (<hello> )
+  selections:
+    - anchor: { line: 0, character: 8 }
+      active: { line: 0, character: 8 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier: { type: surroundingPair, delimiter: any },
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/parseTree/tsx/clearPair16.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/parseTree/tsx/clearPair16.yml
new file mode 100644
index 0000000000..a17be83f3b
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/parseTree/tsx/clearPair16.yml
@@ -0,0 +1,30 @@
+languageId: typescriptreact
+command:
+  version: 1
+  spokenForm: clear pair
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier: { type: surroundingPair, delimiter: any }
+initialState:
+  documentContents: (<hello></hello> )
+  selections:
+    - anchor: { line: 0, character: 9 }
+      active: { line: 0, character: 9 }
+  marks: {}
+finalState:
+  documentContents: (<hello> )
+  selections:
+    - anchor: { line: 0, character: 8 }
+      active: { line: 0, character: 8 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier: { type: surroundingPair, delimiter: any },
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/parseTree/tsx/clearPair17.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/parseTree/tsx/clearPair17.yml
new file mode 100644
index 0000000000..a153353198
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/parseTree/tsx/clearPair17.yml
@@ -0,0 +1,30 @@
+languageId: typescriptreact
+command:
+  version: 1
+  spokenForm: clear pair
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier: { type: surroundingPair, delimiter: any }
+initialState:
+  documentContents: (<hello></hello> )
+  selections:
+    - anchor: { line: 0, character: 10 }
+      active: { line: 0, character: 10 }
+  marks: {}
+finalState:
+  documentContents: (<hello> )
+  selections:
+    - anchor: { line: 0, character: 8 }
+      active: { line: 0, character: 8 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier: { type: surroundingPair, delimiter: any },
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/parseTree/tsx/clearPair18.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/parseTree/tsx/clearPair18.yml
new file mode 100644
index 0000000000..876f897f41
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/parseTree/tsx/clearPair18.yml
@@ -0,0 +1,30 @@
+languageId: typescriptreact
+command:
+  version: 1
+  spokenForm: clear pair
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier: { type: surroundingPair, delimiter: any }
+initialState:
+  documentContents: (<hello></hello> )
+  selections:
+    - anchor: { line: 0, character: 12 }
+      active: { line: 0, character: 12 }
+  marks: {}
+finalState:
+  documentContents: (<hello> )
+  selections:
+    - anchor: { line: 0, character: 8 }
+      active: { line: 0, character: 8 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier: { type: surroundingPair, delimiter: any },
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/parseTree/tsx/clearPair19.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/parseTree/tsx/clearPair19.yml
new file mode 100644
index 0000000000..66e354cc09
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/parseTree/tsx/clearPair19.yml
@@ -0,0 +1,30 @@
+languageId: typescriptreact
+command:
+  version: 1
+  spokenForm: clear pair
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier: { type: surroundingPair, delimiter: any }
+initialState:
+  documentContents: (<hello></hello> )
+  selections:
+    - anchor: { line: 0, character: 15 }
+      active: { line: 0, character: 15 }
+  marks: {}
+finalState:
+  documentContents: (<hello> )
+  selections:
+    - anchor: { line: 0, character: 8 }
+      active: { line: 0, character: 8 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier: { type: surroundingPair, delimiter: any },
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/parseTree/tsx/clearPair20.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/parseTree/tsx/clearPair20.yml
new file mode 100644
index 0000000000..568abba8ef
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/parseTree/tsx/clearPair20.yml
@@ -0,0 +1,30 @@
+languageId: typescriptreact
+command:
+  version: 1
+  spokenForm: clear pair
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier: { type: surroundingPair, delimiter: any }
+initialState:
+  documentContents: (<hello></hello> )
+  selections:
+    - anchor: { line: 0, character: 16 }
+      active: { line: 0, character: 16 }
+  marks: {}
+finalState:
+  documentContents: (<hello> )
+  selections:
+    - anchor: { line: 0, character: 8 }
+      active: { line: 0, character: 8 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier: { type: surroundingPair, delimiter: any },
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/parseTree/tsx/clearPair21.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/parseTree/tsx/clearPair21.yml
new file mode 100644
index 0000000000..f4ccbb6e70
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/parseTree/tsx/clearPair21.yml
@@ -0,0 +1,30 @@
+languageId: typescriptreact
+command:
+  version: 1
+  spokenForm: clear pair
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier: { type: surroundingPair, delimiter: any }
+initialState:
+  documentContents: (<hello></hello>)
+  selections:
+    - anchor: { line: 0, character: 16 }
+      active: { line: 0, character: 16 }
+  marks: {}
+finalState:
+  documentContents: ""
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier: { type: surroundingPair, delimiter: any },
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/parseTree/tsx/clearPair23.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/parseTree/tsx/clearPair23.yml
new file mode 100644
index 0000000000..a964a7d9b9
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/parseTree/tsx/clearPair23.yml
@@ -0,0 +1,30 @@
+languageId: typescriptreact
+command:
+  version: 1
+  spokenForm: clear pair
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier: { type: surroundingPair, delimiter: any }
+initialState:
+  documentContents: (<hello></ hello > )
+  selections:
+    - anchor: { line: 0, character: 16 }
+      active: { line: 0, character: 16 }
+  marks: {}
+finalState:
+  documentContents: (<hello> )
+  selections:
+    - anchor: { line: 0, character: 8 }
+      active: { line: 0, character: 8 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier: { type: surroundingPair, delimiter: any },
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/parseTree/tsx/clearPair4.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/parseTree/tsx/clearPair4.yml
new file mode 100644
index 0000000000..b796573ecd
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/parseTree/tsx/clearPair4.yml
@@ -0,0 +1,30 @@
+languageId: typescriptreact
+command:
+  version: 1
+  spokenForm: clear pair
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier: { type: surroundingPair, delimiter: any }
+initialState:
+  documentContents: (<hello/>)
+  selections:
+    - anchor: { line: 0, character: 5 }
+      active: { line: 0, character: 5 }
+  marks: {}
+finalState:
+  documentContents: ()
+  selections:
+    - anchor: { line: 0, character: 1 }
+      active: { line: 0, character: 1 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier: { type: surroundingPair, delimiter: any },
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/parseTree/tsx/clearPair5.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/parseTree/tsx/clearPair5.yml
new file mode 100644
index 0000000000..d4fcc6e3ed
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/parseTree/tsx/clearPair5.yml
@@ -0,0 +1,30 @@
+languageId: typescriptreact
+command:
+  version: 1
+  spokenForm: clear pair
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier: { type: surroundingPair, delimiter: any }
+initialState:
+  documentContents: (<hello/>)
+  selections:
+    - anchor: { line: 0, character: 1 }
+      active: { line: 0, character: 1 }
+  marks: {}
+finalState:
+  documentContents: ()
+  selections:
+    - anchor: { line: 0, character: 1 }
+      active: { line: 0, character: 1 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier: { type: surroundingPair, delimiter: any },
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/parseTree/tsx/clearPair6.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/parseTree/tsx/clearPair6.yml
new file mode 100644
index 0000000000..9d6b2af338
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/parseTree/tsx/clearPair6.yml
@@ -0,0 +1,30 @@
+languageId: typescriptreact
+command:
+  version: 1
+  spokenForm: clear pair
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier: { type: surroundingPair, delimiter: any }
+initialState:
+  documentContents: (<hello/>)
+  selections:
+    - anchor: { line: 0, character: 2 }
+      active: { line: 0, character: 2 }
+  marks: {}
+finalState:
+  documentContents: ()
+  selections:
+    - anchor: { line: 0, character: 1 }
+      active: { line: 0, character: 1 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier: { type: surroundingPair, delimiter: any },
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/parseTree/tsx/clearPair7.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/parseTree/tsx/clearPair7.yml
new file mode 100644
index 0000000000..2211f9fe80
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/parseTree/tsx/clearPair7.yml
@@ -0,0 +1,30 @@
+languageId: typescriptreact
+command:
+  version: 1
+  spokenForm: clear pair
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier: { type: surroundingPair, delimiter: any }
+initialState:
+  documentContents: (<hello/>)
+  selections:
+    - anchor: { line: 0, character: 7 }
+      active: { line: 0, character: 7 }
+  marks: {}
+finalState:
+  documentContents: ()
+  selections:
+    - anchor: { line: 0, character: 1 }
+      active: { line: 0, character: 1 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier: { type: surroundingPair, delimiter: any },
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/parseTree/tsx/clearPair8.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/parseTree/tsx/clearPair8.yml
new file mode 100644
index 0000000000..3597674c14
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/parseTree/tsx/clearPair8.yml
@@ -0,0 +1,30 @@
+languageId: typescriptreact
+command:
+  version: 1
+  spokenForm: clear pair
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier: { type: surroundingPair, delimiter: any }
+initialState:
+  documentContents: (<hello/>)
+  selections:
+    - anchor: { line: 0, character: 8 }
+      active: { line: 0, character: 8 }
+  marks: {}
+finalState:
+  documentContents: ()
+  selections:
+    - anchor: { line: 0, character: 1 }
+      active: { line: 0, character: 1 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier: { type: surroundingPair, delimiter: any },
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/parseTree/tsx/clearPair9.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/parseTree/tsx/clearPair9.yml
new file mode 100644
index 0000000000..f4e55cc786
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/parseTree/tsx/clearPair9.yml
@@ -0,0 +1,30 @@
+languageId: typescriptreact
+command:
+  version: 1
+  spokenForm: clear pair
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier: { type: surroundingPair, delimiter: any }
+initialState:
+  documentContents: (<hello/> )
+  selections:
+    - anchor: { line: 0, character: 9 }
+      active: { line: 0, character: 9 }
+  marks: {}
+finalState:
+  documentContents: ( )
+  selections:
+    - anchor: { line: 0, character: 1 }
+      active: { line: 0, character: 1 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier: { type: surroundingPair, delimiter: any },
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/parseTree/typescript/clearMatching14.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/parseTree/typescript/clearMatching14.yml
new file mode 100644
index 0000000000..b53dd4e677
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/parseTree/typescript/clearMatching14.yml
@@ -0,0 +1,36 @@
+languageId: typescript
+command:
+  version: 1
+  spokenForm: clear matching
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier:
+        {
+          type: surroundingPair,
+          delimiter: any,
+          delimiterInclusion: interiorOnly,
+        }
+initialState:
+  documentContents: "{const [bongo, baz] = [foo, bar]}"
+  selections:
+    - anchor: { line: 0, character: 17 }
+      active: { line: 0, character: 20 }
+  marks: {}
+finalState:
+  documentContents: "{}"
+  selections:
+    - anchor: { line: 0, character: 1 }
+      active: { line: 0, character: 1 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      modifier:
+        { type: surroundingPair, delimiter: null, delimitersOnly: false },
+      insideOutsideType: inside,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/parseTree/typescript/clearMatching15.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/parseTree/typescript/clearMatching15.yml
new file mode 100644
index 0000000000..bab1ec10be
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/parseTree/typescript/clearMatching15.yml
@@ -0,0 +1,36 @@
+languageId: typescript
+command:
+  version: 1
+  spokenForm: clear matching
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier:
+        {
+          type: surroundingPair,
+          delimiter: any,
+          delimiterInclusion: interiorOnly,
+        }
+initialState:
+  documentContents: "{const [bongo, baz] = [foo, bar]}"
+  selections:
+    - anchor: { line: 0, character: 21 }
+      active: { line: 0, character: 24 }
+  marks: {}
+finalState:
+  documentContents: "{}"
+  selections:
+    - anchor: { line: 0, character: 1 }
+      active: { line: 0, character: 1 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      modifier:
+        { type: surroundingPair, delimiter: null, delimitersOnly: false },
+      insideOutsideType: inside,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/parseTree/typescript/clearOutside10.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/parseTree/typescript/clearOutside10.yml
new file mode 100644
index 0000000000..c4dfbefb93
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/parseTree/typescript/clearOutside10.yml
@@ -0,0 +1,35 @@
+languageId: typescript
+command:
+  version: 1
+  spokenForm: clear outside
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier: { type: surroundingPair, delimiter: any }
+initialState:
+  documentContents: "`Hello, ${name}!`"
+  selections:
+    - anchor: { line: 0, character: 1 }
+      active: { line: 0, character: 1 }
+  marks: {}
+finalState:
+  documentContents: ""
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        {
+          type: surroundingPair,
+          delimiter: null,
+          delimiterInclusion: includeDelimiters,
+        },
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/parseTree/typescript/clearOutside11.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/parseTree/typescript/clearOutside11.yml
new file mode 100644
index 0000000000..983a8c52ba
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/parseTree/typescript/clearOutside11.yml
@@ -0,0 +1,35 @@
+languageId: typescript
+command:
+  version: 1
+  spokenForm: clear outside
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier: { type: surroundingPair, delimiter: any }
+initialState:
+  documentContents: "`Hello, ${name}!`"
+  selections:
+    - anchor: { line: 0, character: 3 }
+      active: { line: 0, character: 3 }
+  marks: {}
+finalState:
+  documentContents: ""
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        {
+          type: surroundingPair,
+          delimiter: null,
+          delimiterInclusion: includeDelimiters,
+        },
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/parseTree/typescript/clearOutside12.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/parseTree/typescript/clearOutside12.yml
new file mode 100644
index 0000000000..cadd1daf34
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/parseTree/typescript/clearOutside12.yml
@@ -0,0 +1,35 @@
+languageId: typescript
+command:
+  version: 1
+  spokenForm: clear outside
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier: { type: surroundingPair, delimiter: any }
+initialState:
+  documentContents: "`Hello, ${name}!`"
+  selections:
+    - anchor: { line: 0, character: 8 }
+      active: { line: 0, character: 8 }
+  marks: {}
+finalState:
+  documentContents: "`Hello, !`"
+  selections:
+    - anchor: { line: 0, character: 8 }
+      active: { line: 0, character: 8 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        {
+          type: surroundingPair,
+          delimiter: null,
+          delimiterInclusion: includeDelimiters,
+        },
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/parseTree/typescript/clearOutside13.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/parseTree/typescript/clearOutside13.yml
new file mode 100644
index 0000000000..4b4dfcf798
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/parseTree/typescript/clearOutside13.yml
@@ -0,0 +1,35 @@
+languageId: typescript
+command:
+  version: 1
+  spokenForm: clear outside
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier: { type: surroundingPair, delimiter: any }
+initialState:
+  documentContents: "`Hello, ${name}!`"
+  selections:
+    - anchor: { line: 0, character: 9 }
+      active: { line: 0, character: 9 }
+  marks: {}
+finalState:
+  documentContents: "`Hello, !`"
+  selections:
+    - anchor: { line: 0, character: 8 }
+      active: { line: 0, character: 8 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        {
+          type: surroundingPair,
+          delimiter: null,
+          delimiterInclusion: includeDelimiters,
+        },
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/parseTree/typescript/clearOutside14.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/parseTree/typescript/clearOutside14.yml
new file mode 100644
index 0000000000..cbe2ee3d15
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/parseTree/typescript/clearOutside14.yml
@@ -0,0 +1,35 @@
+languageId: typescript
+command:
+  version: 1
+  spokenForm: clear outside
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier: { type: surroundingPair, delimiter: any }
+initialState:
+  documentContents: "`Hello, ${name}!`"
+  selections:
+    - anchor: { line: 0, character: 10 }
+      active: { line: 0, character: 10 }
+  marks: {}
+finalState:
+  documentContents: "`Hello, !`"
+  selections:
+    - anchor: { line: 0, character: 8 }
+      active: { line: 0, character: 8 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        {
+          type: surroundingPair,
+          delimiter: null,
+          delimiterInclusion: includeDelimiters,
+        },
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/parseTree/typescript/clearOutside15.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/parseTree/typescript/clearOutside15.yml
new file mode 100644
index 0000000000..6c0a04a520
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/parseTree/typescript/clearOutside15.yml
@@ -0,0 +1,35 @@
+languageId: typescript
+command:
+  version: 1
+  spokenForm: clear outside
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier: { type: surroundingPair, delimiter: any }
+initialState:
+  documentContents: "`Hello, ${name}!`"
+  selections:
+    - anchor: { line: 0, character: 11 }
+      active: { line: 0, character: 11 }
+  marks: {}
+finalState:
+  documentContents: "`Hello, !`"
+  selections:
+    - anchor: { line: 0, character: 8 }
+      active: { line: 0, character: 8 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        {
+          type: surroundingPair,
+          delimiter: null,
+          delimiterInclusion: includeDelimiters,
+        },
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/parseTree/typescript/clearOutside16.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/parseTree/typescript/clearOutside16.yml
new file mode 100644
index 0000000000..db486b1661
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/parseTree/typescript/clearOutside16.yml
@@ -0,0 +1,35 @@
+languageId: typescript
+command:
+  version: 1
+  spokenForm: clear outside
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier: { type: surroundingPair, delimiter: any }
+initialState:
+  documentContents: "`Hello, ${name}!`"
+  selections:
+    - anchor: { line: 0, character: 14 }
+      active: { line: 0, character: 14 }
+  marks: {}
+finalState:
+  documentContents: "`Hello, !`"
+  selections:
+    - anchor: { line: 0, character: 8 }
+      active: { line: 0, character: 8 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        {
+          type: surroundingPair,
+          delimiter: null,
+          delimiterInclusion: includeDelimiters,
+        },
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/parseTree/typescript/clearOutside17.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/parseTree/typescript/clearOutside17.yml
new file mode 100644
index 0000000000..2d6e033c42
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/parseTree/typescript/clearOutside17.yml
@@ -0,0 +1,35 @@
+languageId: typescript
+command:
+  version: 1
+  spokenForm: clear outside
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier: { type: surroundingPair, delimiter: any }
+initialState:
+  documentContents: "`Hello, ${name}!`"
+  selections:
+    - anchor: { line: 0, character: 15 }
+      active: { line: 0, character: 15 }
+  marks: {}
+finalState:
+  documentContents: "`Hello, !`"
+  selections:
+    - anchor: { line: 0, character: 8 }
+      active: { line: 0, character: 8 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        {
+          type: surroundingPair,
+          delimiter: null,
+          delimiterInclusion: includeDelimiters,
+        },
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/parseTree/typescript/clearOutside18.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/parseTree/typescript/clearOutside18.yml
new file mode 100644
index 0000000000..5bbf72eb3f
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/parseTree/typescript/clearOutside18.yml
@@ -0,0 +1,35 @@
+languageId: typescript
+command:
+  version: 1
+  spokenForm: clear outside
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier: { type: surroundingPair, delimiter: any }
+initialState:
+  documentContents: "`Hello, ${name}!`"
+  selections:
+    - anchor: { line: 0, character: 16 }
+      active: { line: 0, character: 16 }
+  marks: {}
+finalState:
+  documentContents: ""
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        {
+          type: surroundingPair,
+          delimiter: null,
+          delimiterInclusion: includeDelimiters,
+        },
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/parseTree/typescript/clearOutside19.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/parseTree/typescript/clearOutside19.yml
new file mode 100644
index 0000000000..f697db508f
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/parseTree/typescript/clearOutside19.yml
@@ -0,0 +1,35 @@
+languageId: typescript
+command:
+  version: 1
+  spokenForm: clear outside
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier: { type: surroundingPair, delimiter: any }
+initialState:
+  documentContents: "`Hello, ${name}!`"
+  selections:
+    - anchor: { line: 0, character: 17 }
+      active: { line: 0, character: 17 }
+  marks: {}
+finalState:
+  documentContents: ""
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        {
+          type: surroundingPair,
+          delimiter: null,
+          delimiterInclusion: includeDelimiters,
+        },
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/parseTree/typescript/clearOutside2.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/parseTree/typescript/clearOutside2.yml
new file mode 100644
index 0000000000..66cb87d0fa
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/parseTree/typescript/clearOutside2.yml
@@ -0,0 +1,35 @@
+languageId: typescript
+command:
+  version: 1
+  spokenForm: clear outside
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier: { type: surroundingPair, delimiter: any }
+initialState:
+  documentContents: '["hello",  "world"]'
+  selections:
+    - anchor: { line: 0, character: 10 }
+      active: { line: 0, character: 10 }
+  marks: {}
+finalState:
+  documentContents: ""
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        {
+          type: surroundingPair,
+          delimiter: null,
+          delimiterInclusion: includeDelimiters,
+        },
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/parseTree/typescript/clearOutside20.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/parseTree/typescript/clearOutside20.yml
new file mode 100644
index 0000000000..8f49a9245c
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/parseTree/typescript/clearOutside20.yml
@@ -0,0 +1,35 @@
+languageId: typescript
+command:
+  version: 1
+  spokenForm: clear outside
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier: { type: surroundingPair, delimiter: any }
+initialState:
+  documentContents: "`Hello, ${name + 's'}!`"
+  selections:
+    - anchor: { line: 0, character: 18 }
+      active: { line: 0, character: 18 }
+  marks: {}
+finalState:
+  documentContents: "`Hello, ${name + }!`"
+  selections:
+    - anchor: { line: 0, character: 17 }
+      active: { line: 0, character: 17 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        {
+          type: surroundingPair,
+          delimiter: null,
+          delimiterInclusion: includeDelimiters,
+        },
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/parseTree/typescript/clearOutside21.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/parseTree/typescript/clearOutside21.yml
new file mode 100644
index 0000000000..a5073fd4df
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/parseTree/typescript/clearOutside21.yml
@@ -0,0 +1,35 @@
+languageId: typescript
+command:
+  version: 1
+  spokenForm: clear outside
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier: { type: surroundingPair, delimiter: any }
+initialState:
+  documentContents: "`Hello, ${name + 's'}!`"
+  selections:
+    - anchor: { line: 0, character: 16 }
+      active: { line: 0, character: 16 }
+  marks: {}
+finalState:
+  documentContents: "`Hello, !`"
+  selections:
+    - anchor: { line: 0, character: 8 }
+      active: { line: 0, character: 8 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        {
+          type: surroundingPair,
+          delimiter: null,
+          delimiterInclusion: includeDelimiters,
+        },
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/parseTree/typescript/clearOutside22.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/parseTree/typescript/clearOutside22.yml
new file mode 100644
index 0000000000..1c76d7b88d
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/parseTree/typescript/clearOutside22.yml
@@ -0,0 +1,35 @@
+languageId: typescript
+command:
+  version: 1
+  spokenForm: clear outside
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier: { type: surroundingPair, delimiter: any }
+initialState:
+  documentContents: "`Hello, \\${name}!`"
+  selections:
+    - anchor: { line: 0, character: 13 }
+      active: { line: 0, character: 13 }
+  marks: {}
+finalState:
+  documentContents: "`Hello, \\$!`"
+  selections:
+    - anchor: { line: 0, character: 10 }
+      active: { line: 0, character: 10 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        {
+          type: surroundingPair,
+          delimiter: null,
+          delimiterInclusion: includeDelimiters,
+        },
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/parseTree/typescript/clearOutside3.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/parseTree/typescript/clearOutside3.yml
new file mode 100644
index 0000000000..7cc8025f75
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/parseTree/typescript/clearOutside3.yml
@@ -0,0 +1,35 @@
+languageId: typescript
+command:
+  version: 1
+  spokenForm: clear outside
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier: { type: surroundingPair, delimiter: any }
+initialState:
+  documentContents: '["hello",  "world"]'
+  selections:
+    - anchor: { line: 0, character: 7 }
+      active: { line: 0, character: 7 }
+  marks: {}
+finalState:
+  documentContents: '[,  "world"]'
+  selections:
+    - anchor: { line: 0, character: 1 }
+      active: { line: 0, character: 1 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        {
+          type: surroundingPair,
+          delimiter: null,
+          delimiterInclusion: includeDelimiters,
+        },
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/parseTree/typescript/clearOutside4.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/parseTree/typescript/clearOutside4.yml
new file mode 100644
index 0000000000..ecf9a1e420
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/parseTree/typescript/clearOutside4.yml
@@ -0,0 +1,35 @@
+languageId: typescript
+command:
+  version: 1
+  spokenForm: clear outside
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier: { type: surroundingPair, delimiter: any }
+initialState:
+  documentContents: '["hello",  "world"]'
+  selections:
+    - anchor: { line: 0, character: 8 }
+      active: { line: 0, character: 8 }
+  marks: {}
+finalState:
+  documentContents: '[,  "world"]'
+  selections:
+    - anchor: { line: 0, character: 1 }
+      active: { line: 0, character: 1 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        {
+          type: surroundingPair,
+          delimiter: null,
+          delimiterInclusion: includeDelimiters,
+        },
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/parseTree/typescript/clearOutside5.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/parseTree/typescript/clearOutside5.yml
new file mode 100644
index 0000000000..b419842ecb
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/parseTree/typescript/clearOutside5.yml
@@ -0,0 +1,35 @@
+languageId: typescript
+command:
+  version: 1
+  spokenForm: clear outside
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier: { type: surroundingPair, delimiter: any }
+initialState:
+  documentContents: '["hello",  "world"]'
+  selections:
+    - anchor: { line: 0, character: 11 }
+      active: { line: 0, character: 11 }
+  marks: {}
+finalState:
+  documentContents: '["hello",  ]'
+  selections:
+    - anchor: { line: 0, character: 11 }
+      active: { line: 0, character: 11 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        {
+          type: surroundingPair,
+          delimiter: null,
+          delimiterInclusion: includeDelimiters,
+        },
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/parseTree/typescript/clearOutside6.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/parseTree/typescript/clearOutside6.yml
new file mode 100644
index 0000000000..58f87e9a00
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/parseTree/typescript/clearOutside6.yml
@@ -0,0 +1,35 @@
+languageId: typescript
+command:
+  version: 1
+  spokenForm: clear outside
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier: { type: surroundingPair, delimiter: any }
+initialState:
+  documentContents: '["hello",  "world"]'
+  selections:
+    - anchor: { line: 0, character: 12 }
+      active: { line: 0, character: 12 }
+  marks: {}
+finalState:
+  documentContents: '["hello",  ]'
+  selections:
+    - anchor: { line: 0, character: 11 }
+      active: { line: 0, character: 11 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        {
+          type: surroundingPair,
+          delimiter: null,
+          delimiterInclusion: includeDelimiters,
+        },
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/parseTree/typescript/clearOutside9.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/parseTree/typescript/clearOutside9.yml
new file mode 100644
index 0000000000..56c554811f
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/parseTree/typescript/clearOutside9.yml
@@ -0,0 +1,35 @@
+languageId: typescript
+command:
+  version: 1
+  spokenForm: clear outside
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier: { type: surroundingPair, delimiter: any }
+initialState:
+  documentContents: "`Hello, ${name}!`"
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+  marks: {}
+finalState:
+  documentContents: ""
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        {
+          type: surroundingPair,
+          delimiter: null,
+          delimiterInclusion: includeDelimiters,
+        },
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/parseTree/typescript/clearPair.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/parseTree/typescript/clearPair.yml
new file mode 100644
index 0000000000..ed65172641
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/parseTree/typescript/clearPair.yml
@@ -0,0 +1,30 @@
+languageId: typescript
+command:
+  version: 1
+  spokenForm: clear pair
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier: { type: surroundingPair, delimiter: any }
+initialState:
+  documentContents: if (foo > 0) {}
+  selections:
+    - anchor: { line: 0, character: 7 }
+      active: { line: 0, character: 7 }
+  marks: {}
+finalState:
+  documentContents: if  {}
+  selections:
+    - anchor: { line: 0, character: 3 }
+      active: { line: 0, character: 3 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier: { type: surroundingPair, delimiter: any },
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/parseTree/typescript/clearPair10.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/parseTree/typescript/clearPair10.yml
new file mode 100644
index 0000000000..eedccd0d21
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/parseTree/typescript/clearPair10.yml
@@ -0,0 +1,31 @@
+languageId: typescript
+command:
+  version: 1
+  spokenForm: clear pair
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier: { type: surroundingPair, delimiter: any }
+initialState:
+  documentContents: foo<bar>
+  selections:
+    - anchor: { line: 0, character: 6 }
+      active: { line: 0, character: 6 }
+  marks: {}
+finalState:
+  documentContents: foo
+  selections:
+    - anchor: { line: 0, character: 3 }
+      active: { line: 0, character: 3 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier: { type: surroundingPair, delimiter: any },
+      isImplicit: false,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/parseTree/typescript/clearPair2.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/parseTree/typescript/clearPair2.yml
new file mode 100644
index 0000000000..c0e6888e91
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/parseTree/typescript/clearPair2.yml
@@ -0,0 +1,30 @@
+languageId: typescript
+command:
+  version: 1
+  spokenForm: clear pair
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier: { type: surroundingPair, delimiter: any }
+initialState:
+  documentContents: if (foo > 0) {}
+  selections:
+    - anchor: { line: 0, character: 8 }
+      active: { line: 0, character: 8 }
+  marks: {}
+finalState:
+  documentContents: if  {}
+  selections:
+    - anchor: { line: 0, character: 3 }
+      active: { line: 0, character: 3 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier: { type: surroundingPair, delimiter: any },
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/parseTree/typescript/clearPair3.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/parseTree/typescript/clearPair3.yml
new file mode 100644
index 0000000000..01851249cb
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/parseTree/typescript/clearPair3.yml
@@ -0,0 +1,30 @@
+languageId: typescript
+command:
+  version: 1
+  spokenForm: clear pair
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier: { type: surroundingPair, delimiter: any }
+initialState:
+  documentContents: if (foo > 0) {}
+  selections:
+    - anchor: { line: 0, character: 9 }
+      active: { line: 0, character: 9 }
+  marks: {}
+finalState:
+  documentContents: if  {}
+  selections:
+    - anchor: { line: 0, character: 3 }
+      active: { line: 0, character: 3 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier: { type: surroundingPair, delimiter: any },
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/parseTree/typescript/clearPair4.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/parseTree/typescript/clearPair4.yml
new file mode 100644
index 0000000000..eae8ccaf13
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/parseTree/typescript/clearPair4.yml
@@ -0,0 +1,30 @@
+languageId: typescript
+command:
+  version: 1
+  spokenForm: clear pair
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier: { type: surroundingPair, delimiter: any }
+initialState:
+  documentContents: 'const {hello} = {hello: "world"}'
+  selections:
+    - anchor: { line: 0, character: 23 }
+      active: { line: 0, character: 23 }
+  marks: {}
+finalState:
+  documentContents: "const {hello} = "
+  selections:
+    - anchor: { line: 0, character: 16 }
+      active: { line: 0, character: 16 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier: { type: surroundingPair, delimiter: any },
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/parseTree/typescript/clearPair5.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/parseTree/typescript/clearPair5.yml
new file mode 100644
index 0000000000..c51a8b4638
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/parseTree/typescript/clearPair5.yml
@@ -0,0 +1,30 @@
+languageId: typescript
+command:
+  version: 1
+  spokenForm: clear pair
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier: { type: surroundingPair, delimiter: any }
+initialState:
+  documentContents: 'const {hello} = {hello: "world"}'
+  selections:
+    - anchor: { line: 0, character: 28 }
+      active: { line: 0, character: 28 }
+  marks: {}
+finalState:
+  documentContents: "const {hello} = {hello: }"
+  selections:
+    - anchor: { line: 0, character: 24 }
+      active: { line: 0, character: 24 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier: { type: surroundingPair, delimiter: any },
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/parseTree/typescript/clearPair6.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/parseTree/typescript/clearPair6.yml
new file mode 100644
index 0000000000..5ed27ffaf2
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/parseTree/typescript/clearPair6.yml
@@ -0,0 +1,30 @@
+languageId: typescript
+command:
+  version: 1
+  spokenForm: clear pair
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier: { type: surroundingPair, delimiter: any }
+initialState:
+  documentContents: 'const {hello} = {hello: "world"}'
+  selections:
+    - anchor: { line: 0, character: 10 }
+      active: { line: 0, character: 10 }
+  marks: {}
+finalState:
+  documentContents: 'const  = {hello: "world"}'
+  selections:
+    - anchor: { line: 0, character: 6 }
+      active: { line: 0, character: 6 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier: { type: surroundingPair, delimiter: any },
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/parseTree/typescript/clearPair7.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/parseTree/typescript/clearPair7.yml
new file mode 100644
index 0000000000..3d7f45ba38
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/parseTree/typescript/clearPair7.yml
@@ -0,0 +1,30 @@
+languageId: typescript
+command:
+  version: 1
+  spokenForm: clear pair
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier: { type: surroundingPair, delimiter: any }
+initialState:
+  documentContents: () => {return 0;}
+  selections:
+    - anchor: { line: 0, character: 12 }
+      active: { line: 0, character: 12 }
+  marks: {}
+finalState:
+  documentContents: "() => "
+  selections:
+    - anchor: { line: 0, character: 6 }
+      active: { line: 0, character: 6 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier: { type: surroundingPair, delimiter: any },
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/parseTree/typescript/clearPair8.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/parseTree/typescript/clearPair8.yml
new file mode 100644
index 0000000000..ab0f8dc12e
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/parseTree/typescript/clearPair8.yml
@@ -0,0 +1,30 @@
+languageId: typescript
+command:
+  version: 1
+  spokenForm: clear pair
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier: { type: surroundingPair, delimiter: any }
+initialState:
+  documentContents: function hello<Foo>() {}
+  selections:
+    - anchor: { line: 0, character: 17 }
+      active: { line: 0, character: 17 }
+  marks: {}
+finalState:
+  documentContents: function hello() {}
+  selections:
+    - anchor: { line: 0, character: 14 }
+      active: { line: 0, character: 14 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier: { type: surroundingPair, delimiter: any },
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/parseTree/typescript/clearPair9.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/parseTree/typescript/clearPair9.yml
new file mode 100644
index 0000000000..d15e490ea2
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/parseTree/typescript/clearPair9.yml
@@ -0,0 +1,31 @@
+languageId: typescript
+command:
+  version: 1
+  spokenForm: clear pair
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier: { type: surroundingPair, delimiter: any }
+initialState:
+  documentContents: foo<>
+  selections:
+    - anchor: { line: 0, character: 4 }
+      active: { line: 0, character: 4 }
+  marks: {}
+finalState:
+  documentContents: foo
+  selections:
+    - anchor: { line: 0, character: 3 }
+      active: { line: 0, character: 3 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier: { type: surroundingPair, delimiter: any },
+      isImplicit: false,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/parseTree/typescript/clearQuad.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/parseTree/typescript/clearQuad.yml
new file mode 100644
index 0000000000..da17903d59
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/parseTree/typescript/clearQuad.yml
@@ -0,0 +1,35 @@
+languageId: typescript
+command:
+  version: 1
+  spokenForm: clear quad
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier: { type: surroundingPair, delimiter: doubleQuotes }
+initialState:
+  documentContents: // "(hello)"
+  selections:
+    - anchor: { line: 0, character: 7 }
+      active: { line: 0, character: 7 }
+  marks: {}
+finalState:
+  documentContents: "// "
+  selections:
+    - anchor: { line: 0, character: 3 }
+      active: { line: 0, character: 3 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        {
+          type: surroundingPair,
+          delimiter: doubleQuotes,
+          delimiterInclusion: includeDelimiters,
+        },
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/parseTree/typescript/clearRound2.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/parseTree/typescript/clearRound2.yml
new file mode 100644
index 0000000000..3d41801be3
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/parseTree/typescript/clearRound2.yml
@@ -0,0 +1,35 @@
+languageId: typescript
+command:
+  version: 1
+  spokenForm: clear round
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier: { type: surroundingPair, delimiter: parentheses }
+initialState:
+  documentContents: '"(hello)"'
+  selections:
+    - anchor: { line: 0, character: 6 }
+      active: { line: 0, character: 6 }
+  marks: {}
+finalState:
+  documentContents: '""'
+  selections:
+    - anchor: { line: 0, character: 1 }
+      active: { line: 0, character: 1 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        {
+          type: surroundingPair,
+          delimiter: parentheses,
+          delimiterInclusion: includeDelimiters,
+        },
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/parseTree/typescript/clearRound3.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/parseTree/typescript/clearRound3.yml
new file mode 100644
index 0000000000..a8231617d3
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/parseTree/typescript/clearRound3.yml
@@ -0,0 +1,35 @@
+languageId: typescript
+command:
+  version: 1
+  spokenForm: clear round
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier: { type: surroundingPair, delimiter: parentheses }
+initialState:
+  documentContents: // "(hello)"
+  selections:
+    - anchor: { line: 0, character: 7 }
+      active: { line: 0, character: 7 }
+  marks: {}
+finalState:
+  documentContents: // ""
+  selections:
+    - anchor: { line: 0, character: 4 }
+      active: { line: 0, character: 4 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        {
+          type: surroundingPair,
+          delimiter: parentheses,
+          delimiterInclusion: includeDelimiters,
+        },
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/parseTree/typescript/clearRound4.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/parseTree/typescript/clearRound4.yml
new file mode 100644
index 0000000000..60f2feaa7c
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/parseTree/typescript/clearRound4.yml
@@ -0,0 +1,35 @@
+languageId: typescript
+command:
+  version: 1
+  spokenForm: clear round
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier: { type: surroundingPair, delimiter: parentheses }
+initialState:
+  documentContents: "'(hello)'"
+  selections:
+    - anchor: { line: 0, character: 5 }
+      active: { line: 0, character: 5 }
+  marks: {}
+finalState:
+  documentContents: "''"
+  selections:
+    - anchor: { line: 0, character: 1 }
+      active: { line: 0, character: 1 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        {
+          type: surroundingPair,
+          delimiter: parentheses,
+          delimiterInclusion: includeDelimiters,
+        },
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/parseTree/typescript/clearSkis.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/parseTree/typescript/clearSkis.yml
new file mode 100644
index 0000000000..cf30d0781c
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/parseTree/typescript/clearSkis.yml
@@ -0,0 +1,35 @@
+languageId: typescript
+command:
+  version: 1
+  spokenForm: clear skis
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier: { type: surroundingPair, delimiter: backtickQuotes }
+initialState:
+  documentContents: "`Hello, ${name}!`"
+  selections:
+    - anchor: { line: 0, character: 12 }
+      active: { line: 0, character: 12 }
+  marks: {}
+finalState:
+  documentContents: ""
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        {
+          type: surroundingPair,
+          delimiter: backtickQuotes,
+          delimiterInclusion: includeDelimiters,
+        },
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/parseTree/typescript/clearSquare3.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/parseTree/typescript/clearSquare3.yml
new file mode 100644
index 0000000000..7ed9c6d684
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/parseTree/typescript/clearSquare3.yml
@@ -0,0 +1,40 @@
+languageId: typescript
+command:
+  version: 1
+  spokenForm: clear square
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier:
+        {
+          type: surroundingPair,
+          delimiter: squareBrackets,
+          delimiterInclusion: interiorOnly,
+        }
+initialState:
+  documentContents: const [bongo, baz] = [foo, bar]
+  selections:
+    - anchor: { line: 0, character: 22 }
+      active: { line: 0, character: 22 }
+  marks: {}
+finalState:
+  documentContents: const [bongo, baz] = []
+  selections:
+    - anchor: { line: 0, character: 22 }
+      active: { line: 0, character: 22 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      modifier:
+        {
+          type: surroundingPair,
+          delimiter: squareBrackets,
+          delimitersOnly: false,
+        },
+      insideOutsideType: inside,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/parseTree/typescript/clearSquare4.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/parseTree/typescript/clearSquare4.yml
new file mode 100644
index 0000000000..3fe4348bbe
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/parseTree/typescript/clearSquare4.yml
@@ -0,0 +1,40 @@
+languageId: typescript
+command:
+  version: 1
+  spokenForm: clear square
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier:
+        {
+          type: surroundingPair,
+          delimiter: squareBrackets,
+          delimiterInclusion: interiorOnly,
+        }
+initialState:
+  documentContents: const [bongo, baz] = [foo, bar]
+  selections:
+    - anchor: { line: 0, character: 21 }
+      active: { line: 0, character: 21 }
+  marks: {}
+finalState:
+  documentContents: const [bongo, baz] = []
+  selections:
+    - anchor: { line: 0, character: 22 }
+      active: { line: 0, character: 22 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      modifier:
+        {
+          type: surroundingPair,
+          delimiter: squareBrackets,
+          delimitersOnly: false,
+        },
+      insideOutsideType: inside,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/parseTree/typescript/clearSquare5.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/parseTree/typescript/clearSquare5.yml
new file mode 100644
index 0000000000..a8bc9bf618
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/parseTree/typescript/clearSquare5.yml
@@ -0,0 +1,40 @@
+languageId: typescript
+command:
+  version: 1
+  spokenForm: clear square
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier:
+        {
+          type: surroundingPair,
+          delimiter: squareBrackets,
+          delimiterInclusion: interiorOnly,
+        }
+initialState:
+  documentContents: const [bongo, baz] = [foo, bar]
+  selections:
+    - anchor: { line: 0, character: 30 }
+      active: { line: 0, character: 30 }
+  marks: {}
+finalState:
+  documentContents: const [bongo, baz] = []
+  selections:
+    - anchor: { line: 0, character: 22 }
+      active: { line: 0, character: 22 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      modifier:
+        {
+          type: surroundingPair,
+          delimiter: squareBrackets,
+          delimitersOnly: false,
+        },
+      insideOutsideType: inside,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/parseTree/typescript/clearSquareLack.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/parseTree/typescript/clearSquareLack.yml
new file mode 100644
index 0000000000..e828c452e4
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/parseTree/typescript/clearSquareLack.yml
@@ -0,0 +1,44 @@
+languageId: typescript
+command:
+  version: 1
+  spokenForm: clear square lack
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier:
+        {
+          type: surroundingPair,
+          delimiter: squareBrackets,
+          delimiterInclusion: interiorOnly,
+        }
+      mark: { type: decoratedSymbol, symbolColor: default, character: "[" }
+initialState:
+  documentContents: const [bongo, baz] = [foo, bar]
+  selections:
+    - anchor: { line: 0, character: 26 }
+      active: { line: 0, character: 26 }
+  marks:
+    default.[:
+      start: { line: 0, character: 21 }
+      end: { line: 0, character: 22 }
+finalState:
+  documentContents: const [bongo, baz] = []
+  selections:
+    - anchor: { line: 0, character: 22 }
+      active: { line: 0, character: 22 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: decoratedSymbol, symbolColor: default, character: "[" },
+      selectionType: token,
+      position: contents,
+      modifier:
+        {
+          type: surroundingPair,
+          delimiter: squareBrackets,
+          delimitersOnly: false,
+        },
+      insideOutsideType: inside,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/parseTree/typescript/clearSquareRack.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/parseTree/typescript/clearSquareRack.yml
new file mode 100644
index 0000000000..95e7d641f4
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/parseTree/typescript/clearSquareRack.yml
@@ -0,0 +1,44 @@
+languageId: typescript
+command:
+  version: 1
+  spokenForm: clear square rack
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier:
+        {
+          type: surroundingPair,
+          delimiter: squareBrackets,
+          delimiterInclusion: interiorOnly,
+        }
+      mark: { type: decoratedSymbol, symbolColor: default, character: "]" }
+initialState:
+  documentContents: const [bongo, baz] = [foo, bar]
+  selections:
+    - anchor: { line: 0, character: 26 }
+      active: { line: 0, character: 26 }
+  marks:
+    default.]:
+      start: { line: 0, character: 30 }
+      end: { line: 0, character: 31 }
+finalState:
+  documentContents: const [bongo, baz] = []
+  selections:
+    - anchor: { line: 0, character: 22 }
+      active: { line: 0, character: 22 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: decoratedSymbol, symbolColor: default, character: "]" },
+      selectionType: token,
+      position: contents,
+      modifier:
+        {
+          type: surroundingPair,
+          delimiter: squareBrackets,
+          delimitersOnly: false,
+        },
+      insideOutsideType: inside,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/parseTree/typescript/clearString.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/parseTree/typescript/clearString.yml
new file mode 100644
index 0000000000..2b1899afa2
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/parseTree/typescript/clearString.yml
@@ -0,0 +1,35 @@
+languageId: typescript
+command:
+  version: 1
+  spokenForm: clear string
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier: { type: surroundingPair, delimiter: string }
+initialState:
+  documentContents: '"(hello)"'
+  selections:
+    - anchor: { line: 0, character: 5 }
+      active: { line: 0, character: 5 }
+  marks: {}
+finalState:
+  documentContents: ""
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        {
+          type: surroundingPair,
+          delimiter: string,
+          delimiterInclusion: includeDelimiters,
+        },
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/parseTree/typescript/clearString2.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/parseTree/typescript/clearString2.yml
new file mode 100644
index 0000000000..1242e821f7
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/parseTree/typescript/clearString2.yml
@@ -0,0 +1,35 @@
+languageId: typescript
+command:
+  version: 1
+  spokenForm: clear string
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier: { type: surroundingPair, delimiter: string }
+initialState:
+  documentContents: "'(hello)'"
+  selections:
+    - anchor: { line: 0, character: 5 }
+      active: { line: 0, character: 5 }
+  marks: {}
+finalState:
+  documentContents: ""
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        {
+          type: surroundingPair,
+          delimiter: string,
+          delimiterInclusion: includeDelimiters,
+        },
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/parseTree/typescript/clearString3.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/parseTree/typescript/clearString3.yml
new file mode 100644
index 0000000000..6734900de4
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/parseTree/typescript/clearString3.yml
@@ -0,0 +1,35 @@
+languageId: typescript
+command:
+  version: 1
+  spokenForm: clear string
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier: { type: surroundingPair, delimiter: string }
+initialState:
+  documentContents: "`(hello)`"
+  selections:
+    - anchor: { line: 0, character: 5 }
+      active: { line: 0, character: 5 }
+  marks: {}
+finalState:
+  documentContents: ""
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        {
+          type: surroundingPair,
+          delimiter: string,
+          delimiterInclusion: includeDelimiters,
+        },
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/parseTree/typescript/takeCore.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/parseTree/typescript/takeCore.yml
new file mode 100644
index 0000000000..e1cb5938e2
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/parseTree/typescript/takeCore.yml
@@ -0,0 +1,48 @@
+languageId: typescript
+command:
+  spokenForm: take core
+  version: 2
+  targets:
+    - type: primitive
+      modifiers:
+        - { type: interiorOnly }
+        - type: containingScope
+          scopeType: { type: surroundingPair, delimiter: any }
+  usePrePhraseSnapshot: true
+  action: { name: setSelection }
+initialState:
+  documentContents: |
+    async (editor, targets) => {
+        const edits = targets.map((target, i) =>(
+        text: i%2 === 0?left:right
+        )
+    }
+  selections:
+    - anchor: { line: 2, character: 8 }
+      active: { line: 2, character: 8 }
+  marks: {}
+finalState:
+  documentContents: |
+    async (editor, targets) => {
+        const edits = targets.map((target, i) =>(
+        text: i%2 === 0?left:right
+        )
+    }
+  selections:
+    - anchor: { line: 2, character: 4 }
+      active: { line: 2, character: 30 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      modifiers:
+        [
+          {
+            type: containingScope,
+            scopeType: { type: surroundingPair, delimiter: any },
+          },
+          { type: interiorOnly },
+        ],
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/parseTree/typescript/takePairBatt.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/parseTree/typescript/takePairBatt.yml
new file mode 100644
index 0000000000..234a045837
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/parseTree/typescript/takePairBatt.yml
@@ -0,0 +1,35 @@
+languageId: typescript
+command:
+  version: 1
+  spokenForm: take pair batt
+  action: setSelection
+  targets:
+    - type: primitive
+      modifier: { type: surroundingPair, delimiter: any }
+      mark: { type: decoratedSymbol, symbolColor: default, character: b }
+initialState:
+  documentContents: const r = /a[b]*/;
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+  marks:
+    default.b:
+      start: { line: 0, character: 13 }
+      end: { line: 0, character: 14 }
+finalState:
+  documentContents: const r = /a[b]*/;
+  selections:
+    - anchor: { line: 0, character: 12 }
+      active: { line: 0, character: 15 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: decoratedSymbol, symbolColor: default, character: b },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier: { type: surroundingPair, delimiter: any },
+      isImplicit: false,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/parseTreeParity/README.md b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/parseTreeParity/README.md
similarity index 100%
rename from packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/parseTreeParity/README.md
rename to packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/parseTreeParity/README.md
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/parseTreeParity/chuckInsideRound.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/parseTreeParity/chuckInsideRound.yml
new file mode 100644
index 0000000000..3197e96b27
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/parseTreeParity/chuckInsideRound.yml
@@ -0,0 +1,40 @@
+languageId: typescript
+command:
+  version: 1
+  spokenForm: chuck inside round
+  action: remove
+  targets:
+    - type: primitive
+      modifier:
+        {
+          type: surroundingPair,
+          delimiter: parentheses,
+          delimiterInclusion: interiorOnly,
+        }
+initialState:
+  documentContents: (hello)
+  selections:
+    - anchor: { line: 0, character: 5 }
+      active: { line: 0, character: 5 }
+  marks: {}
+finalState:
+  documentContents: ()
+  selections:
+    - anchor: { line: 0, character: 1 }
+      active: { line: 0, character: 1 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: outside,
+      modifier:
+        {
+          type: surroundingPair,
+          delimiter: parentheses,
+          delimiterInclusion: excludeDelimiters,
+        },
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/parseTreeParity/chuckPairRound.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/parseTreeParity/chuckPairRound.yml
new file mode 100644
index 0000000000..78d4616251
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/parseTreeParity/chuckPairRound.yml
@@ -0,0 +1,40 @@
+languageId: typescript
+command:
+  version: 1
+  spokenForm: chuck pair round
+  action: remove
+  targets:
+    - type: primitive
+      modifier:
+        {
+          type: surroundingPair,
+          delimiter: parentheses,
+          delimiterInclusion: excludeInterior,
+        }
+initialState:
+  documentContents: (hello)
+  selections:
+    - anchor: { line: 0, character: 5 }
+      active: { line: 0, character: 5 }
+  marks: {}
+finalState:
+  documentContents: hello
+  selections:
+    - anchor: { line: 0, character: 4 }
+      active: { line: 0, character: 4 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: outside,
+      modifier:
+        {
+          type: surroundingPair,
+          delimiter: parentheses,
+          delimiterInclusion: delimitersOnly,
+        },
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/parseTreeParity/chuckRound2.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/parseTreeParity/chuckRound2.yml
new file mode 100644
index 0000000000..75ddab29af
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/parseTreeParity/chuckRound2.yml
@@ -0,0 +1,35 @@
+languageId: typescript
+command:
+  version: 1
+  spokenForm: chuck round
+  action: remove
+  targets:
+    - type: primitive
+      modifier: { type: surroundingPair, delimiter: parentheses }
+initialState:
+  documentContents: (hello)
+  selections:
+    - anchor: { line: 0, character: 5 }
+      active: { line: 0, character: 5 }
+  marks: {}
+finalState:
+  documentContents: ""
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: outside,
+      modifier:
+        {
+          type: surroundingPair,
+          delimiter: parentheses,
+          delimiterInclusion: includeDelimiters,
+        },
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/parseTreeParity/clearBoundsDouble.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/parseTreeParity/clearBoundsDouble.yml
new file mode 100644
index 0000000000..7a98f790eb
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/parseTreeParity/clearBoundsDouble.yml
@@ -0,0 +1,40 @@
+languageId: typescript
+command:
+  version: 1
+  spokenForm: clear bounds double
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier:
+        {
+          type: surroundingPair,
+          delimiter: any,
+          delimiterInclusion: excludeInterior,
+        }
+      mark: { type: decoratedSymbol, symbolColor: default, character: '"' }
+initialState:
+  documentContents: '""'
+  selections:
+    - anchor: { line: 0, character: 1 }
+      active: { line: 0, character: 1 }
+finalState:
+  documentContents: ""
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: decoratedSymbol, symbolColor: default, character: '"' },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        {
+          type: surroundingPair,
+          delimiter: null,
+          delimiterInclusion: delimitersOnly,
+        },
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/parseTreeParity/clearBoundsRound.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/parseTreeParity/clearBoundsRound.yml
new file mode 100644
index 0000000000..27f3f92ad8
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/parseTreeParity/clearBoundsRound.yml
@@ -0,0 +1,39 @@
+languageId: typescript
+command:
+  version: 1
+  spokenForm: clear bounds round
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier:
+        {
+          type: surroundingPair,
+          delimiter: parentheses,
+          delimiterInclusion: excludeInterior,
+        }
+initialState:
+  documentContents: ()
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+finalState:
+  documentContents: ""
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        {
+          type: surroundingPair,
+          delimiter: parentheses,
+          delimiterInclusion: delimitersOnly,
+        },
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/parseTreeParity/clearBoundsRound2.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/parseTreeParity/clearBoundsRound2.yml
new file mode 100644
index 0000000000..e371929d99
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/parseTreeParity/clearBoundsRound2.yml
@@ -0,0 +1,41 @@
+languageId: typescript
+command:
+  version: 1
+  spokenForm: clear bounds round
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier:
+        {
+          type: surroundingPair,
+          delimiter: parentheses,
+          delimiterInclusion: excludeInterior,
+        }
+initialState:
+  documentContents: (hello)
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+finalState:
+  documentContents: hello
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+    - anchor: { line: 0, character: 5 }
+      active: { line: 0, character: 5 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        {
+          type: surroundingPair,
+          delimiter: parentheses,
+          delimiterInclusion: delimitersOnly,
+        },
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/parseTreeParity/clearCurly2.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/parseTreeParity/clearCurly2.yml
new file mode 100644
index 0000000000..25ff0ee6a5
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/parseTreeParity/clearCurly2.yml
@@ -0,0 +1,38 @@
+languageId: typescript
+command:
+  version: 1
+  spokenForm: clear curly
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier: { type: surroundingPair, delimiter: curlyBrackets }
+initialState:
+  documentContents: |-
+    {
+        hello
+    }
+  selections:
+    - anchor: { line: 1, character: 7 }
+      active: { line: 1, character: 7 }
+  marks: {}
+finalState:
+  documentContents: ""
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        {
+          type: surroundingPair,
+          delimiter: curlyBrackets,
+          delimiterInclusion: includeDelimiters,
+        },
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/parseTreeParity/clearOutsideGreenDouble.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/parseTreeParity/clearOutsideGreenDouble.yml
new file mode 100644
index 0000000000..2f1afbb35c
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/parseTreeParity/clearOutsideGreenDouble.yml
@@ -0,0 +1,45 @@
+languageId: typescript
+command:
+  version: 1
+  spokenForm: clear outside blue double
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier: { type: surroundingPair, delimiter: any }
+      mark: { type: decoratedSymbol, symbolColor: blue, character: '"' }
+initialState:
+  documentContents: '""'
+  selections:
+    - anchor: { line: 0, character: 1 }
+      active: { line: 0, character: 1 }
+  marks:
+    blue.":
+      start: { line: 0, character: 0 }
+      end: { line: 0, character: 1 }
+finalState:
+  documentContents: ""
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark:
+        {
+          type: decoratedSymbol,
+          symbolColor: green,
+          character: '"',
+          usePrePhraseSnapshot: true,
+        },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        {
+          type: surroundingPair,
+          delimiter: null,
+          delimiterInclusion: includeDelimiters,
+        },
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/parseTreeParity/clearRound9.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/parseTreeParity/clearRound9.yml
new file mode 100644
index 0000000000..669e8d7600
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/parseTreeParity/clearRound9.yml
@@ -0,0 +1,42 @@
+languageId: typescript
+command:
+  version: 1
+  spokenForm: clear round
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier: { type: surroundingPair, delimiter: parentheses }
+initialState:
+  documentContents: |-
+    (hello)
+    (hello)
+  selections:
+    - anchor: { line: 0, character: 4 }
+      active: { line: 0, character: 4 }
+    - anchor: { line: 1, character: 4 }
+      active: { line: 1, character: 4 }
+  marks: {}
+finalState:
+  documentContents: |+
+
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+    - anchor: { line: 1, character: 0 }
+      active: { line: 1, character: 0 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        {
+          type: surroundingPair,
+          delimiter: parentheses,
+          delimiterInclusion: includeDelimiters,
+        },
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeInsideRound.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeInsideRound.yml
new file mode 100644
index 0000000000..1d0f395990
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeInsideRound.yml
@@ -0,0 +1,39 @@
+languageId: typescript
+command:
+  version: 1
+  spokenForm: clear inside round
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier:
+        {
+          type: surroundingPair,
+          delimiter: parentheses,
+          delimiterInclusion: interiorOnly,
+        }
+initialState:
+  documentContents: ()
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+finalState:
+  documentContents: ()
+  selections:
+    - anchor: { line: 0, character: 1 }
+      active: { line: 0, character: 1 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        {
+          type: surroundingPair,
+          delimiter: parentheses,
+          delimiterInclusion: excludeDelimiters,
+        },
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeInsideRound2.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeInsideRound2.yml
new file mode 100644
index 0000000000..c67f9f2069
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeInsideRound2.yml
@@ -0,0 +1,39 @@
+languageId: typescript
+command:
+  version: 1
+  spokenForm: clear inside round
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier:
+        {
+          type: surroundingPair,
+          delimiter: parentheses,
+          delimiterInclusion: interiorOnly,
+        }
+initialState:
+  documentContents: (hello)
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+finalState:
+  documentContents: ()
+  selections:
+    - anchor: { line: 0, character: 1 }
+      active: { line: 0, character: 1 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        {
+          type: surroundingPair,
+          delimiter: parentheses,
+          delimiterInclusion: excludeDelimiters,
+        },
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeOutside.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeOutside.yml
new file mode 100644
index 0000000000..9bd084012a
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeOutside.yml
@@ -0,0 +1,34 @@
+languageId: typescript
+command:
+  version: 1
+  spokenForm: clear outside
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier: { type: surroundingPair, delimiter: any }
+initialState:
+  documentContents: ()
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+finalState:
+  documentContents: ""
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        {
+          type: surroundingPair,
+          delimiter: null,
+          delimiterInclusion: includeDelimiters,
+        },
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeOutside11.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeOutside11.yml
new file mode 100644
index 0000000000..16a098ee82
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeOutside11.yml
@@ -0,0 +1,35 @@
+languageId: typescript
+command:
+  version: 1
+  spokenForm: clear outside
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier: { type: surroundingPair, delimiter: any }
+initialState:
+  documentContents: (  [  )  ]
+  selections:
+    - anchor: { line: 0, character: 1 }
+      active: { line: 0, character: 1 }
+  marks: {}
+finalState:
+  documentContents: "  ]"
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        {
+          type: surroundingPair,
+          delimiter: null,
+          delimiterInclusion: includeDelimiters,
+        },
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeOutside12.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeOutside12.yml
new file mode 100644
index 0000000000..90b7b03a40
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeOutside12.yml
@@ -0,0 +1,35 @@
+languageId: typescript
+command:
+  version: 1
+  spokenForm: clear outside
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier: { type: surroundingPair, delimiter: any }
+initialState:
+  documentContents: (  [  )  ]
+  selections:
+    - anchor: { line: 0, character: 2 }
+      active: { line: 0, character: 2 }
+  marks: {}
+finalState:
+  documentContents: "  ]"
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        {
+          type: surroundingPair,
+          delimiter: null,
+          delimiterInclusion: includeDelimiters,
+        },
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeOutside13.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeOutside13.yml
new file mode 100644
index 0000000000..6b13a9351e
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeOutside13.yml
@@ -0,0 +1,35 @@
+languageId: typescript
+command:
+  version: 1
+  spokenForm: clear outside
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier: { type: surroundingPair, delimiter: any }
+initialState:
+  documentContents: (  [  )  ]
+  selections:
+    - anchor: { line: 0, character: 3 }
+      active: { line: 0, character: 3 }
+  marks: {}
+finalState:
+  documentContents: "(  "
+  selections:
+    - anchor: { line: 0, character: 3 }
+      active: { line: 0, character: 3 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        {
+          type: surroundingPair,
+          delimiter: null,
+          delimiterInclusion: includeDelimiters,
+        },
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeOutside14.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeOutside14.yml
new file mode 100644
index 0000000000..6fe00962a8
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeOutside14.yml
@@ -0,0 +1,35 @@
+languageId: typescript
+command:
+  version: 1
+  spokenForm: clear outside
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier: { type: surroundingPair, delimiter: any }
+initialState:
+  documentContents: (  [  )  ]
+  selections:
+    - anchor: { line: 0, character: 5 }
+      active: { line: 0, character: 5 }
+  marks: {}
+finalState:
+  documentContents: "  ]"
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        {
+          type: surroundingPair,
+          delimiter: null,
+          delimiterInclusion: includeDelimiters,
+        },
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeOutside15.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeOutside15.yml
new file mode 100644
index 0000000000..9fddb8c7af
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeOutside15.yml
@@ -0,0 +1,35 @@
+languageId: typescript
+command:
+  version: 1
+  spokenForm: clear outside
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier: { type: surroundingPair, delimiter: any }
+initialState:
+  documentContents: (  [  )  ]
+  selections:
+    - anchor: { line: 0, character: 7 }
+      active: { line: 0, character: 7 }
+  marks: {}
+finalState:
+  documentContents: "  ]"
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        {
+          type: surroundingPair,
+          delimiter: null,
+          delimiterInclusion: includeDelimiters,
+        },
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeOutside16.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeOutside16.yml
new file mode 100644
index 0000000000..0cde55d15a
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeOutside16.yml
@@ -0,0 +1,35 @@
+languageId: typescript
+command:
+  version: 1
+  spokenForm: clear outside
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier: { type: surroundingPair, delimiter: any }
+initialState:
+  documentContents: (  [  )  ]
+  selections:
+    - anchor: { line: 0, character: 8 }
+      active: { line: 0, character: 8 }
+  marks: {}
+finalState:
+  documentContents: "(  "
+  selections:
+    - anchor: { line: 0, character: 3 }
+      active: { line: 0, character: 3 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        {
+          type: surroundingPair,
+          delimiter: null,
+          delimiterInclusion: includeDelimiters,
+        },
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeOutside17.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeOutside17.yml
new file mode 100644
index 0000000000..85cb774812
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeOutside17.yml
@@ -0,0 +1,35 @@
+languageId: typescript
+command:
+  version: 1
+  spokenForm: clear outside
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier: { type: surroundingPair, delimiter: any }
+initialState:
+  documentContents: "[  (  ]  )"
+  selections:
+    - anchor: { line: 0, character: 2 }
+      active: { line: 0, character: 2 }
+  marks: {}
+finalState:
+  documentContents: "  )"
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        {
+          type: surroundingPair,
+          delimiter: null,
+          delimiterInclusion: includeDelimiters,
+        },
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeOutside18.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeOutside18.yml
new file mode 100644
index 0000000000..2ef8c89faa
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeOutside18.yml
@@ -0,0 +1,35 @@
+languageId: typescript
+command:
+  version: 1
+  spokenForm: clear outside
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier: { type: surroundingPair, delimiter: any }
+initialState:
+  documentContents: "{   (  ]  )"
+  selections:
+    - anchor: { line: 0, character: 9 }
+      active: { line: 0, character: 9 }
+  marks: {}
+finalState:
+  documentContents: "{   "
+  selections:
+    - anchor: { line: 0, character: 4 }
+      active: { line: 0, character: 4 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        {
+          type: surroundingPair,
+          delimiter: null,
+          delimiterInclusion: includeDelimiters,
+        },
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeOutside19.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeOutside19.yml
new file mode 100644
index 0000000000..316b499705
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeOutside19.yml
@@ -0,0 +1,35 @@
+languageId: typescript
+command:
+  version: 1
+  spokenForm: clear outside
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier: { type: surroundingPair, delimiter: any }
+initialState:
+  documentContents: "{   (  } ]  )"
+  selections:
+    - anchor: { line: 0, character: 8 }
+      active: { line: 0, character: 8 }
+  marks: {}
+finalState:
+  documentContents: " ]  )"
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        {
+          type: surroundingPair,
+          delimiter: null,
+          delimiterInclusion: includeDelimiters,
+        },
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeOutside2.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeOutside2.yml
new file mode 100644
index 0000000000..9f109d7036
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeOutside2.yml
@@ -0,0 +1,34 @@
+languageId: typescript
+command:
+  version: 1
+  spokenForm: clear outside
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier: { type: surroundingPair, delimiter: any }
+initialState:
+  documentContents: ([])
+  selections:
+    - anchor: { line: 0, character: 3 }
+      active: { line: 0, character: 3 }
+finalState:
+  documentContents: ""
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        {
+          type: surroundingPair,
+          delimiter: null,
+          delimiterInclusion: includeDelimiters,
+        },
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeOutside20.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeOutside20.yml
new file mode 100644
index 0000000000..1b0154c5d5
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeOutside20.yml
@@ -0,0 +1,35 @@
+languageId: typescript
+command:
+  version: 1
+  spokenForm: clear outside
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier: { type: surroundingPair, delimiter: any }
+initialState:
+  documentContents: "[ {   ( { } ]  )"
+  selections:
+    - anchor: { line: 0, character: 5 }
+      active: { line: 0, character: 5 }
+  marks: {}
+finalState:
+  documentContents: "  )"
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        {
+          type: surroundingPair,
+          delimiter: null,
+          delimiterInclusion: includeDelimiters,
+        },
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeOutside21.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeOutside21.yml
new file mode 100644
index 0000000000..27268dee0c
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeOutside21.yml
@@ -0,0 +1,35 @@
+languageId: typescript
+command:
+  version: 1
+  spokenForm: clear outside
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier: { type: surroundingPair, delimiter: any }
+initialState:
+  documentContents: "{ [  ( { } ]  )"
+  selections:
+    - anchor: { line: 0, character: 4 }
+      active: { line: 0, character: 4 }
+  marks: {}
+finalState:
+  documentContents: "{   )"
+  selections:
+    - anchor: { line: 0, character: 2 }
+      active: { line: 0, character: 2 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        {
+          type: surroundingPair,
+          delimiter: null,
+          delimiterInclusion: includeDelimiters,
+        },
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeOutside22.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeOutside22.yml
new file mode 100644
index 0000000000..97e5fd9b67
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeOutside22.yml
@@ -0,0 +1,35 @@
+languageId: typescript
+command:
+  version: 1
+  spokenForm: clear outside
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier: { type: surroundingPair, delimiter: any }
+initialState:
+  documentContents: "{ [  (  } ]  )"
+  selections:
+    - anchor: { line: 0, character: 7 }
+      active: { line: 0, character: 7 }
+  marks: {}
+finalState:
+  documentContents: " ]  )"
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        {
+          type: surroundingPair,
+          delimiter: null,
+          delimiterInclusion: includeDelimiters,
+        },
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeOutside23.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeOutside23.yml
new file mode 100644
index 0000000000..a0f08c395b
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeOutside23.yml
@@ -0,0 +1,35 @@
+languageId: typescript
+command:
+  version: 1
+  spokenForm: clear outside
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier: { type: surroundingPair, delimiter: any }
+initialState:
+  documentContents: "{[  ( } ]  )"
+  selections:
+    - anchor: { line: 0, character: 3 }
+      active: { line: 0, character: 3 }
+  marks: {}
+finalState:
+  documentContents: " ]  )"
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        {
+          type: surroundingPair,
+          delimiter: null,
+          delimiterInclusion: includeDelimiters,
+        },
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeOutside24.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeOutside24.yml
new file mode 100644
index 0000000000..ef8b6b0295
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeOutside24.yml
@@ -0,0 +1,35 @@
+languageId: typescript
+command:
+  version: 1
+  spokenForm: clear outside
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier: { type: surroundingPair, delimiter: any }
+initialState:
+  documentContents: ([)]
+  selections:
+    - anchor: { line: 0, character: 2 }
+      active: { line: 0, character: 2 }
+  marks: {}
+finalState:
+  documentContents: "]"
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        {
+          type: surroundingPair,
+          delimiter: null,
+          delimiterInclusion: includeDelimiters,
+        },
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeOutside25.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeOutside25.yml
new file mode 100644
index 0000000000..a639a40f99
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeOutside25.yml
@@ -0,0 +1,35 @@
+languageId: typescript
+command:
+  version: 1
+  spokenForm: clear outside
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier: { type: surroundingPair, delimiter: any }
+initialState:
+  documentContents: ([)]
+  selections:
+    - anchor: { line: 0, character: 1 }
+      active: { line: 0, character: 1 }
+  marks: {}
+finalState:
+  documentContents: (
+  selections:
+    - anchor: { line: 0, character: 1 }
+      active: { line: 0, character: 1 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        {
+          type: surroundingPair,
+          delimiter: null,
+          delimiterInclusion: includeDelimiters,
+        },
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeOutside26.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeOutside26.yml
new file mode 100644
index 0000000000..0be78691a8
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeOutside26.yml
@@ -0,0 +1,35 @@
+languageId: typescript
+command:
+  version: 1
+  spokenForm: clear outside
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier: { type: surroundingPair, delimiter: any }
+initialState:
+  documentContents: (<user.foo>  <user.bar>)
+  selections:
+    - anchor: { line: 0, character: 12 }
+      active: { line: 0, character: 12 }
+  marks: {}
+finalState:
+  documentContents: ""
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        {
+          type: surroundingPair,
+          delimiter: null,
+          delimiterInclusion: includeDelimiters,
+        },
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeOutside3.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeOutside3.yml
new file mode 100644
index 0000000000..afbba4e39e
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeOutside3.yml
@@ -0,0 +1,34 @@
+languageId: typescript
+command:
+  version: 1
+  spokenForm: clear outside
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier: { type: surroundingPair, delimiter: any }
+initialState:
+  documentContents: (hello)
+  selections:
+    - anchor: { line: 0, character: 4 }
+      active: { line: 0, character: 4 }
+finalState:
+  documentContents: ""
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        {
+          type: surroundingPair,
+          delimiter: null,
+          delimiterInclusion: includeDelimiters,
+        },
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeOutside4.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeOutside4.yml
new file mode 100644
index 0000000000..b47f2fc301
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeOutside4.yml
@@ -0,0 +1,34 @@
+languageId: typescript
+command:
+  version: 1
+  spokenForm: clear outside
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier: { type: surroundingPair, delimiter: any }
+initialState:
+  documentContents: "[(hello)]"
+  selections:
+    - anchor: { line: 0, character: 8 }
+      active: { line: 0, character: 5 }
+finalState:
+  documentContents: "[]"
+  selections:
+    - anchor: { line: 0, character: 1 }
+      active: { line: 0, character: 1 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        {
+          type: surroundingPair,
+          delimiter: null,
+          delimiterInclusion: includeDelimiters,
+        },
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeOutside5.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeOutside5.yml
new file mode 100644
index 0000000000..08c6bfcc51
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeOutside5.yml
@@ -0,0 +1,34 @@
+languageId: typescript
+command:
+  version: 1
+  spokenForm: clear outside
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier: { type: surroundingPair, delimiter: any }
+initialState:
+  documentContents: "[(hello)]"
+  selections:
+    - anchor: { line: 0, character: 1 }
+      active: { line: 0, character: 4 }
+finalState:
+  documentContents: "[]"
+  selections:
+    - anchor: { line: 0, character: 1 }
+      active: { line: 0, character: 1 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        {
+          type: surroundingPair,
+          delimiter: null,
+          delimiterInclusion: includeDelimiters,
+        },
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeOutside6.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeOutside6.yml
new file mode 100644
index 0000000000..41620e0fcf
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeOutside6.yml
@@ -0,0 +1,34 @@
+languageId: typescript
+command:
+  version: 1
+  spokenForm: clear outside
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier: { type: surroundingPair, delimiter: any }
+initialState:
+  documentContents: "[(hello)]"
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 3 }
+finalState:
+  documentContents: ""
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        {
+          type: surroundingPair,
+          delimiter: null,
+          delimiterInclusion: includeDelimiters,
+        },
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeOutside7.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeOutside7.yml
new file mode 100644
index 0000000000..782b0915a3
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeOutside7.yml
@@ -0,0 +1,34 @@
+languageId: typescript
+command:
+  version: 1
+  spokenForm: clear outside
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier: { type: surroundingPair, delimiter: any }
+initialState:
+  documentContents: "[(hello)  (whatever)]"
+  selections:
+    - anchor: { line: 0, character: 9 }
+      active: { line: 0, character: 11 }
+finalState:
+  documentContents: ""
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        {
+          type: surroundingPair,
+          delimiter: null,
+          delimiterInclusion: includeDelimiters,
+        },
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeOutside8.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeOutside8.yml
new file mode 100644
index 0000000000..6c7b2433ff
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeOutside8.yml
@@ -0,0 +1,34 @@
+languageId: typescript
+command:
+  version: 1
+  spokenForm: clear outside
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier: { type: surroundingPair, delimiter: any }
+initialState:
+  documentContents: "[(hello)  (whatever)]"
+  selections:
+    - anchor: { line: 0, character: 9 }
+      active: { line: 0, character: 9 }
+finalState:
+  documentContents: ""
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        {
+          type: surroundingPair,
+          delimiter: null,
+          delimiterInclusion: includeDelimiters,
+        },
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeOutside9.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeOutside9.yml
new file mode 100644
index 0000000000..fb775f96bb
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeOutside9.yml
@@ -0,0 +1,34 @@
+languageId: typescript
+command:
+  version: 1
+  spokenForm: clear outside
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier: { type: surroundingPair, delimiter: any }
+initialState:
+  documentContents: "[hello  (whatever)]"
+  selections:
+    - anchor: { line: 0, character: 7 }
+      active: { line: 0, character: 7 }
+finalState:
+  documentContents: ""
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        {
+          type: surroundingPair,
+          delimiter: null,
+          delimiterInclusion: includeDelimiters,
+        },
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeOutsideLeper.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeOutsideLeper.yml
new file mode 100644
index 0000000000..11ebebb17a
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeOutsideLeper.yml
@@ -0,0 +1,37 @@
+languageId: typescript
+command:
+  version: 1
+  spokenForm: clear outside leper
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier: { type: surroundingPair, delimiter: any }
+      mark: { type: decoratedSymbol, symbolColor: default, character: ( }
+initialState:
+  documentContents: |
+    [(hello)  (whatever)]
+  selections:
+    - anchor: { line: 1, character: 0 }
+      active: { line: 1, character: 0 }
+finalState:
+  documentContents: |
+    [  (whatever)]
+  selections:
+    - anchor: { line: 0, character: 1 }
+      active: { line: 0, character: 1 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: decoratedSymbol, symbolColor: default, character: ( },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        {
+          type: surroundingPair,
+          delimiter: null,
+          delimiterInclusion: includeDelimiters,
+        },
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeOutsideRack.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeOutsideRack.yml
new file mode 100644
index 0000000000..9fa0c528aa
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeOutsideRack.yml
@@ -0,0 +1,37 @@
+languageId: typescript
+command:
+  version: 1
+  spokenForm: clear outside rack
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier: { type: surroundingPair, delimiter: any }
+      mark: { type: decoratedSymbol, symbolColor: default, character: "]" }
+initialState:
+  documentContents: |
+    [(hello)  (whatever)]
+  selections:
+    - anchor: { line: 1, character: 0 }
+      active: { line: 1, character: 0 }
+finalState:
+  documentContents: |+
+
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: decoratedSymbol, symbolColor: default, character: "]" },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        {
+          type: surroundingPair,
+          delimiter: null,
+          delimiterInclusion: includeDelimiters,
+        },
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeQuad.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeQuad.yml
new file mode 100644
index 0000000000..5e193f40e9
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeQuad.yml
@@ -0,0 +1,34 @@
+languageId: typescript
+command:
+  version: 1
+  spokenForm: clear quad
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier: { type: surroundingPair, delimiter: doubleQuotes }
+initialState:
+  documentContents: '""'
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+finalState:
+  documentContents: ""
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        {
+          type: surroundingPair,
+          delimiter: doubleQuotes,
+          delimiterInclusion: includeDelimiters,
+        },
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeQuad2.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeQuad2.yml
new file mode 100644
index 0000000000..d51e992274
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeQuad2.yml
@@ -0,0 +1,34 @@
+languageId: typescript
+command:
+  version: 1
+  spokenForm: clear quad
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier: { type: surroundingPair, delimiter: doubleQuotes }
+initialState:
+  documentContents: '""'
+  selections:
+    - anchor: { line: 0, character: 1 }
+      active: { line: 0, character: 1 }
+finalState:
+  documentContents: ""
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        {
+          type: surroundingPair,
+          delimiter: doubleQuotes,
+          delimiterInclusion: includeDelimiters,
+        },
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeQuad3.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeQuad3.yml
new file mode 100644
index 0000000000..2a69488af3
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeQuad3.yml
@@ -0,0 +1,34 @@
+languageId: typescript
+command:
+  version: 1
+  spokenForm: clear quad
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier: { type: surroundingPair, delimiter: doubleQuotes }
+initialState:
+  documentContents: '""'
+  selections:
+    - anchor: { line: 0, character: 2 }
+      active: { line: 0, character: 2 }
+finalState:
+  documentContents: ""
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        {
+          type: surroundingPair,
+          delimiter: doubleQuotes,
+          delimiterInclusion: includeDelimiters,
+        },
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeQuad4.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeQuad4.yml
new file mode 100644
index 0000000000..8c580b97fb
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeQuad4.yml
@@ -0,0 +1,34 @@
+languageId: typescript
+command:
+  version: 1
+  spokenForm: clear quad
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier: { type: surroundingPair, delimiter: doubleQuotes }
+initialState:
+  documentContents: '"()"'
+  selections:
+    - anchor: { line: 0, character: 3 }
+      active: { line: 0, character: 3 }
+finalState:
+  documentContents: ""
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        {
+          type: surroundingPair,
+          delimiter: doubleQuotes,
+          delimiterInclusion: includeDelimiters,
+        },
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeQuad5.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeQuad5.yml
new file mode 100644
index 0000000000..fd8f07aa86
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeQuad5.yml
@@ -0,0 +1,34 @@
+languageId: typescript
+command:
+  version: 1
+  spokenForm: clear quad
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier: { type: surroundingPair, delimiter: doubleQuotes }
+initialState:
+  documentContents: '"hello"'
+  selections:
+    - anchor: { line: 0, character: 6 }
+      active: { line: 0, character: 6 }
+finalState:
+  documentContents: ""
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        {
+          type: surroundingPair,
+          delimiter: doubleQuotes,
+          delimiterInclusion: includeDelimiters,
+        },
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeQuad6.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeQuad6.yml
new file mode 100644
index 0000000000..31d7f73fa4
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeQuad6.yml
@@ -0,0 +1,34 @@
+languageId: typescript
+command:
+  version: 1
+  spokenForm: clear quad
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier: { type: surroundingPair, delimiter: doubleQuotes }
+initialState:
+  documentContents: "\"\\\"\\\"\""
+  selections:
+    - anchor: { line: 0, character: 5 }
+      active: { line: 0, character: 5 }
+finalState:
+  documentContents: ""
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        {
+          type: surroundingPair,
+          delimiter: doubleQuotes,
+          delimiterInclusion: includeDelimiters,
+        },
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeRound.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeRound.yml
new file mode 100644
index 0000000000..cc3d314bcb
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeRound.yml
@@ -0,0 +1,34 @@
+languageId: typescript
+command:
+  version: 1
+  spokenForm: clear round
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier: { type: surroundingPair, delimiter: parentheses }
+initialState:
+  documentContents: ()
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+finalState:
+  documentContents: ""
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        {
+          type: surroundingPair,
+          delimiter: parentheses,
+          delimiterInclusion: includeDelimiters,
+        },
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeRound10.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeRound10.yml
new file mode 100644
index 0000000000..a95d71bacf
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeRound10.yml
@@ -0,0 +1,34 @@
+languageId: typescript
+command:
+  version: 1
+  spokenForm: clear round
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier: { type: surroundingPair, delimiter: parentheses }
+initialState:
+  documentContents: ((hello))
+  selections:
+    - anchor: { line: 0, character: 7 }
+      active: { line: 0, character: 7 }
+finalState:
+  documentContents: ()
+  selections:
+    - anchor: { line: 0, character: 1 }
+      active: { line: 0, character: 1 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        {
+          type: surroundingPair,
+          delimiter: parentheses,
+          delimiterInclusion: includeDelimiters,
+        },
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeRound11.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeRound11.yml
new file mode 100644
index 0000000000..9d2d2b0665
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeRound11.yml
@@ -0,0 +1,34 @@
+languageId: typescript
+command:
+  version: 1
+  spokenForm: clear round
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier: { type: surroundingPair, delimiter: parentheses }
+initialState:
+  documentContents: ((hello))
+  selections:
+    - anchor: { line: 0, character: 8 }
+      active: { line: 0, character: 8 }
+finalState:
+  documentContents: ""
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        {
+          type: surroundingPair,
+          delimiter: parentheses,
+          delimiterInclusion: includeDelimiters,
+        },
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeRound12.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeRound12.yml
new file mode 100644
index 0000000000..773f4df984
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeRound12.yml
@@ -0,0 +1,34 @@
+languageId: typescript
+command:
+  version: 1
+  spokenForm: clear round
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier: { type: surroundingPair, delimiter: parentheses }
+initialState:
+  documentContents: ((hello))
+  selections:
+    - anchor: { line: 0, character: 9 }
+      active: { line: 0, character: 9 }
+finalState:
+  documentContents: ""
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        {
+          type: surroundingPair,
+          delimiter: parentheses,
+          delimiterInclusion: includeDelimiters,
+        },
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeRound13.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeRound13.yml
new file mode 100644
index 0000000000..a35af15c7e
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeRound13.yml
@@ -0,0 +1,34 @@
+languageId: typescript
+command:
+  version: 1
+  spokenForm: clear round
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier: { type: surroundingPair, delimiter: parentheses }
+initialState:
+  documentContents: ((hello) () )
+  selections:
+    - anchor: { line: 0, character: 12 }
+      active: { line: 0, character: 12 }
+finalState:
+  documentContents: ""
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        {
+          type: surroundingPair,
+          delimiter: parentheses,
+          delimiterInclusion: includeDelimiters,
+        },
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeRound14.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeRound14.yml
new file mode 100644
index 0000000000..86d537c030
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeRound14.yml
@@ -0,0 +1,34 @@
+languageId: typescript
+command:
+  version: 1
+  spokenForm: clear round
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier: { type: surroundingPair, delimiter: parentheses }
+initialState:
+  documentContents: ((hello) () )
+  selections:
+    - anchor: { line: 0, character: 11 }
+      active: { line: 0, character: 11 }
+finalState:
+  documentContents: ((hello)  )
+  selections:
+    - anchor: { line: 0, character: 9 }
+      active: { line: 0, character: 9 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        {
+          type: surroundingPair,
+          delimiter: parentheses,
+          delimiterInclusion: includeDelimiters,
+        },
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeRound15.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeRound15.yml
new file mode 100644
index 0000000000..53593550a5
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeRound15.yml
@@ -0,0 +1,34 @@
+languageId: typescript
+command:
+  version: 1
+  spokenForm: clear round
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier: { type: surroundingPair, delimiter: parentheses }
+initialState:
+  documentContents: ((hello) [] )
+  selections:
+    - anchor: { line: 0, character: 12 }
+      active: { line: 0, character: 12 }
+finalState:
+  documentContents: ""
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        {
+          type: surroundingPair,
+          delimiter: parentheses,
+          delimiterInclusion: includeDelimiters,
+        },
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeRound16.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeRound16.yml
new file mode 100644
index 0000000000..5a52a73384
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeRound16.yml
@@ -0,0 +1,34 @@
+languageId: typescript
+command:
+  version: 1
+  spokenForm: clear round
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier: { type: surroundingPair, delimiter: parentheses }
+initialState:
+  documentContents: ()()
+  selections:
+    - anchor: { line: 0, character: 2 }
+      active: { line: 0, character: 2 }
+finalState:
+  documentContents: ()
+  selections:
+    - anchor: { line: 0, character: 2 }
+      active: { line: 0, character: 2 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        {
+          type: surroundingPair,
+          delimiter: parentheses,
+          delimiterInclusion: includeDelimiters,
+        },
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeRound17.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeRound17.yml
new file mode 100644
index 0000000000..b00b97edbf
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeRound17.yml
@@ -0,0 +1,34 @@
+languageId: typescript
+command:
+  version: 1
+  spokenForm: clear round
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier: { type: surroundingPair, delimiter: parentheses }
+initialState:
+  documentContents: ()(
+  selections:
+    - anchor: { line: 0, character: 2 }
+      active: { line: 0, character: 2 }
+finalState:
+  documentContents: (
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        {
+          type: surroundingPair,
+          delimiter: parentheses,
+          delimiterInclusion: includeDelimiters,
+        },
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeRound18.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeRound18.yml
new file mode 100644
index 0000000000..2869d138e7
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeRound18.yml
@@ -0,0 +1,34 @@
+languageId: typescript
+command:
+  version: 1
+  spokenForm: clear round
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier: { type: surroundingPair, delimiter: parentheses }
+initialState:
+  documentContents: (\(hello\))
+  selections:
+    - anchor: { line: 0, character: 1 }
+      active: { line: 0, character: 1 }
+finalState:
+  documentContents: ""
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        {
+          type: surroundingPair,
+          delimiter: parentheses,
+          delimiterInclusion: includeDelimiters,
+        },
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeRound19.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeRound19.yml
new file mode 100644
index 0000000000..54c09393a8
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeRound19.yml
@@ -0,0 +1,34 @@
+languageId: typescript
+command:
+  version: 1
+  spokenForm: clear round
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier: { type: surroundingPair, delimiter: parentheses }
+initialState:
+  documentContents: (hello)
+  selections:
+    - anchor: { line: 0, character: 4 }
+      active: { line: 0, character: 4 }
+finalState:
+  documentContents: ""
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        {
+          type: surroundingPair,
+          delimiter: parentheses,
+          delimiterInclusion: includeDelimiters,
+        },
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeRound2.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeRound2.yml
new file mode 100644
index 0000000000..bbd694405a
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeRound2.yml
@@ -0,0 +1,34 @@
+languageId: typescript
+command:
+  version: 1
+  spokenForm: clear round
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier: { type: surroundingPair, delimiter: parentheses }
+initialState:
+  documentContents: (hello)
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+finalState:
+  documentContents: ""
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        {
+          type: surroundingPair,
+          delimiter: parentheses,
+          delimiterInclusion: includeDelimiters,
+        },
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeRound20.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeRound20.yml
new file mode 100644
index 0000000000..b1b94ce84c
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeRound20.yml
@@ -0,0 +1,34 @@
+languageId: typescript
+command:
+  version: 1
+  spokenForm: clear round
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier: { type: surroundingPair, delimiter: parentheses }
+initialState:
+  documentContents: (hello  (whatever))
+  selections:
+    - anchor: { line: 0, character: 7 }
+      active: { line: 0, character: 7 }
+finalState:
+  documentContents: ""
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        {
+          type: surroundingPair,
+          delimiter: parentheses,
+          delimiterInclusion: includeDelimiters,
+        },
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeRound21.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeRound21.yml
new file mode 100644
index 0000000000..761c829529
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeRound21.yml
@@ -0,0 +1,34 @@
+languageId: typescript
+command:
+  version: 1
+  spokenForm: clear round
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier: { type: surroundingPair, delimiter: parentheses }
+initialState:
+  documentContents: (hello ()  )
+  selections:
+    - anchor: { line: 0, character: 10 }
+      active: { line: 0, character: 10 }
+finalState:
+  documentContents: ""
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        {
+          type: surroundingPair,
+          delimiter: parentheses,
+          delimiterInclusion: includeDelimiters,
+        },
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeRound22.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeRound22.yml
new file mode 100644
index 0000000000..3825afb295
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeRound22.yml
@@ -0,0 +1,34 @@
+languageId: typescript
+command:
+  version: 1
+  spokenForm: clear round
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier: { type: surroundingPair, delimiter: parentheses }
+initialState:
+  documentContents: (hello  () (whatever))
+  selections:
+    - anchor: { line: 0, character: 7 }
+      active: { line: 0, character: 7 }
+finalState:
+  documentContents: ""
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        {
+          type: surroundingPair,
+          delimiter: parentheses,
+          delimiterInclusion: includeDelimiters,
+        },
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeRound23.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeRound23.yml
new file mode 100644
index 0000000000..b7a9d6f30e
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeRound23.yml
@@ -0,0 +1,34 @@
+languageId: typescript
+command:
+  version: 1
+  spokenForm: clear round
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier: { type: surroundingPair, delimiter: parentheses }
+initialState:
+  documentContents: (\(hello\))
+  selections:
+    - anchor: { line: 0, character: 6 }
+      active: { line: 0, character: 6 }
+finalState:
+  documentContents: ""
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        {
+          type: surroundingPair,
+          delimiter: parentheses,
+          delimiterInclusion: includeDelimiters,
+        },
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeRound3.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeRound3.yml
new file mode 100644
index 0000000000..21c9f39c3d
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeRound3.yml
@@ -0,0 +1,34 @@
+languageId: typescript
+command:
+  version: 1
+  spokenForm: clear round
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier: { type: surroundingPair, delimiter: parentheses }
+initialState:
+  documentContents: (hello)
+  selections:
+    - anchor: { line: 0, character: 6 }
+      active: { line: 0, character: 6 }
+finalState:
+  documentContents: ""
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        {
+          type: surroundingPair,
+          delimiter: parentheses,
+          delimiterInclusion: includeDelimiters,
+        },
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeRound4.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeRound4.yml
new file mode 100644
index 0000000000..e502933b43
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeRound4.yml
@@ -0,0 +1,34 @@
+languageId: typescript
+command:
+  version: 1
+  spokenForm: clear round
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier: { type: surroundingPair, delimiter: parentheses }
+initialState:
+  documentContents: (hello)
+  selections:
+    - anchor: { line: 0, character: 7 }
+      active: { line: 0, character: 7 }
+finalState:
+  documentContents: ""
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        {
+          type: surroundingPair,
+          delimiter: parentheses,
+          delimiterInclusion: includeDelimiters,
+        },
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeRound5.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeRound5.yml
new file mode 100644
index 0000000000..4c8804ec02
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeRound5.yml
@@ -0,0 +1,34 @@
+languageId: typescript
+command:
+  version: 1
+  spokenForm: clear round
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier: { type: surroundingPair, delimiter: parentheses }
+initialState:
+  documentContents: (hello)
+  selections:
+    - anchor: { line: 0, character: 1 }
+      active: { line: 0, character: 1 }
+finalState:
+  documentContents: ""
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        {
+          type: surroundingPair,
+          delimiter: parentheses,
+          delimiterInclusion: includeDelimiters,
+        },
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeRound6.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeRound6.yml
new file mode 100644
index 0000000000..735686af38
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeRound6.yml
@@ -0,0 +1,34 @@
+languageId: typescript
+command:
+  version: 1
+  spokenForm: clear round
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier: { type: surroundingPair, delimiter: parentheses }
+initialState:
+  documentContents: ()
+  selections:
+    - anchor: { line: 0, character: 1 }
+      active: { line: 0, character: 1 }
+finalState:
+  documentContents: ""
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        {
+          type: surroundingPair,
+          delimiter: parentheses,
+          delimiterInclusion: includeDelimiters,
+        },
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeRound7.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeRound7.yml
new file mode 100644
index 0000000000..114c25bfd8
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeRound7.yml
@@ -0,0 +1,34 @@
+languageId: typescript
+command:
+  version: 1
+  spokenForm: clear round
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier: { type: surroundingPair, delimiter: parentheses }
+initialState:
+  documentContents: (())
+  selections:
+    - anchor: { line: 0, character: 2 }
+      active: { line: 0, character: 2 }
+finalState:
+  documentContents: ()
+  selections:
+    - anchor: { line: 0, character: 1 }
+      active: { line: 0, character: 1 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        {
+          type: surroundingPair,
+          delimiter: parentheses,
+          delimiterInclusion: includeDelimiters,
+        },
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeRound8.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeRound8.yml
new file mode 100644
index 0000000000..25980fca33
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeRound8.yml
@@ -0,0 +1,34 @@
+languageId: typescript
+command:
+  version: 1
+  spokenForm: clear round
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier: { type: surroundingPair, delimiter: parentheses }
+initialState:
+  documentContents: (())
+  selections:
+    - anchor: { line: 0, character: 3 }
+      active: { line: 0, character: 3 }
+finalState:
+  documentContents: ""
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        {
+          type: surroundingPair,
+          delimiter: parentheses,
+          delimiterInclusion: includeDelimiters,
+        },
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeRound9.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeRound9.yml
new file mode 100644
index 0000000000..0f068ef97a
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeRound9.yml
@@ -0,0 +1,34 @@
+languageId: typescript
+command:
+  version: 1
+  spokenForm: clear round
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier: { type: surroundingPair, delimiter: parentheses }
+initialState:
+  documentContents: (())
+  selections:
+    - anchor: { line: 0, character: 1 }
+      active: { line: 0, character: 1 }
+finalState:
+  documentContents: ()
+  selections:
+    - anchor: { line: 0, character: 1 }
+      active: { line: 0, character: 1 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        {
+          type: surroundingPair,
+          delimiter: parentheses,
+          delimiterInclusion: includeDelimiters,
+        },
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeRoundLeper.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeRoundLeper.yml
new file mode 100644
index 0000000000..ed9b3b8475
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeRoundLeper.yml
@@ -0,0 +1,35 @@
+languageId: typescript
+command:
+  version: 1
+  spokenForm: clear round leper
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier: { type: surroundingPair, delimiter: parentheses }
+      mark: { type: decoratedSymbol, symbolColor: default, character: ( }
+initialState:
+  documentContents: (hello)
+  selections:
+    - anchor: { line: 0, character: 4 }
+      active: { line: 0, character: 4 }
+finalState:
+  documentContents: ""
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: decoratedSymbol, symbolColor: default, character: ( },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        {
+          type: surroundingPair,
+          delimiter: parentheses,
+          delimiterInclusion: includeDelimiters,
+        },
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeRoundRepper.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeRoundRepper.yml
new file mode 100644
index 0000000000..377acc448e
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeRoundRepper.yml
@@ -0,0 +1,35 @@
+languageId: typescript
+command:
+  version: 1
+  spokenForm: clear round repper
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier: { type: surroundingPair, delimiter: parentheses }
+      mark: { type: decoratedSymbol, symbolColor: default, character: ) }
+initialState:
+  documentContents: (hello)
+  selections:
+    - anchor: { line: 0, character: 4 }
+      active: { line: 0, character: 4 }
+finalState:
+  documentContents: ""
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: decoratedSymbol, symbolColor: default, character: ) },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        {
+          type: surroundingPair,
+          delimiter: parentheses,
+          delimiterInclusion: includeDelimiters,
+        },
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeSquare.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeSquare.yml
new file mode 100644
index 0000000000..032941d6d5
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeSquare.yml
@@ -0,0 +1,34 @@
+languageId: typescript
+command:
+  version: 1
+  spokenForm: clear square
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier: { type: surroundingPair, delimiter: squareBrackets }
+initialState:
+  documentContents: "[(hello)]"
+  selections:
+    - anchor: { line: 0, character: 5 }
+      active: { line: 0, character: 5 }
+finalState:
+  documentContents: ""
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        {
+          type: surroundingPair,
+          delimiter: squareBrackets,
+          delimiterInclusion: includeDelimiters,
+        },
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/takeCore.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/takeCore.yml
new file mode 100644
index 0000000000..b2452dbe3d
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/takeCore.yml
@@ -0,0 +1,37 @@
+languageId: typescript
+command:
+  spokenForm: take core
+  version: 2
+  targets:
+    - type: primitive
+      modifiers:
+        - { type: interiorOnly }
+  usePrePhraseSnapshot: true
+  action: { name: setSelection }
+initialState:
+  documentContents: |-
+    [
+        "foo",
+        "bar"
+    ]
+  selections:
+    - anchor: { line: 1, character: 10 }
+      active: { line: 1, character: 10 }
+  marks: {}
+finalState:
+  documentContents: |-
+    [
+        "foo",
+        "bar"
+    ]
+  selections:
+    - anchor: { line: 1, character: 4 }
+      active: { line: 2, character: 9 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      modifiers: [{ type: interiorOnly }],
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/takeCore2.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/takeCore2.yml
new file mode 100644
index 0000000000..2b6115eb32
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/takeCore2.yml
@@ -0,0 +1,29 @@
+languageId: plaintext
+command:
+  spokenForm: take core
+  version: 2
+  targets:
+    - type: primitive
+      modifiers:
+        - { type: interiorOnly }
+  usePrePhraseSnapshot: true
+  action: { name: setSelection }
+initialState:
+  documentContents: ( hello )
+  selections:
+    - anchor: { line: 0, character: 6 }
+      active: { line: 0, character: 6 }
+  marks: {}
+finalState:
+  documentContents: ( hello )
+  selections:
+    - anchor: { line: 0, character: 2 }
+      active: { line: 0, character: 7 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      modifiers: [{ type: interiorOnly }],
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/takeCoreRiskPastJustHarp.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/takeCoreRiskPastJustHarp.yml
new file mode 100644
index 0000000000..98c3079c17
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/takeCoreRiskPastJustHarp.yml
@@ -0,0 +1,62 @@
+languageId: plaintext
+command:
+  spokenForm: take core risk past just harp
+  version: 2
+  targets:
+    - type: range
+      anchor:
+        type: primitive
+        modifiers:
+          - { type: interiorOnly }
+        mark: { type: decoratedSymbol, symbolColor: default, character: r }
+      active:
+        type: primitive
+        modifiers:
+          - { type: toRawSelection }
+        mark: { type: decoratedSymbol, symbolColor: default, character: h }
+      excludeAnchor: false
+      excludeActive: false
+  usePrePhraseSnapshot: true
+  action: { name: setSelection }
+initialState:
+  documentContents: |-
+    ( hello world )
+    (hello world)
+  selections:
+    - anchor: { line: 1, character: 13 }
+      active: { line: 1, character: 13 }
+  marks:
+    default.r:
+      start: { line: 0, character: 8 }
+      end: { line: 0, character: 13 }
+    default.h:
+      start: { line: 1, character: 1 }
+      end: { line: 1, character: 6 }
+finalState:
+  documentContents: |-
+    ( hello world )
+    (hello world)
+  selections:
+    - anchor: { line: 0, character: 2 }
+      active: { line: 1, character: 6 }
+fullTargets:
+  [
+    {
+      type: range,
+      excludeAnchor: false,
+      excludeActive: false,
+      rangeType: continuous,
+      anchor:
+        {
+          type: primitive,
+          mark: { type: decoratedSymbol, symbolColor: default, character: r },
+          modifiers: [{ type: interiorOnly }],
+        },
+      active:
+        {
+          type: primitive,
+          mark: { type: decoratedSymbol, symbolColor: default, character: h },
+          modifiers: [{ type: toRawSelection }],
+        },
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/textual/chuckInsideRound.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/textual/chuckInsideRound.yml
new file mode 100644
index 0000000000..fff1839f36
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/textual/chuckInsideRound.yml
@@ -0,0 +1,40 @@
+languageId: plaintext
+command:
+  version: 1
+  spokenForm: chuck inside round
+  action: remove
+  targets:
+    - type: primitive
+      modifier:
+        {
+          type: surroundingPair,
+          delimiter: parentheses,
+          delimiterInclusion: interiorOnly,
+        }
+initialState:
+  documentContents: (hello)
+  selections:
+    - anchor: { line: 0, character: 5 }
+      active: { line: 0, character: 5 }
+  marks: {}
+finalState:
+  documentContents: ()
+  selections:
+    - anchor: { line: 0, character: 1 }
+      active: { line: 0, character: 1 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: outside,
+      modifier:
+        {
+          type: surroundingPair,
+          delimiter: parentheses,
+          delimiterInclusion: excludeDelimiters,
+        },
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/textual/chuckPairHarp.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/textual/chuckPairHarp.yml
new file mode 100644
index 0000000000..b47929eb72
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/textual/chuckPairHarp.yml
@@ -0,0 +1,36 @@
+languageId: plaintext
+command:
+  version: 1
+  spokenForm: chuck pair harp
+  action: remove
+  targets:
+    - type: primitive
+      modifier: { type: surroundingPair, delimiter: any }
+      mark: { type: decoratedSymbol, symbolColor: default, character: h }
+initialState:
+  documentContents: |
+    (hello) (there)
+  selections:
+    - anchor: { line: 0, character: 13 }
+      active: { line: 0, character: 13 }
+  marks:
+    default.h:
+      start: { line: 0, character: 1 }
+      end: { line: 0, character: 6 }
+finalState:
+  documentContents: |
+    (there)
+  selections:
+    - anchor: { line: 0, character: 5 }
+      active: { line: 0, character: 5 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: decoratedSymbol, symbolColor: default, character: h },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: outside,
+      modifier: { type: surroundingPair, delimiter: any },
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/textual/chuckPairRound.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/textual/chuckPairRound.yml
new file mode 100644
index 0000000000..1354a36044
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/textual/chuckPairRound.yml
@@ -0,0 +1,40 @@
+languageId: plaintext
+command:
+  version: 1
+  spokenForm: chuck pair round
+  action: remove
+  targets:
+    - type: primitive
+      modifier:
+        {
+          type: surroundingPair,
+          delimiter: parentheses,
+          delimiterInclusion: excludeInterior,
+        }
+initialState:
+  documentContents: (hello)
+  selections:
+    - anchor: { line: 0, character: 5 }
+      active: { line: 0, character: 5 }
+  marks: {}
+finalState:
+  documentContents: hello
+  selections:
+    - anchor: { line: 0, character: 4 }
+      active: { line: 0, character: 4 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: outside,
+      modifier:
+        {
+          type: surroundingPair,
+          delimiter: parentheses,
+          delimiterInclusion: delimitersOnly,
+        },
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/textual/chuckRound2.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/textual/chuckRound2.yml
new file mode 100644
index 0000000000..96f1bec555
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/textual/chuckRound2.yml
@@ -0,0 +1,35 @@
+languageId: plaintext
+command:
+  version: 1
+  spokenForm: chuck round
+  action: remove
+  targets:
+    - type: primitive
+      modifier: { type: surroundingPair, delimiter: parentheses }
+initialState:
+  documentContents: (hello)
+  selections:
+    - anchor: { line: 0, character: 5 }
+      active: { line: 0, character: 5 }
+  marks: {}
+finalState:
+  documentContents: ""
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: outside,
+      modifier:
+        {
+          type: surroundingPair,
+          delimiter: parentheses,
+          delimiterInclusion: includeDelimiters,
+        },
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/textual/clearBoundsBatt2.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/textual/clearBoundsBatt2.yml
new file mode 100644
index 0000000000..5622b70845
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/textual/clearBoundsBatt2.yml
@@ -0,0 +1,56 @@
+languageId: plaintext
+command:
+  version: 1
+  spokenForm: clear bounds batt
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier:
+        {
+          type: surroundingPair,
+          delimiter: any,
+          delimiterInclusion: excludeInterior,
+        }
+      mark: { type: decoratedSymbol, symbolColor: default, character: b }
+initialState:
+  documentContents: |-
+    <html>
+        <body>
+            <hr/>
+        </body>
+    </html>
+  selections:
+    - anchor: { line: 4, character: 7 }
+      active: { line: 4, character: 7 }
+  marks:
+    default.b:
+      start: { line: 3, character: 6 }
+      end: { line: 3, character: 10 }
+finalState:
+  documentContents: |-
+    <html>
+        <body>
+            <hr/>
+        body
+    </html>
+  selections:
+    - anchor: { line: 3, character: 4 }
+      active: { line: 3, character: 4 }
+    - anchor: { line: 3, character: 8 }
+      active: { line: 3, character: 8 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: decoratedSymbol, symbolColor: default, character: b },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        {
+          type: surroundingPair,
+          delimiter: any,
+          delimiterInclusion: excludeInterior,
+        },
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/textual/clearBoundsDouble.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/textual/clearBoundsDouble.yml
new file mode 100644
index 0000000000..0aa96e9313
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/textual/clearBoundsDouble.yml
@@ -0,0 +1,40 @@
+languageId: plaintext
+command:
+  version: 1
+  spokenForm: clear bounds double
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier:
+        {
+          type: surroundingPair,
+          delimiter: any,
+          delimiterInclusion: excludeInterior,
+        }
+      mark: { type: decoratedSymbol, symbolColor: default, character: '"' }
+initialState:
+  documentContents: '""'
+  selections:
+    - anchor: { line: 0, character: 1 }
+      active: { line: 0, character: 1 }
+finalState:
+  documentContents: ""
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: decoratedSymbol, symbolColor: default, character: '"' },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        {
+          type: surroundingPair,
+          delimiter: null,
+          delimiterInclusion: delimitersOnly,
+        },
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/textual/clearBoundsEach2.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/textual/clearBoundsEach2.yml
new file mode 100644
index 0000000000..2fbf665e8b
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/textual/clearBoundsEach2.yml
@@ -0,0 +1,51 @@
+languageId: plaintext
+command:
+  version: 1
+  spokenForm: clear bounds each
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier:
+        {
+          type: surroundingPair,
+          delimiter: any,
+          delimiterInclusion: excludeInterior,
+        }
+      mark: { type: decoratedSymbol, symbolColor: default, character: e }
+initialState:
+  documentContents: |-
+    <html id="(hello)">
+    </html>
+  selections:
+    - anchor: { line: 1, character: 0 }
+      active: { line: 1, character: 0 }
+  marks:
+    default.e:
+      start: { line: 0, character: 11 }
+      end: { line: 0, character: 16 }
+finalState:
+  documentContents: |-
+    <html id="hello">
+    </html>
+  selections:
+    - anchor: { line: 0, character: 10 }
+      active: { line: 0, character: 10 }
+    - anchor: { line: 0, character: 15 }
+      active: { line: 0, character: 15 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: decoratedSymbol, symbolColor: default, character: e },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        {
+          type: surroundingPair,
+          delimiter: any,
+          delimiterInclusion: excludeInterior,
+        },
+      isImplicit: false,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/textual/clearBoundsOx2.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/textual/clearBoundsOx2.yml
new file mode 100644
index 0000000000..cd675d2837
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/textual/clearBoundsOx2.yml
@@ -0,0 +1,56 @@
+languageId: plaintext
+command:
+  version: 1
+  spokenForm: clear bounds ox
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier:
+        {
+          type: surroundingPair,
+          delimiter: any,
+          delimiterInclusion: excludeInterior,
+        }
+      mark: { type: decoratedSymbol, symbolColor: default, character: o }
+initialState:
+  documentContents: |-
+    <html>
+        <body>
+            <hr/>
+        </body>
+    </html>
+  selections:
+    - anchor: { line: 4, character: 7 }
+      active: { line: 4, character: 7 }
+  marks:
+    default.o:
+      start: { line: 1, character: 5 }
+      end: { line: 1, character: 9 }
+finalState:
+  documentContents: |-
+    <html>
+        body
+            <hr/>
+        </body>
+    </html>
+  selections:
+    - anchor: { line: 1, character: 4 }
+      active: { line: 1, character: 4 }
+    - anchor: { line: 1, character: 8 }
+      active: { line: 1, character: 8 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: decoratedSymbol, symbolColor: default, character: o },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        {
+          type: surroundingPair,
+          delimiter: any,
+          delimiterInclusion: excludeInterior,
+        },
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/textual/clearBoundsRam2.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/textual/clearBoundsRam2.yml
new file mode 100644
index 0000000000..5870e6ebfb
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/textual/clearBoundsRam2.yml
@@ -0,0 +1,56 @@
+languageId: plaintext
+command:
+  version: 1
+  spokenForm: clear bounds ram
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier:
+        {
+          type: surroundingPair,
+          delimiter: any,
+          delimiterInclusion: excludeInterior,
+        }
+      mark: { type: decoratedSymbol, symbolColor: default, character: r }
+initialState:
+  documentContents: |-
+    <html>
+        <body>
+            <hr/>
+        </body>
+    </html>
+  selections:
+    - anchor: { line: 4, character: 7 }
+      active: { line: 4, character: 7 }
+  marks:
+    default.r:
+      start: { line: 2, character: 9 }
+      end: { line: 2, character: 11 }
+finalState:
+  documentContents: |-
+    <html>
+        <body>
+            hr
+        </body>
+    </html>
+  selections:
+    - anchor: { line: 2, character: 8 }
+      active: { line: 2, character: 8 }
+    - anchor: { line: 2, character: 10 }
+      active: { line: 2, character: 10 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: decoratedSymbol, symbolColor: default, character: r },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        {
+          type: surroundingPair,
+          delimiter: any,
+          delimiterInclusion: excludeInterior,
+        },
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/textual/clearBoundsRound.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/textual/clearBoundsRound.yml
new file mode 100644
index 0000000000..11e392f4e7
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/textual/clearBoundsRound.yml
@@ -0,0 +1,39 @@
+languageId: plaintext
+command:
+  version: 1
+  spokenForm: clear bounds round
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier:
+        {
+          type: surroundingPair,
+          delimiter: parentheses,
+          delimiterInclusion: excludeInterior,
+        }
+initialState:
+  documentContents: ()
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+finalState:
+  documentContents: ""
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        {
+          type: surroundingPair,
+          delimiter: parentheses,
+          delimiterInclusion: delimitersOnly,
+        },
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/textual/clearBoundsRound2.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/textual/clearBoundsRound2.yml
new file mode 100644
index 0000000000..deb9806997
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/textual/clearBoundsRound2.yml
@@ -0,0 +1,41 @@
+languageId: plaintext
+command:
+  version: 1
+  spokenForm: clear bounds round
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier:
+        {
+          type: surroundingPair,
+          delimiter: parentheses,
+          delimiterInclusion: excludeInterior,
+        }
+initialState:
+  documentContents: (hello)
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+finalState:
+  documentContents: hello
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+    - anchor: { line: 0, character: 5 }
+      active: { line: 0, character: 5 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        {
+          type: surroundingPair,
+          delimiter: parentheses,
+          delimiterInclusion: delimitersOnly,
+        },
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/textual/clearCurly2.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/textual/clearCurly2.yml
new file mode 100644
index 0000000000..a4e355b4a3
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/textual/clearCurly2.yml
@@ -0,0 +1,38 @@
+languageId: plaintext
+command:
+  version: 1
+  spokenForm: clear curly
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier: { type: surroundingPair, delimiter: curlyBrackets }
+initialState:
+  documentContents: |-
+    {
+        hello
+    }
+  selections:
+    - anchor: { line: 1, character: 7 }
+      active: { line: 1, character: 7 }
+  marks: {}
+finalState:
+  documentContents: ""
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        {
+          type: surroundingPair,
+          delimiter: curlyBrackets,
+          delimiterInclusion: includeDelimiters,
+        },
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/textual/clearEscapedSquare.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/textual/clearEscapedSquare.yml
new file mode 100644
index 0000000000..d611cca694
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/textual/clearEscapedSquare.yml
@@ -0,0 +1,31 @@
+languageId: markdown
+command:
+  version: 1
+  spokenForm: clear escaped square
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier: { type: surroundingPair, delimiter: escapedSquareBrackets }
+initialState:
+  documentContents: \[foo\]
+  selections:
+    - anchor: { line: 0, character: 4 }
+      active: { line: 0, character: 4 }
+  marks: {}
+finalState:
+  documentContents: ""
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier: { type: surroundingPair, delimiter: escapedSquareBrackets },
+      isImplicit: false,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/textual/clearOutsideGreenDouble.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/textual/clearOutsideGreenDouble.yml
new file mode 100644
index 0000000000..5c83754260
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/textual/clearOutsideGreenDouble.yml
@@ -0,0 +1,45 @@
+languageId: plaintext
+command:
+  version: 1
+  spokenForm: clear outside blue double
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier: { type: surroundingPair, delimiter: any }
+      mark: { type: decoratedSymbol, symbolColor: blue, character: '"' }
+initialState:
+  documentContents: '""'
+  selections:
+    - anchor: { line: 0, character: 1 }
+      active: { line: 0, character: 1 }
+  marks:
+    blue.":
+      start: { line: 0, character: 0 }
+      end: { line: 0, character: 1 }
+finalState:
+  documentContents: ""
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark:
+        {
+          type: decoratedSymbol,
+          symbolColor: green,
+          character: '"',
+          usePrePhraseSnapshot: true,
+        },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        {
+          type: surroundingPair,
+          delimiter: null,
+          delimiterInclusion: includeDelimiters,
+        },
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/textual/clearPair.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/textual/clearPair.yml
new file mode 100644
index 0000000000..c1d79fae45
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/textual/clearPair.yml
@@ -0,0 +1,30 @@
+languageId: plaintext
+command:
+  version: 1
+  spokenForm: clear pair
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier: { type: surroundingPair, delimiter: any }
+initialState:
+  documentContents: ("hello",  "world")
+  selections:
+    - anchor: { line: 0, character: 10 }
+      active: { line: 0, character: 10 }
+  marks: {}
+finalState:
+  documentContents: ""
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier: { type: surroundingPair, delimiter: any },
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/textual/clearPair10.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/textual/clearPair10.yml
new file mode 100644
index 0000000000..f97872ee23
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/textual/clearPair10.yml
@@ -0,0 +1,30 @@
+languageId: plaintext
+command:
+  version: 1
+  spokenForm: clear pair
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier: { type: surroundingPair, delimiter: any }
+initialState:
+  documentContents: ("hello",  "world")
+  selections:
+    - anchor: { line: 0, character: 17 }
+      active: { line: 0, character: 17 }
+  marks: {}
+finalState:
+  documentContents: ("hello",  )
+  selections:
+    - anchor: { line: 0, character: 11 }
+      active: { line: 0, character: 11 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier: { type: surroundingPair, delimiter: any },
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/textual/clearPair11.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/textual/clearPair11.yml
new file mode 100644
index 0000000000..12b81ef220
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/textual/clearPair11.yml
@@ -0,0 +1,30 @@
+languageId: plaintext
+command:
+  version: 1
+  spokenForm: clear pair
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier: { type: surroundingPair, delimiter: any }
+initialState:
+  documentContents: ("hello",  "world")
+  selections:
+    - anchor: { line: 0, character: 18 }
+      active: { line: 0, character: 18 }
+  marks: {}
+finalState:
+  documentContents: ""
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier: { type: surroundingPair, delimiter: any },
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/textual/clearPair12.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/textual/clearPair12.yml
new file mode 100644
index 0000000000..5134ce06ab
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/textual/clearPair12.yml
@@ -0,0 +1,30 @@
+languageId: plaintext
+command:
+  version: 1
+  spokenForm: clear pair
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier: { type: surroundingPair, delimiter: any }
+initialState:
+  documentContents: ("hello",  "world")
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+  marks: {}
+finalState:
+  documentContents: ""
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier: { type: surroundingPair, delimiter: any },
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/textual/clearPair13.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/textual/clearPair13.yml
new file mode 100644
index 0000000000..2a37a4eebc
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/textual/clearPair13.yml
@@ -0,0 +1,30 @@
+languageId: plaintext
+command:
+  version: 1
+  spokenForm: clear pair
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier: { type: surroundingPair, delimiter: any }
+initialState:
+  documentContents: ('"hello",  "world"')
+  selections:
+    - anchor: { line: 0, character: 11 }
+      active: { line: 0, character: 11 }
+  marks: {}
+finalState:
+  documentContents: ()
+  selections:
+    - anchor: { line: 0, character: 1 }
+      active: { line: 0, character: 1 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier: { type: surroundingPair, delimiter: any },
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/textual/clearPair14.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/textual/clearPair14.yml
new file mode 100644
index 0000000000..6bd08547ee
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/textual/clearPair14.yml
@@ -0,0 +1,33 @@
+languageId: plaintext
+command:
+  version: 1
+  spokenForm: clear pair
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier: { type: surroundingPair, delimiter: any }
+initialState:
+  documentContents: |-
+    "
+    ("hello",  "world")
+  selections:
+    - anchor: { line: 1, character: 10 }
+      active: { line: 1, character: 10 }
+  marks: {}
+finalState:
+  documentContents: |
+    "
+  selections:
+    - anchor: { line: 1, character: 0 }
+      active: { line: 1, character: 0 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier: { type: surroundingPair, delimiter: any },
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/textual/clearPair15.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/textual/clearPair15.yml
new file mode 100644
index 0000000000..df0e5045e7
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/textual/clearPair15.yml
@@ -0,0 +1,31 @@
+languageId: markdown
+command:
+  version: 1
+  spokenForm: clear pair
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier: { type: surroundingPair, delimiter: any }
+initialState:
+  documentContents: \[foo\]
+  selections:
+    - anchor: { line: 0, character: 4 }
+      active: { line: 0, character: 4 }
+  marks: {}
+finalState:
+  documentContents: ""
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier: { type: surroundingPair, delimiter: any },
+      isImplicit: false,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/textual/clearPair16.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/textual/clearPair16.yml
new file mode 100644
index 0000000000..2892cfeea8
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/textual/clearPair16.yml
@@ -0,0 +1,31 @@
+languageId: markdown
+command:
+  version: 1
+  spokenForm: clear pair
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier: { type: surroundingPair, delimiter: any }
+initialState:
+  documentContents: "[\\[foo\\]]"
+  selections:
+    - anchor: { line: 0, character: 5 }
+      active: { line: 0, character: 5 }
+  marks: {}
+finalState:
+  documentContents: "[]"
+  selections:
+    - anchor: { line: 0, character: 1 }
+      active: { line: 0, character: 1 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier: { type: surroundingPair, delimiter: any },
+      isImplicit: false,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/textual/clearPair2.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/textual/clearPair2.yml
new file mode 100644
index 0000000000..687b228245
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/textual/clearPair2.yml
@@ -0,0 +1,30 @@
+languageId: plaintext
+command:
+  version: 1
+  spokenForm: clear pair
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier: { type: surroundingPair, delimiter: any }
+initialState:
+  documentContents: ("hello",  "world")
+  selections:
+    - anchor: { line: 0, character: 1 }
+      active: { line: 0, character: 1 }
+  marks: {}
+finalState:
+  documentContents: (,  "world")
+  selections:
+    - anchor: { line: 0, character: 1 }
+      active: { line: 0, character: 1 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier: { type: surroundingPair, delimiter: any },
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/textual/clearPair3.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/textual/clearPair3.yml
new file mode 100644
index 0000000000..9e85a1d427
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/textual/clearPair3.yml
@@ -0,0 +1,30 @@
+languageId: plaintext
+command:
+  version: 1
+  spokenForm: clear pair
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier: { type: surroundingPair, delimiter: any }
+initialState:
+  documentContents: ("hello",  "world")
+  selections:
+    - anchor: { line: 0, character: 2 }
+      active: { line: 0, character: 2 }
+  marks: {}
+finalState:
+  documentContents: (,  "world")
+  selections:
+    - anchor: { line: 0, character: 1 }
+      active: { line: 0, character: 1 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier: { type: surroundingPair, delimiter: any },
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/textual/clearPair4.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/textual/clearPair4.yml
new file mode 100644
index 0000000000..bc1630fe15
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/textual/clearPair4.yml
@@ -0,0 +1,30 @@
+languageId: plaintext
+command:
+  version: 1
+  spokenForm: clear pair
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier: { type: surroundingPair, delimiter: any }
+initialState:
+  documentContents: ("hello",  "world")
+  selections:
+    - anchor: { line: 0, character: 3 }
+      active: { line: 0, character: 3 }
+  marks: {}
+finalState:
+  documentContents: (,  "world")
+  selections:
+    - anchor: { line: 0, character: 1 }
+      active: { line: 0, character: 1 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier: { type: surroundingPair, delimiter: any },
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/textual/clearPair5.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/textual/clearPair5.yml
new file mode 100644
index 0000000000..117c10e8c8
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/textual/clearPair5.yml
@@ -0,0 +1,30 @@
+languageId: plaintext
+command:
+  version: 1
+  spokenForm: clear pair
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier: { type: surroundingPair, delimiter: any }
+initialState:
+  documentContents: ("hello",  "world")
+  selections:
+    - anchor: { line: 0, character: 7 }
+      active: { line: 0, character: 7 }
+  marks: {}
+finalState:
+  documentContents: (,  "world")
+  selections:
+    - anchor: { line: 0, character: 1 }
+      active: { line: 0, character: 1 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier: { type: surroundingPair, delimiter: any },
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/textual/clearPair6.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/textual/clearPair6.yml
new file mode 100644
index 0000000000..11b6ca3dd7
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/textual/clearPair6.yml
@@ -0,0 +1,30 @@
+languageId: plaintext
+command:
+  version: 1
+  spokenForm: clear pair
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier: { type: surroundingPair, delimiter: any }
+initialState:
+  documentContents: ("hello",  "world")
+  selections:
+    - anchor: { line: 0, character: 8 }
+      active: { line: 0, character: 8 }
+  marks: {}
+finalState:
+  documentContents: (,  "world")
+  selections:
+    - anchor: { line: 0, character: 1 }
+      active: { line: 0, character: 1 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier: { type: surroundingPair, delimiter: any },
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/textual/clearPair7.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/textual/clearPair7.yml
new file mode 100644
index 0000000000..d1812d1fe5
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/textual/clearPair7.yml
@@ -0,0 +1,30 @@
+languageId: plaintext
+command:
+  version: 1
+  spokenForm: clear pair
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier: { type: surroundingPair, delimiter: any }
+initialState:
+  documentContents: ("hello",  "world")
+  selections:
+    - anchor: { line: 0, character: 11 }
+      active: { line: 0, character: 11 }
+  marks: {}
+finalState:
+  documentContents: ("hello",  )
+  selections:
+    - anchor: { line: 0, character: 11 }
+      active: { line: 0, character: 11 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier: { type: surroundingPair, delimiter: any },
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/textual/clearPair8.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/textual/clearPair8.yml
new file mode 100644
index 0000000000..c064dfa762
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/textual/clearPair8.yml
@@ -0,0 +1,30 @@
+languageId: plaintext
+command:
+  version: 1
+  spokenForm: clear pair
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier: { type: surroundingPair, delimiter: any }
+initialState:
+  documentContents: ("hello",  "world")
+  selections:
+    - anchor: { line: 0, character: 12 }
+      active: { line: 0, character: 12 }
+  marks: {}
+finalState:
+  documentContents: ("hello",  )
+  selections:
+    - anchor: { line: 0, character: 11 }
+      active: { line: 0, character: 11 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier: { type: surroundingPair, delimiter: any },
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/textual/clearPair9.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/textual/clearPair9.yml
new file mode 100644
index 0000000000..b77bbd3187
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/textual/clearPair9.yml
@@ -0,0 +1,30 @@
+languageId: plaintext
+command:
+  version: 1
+  spokenForm: clear pair
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier: { type: surroundingPair, delimiter: any }
+initialState:
+  documentContents: ("hello",  "world")
+  selections:
+    - anchor: { line: 0, character: 13 }
+      active: { line: 0, character: 13 }
+  marks: {}
+finalState:
+  documentContents: ("hello",  )
+  selections:
+    - anchor: { line: 0, character: 11 }
+      active: { line: 0, character: 11 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier: { type: surroundingPair, delimiter: any },
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/textual/clearRound.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/textual/clearRound.yml
new file mode 100644
index 0000000000..b7b79a0ef7
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/textual/clearRound.yml
@@ -0,0 +1,333 @@
+languageId: plaintext
+command:
+  version: 1
+  spokenForm: clear round
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier: { type: surroundingPair, delimiter: parentheses }
+initialState:
+  documentContents: |-
+    (
+        a
+        a
+        a
+        a
+        a
+        a
+        a
+        a
+        a
+        a
+        a
+        a
+        a
+        a
+        a
+        a
+        a
+        a
+        a
+        a
+        a
+        a
+        a
+        a
+        a
+        a
+        a
+        a
+        a
+        a
+        a
+        a
+        a
+        a
+        a
+        a
+        a
+        a
+        a
+        a
+        a
+        a
+        a
+        a
+        a
+        a
+        a
+        a
+        a
+        a
+        a
+        a
+        a
+        a
+        a
+        a
+        a
+        a
+        a
+        a
+        a
+        a
+        a
+        a
+        a
+        a
+        a
+        a
+        a
+        a
+        a
+        a
+        a
+        a
+        a
+        a
+        a
+        a
+        a
+        a
+        a
+        a
+        a
+        a
+        a
+        a
+        a
+        a
+        a
+        a
+        a
+        a
+        a
+        a
+        a
+        a
+        a
+        a
+        a
+        a
+        a
+        a
+        a
+        a
+        a
+        a
+        a
+        a
+        a
+        a
+        a
+        a
+        a
+        a
+        a
+        a
+        a
+        a
+        a
+        a
+        a
+        a
+        a
+        a
+        a
+        a
+        a
+        a
+        a
+        a
+        a
+        a
+        a
+        a
+        a
+        a
+        a
+        a
+        a
+        a
+        a
+        a
+        a
+        a
+        a
+        a
+        a
+        a
+        a
+        a
+        a
+        a
+        a
+        a
+        a
+        a
+        a
+        a
+        a
+        a
+        a
+        a
+        a
+        a
+        a
+        a
+        a
+        a
+        a
+        a
+        a
+        a
+        a
+        a
+        a
+        a
+        a
+        a
+        a
+        a
+        a
+        a
+        a
+        a
+        a
+        a
+        a
+        a
+        a
+        a
+        a
+        a
+        a
+        a
+        a
+        a
+        a
+        a
+        a
+        a
+        a
+        a
+        a
+        a
+        a
+        a
+        a
+        a
+        a
+        a
+        a
+        a
+        a
+        a
+        a
+        a
+        a
+        a
+        a
+        a
+        a
+        a
+        a
+        a
+        a
+        a
+        a
+        a
+        a
+        a
+        a
+        a
+        a
+        a
+        a
+        a
+        a
+        a
+        a
+        a
+        a
+        a
+        a
+        a
+        a
+        a
+        a
+        a
+        a
+        a
+        a
+        a
+        a
+        a
+        a
+        a
+        a
+        a
+        a
+        a
+        a
+        a
+        a
+        a
+        a
+        a
+        a
+        a
+        a
+        a
+        a
+        a
+        a
+        a
+        a
+        a
+        a
+        a
+        a
+        a
+        a
+        a
+        a
+        a
+        a
+        a
+        a
+        a
+        a
+        a
+        a
+        a
+        a
+        a
+        a
+        a
+    )
+  selections:
+    - anchor: { line: 266, character: 5 }
+      active: { line: 266, character: 5 }
+  marks: {}
+finalState:
+  documentContents: ""
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        {
+          type: surroundingPair,
+          delimiter: parentheses,
+          delimiterInclusion: includeDelimiters,
+        },
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/textual/clearRound9.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/textual/clearRound9.yml
new file mode 100644
index 0000000000..1ab02258d5
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/textual/clearRound9.yml
@@ -0,0 +1,42 @@
+languageId: plaintext
+command:
+  version: 1
+  spokenForm: clear round
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier: { type: surroundingPair, delimiter: parentheses }
+initialState:
+  documentContents: |-
+    (hello)
+    (hello)
+  selections:
+    - anchor: { line: 0, character: 4 }
+      active: { line: 0, character: 4 }
+    - anchor: { line: 1, character: 4 }
+      active: { line: 1, character: 4 }
+  marks: {}
+finalState:
+  documentContents: |+
+
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+    - anchor: { line: 1, character: 0 }
+      active: { line: 1, character: 0 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        {
+          type: surroundingPair,
+          delimiter: parentheses,
+          delimiterInclusion: includeDelimiters,
+        },
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/textual/clearSquare.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/textual/clearSquare.yml
new file mode 100644
index 0000000000..be55dc9464
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/textual/clearSquare.yml
@@ -0,0 +1,31 @@
+languageId: markdown
+command:
+  version: 1
+  spokenForm: clear square
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier: { type: surroundingPair, delimiter: squareBrackets }
+initialState:
+  documentContents: "[\\[foo\\]]"
+  selections:
+    - anchor: { line: 0, character: 5 }
+      active: { line: 0, character: 5 }
+  marks: {}
+finalState:
+  documentContents: ""
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier: { type: surroundingPair, delimiter: squareBrackets },
+      isImplicit: false,
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/textual/clearString4.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/textual/clearString4.yml
new file mode 100644
index 0000000000..1a4b2483ce
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/textual/clearString4.yml
@@ -0,0 +1,35 @@
+languageId: plaintext
+command:
+  version: 1
+  spokenForm: clear string
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier: { type: surroundingPair, delimiter: string }
+initialState:
+  documentContents: '"(hello)"'
+  selections:
+    - anchor: { line: 0, character: 5 }
+      active: { line: 0, character: 5 }
+  marks: {}
+finalState:
+  documentContents: ""
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        {
+          type: surroundingPair,
+          delimiter: string,
+          delimiterInclusion: includeDelimiters,
+        },
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/textual/tailTakeEscapedQuad.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/textual/tailTakeEscapedQuad.yml
new file mode 100644
index 0000000000..480d18b045
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/textual/tailTakeEscapedQuad.yml
@@ -0,0 +1,34 @@
+languageId: plaintext
+command:
+  version: 1
+  spokenForm: clear escaped quad
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier: { type: surroundingPair, delimiter: escapedDoubleQuotes }
+initialState:
+  documentContents: \"\"
+  selections:
+    - anchor: { line: 0, character: 4 }
+      active: { line: 0, character: 4 }
+finalState:
+  documentContents: ""
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        {
+          type: surroundingPair,
+          delimiter: escapedDoubleQuotes,
+          delimiterInclusion: includeDelimiters,
+        },
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/textual/takeEscapedQuad.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/textual/takeEscapedQuad.yml
new file mode 100644
index 0000000000..ffd00204f1
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/textual/takeEscapedQuad.yml
@@ -0,0 +1,34 @@
+languageId: plaintext
+command:
+  version: 1
+  spokenForm: clear escaped quad
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier: { type: surroundingPair, delimiter: escapedDoubleQuotes }
+initialState:
+  documentContents: \"\"
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+finalState:
+  documentContents: ""
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        {
+          type: surroundingPair,
+          delimiter: escapedDoubleQuotes,
+          delimiterInclusion: includeDelimiters,
+        },
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/textual/takeEscapedQuad2.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/textual/takeEscapedQuad2.yml
new file mode 100644
index 0000000000..c545b28000
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/textual/takeEscapedQuad2.yml
@@ -0,0 +1,34 @@
+languageId: plaintext
+command:
+  version: 1
+  spokenForm: clear escaped quad
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier: { type: surroundingPair, delimiter: escapedDoubleQuotes }
+initialState:
+  documentContents: \"\"
+  selections:
+    - anchor: { line: 0, character: 1 }
+      active: { line: 0, character: 1 }
+finalState:
+  documentContents: ""
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        {
+          type: surroundingPair,
+          delimiter: escapedDoubleQuotes,
+          delimiterInclusion: includeDelimiters,
+        },
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/textual/takeEscapedQuad3.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/textual/takeEscapedQuad3.yml
new file mode 100644
index 0000000000..059576fab8
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/textual/takeEscapedQuad3.yml
@@ -0,0 +1,34 @@
+languageId: plaintext
+command:
+  version: 1
+  spokenForm: clear escaped quad
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier: { type: surroundingPair, delimiter: escapedDoubleQuotes }
+initialState:
+  documentContents: \"\"
+  selections:
+    - anchor: { line: 0, character: 2 }
+      active: { line: 0, character: 2 }
+finalState:
+  documentContents: ""
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        {
+          type: surroundingPair,
+          delimiter: escapedDoubleQuotes,
+          delimiterInclusion: includeDelimiters,
+        },
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/textual/takeEscapedQuad4.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/textual/takeEscapedQuad4.yml
new file mode 100644
index 0000000000..e8ea19fc43
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/textual/takeEscapedQuad4.yml
@@ -0,0 +1,34 @@
+languageId: plaintext
+command:
+  version: 1
+  spokenForm: clear escaped quad
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier: { type: surroundingPair, delimiter: escapedDoubleQuotes }
+initialState:
+  documentContents: \"\"
+  selections:
+    - anchor: { line: 0, character: 3 }
+      active: { line: 0, character: 3 }
+finalState:
+  documentContents: ""
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        {
+          type: surroundingPair,
+          delimiter: escapedDoubleQuotes,
+          delimiterInclusion: includeDelimiters,
+        },
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/textual/takeEscapedQuad5.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/textual/takeEscapedQuad5.yml
new file mode 100644
index 0000000000..208bb536bd
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/textual/takeEscapedQuad5.yml
@@ -0,0 +1,34 @@
+languageId: plaintext
+command:
+  version: 1
+  spokenForm: clear escaped quad
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier: { type: surroundingPair, delimiter: escapedDoubleQuotes }
+initialState:
+  documentContents: \"hello\"
+  selections:
+    - anchor: { line: 0, character: 7 }
+      active: { line: 0, character: 7 }
+finalState:
+  documentContents: ""
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        {
+          type: surroundingPair,
+          delimiter: escapedDoubleQuotes,
+          delimiterInclusion: includeDelimiters,
+        },
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/textual/takeInsideRound.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/textual/takeInsideRound.yml
new file mode 100644
index 0000000000..aaa0ab1cb7
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/textual/takeInsideRound.yml
@@ -0,0 +1,39 @@
+languageId: plaintext
+command:
+  version: 1
+  spokenForm: clear inside round
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier:
+        {
+          type: surroundingPair,
+          delimiter: parentheses,
+          delimiterInclusion: interiorOnly,
+        }
+initialState:
+  documentContents: ()
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+finalState:
+  documentContents: ()
+  selections:
+    - anchor: { line: 0, character: 1 }
+      active: { line: 0, character: 1 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        {
+          type: surroundingPair,
+          delimiter: parentheses,
+          delimiterInclusion: excludeDelimiters,
+        },
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/textual/takeInsideRound2.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/textual/takeInsideRound2.yml
new file mode 100644
index 0000000000..a71e046e11
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/textual/takeInsideRound2.yml
@@ -0,0 +1,39 @@
+languageId: plaintext
+command:
+  version: 1
+  spokenForm: clear inside round
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier:
+        {
+          type: surroundingPair,
+          delimiter: parentheses,
+          delimiterInclusion: interiorOnly,
+        }
+initialState:
+  documentContents: (hello)
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+finalState:
+  documentContents: ()
+  selections:
+    - anchor: { line: 0, character: 1 }
+      active: { line: 0, character: 1 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        {
+          type: surroundingPair,
+          delimiter: parentheses,
+          delimiterInclusion: excludeDelimiters,
+        },
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/textual/takeLeftQuad.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/textual/takeLeftQuad.yml
new file mode 100644
index 0000000000..b4feaa3a00
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/textual/takeLeftQuad.yml
@@ -0,0 +1,40 @@
+languageId: plaintext
+command:
+  version: 1
+  spokenForm: take left quad
+  action: setSelection
+  targets:
+    - type: primitive
+      modifier:
+        { type: surroundingPair, delimiter: doubleQuotes, forceDirection: left }
+initialState:
+  documentContents: |-
+    hello world whatever "testing testing testing
+    this is another" test "whatever" whatever
+  selections:
+    - anchor: { line: 0, character: 26 }
+      active: { line: 0, character: 26 }
+  marks: {}
+finalState:
+  documentContents: |-
+    hello world whatever "testing testing testing
+    this is another" test "whatever" whatever
+  selections:
+    - anchor: { line: 0, character: 21 }
+      active: { line: 1, character: 16 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        {
+          type: surroundingPair,
+          delimiter: doubleQuotes,
+          forceDirection: left,
+        },
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/textual/takeLeftQuad2.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/textual/takeLeftQuad2.yml
new file mode 100644
index 0000000000..37f0a4eab4
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/textual/takeLeftQuad2.yml
@@ -0,0 +1,40 @@
+languageId: plaintext
+command:
+  version: 1
+  spokenForm: take left quad
+  action: setSelection
+  targets:
+    - type: primitive
+      modifier:
+        { type: surroundingPair, delimiter: doubleQuotes, forceDirection: left }
+initialState:
+  documentContents: |-
+    hello world whatever "testing testing testing
+    this is another" test "whatever" whatever
+  selections:
+    - anchor: { line: 1, character: 15 }
+      active: { line: 1, character: 15 }
+  marks: {}
+finalState:
+  documentContents: |-
+    hello world whatever "testing testing testing
+    this is another" test "whatever" whatever
+  selections:
+    - anchor: { line: 0, character: 21 }
+      active: { line: 1, character: 16 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        {
+          type: surroundingPair,
+          delimiter: doubleQuotes,
+          forceDirection: left,
+        },
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/textual/takeLeftQuad3.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/textual/takeLeftQuad3.yml
new file mode 100644
index 0000000000..c78a785bef
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/textual/takeLeftQuad3.yml
@@ -0,0 +1,40 @@
+languageId: plaintext
+command:
+  version: 1
+  spokenForm: take left quad
+  action: setSelection
+  targets:
+    - type: primitive
+      modifier:
+        { type: surroundingPair, delimiter: doubleQuotes, forceDirection: left }
+initialState:
+  documentContents: |-
+    hello world whatever "testing testing testing
+    this is another" test "whatever" whatever
+  selections:
+    - anchor: { line: 1, character: 16 }
+      active: { line: 1, character: 16 }
+  marks: {}
+finalState:
+  documentContents: |-
+    hello world whatever "testing testing testing
+    this is another" test "whatever" whatever
+  selections:
+    - anchor: { line: 0, character: 21 }
+      active: { line: 1, character: 16 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        {
+          type: surroundingPair,
+          delimiter: doubleQuotes,
+          forceDirection: left,
+        },
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/textual/takeLeftQuad4.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/textual/takeLeftQuad4.yml
new file mode 100644
index 0000000000..eaa081d0a5
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/textual/takeLeftQuad4.yml
@@ -0,0 +1,40 @@
+languageId: plaintext
+command:
+  version: 1
+  spokenForm: take left quad
+  action: setSelection
+  targets:
+    - type: primitive
+      modifier:
+        { type: surroundingPair, delimiter: doubleQuotes, forceDirection: left }
+initialState:
+  documentContents: |-
+    hello world whatever "testing testing testing
+    this is another" test "whatever" whatever
+  selections:
+    - anchor: { line: 1, character: 12 }
+      active: { line: 1, character: 12 }
+  marks: {}
+finalState:
+  documentContents: |-
+    hello world whatever "testing testing testing
+    this is another" test "whatever" whatever
+  selections:
+    - anchor: { line: 0, character: 21 }
+      active: { line: 1, character: 16 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        {
+          type: surroundingPair,
+          delimiter: doubleQuotes,
+          forceDirection: left,
+        },
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/textual/takeLeftQuad5.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/textual/takeLeftQuad5.yml
new file mode 100644
index 0000000000..f683ceb1bd
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/textual/takeLeftQuad5.yml
@@ -0,0 +1,40 @@
+languageId: plaintext
+command:
+  version: 1
+  spokenForm: take left quad
+  action: setSelection
+  targets:
+    - type: primitive
+      modifier:
+        { type: surroundingPair, delimiter: doubleQuotes, forceDirection: left }
+initialState:
+  documentContents: |-
+    hello world whatever "testing testing testing
+    this is another" test "whatever" whatever
+  selections:
+    - anchor: { line: 1, character: 26 }
+      active: { line: 1, character: 26 }
+  marks: {}
+finalState:
+  documentContents: |-
+    hello world whatever "testing testing testing
+    this is another" test "whatever" whatever
+  selections:
+    - anchor: { line: 1, character: 22 }
+      active: { line: 1, character: 32 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        {
+          type: surroundingPair,
+          delimiter: doubleQuotes,
+          forceDirection: left,
+        },
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/textual/takeLeftQuad6.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/textual/takeLeftQuad6.yml
new file mode 100644
index 0000000000..60ccf075cb
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/textual/takeLeftQuad6.yml
@@ -0,0 +1,40 @@
+languageId: plaintext
+command:
+  version: 1
+  spokenForm: take left quad
+  action: setSelection
+  targets:
+    - type: primitive
+      modifier:
+        { type: surroundingPair, delimiter: doubleQuotes, forceDirection: left }
+initialState:
+  documentContents: |-
+    hello world whatever "testing testing testing
+    this is another" test "whatever" whatever
+  selections:
+    - anchor: { line: 1, character: 31 }
+      active: { line: 1, character: 31 }
+  marks: {}
+finalState:
+  documentContents: |-
+    hello world whatever "testing testing testing
+    this is another" test "whatever" whatever
+  selections:
+    - anchor: { line: 1, character: 22 }
+      active: { line: 1, character: 32 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        {
+          type: surroundingPair,
+          delimiter: doubleQuotes,
+          forceDirection: left,
+        },
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/textual/takeLeftQuad7.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/textual/takeLeftQuad7.yml
new file mode 100644
index 0000000000..60224e6388
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/textual/takeLeftQuad7.yml
@@ -0,0 +1,40 @@
+languageId: plaintext
+command:
+  version: 1
+  spokenForm: take left quad
+  action: setSelection
+  targets:
+    - type: primitive
+      modifier:
+        { type: surroundingPair, delimiter: doubleQuotes, forceDirection: left }
+initialState:
+  documentContents: |-
+    hello world whatever "testing testing testing
+    this is another" test "whatever" whatever
+  selections:
+    - anchor: { line: 1, character: 32 }
+      active: { line: 1, character: 32 }
+  marks: {}
+finalState:
+  documentContents: |-
+    hello world whatever "testing testing testing
+    this is another" test "whatever" whatever
+  selections:
+    - anchor: { line: 1, character: 22 }
+      active: { line: 1, character: 32 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        {
+          type: surroundingPair,
+          delimiter: doubleQuotes,
+          forceDirection: left,
+        },
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/textual/takeOutside.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/textual/takeOutside.yml
new file mode 100644
index 0000000000..5f85c634be
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/textual/takeOutside.yml
@@ -0,0 +1,34 @@
+languageId: plaintext
+command:
+  version: 1
+  spokenForm: clear outside
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier: { type: surroundingPair, delimiter: any }
+initialState:
+  documentContents: ()
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+finalState:
+  documentContents: ""
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        {
+          type: surroundingPair,
+          delimiter: null,
+          delimiterInclusion: includeDelimiters,
+        },
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/textual/takeOutside10.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/textual/takeOutside10.yml
new file mode 100644
index 0000000000..1cc26c47eb
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/textual/takeOutside10.yml
@@ -0,0 +1,34 @@
+languageId: plaintext
+command:
+  version: 1
+  spokenForm: clear outside
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier: { type: surroundingPair, delimiter: any }
+initialState:
+  documentContents: (\(hello\))
+  selections:
+    - anchor: { line: 0, character: 6 }
+      active: { line: 0, character: 6 }
+finalState:
+  documentContents: ()
+  selections:
+    - anchor: { line: 0, character: 1 }
+      active: { line: 0, character: 1 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        {
+          type: surroundingPair,
+          delimiter: null,
+          delimiterInclusion: includeDelimiters,
+        },
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/textual/takeOutside11.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/textual/takeOutside11.yml
new file mode 100644
index 0000000000..2501aee4b0
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/textual/takeOutside11.yml
@@ -0,0 +1,35 @@
+languageId: plaintext
+command:
+  version: 1
+  spokenForm: clear outside
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier: { type: surroundingPair, delimiter: any }
+initialState:
+  documentContents: (  [  )  ]
+  selections:
+    - anchor: { line: 0, character: 1 }
+      active: { line: 0, character: 1 }
+  marks: {}
+finalState:
+  documentContents: "  ]"
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        {
+          type: surroundingPair,
+          delimiter: null,
+          delimiterInclusion: includeDelimiters,
+        },
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/textual/takeOutside12.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/textual/takeOutside12.yml
new file mode 100644
index 0000000000..0d58b09a52
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/textual/takeOutside12.yml
@@ -0,0 +1,35 @@
+languageId: plaintext
+command:
+  version: 1
+  spokenForm: clear outside
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier: { type: surroundingPair, delimiter: any }
+initialState:
+  documentContents: (  [  )  ]
+  selections:
+    - anchor: { line: 0, character: 2 }
+      active: { line: 0, character: 2 }
+  marks: {}
+finalState:
+  documentContents: "  ]"
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        {
+          type: surroundingPair,
+          delimiter: null,
+          delimiterInclusion: includeDelimiters,
+        },
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/textual/takeOutside13.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/textual/takeOutside13.yml
new file mode 100644
index 0000000000..f2708bb813
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/textual/takeOutside13.yml
@@ -0,0 +1,35 @@
+languageId: plaintext
+command:
+  version: 1
+  spokenForm: clear outside
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier: { type: surroundingPair, delimiter: any }
+initialState:
+  documentContents: (  [  )  ]
+  selections:
+    - anchor: { line: 0, character: 3 }
+      active: { line: 0, character: 3 }
+  marks: {}
+finalState:
+  documentContents: "(  "
+  selections:
+    - anchor: { line: 0, character: 3 }
+      active: { line: 0, character: 3 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        {
+          type: surroundingPair,
+          delimiter: null,
+          delimiterInclusion: includeDelimiters,
+        },
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/textual/takeOutside14.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/textual/takeOutside14.yml
new file mode 100644
index 0000000000..3ce397b0fa
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/textual/takeOutside14.yml
@@ -0,0 +1,35 @@
+languageId: plaintext
+command:
+  version: 1
+  spokenForm: clear outside
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier: { type: surroundingPair, delimiter: any }
+initialState:
+  documentContents: (  [  )  ]
+  selections:
+    - anchor: { line: 0, character: 5 }
+      active: { line: 0, character: 5 }
+  marks: {}
+finalState:
+  documentContents: "  ]"
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        {
+          type: surroundingPair,
+          delimiter: null,
+          delimiterInclusion: includeDelimiters,
+        },
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/textual/takeOutside15.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/textual/takeOutside15.yml
new file mode 100644
index 0000000000..ba7ba53e70
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/textual/takeOutside15.yml
@@ -0,0 +1,35 @@
+languageId: plaintext
+command:
+  version: 1
+  spokenForm: clear outside
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier: { type: surroundingPair, delimiter: any }
+initialState:
+  documentContents: (  [  )  ]
+  selections:
+    - anchor: { line: 0, character: 7 }
+      active: { line: 0, character: 7 }
+  marks: {}
+finalState:
+  documentContents: "  ]"
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        {
+          type: surroundingPair,
+          delimiter: null,
+          delimiterInclusion: includeDelimiters,
+        },
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/textual/takeOutside16.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/textual/takeOutside16.yml
new file mode 100644
index 0000000000..6df4fd2d21
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/textual/takeOutside16.yml
@@ -0,0 +1,35 @@
+languageId: plaintext
+command:
+  version: 1
+  spokenForm: clear outside
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier: { type: surroundingPair, delimiter: any }
+initialState:
+  documentContents: (  [  )  ]
+  selections:
+    - anchor: { line: 0, character: 8 }
+      active: { line: 0, character: 8 }
+  marks: {}
+finalState:
+  documentContents: "(  "
+  selections:
+    - anchor: { line: 0, character: 3 }
+      active: { line: 0, character: 3 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        {
+          type: surroundingPair,
+          delimiter: null,
+          delimiterInclusion: includeDelimiters,
+        },
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/textual/takeOutside17.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/textual/takeOutside17.yml
new file mode 100644
index 0000000000..d585908351
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/textual/takeOutside17.yml
@@ -0,0 +1,35 @@
+languageId: plaintext
+command:
+  version: 1
+  spokenForm: clear outside
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier: { type: surroundingPair, delimiter: any }
+initialState:
+  documentContents: "[  (  ]  )"
+  selections:
+    - anchor: { line: 0, character: 2 }
+      active: { line: 0, character: 2 }
+  marks: {}
+finalState:
+  documentContents: "  )"
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        {
+          type: surroundingPair,
+          delimiter: null,
+          delimiterInclusion: includeDelimiters,
+        },
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/textual/takeOutside18.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/textual/takeOutside18.yml
new file mode 100644
index 0000000000..7bcb594159
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/textual/takeOutside18.yml
@@ -0,0 +1,35 @@
+languageId: plaintext
+command:
+  version: 1
+  spokenForm: clear outside
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier: { type: surroundingPair, delimiter: any }
+initialState:
+  documentContents: "{   (  ]  )"
+  selections:
+    - anchor: { line: 0, character: 9 }
+      active: { line: 0, character: 9 }
+  marks: {}
+finalState:
+  documentContents: "{   "
+  selections:
+    - anchor: { line: 0, character: 4 }
+      active: { line: 0, character: 4 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        {
+          type: surroundingPair,
+          delimiter: null,
+          delimiterInclusion: includeDelimiters,
+        },
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/textual/takeOutside19.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/textual/takeOutside19.yml
new file mode 100644
index 0000000000..d3c161869a
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/textual/takeOutside19.yml
@@ -0,0 +1,35 @@
+languageId: plaintext
+command:
+  version: 1
+  spokenForm: clear outside
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier: { type: surroundingPair, delimiter: any }
+initialState:
+  documentContents: "{   (  } ]  )"
+  selections:
+    - anchor: { line: 0, character: 8 }
+      active: { line: 0, character: 8 }
+  marks: {}
+finalState:
+  documentContents: " ]  )"
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        {
+          type: surroundingPair,
+          delimiter: null,
+          delimiterInclusion: includeDelimiters,
+        },
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/textual/takeOutside2.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/textual/takeOutside2.yml
new file mode 100644
index 0000000000..3a10107a6f
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/textual/takeOutside2.yml
@@ -0,0 +1,34 @@
+languageId: plaintext
+command:
+  version: 1
+  spokenForm: clear outside
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier: { type: surroundingPair, delimiter: any }
+initialState:
+  documentContents: ([])
+  selections:
+    - anchor: { line: 0, character: 3 }
+      active: { line: 0, character: 3 }
+finalState:
+  documentContents: ""
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        {
+          type: surroundingPair,
+          delimiter: null,
+          delimiterInclusion: includeDelimiters,
+        },
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/textual/takeOutside20.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/textual/takeOutside20.yml
new file mode 100644
index 0000000000..3c7448237a
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/textual/takeOutside20.yml
@@ -0,0 +1,35 @@
+languageId: plaintext
+command:
+  version: 1
+  spokenForm: clear outside
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier: { type: surroundingPair, delimiter: any }
+initialState:
+  documentContents: "[ {   ( { } ]  )"
+  selections:
+    - anchor: { line: 0, character: 5 }
+      active: { line: 0, character: 5 }
+  marks: {}
+finalState:
+  documentContents: "  )"
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        {
+          type: surroundingPair,
+          delimiter: null,
+          delimiterInclusion: includeDelimiters,
+        },
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/textual/takeOutside21.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/textual/takeOutside21.yml
new file mode 100644
index 0000000000..ebc9ec5c21
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/textual/takeOutside21.yml
@@ -0,0 +1,35 @@
+languageId: plaintext
+command:
+  version: 1
+  spokenForm: clear outside
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier: { type: surroundingPair, delimiter: any }
+initialState:
+  documentContents: "{ [  ( { } ]  )"
+  selections:
+    - anchor: { line: 0, character: 4 }
+      active: { line: 0, character: 4 }
+  marks: {}
+finalState:
+  documentContents: "{   )"
+  selections:
+    - anchor: { line: 0, character: 2 }
+      active: { line: 0, character: 2 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        {
+          type: surroundingPair,
+          delimiter: null,
+          delimiterInclusion: includeDelimiters,
+        },
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/textual/takeOutside22.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/textual/takeOutside22.yml
new file mode 100644
index 0000000000..6406cf762d
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/textual/takeOutside22.yml
@@ -0,0 +1,35 @@
+languageId: plaintext
+command:
+  version: 1
+  spokenForm: clear outside
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier: { type: surroundingPair, delimiter: any }
+initialState:
+  documentContents: "{ [  (  } ]  )"
+  selections:
+    - anchor: { line: 0, character: 7 }
+      active: { line: 0, character: 7 }
+  marks: {}
+finalState:
+  documentContents: " ]  )"
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        {
+          type: surroundingPair,
+          delimiter: null,
+          delimiterInclusion: includeDelimiters,
+        },
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/textual/takeOutside23.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/textual/takeOutside23.yml
new file mode 100644
index 0000000000..eb31bcfd56
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/textual/takeOutside23.yml
@@ -0,0 +1,35 @@
+languageId: plaintext
+command:
+  version: 1
+  spokenForm: clear outside
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier: { type: surroundingPair, delimiter: any }
+initialState:
+  documentContents: "{[  ( } ]  )"
+  selections:
+    - anchor: { line: 0, character: 3 }
+      active: { line: 0, character: 3 }
+  marks: {}
+finalState:
+  documentContents: " ]  )"
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        {
+          type: surroundingPair,
+          delimiter: null,
+          delimiterInclusion: includeDelimiters,
+        },
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/textual/takeOutside24.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/textual/takeOutside24.yml
new file mode 100644
index 0000000000..3cbcf6c11c
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/textual/takeOutside24.yml
@@ -0,0 +1,35 @@
+languageId: plaintext
+command:
+  version: 1
+  spokenForm: clear outside
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier: { type: surroundingPair, delimiter: any }
+initialState:
+  documentContents: ([)]
+  selections:
+    - anchor: { line: 0, character: 2 }
+      active: { line: 0, character: 2 }
+  marks: {}
+finalState:
+  documentContents: "]"
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        {
+          type: surroundingPair,
+          delimiter: null,
+          delimiterInclusion: includeDelimiters,
+        },
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/textual/takeOutside25.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/textual/takeOutside25.yml
new file mode 100644
index 0000000000..99a2830f64
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/textual/takeOutside25.yml
@@ -0,0 +1,35 @@
+languageId: plaintext
+command:
+  version: 1
+  spokenForm: clear outside
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier: { type: surroundingPair, delimiter: any }
+initialState:
+  documentContents: ([)]
+  selections:
+    - anchor: { line: 0, character: 1 }
+      active: { line: 0, character: 1 }
+  marks: {}
+finalState:
+  documentContents: (
+  selections:
+    - anchor: { line: 0, character: 1 }
+      active: { line: 0, character: 1 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        {
+          type: surroundingPair,
+          delimiter: null,
+          delimiterInclusion: includeDelimiters,
+        },
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/textual/takeOutside26.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/textual/takeOutside26.yml
new file mode 100644
index 0000000000..6c5e08998b
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/textual/takeOutside26.yml
@@ -0,0 +1,35 @@
+languageId: plaintext
+command:
+  version: 1
+  spokenForm: clear outside
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier: { type: surroundingPair, delimiter: any }
+initialState:
+  documentContents: (<user.foo>  <user.bar>)
+  selections:
+    - anchor: { line: 0, character: 12 }
+      active: { line: 0, character: 12 }
+  marks: {}
+finalState:
+  documentContents: ""
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        {
+          type: surroundingPair,
+          delimiter: null,
+          delimiterInclusion: includeDelimiters,
+        },
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/textual/takeOutside27.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/textual/takeOutside27.yml
new file mode 100644
index 0000000000..be8dc3d3b4
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/textual/takeOutside27.yml
@@ -0,0 +1,35 @@
+languageId: plaintext
+command:
+  version: 1
+  spokenForm: clear outside
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier: { type: surroundingPair, delimiter: any }
+initialState:
+  documentContents: (<user.foo>  <user.bar>)
+  selections:
+    - anchor: { line: 0, character: 7 }
+      active: { line: 0, character: 18 }
+  marks: {}
+finalState:
+  documentContents: ""
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        {
+          type: surroundingPair,
+          delimiter: null,
+          delimiterInclusion: includeDelimiters,
+        },
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/textual/takeOutside3.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/textual/takeOutside3.yml
new file mode 100644
index 0000000000..7cfe3d5db0
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/textual/takeOutside3.yml
@@ -0,0 +1,34 @@
+languageId: plaintext
+command:
+  version: 1
+  spokenForm: clear outside
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier: { type: surroundingPair, delimiter: any }
+initialState:
+  documentContents: (hello)
+  selections:
+    - anchor: { line: 0, character: 4 }
+      active: { line: 0, character: 4 }
+finalState:
+  documentContents: ""
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        {
+          type: surroundingPair,
+          delimiter: null,
+          delimiterInclusion: includeDelimiters,
+        },
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/textual/takeOutside4.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/textual/takeOutside4.yml
new file mode 100644
index 0000000000..a673923cae
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/textual/takeOutside4.yml
@@ -0,0 +1,34 @@
+languageId: plaintext
+command:
+  version: 1
+  spokenForm: clear outside
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier: { type: surroundingPair, delimiter: any }
+initialState:
+  documentContents: "[(hello)]"
+  selections:
+    - anchor: { line: 0, character: 8 }
+      active: { line: 0, character: 5 }
+finalState:
+  documentContents: "[]"
+  selections:
+    - anchor: { line: 0, character: 1 }
+      active: { line: 0, character: 1 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        {
+          type: surroundingPair,
+          delimiter: null,
+          delimiterInclusion: includeDelimiters,
+        },
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/textual/takeOutside5.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/textual/takeOutside5.yml
new file mode 100644
index 0000000000..e4b81e6555
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/textual/takeOutside5.yml
@@ -0,0 +1,34 @@
+languageId: plaintext
+command:
+  version: 1
+  spokenForm: clear outside
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier: { type: surroundingPair, delimiter: any }
+initialState:
+  documentContents: "[(hello)]"
+  selections:
+    - anchor: { line: 0, character: 1 }
+      active: { line: 0, character: 4 }
+finalState:
+  documentContents: "[]"
+  selections:
+    - anchor: { line: 0, character: 1 }
+      active: { line: 0, character: 1 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        {
+          type: surroundingPair,
+          delimiter: null,
+          delimiterInclusion: includeDelimiters,
+        },
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/textual/takeOutside6.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/textual/takeOutside6.yml
new file mode 100644
index 0000000000..823e304f0d
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/textual/takeOutside6.yml
@@ -0,0 +1,34 @@
+languageId: plaintext
+command:
+  version: 1
+  spokenForm: clear outside
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier: { type: surroundingPair, delimiter: any }
+initialState:
+  documentContents: "[(hello)]"
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 3 }
+finalState:
+  documentContents: ""
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        {
+          type: surroundingPair,
+          delimiter: null,
+          delimiterInclusion: includeDelimiters,
+        },
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/textual/takeOutside7.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/textual/takeOutside7.yml
new file mode 100644
index 0000000000..bb24d13f8c
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/textual/takeOutside7.yml
@@ -0,0 +1,34 @@
+languageId: plaintext
+command:
+  version: 1
+  spokenForm: clear outside
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier: { type: surroundingPair, delimiter: any }
+initialState:
+  documentContents: "[(hello)  (whatever)]"
+  selections:
+    - anchor: { line: 0, character: 9 }
+      active: { line: 0, character: 11 }
+finalState:
+  documentContents: ""
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        {
+          type: surroundingPair,
+          delimiter: null,
+          delimiterInclusion: includeDelimiters,
+        },
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/textual/takeOutside8.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/textual/takeOutside8.yml
new file mode 100644
index 0000000000..8292828237
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/textual/takeOutside8.yml
@@ -0,0 +1,34 @@
+languageId: plaintext
+command:
+  version: 1
+  spokenForm: clear outside
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier: { type: surroundingPair, delimiter: any }
+initialState:
+  documentContents: "[(hello)  (whatever)]"
+  selections:
+    - anchor: { line: 0, character: 9 }
+      active: { line: 0, character: 9 }
+finalState:
+  documentContents: ""
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        {
+          type: surroundingPair,
+          delimiter: null,
+          delimiterInclusion: includeDelimiters,
+        },
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/textual/takeOutside9.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/textual/takeOutside9.yml
new file mode 100644
index 0000000000..3eaed8414c
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/textual/takeOutside9.yml
@@ -0,0 +1,34 @@
+languageId: plaintext
+command:
+  version: 1
+  spokenForm: clear outside
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier: { type: surroundingPair, delimiter: any }
+initialState:
+  documentContents: "[hello  (whatever)]"
+  selections:
+    - anchor: { line: 0, character: 7 }
+      active: { line: 0, character: 7 }
+finalState:
+  documentContents: ""
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        {
+          type: surroundingPair,
+          delimiter: null,
+          delimiterInclusion: includeDelimiters,
+        },
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/textual/takeOutsideFine.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/textual/takeOutsideFine.yml
new file mode 100644
index 0000000000..4b574c18dc
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/textual/takeOutsideFine.yml
@@ -0,0 +1,45 @@
+languageId: plaintext
+command:
+  version: 1
+  spokenForm: clear outside fine
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier: { type: surroundingPair, delimiter: any }
+      mark: { type: decoratedSymbol, symbolColor: default, character: f }
+initialState:
+  documentContents: (<user.foo>  <user.bar>)
+  selections:
+    - anchor: { line: 0, character: 13 }
+      active: { line: 0, character: 23 }
+  marks:
+    default.f:
+      start: { line: 0, character: 7 }
+      end: { line: 0, character: 10 }
+finalState:
+  documentContents: (  <user.bar>)
+  selections:
+    - anchor: { line: 0, character: 1 }
+      active: { line: 0, character: 1 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark:
+        {
+          type: decoratedSymbol,
+          symbolColor: default,
+          character: f,
+          usePrePhraseSnapshot: true,
+        },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        {
+          type: surroundingPair,
+          delimiter: null,
+          delimiterInclusion: includeDelimiters,
+        },
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/textual/takeOutsideLeper.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/textual/takeOutsideLeper.yml
new file mode 100644
index 0000000000..fe7eeb9356
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/textual/takeOutsideLeper.yml
@@ -0,0 +1,37 @@
+languageId: plaintext
+command:
+  version: 1
+  spokenForm: clear outside leper
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier: { type: surroundingPair, delimiter: any }
+      mark: { type: decoratedSymbol, symbolColor: default, character: ( }
+initialState:
+  documentContents: |
+    [(hello)  (whatever)]
+  selections:
+    - anchor: { line: 1, character: 0 }
+      active: { line: 1, character: 0 }
+finalState:
+  documentContents: |
+    [  (whatever)]
+  selections:
+    - anchor: { line: 0, character: 1 }
+      active: { line: 0, character: 1 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: decoratedSymbol, symbolColor: default, character: ( },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        {
+          type: surroundingPair,
+          delimiter: null,
+          delimiterInclusion: includeDelimiters,
+        },
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/textual/takeOutsideRack.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/textual/takeOutsideRack.yml
new file mode 100644
index 0000000000..77ee314d07
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/textual/takeOutsideRack.yml
@@ -0,0 +1,37 @@
+languageId: plaintext
+command:
+  version: 1
+  spokenForm: clear outside rack
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier: { type: surroundingPair, delimiter: any }
+      mark: { type: decoratedSymbol, symbolColor: default, character: "]" }
+initialState:
+  documentContents: |
+    [(hello)  (whatever)]
+  selections:
+    - anchor: { line: 1, character: 0 }
+      active: { line: 1, character: 0 }
+finalState:
+  documentContents: |+
+
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: decoratedSymbol, symbolColor: default, character: "]" },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        {
+          type: surroundingPair,
+          delimiter: null,
+          delimiterInclusion: includeDelimiters,
+        },
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/textual/takeOutsideUrge.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/textual/takeOutsideUrge.yml
new file mode 100644
index 0000000000..a3c6f5267b
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/textual/takeOutsideUrge.yml
@@ -0,0 +1,45 @@
+languageId: plaintext
+command:
+  version: 1
+  spokenForm: clear outside urge
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier: { type: surroundingPair, delimiter: any }
+      mark: { type: decoratedSymbol, symbolColor: default, character: u }
+initialState:
+  documentContents: (<user.foo>  <user.bar>)
+  selections:
+    - anchor: { line: 0, character: 12 }
+      active: { line: 0, character: 12 }
+  marks:
+    default.u:
+      start: { line: 0, character: 14 }
+      end: { line: 0, character: 18 }
+finalState:
+  documentContents: (<user.foo>  )
+  selections:
+    - anchor: { line: 0, character: 13 }
+      active: { line: 0, character: 13 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark:
+        {
+          type: decoratedSymbol,
+          symbolColor: default,
+          character: u,
+          usePrePhraseSnapshot: true,
+        },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        {
+          type: surroundingPair,
+          delimiter: null,
+          delimiterInclusion: includeDelimiters,
+        },
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/textual/takeQuad.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/textual/takeQuad.yml
new file mode 100644
index 0000000000..a6f0182dfb
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/textual/takeQuad.yml
@@ -0,0 +1,34 @@
+languageId: plaintext
+command:
+  version: 1
+  spokenForm: clear quad
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier: { type: surroundingPair, delimiter: doubleQuotes }
+initialState:
+  documentContents: '""'
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+finalState:
+  documentContents: ""
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        {
+          type: surroundingPair,
+          delimiter: doubleQuotes,
+          delimiterInclusion: includeDelimiters,
+        },
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/textual/takeQuad2.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/textual/takeQuad2.yml
new file mode 100644
index 0000000000..5116aa1ae1
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/textual/takeQuad2.yml
@@ -0,0 +1,34 @@
+languageId: plaintext
+command:
+  version: 1
+  spokenForm: clear quad
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier: { type: surroundingPair, delimiter: doubleQuotes }
+initialState:
+  documentContents: '""'
+  selections:
+    - anchor: { line: 0, character: 1 }
+      active: { line: 0, character: 1 }
+finalState:
+  documentContents: ""
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        {
+          type: surroundingPair,
+          delimiter: doubleQuotes,
+          delimiterInclusion: includeDelimiters,
+        },
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/textual/takeQuad3.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/textual/takeQuad3.yml
new file mode 100644
index 0000000000..8b46c2ca72
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/textual/takeQuad3.yml
@@ -0,0 +1,34 @@
+languageId: plaintext
+command:
+  version: 1
+  spokenForm: clear quad
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier: { type: surroundingPair, delimiter: doubleQuotes }
+initialState:
+  documentContents: '""'
+  selections:
+    - anchor: { line: 0, character: 2 }
+      active: { line: 0, character: 2 }
+finalState:
+  documentContents: ""
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        {
+          type: surroundingPair,
+          delimiter: doubleQuotes,
+          delimiterInclusion: includeDelimiters,
+        },
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/textual/takeQuad4.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/textual/takeQuad4.yml
new file mode 100644
index 0000000000..58eac726c3
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/textual/takeQuad4.yml
@@ -0,0 +1,34 @@
+languageId: plaintext
+command:
+  version: 1
+  spokenForm: clear quad
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier: { type: surroundingPair, delimiter: doubleQuotes }
+initialState:
+  documentContents: '"()"'
+  selections:
+    - anchor: { line: 0, character: 3 }
+      active: { line: 0, character: 3 }
+finalState:
+  documentContents: ""
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        {
+          type: surroundingPair,
+          delimiter: doubleQuotes,
+          delimiterInclusion: includeDelimiters,
+        },
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/textual/takeQuad5.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/textual/takeQuad5.yml
new file mode 100644
index 0000000000..42f7a4a55e
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/textual/takeQuad5.yml
@@ -0,0 +1,34 @@
+languageId: plaintext
+command:
+  version: 1
+  spokenForm: clear quad
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier: { type: surroundingPair, delimiter: doubleQuotes }
+initialState:
+  documentContents: '"hello"'
+  selections:
+    - anchor: { line: 0, character: 6 }
+      active: { line: 0, character: 6 }
+finalState:
+  documentContents: ""
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        {
+          type: surroundingPair,
+          delimiter: doubleQuotes,
+          delimiterInclusion: includeDelimiters,
+        },
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/textual/takeQuad6.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/textual/takeQuad6.yml
new file mode 100644
index 0000000000..22fa37ffe7
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/textual/takeQuad6.yml
@@ -0,0 +1,34 @@
+languageId: plaintext
+command:
+  version: 1
+  spokenForm: clear quad
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier: { type: surroundingPair, delimiter: doubleQuotes }
+initialState:
+  documentContents: "\"\\\"\\\"\""
+  selections:
+    - anchor: { line: 0, character: 5 }
+      active: { line: 0, character: 5 }
+finalState:
+  documentContents: ""
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        {
+          type: surroundingPair,
+          delimiter: doubleQuotes,
+          delimiterInclusion: includeDelimiters,
+        },
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/textual/takeRightQuad.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/textual/takeRightQuad.yml
new file mode 100644
index 0000000000..4cc85ff042
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/textual/takeRightQuad.yml
@@ -0,0 +1,44 @@
+languageId: plaintext
+command:
+  version: 1
+  spokenForm: take right quad
+  action: setSelection
+  targets:
+    - type: primitive
+      modifier:
+        {
+          type: surroundingPair,
+          delimiter: doubleQuotes,
+          forceDirection: right,
+        }
+initialState:
+  documentContents: |-
+    hello world whatever "testing testing testing
+    this is another" test "whatever" whatever
+  selections:
+    - anchor: { line: 0, character: 21 }
+      active: { line: 0, character: 21 }
+  marks: {}
+finalState:
+  documentContents: |-
+    hello world whatever "testing testing testing
+    this is another" test "whatever" whatever
+  selections:
+    - anchor: { line: 0, character: 21 }
+      active: { line: 1, character: 16 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        {
+          type: surroundingPair,
+          delimiter: doubleQuotes,
+          forceDirection: right,
+        },
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/textual/takeRightQuad2.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/textual/takeRightQuad2.yml
new file mode 100644
index 0000000000..59d61de73d
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/textual/takeRightQuad2.yml
@@ -0,0 +1,44 @@
+languageId: plaintext
+command:
+  version: 1
+  spokenForm: take right quad
+  action: setSelection
+  targets:
+    - type: primitive
+      modifier:
+        {
+          type: surroundingPair,
+          delimiter: doubleQuotes,
+          forceDirection: right,
+        }
+initialState:
+  documentContents: |-
+    hello world whatever "testing testing testing
+    this is another" test "whatever" whatever
+  selections:
+    - anchor: { line: 0, character: 22 }
+      active: { line: 0, character: 22 }
+  marks: {}
+finalState:
+  documentContents: |-
+    hello world whatever "testing testing testing
+    this is another" test "whatever" whatever
+  selections:
+    - anchor: { line: 0, character: 21 }
+      active: { line: 1, character: 16 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        {
+          type: surroundingPair,
+          delimiter: doubleQuotes,
+          forceDirection: right,
+        },
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/textual/takeRightQuad3.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/textual/takeRightQuad3.yml
new file mode 100644
index 0000000000..7c81561b70
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/textual/takeRightQuad3.yml
@@ -0,0 +1,44 @@
+languageId: plaintext
+command:
+  version: 1
+  spokenForm: take right quad
+  action: setSelection
+  targets:
+    - type: primitive
+      modifier:
+        {
+          type: surroundingPair,
+          delimiter: doubleQuotes,
+          forceDirection: right,
+        }
+initialState:
+  documentContents: |-
+    hello world whatever "testing testing testing
+    this is another" test "whatever" whatever
+  selections:
+    - anchor: { line: 0, character: 26 }
+      active: { line: 0, character: 26 }
+  marks: {}
+finalState:
+  documentContents: |-
+    hello world whatever "testing testing testing
+    this is another" test "whatever" whatever
+  selections:
+    - anchor: { line: 0, character: 21 }
+      active: { line: 1, character: 16 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        {
+          type: surroundingPair,
+          delimiter: doubleQuotes,
+          forceDirection: right,
+        },
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/textual/takeRightQuad4.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/textual/takeRightQuad4.yml
new file mode 100644
index 0000000000..51a811c7ab
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/textual/takeRightQuad4.yml
@@ -0,0 +1,44 @@
+languageId: plaintext
+command:
+  version: 1
+  spokenForm: take right quad
+  action: setSelection
+  targets:
+    - type: primitive
+      modifier:
+        {
+          type: surroundingPair,
+          delimiter: doubleQuotes,
+          forceDirection: right,
+        }
+initialState:
+  documentContents: |-
+    hello world whatever "testing testing testing
+    this is another" test "whatever" whatever
+  selections:
+    - anchor: { line: 1, character: 22 }
+      active: { line: 1, character: 22 }
+  marks: {}
+finalState:
+  documentContents: |-
+    hello world whatever "testing testing testing
+    this is another" test "whatever" whatever
+  selections:
+    - anchor: { line: 1, character: 22 }
+      active: { line: 1, character: 32 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        {
+          type: surroundingPair,
+          delimiter: doubleQuotes,
+          forceDirection: right,
+        },
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/textual/takeRightQuad5.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/textual/takeRightQuad5.yml
new file mode 100644
index 0000000000..b7aafd2c8d
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/textual/takeRightQuad5.yml
@@ -0,0 +1,44 @@
+languageId: plaintext
+command:
+  version: 1
+  spokenForm: take right quad
+  action: setSelection
+  targets:
+    - type: primitive
+      modifier:
+        {
+          type: surroundingPair,
+          delimiter: doubleQuotes,
+          forceDirection: right,
+        }
+initialState:
+  documentContents: |-
+    hello world whatever "testing testing testing
+    this is another" test "whatever" whatever
+  selections:
+    - anchor: { line: 1, character: 23 }
+      active: { line: 1, character: 23 }
+  marks: {}
+finalState:
+  documentContents: |-
+    hello world whatever "testing testing testing
+    this is another" test "whatever" whatever
+  selections:
+    - anchor: { line: 1, character: 22 }
+      active: { line: 1, character: 32 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        {
+          type: surroundingPair,
+          delimiter: doubleQuotes,
+          forceDirection: right,
+        },
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/textual/takeRightQuad6.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/textual/takeRightQuad6.yml
new file mode 100644
index 0000000000..94904b92f5
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/textual/takeRightQuad6.yml
@@ -0,0 +1,44 @@
+languageId: plaintext
+command:
+  version: 1
+  spokenForm: take right quad
+  action: setSelection
+  targets:
+    - type: primitive
+      modifier:
+        {
+          type: surroundingPair,
+          delimiter: doubleQuotes,
+          forceDirection: right,
+        }
+initialState:
+  documentContents: |-
+    hello world whatever "testing testing testing
+    this is another" test "whatever" whatever
+  selections:
+    - anchor: { line: 1, character: 12 }
+      active: { line: 1, character: 12 }
+  marks: {}
+finalState:
+  documentContents: |-
+    hello world whatever "testing testing testing
+    this is another" test "whatever" whatever
+  selections:
+    - anchor: { line: 0, character: 21 }
+      active: { line: 1, character: 16 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        {
+          type: surroundingPair,
+          delimiter: doubleQuotes,
+          forceDirection: right,
+        },
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/textual/takeRightQuad7.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/textual/takeRightQuad7.yml
new file mode 100644
index 0000000000..3120a755bc
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/textual/takeRightQuad7.yml
@@ -0,0 +1,44 @@
+languageId: plaintext
+command:
+  version: 1
+  spokenForm: take right quad
+  action: setSelection
+  targets:
+    - type: primitive
+      modifier:
+        {
+          type: surroundingPair,
+          delimiter: doubleQuotes,
+          forceDirection: right,
+        }
+initialState:
+  documentContents: |-
+    hello world whatever "testing testing testing
+    this is another" test "whatever" whatever
+  selections:
+    - anchor: { line: 1, character: 26 }
+      active: { line: 1, character: 26 }
+  marks: {}
+finalState:
+  documentContents: |-
+    hello world whatever "testing testing testing
+    this is another" test "whatever" whatever
+  selections:
+    - anchor: { line: 1, character: 22 }
+      active: { line: 1, character: 32 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        {
+          type: surroundingPair,
+          delimiter: doubleQuotes,
+          forceDirection: right,
+        },
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/textual/takeRound.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/textual/takeRound.yml
new file mode 100644
index 0000000000..f995030202
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/textual/takeRound.yml
@@ -0,0 +1,34 @@
+languageId: plaintext
+command:
+  version: 1
+  spokenForm: clear round
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier: { type: surroundingPair, delimiter: parentheses }
+initialState:
+  documentContents: ()
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+finalState:
+  documentContents: ""
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        {
+          type: surroundingPair,
+          delimiter: parentheses,
+          delimiterInclusion: includeDelimiters,
+        },
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/textual/takeRound10.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/textual/takeRound10.yml
new file mode 100644
index 0000000000..491b23238c
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/textual/takeRound10.yml
@@ -0,0 +1,34 @@
+languageId: plaintext
+command:
+  version: 1
+  spokenForm: clear round
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier: { type: surroundingPair, delimiter: parentheses }
+initialState:
+  documentContents: ((hello))
+  selections:
+    - anchor: { line: 0, character: 7 }
+      active: { line: 0, character: 7 }
+finalState:
+  documentContents: ()
+  selections:
+    - anchor: { line: 0, character: 1 }
+      active: { line: 0, character: 1 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        {
+          type: surroundingPair,
+          delimiter: parentheses,
+          delimiterInclusion: includeDelimiters,
+        },
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/textual/takeRound11.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/textual/takeRound11.yml
new file mode 100644
index 0000000000..32b2a1c642
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/textual/takeRound11.yml
@@ -0,0 +1,34 @@
+languageId: plaintext
+command:
+  version: 1
+  spokenForm: clear round
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier: { type: surroundingPair, delimiter: parentheses }
+initialState:
+  documentContents: ((hello))
+  selections:
+    - anchor: { line: 0, character: 8 }
+      active: { line: 0, character: 8 }
+finalState:
+  documentContents: ""
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        {
+          type: surroundingPair,
+          delimiter: parentheses,
+          delimiterInclusion: includeDelimiters,
+        },
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/textual/takeRound12.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/textual/takeRound12.yml
new file mode 100644
index 0000000000..c13bd2d675
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/textual/takeRound12.yml
@@ -0,0 +1,34 @@
+languageId: plaintext
+command:
+  version: 1
+  spokenForm: clear round
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier: { type: surroundingPair, delimiter: parentheses }
+initialState:
+  documentContents: ((hello))
+  selections:
+    - anchor: { line: 0, character: 9 }
+      active: { line: 0, character: 9 }
+finalState:
+  documentContents: ""
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        {
+          type: surroundingPair,
+          delimiter: parentheses,
+          delimiterInclusion: includeDelimiters,
+        },
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/textual/takeRound13.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/textual/takeRound13.yml
new file mode 100644
index 0000000000..aa6d0abad7
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/textual/takeRound13.yml
@@ -0,0 +1,34 @@
+languageId: plaintext
+command:
+  version: 1
+  spokenForm: clear round
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier: { type: surroundingPair, delimiter: parentheses }
+initialState:
+  documentContents: ((hello) () )
+  selections:
+    - anchor: { line: 0, character: 12 }
+      active: { line: 0, character: 12 }
+finalState:
+  documentContents: ""
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        {
+          type: surroundingPair,
+          delimiter: parentheses,
+          delimiterInclusion: includeDelimiters,
+        },
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/textual/takeRound14.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/textual/takeRound14.yml
new file mode 100644
index 0000000000..622b60d3d6
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/textual/takeRound14.yml
@@ -0,0 +1,34 @@
+languageId: plaintext
+command:
+  version: 1
+  spokenForm: clear round
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier: { type: surroundingPair, delimiter: parentheses }
+initialState:
+  documentContents: ((hello) () )
+  selections:
+    - anchor: { line: 0, character: 11 }
+      active: { line: 0, character: 11 }
+finalState:
+  documentContents: ((hello)  )
+  selections:
+    - anchor: { line: 0, character: 9 }
+      active: { line: 0, character: 9 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        {
+          type: surroundingPair,
+          delimiter: parentheses,
+          delimiterInclusion: includeDelimiters,
+        },
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/textual/takeRound15.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/textual/takeRound15.yml
new file mode 100644
index 0000000000..52f8b62cb8
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/textual/takeRound15.yml
@@ -0,0 +1,34 @@
+languageId: plaintext
+command:
+  version: 1
+  spokenForm: clear round
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier: { type: surroundingPair, delimiter: parentheses }
+initialState:
+  documentContents: ((hello) [] )
+  selections:
+    - anchor: { line: 0, character: 12 }
+      active: { line: 0, character: 12 }
+finalState:
+  documentContents: ""
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        {
+          type: surroundingPair,
+          delimiter: parentheses,
+          delimiterInclusion: includeDelimiters,
+        },
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/textual/takeRound16.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/textual/takeRound16.yml
new file mode 100644
index 0000000000..30bfd1f65d
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/textual/takeRound16.yml
@@ -0,0 +1,34 @@
+languageId: plaintext
+command:
+  version: 1
+  spokenForm: clear round
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier: { type: surroundingPair, delimiter: parentheses }
+initialState:
+  documentContents: ()()
+  selections:
+    - anchor: { line: 0, character: 2 }
+      active: { line: 0, character: 2 }
+finalState:
+  documentContents: ()
+  selections:
+    - anchor: { line: 0, character: 2 }
+      active: { line: 0, character: 2 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        {
+          type: surroundingPair,
+          delimiter: parentheses,
+          delimiterInclusion: includeDelimiters,
+        },
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/textual/takeRound17.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/textual/takeRound17.yml
new file mode 100644
index 0000000000..e8c97fe6da
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/textual/takeRound17.yml
@@ -0,0 +1,34 @@
+languageId: plaintext
+command:
+  version: 1
+  spokenForm: clear round
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier: { type: surroundingPair, delimiter: parentheses }
+initialState:
+  documentContents: ()(
+  selections:
+    - anchor: { line: 0, character: 2 }
+      active: { line: 0, character: 2 }
+finalState:
+  documentContents: (
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        {
+          type: surroundingPair,
+          delimiter: parentheses,
+          delimiterInclusion: includeDelimiters,
+        },
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/textual/takeRound18.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/textual/takeRound18.yml
new file mode 100644
index 0000000000..cbdd5ff694
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/textual/takeRound18.yml
@@ -0,0 +1,34 @@
+languageId: plaintext
+command:
+  version: 1
+  spokenForm: clear round
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier: { type: surroundingPair, delimiter: parentheses }
+initialState:
+  documentContents: (\(hello\))
+  selections:
+    - anchor: { line: 0, character: 1 }
+      active: { line: 0, character: 1 }
+finalState:
+  documentContents: ""
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        {
+          type: surroundingPair,
+          delimiter: parentheses,
+          delimiterInclusion: includeDelimiters,
+        },
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/textual/takeRound19.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/textual/takeRound19.yml
new file mode 100644
index 0000000000..daf6b279f1
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/textual/takeRound19.yml
@@ -0,0 +1,34 @@
+languageId: plaintext
+command:
+  version: 1
+  spokenForm: clear round
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier: { type: surroundingPair, delimiter: parentheses }
+initialState:
+  documentContents: (hello)
+  selections:
+    - anchor: { line: 0, character: 4 }
+      active: { line: 0, character: 4 }
+finalState:
+  documentContents: ""
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        {
+          type: surroundingPair,
+          delimiter: parentheses,
+          delimiterInclusion: includeDelimiters,
+        },
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/textual/takeRound2.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/textual/takeRound2.yml
new file mode 100644
index 0000000000..303f6c39f8
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/textual/takeRound2.yml
@@ -0,0 +1,34 @@
+languageId: plaintext
+command:
+  version: 1
+  spokenForm: clear round
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier: { type: surroundingPair, delimiter: parentheses }
+initialState:
+  documentContents: (hello)
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+finalState:
+  documentContents: ""
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        {
+          type: surroundingPair,
+          delimiter: parentheses,
+          delimiterInclusion: includeDelimiters,
+        },
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/textual/takeRound20.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/textual/takeRound20.yml
new file mode 100644
index 0000000000..d2b5397c82
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/textual/takeRound20.yml
@@ -0,0 +1,34 @@
+languageId: plaintext
+command:
+  version: 1
+  spokenForm: clear round
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier: { type: surroundingPair, delimiter: parentheses }
+initialState:
+  documentContents: (hello  (whatever))
+  selections:
+    - anchor: { line: 0, character: 7 }
+      active: { line: 0, character: 7 }
+finalState:
+  documentContents: ""
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        {
+          type: surroundingPair,
+          delimiter: parentheses,
+          delimiterInclusion: includeDelimiters,
+        },
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/textual/takeRound21.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/textual/takeRound21.yml
new file mode 100644
index 0000000000..7a5bb206c6
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/textual/takeRound21.yml
@@ -0,0 +1,34 @@
+languageId: plaintext
+command:
+  version: 1
+  spokenForm: clear round
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier: { type: surroundingPair, delimiter: parentheses }
+initialState:
+  documentContents: (hello ()  )
+  selections:
+    - anchor: { line: 0, character: 10 }
+      active: { line: 0, character: 10 }
+finalState:
+  documentContents: ""
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        {
+          type: surroundingPair,
+          delimiter: parentheses,
+          delimiterInclusion: includeDelimiters,
+        },
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/textual/takeRound22.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/textual/takeRound22.yml
new file mode 100644
index 0000000000..b1c1d8fc57
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/textual/takeRound22.yml
@@ -0,0 +1,34 @@
+languageId: plaintext
+command:
+  version: 1
+  spokenForm: clear round
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier: { type: surroundingPair, delimiter: parentheses }
+initialState:
+  documentContents: (hello  () (whatever))
+  selections:
+    - anchor: { line: 0, character: 7 }
+      active: { line: 0, character: 7 }
+finalState:
+  documentContents: ""
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        {
+          type: surroundingPair,
+          delimiter: parentheses,
+          delimiterInclusion: includeDelimiters,
+        },
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/textual/takeRound23.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/textual/takeRound23.yml
new file mode 100644
index 0000000000..6ac0c29713
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/textual/takeRound23.yml
@@ -0,0 +1,34 @@
+languageId: plaintext
+command:
+  version: 1
+  spokenForm: clear round
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier: { type: surroundingPair, delimiter: parentheses }
+initialState:
+  documentContents: (\(hello\))
+  selections:
+    - anchor: { line: 0, character: 6 }
+      active: { line: 0, character: 6 }
+finalState:
+  documentContents: ""
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        {
+          type: surroundingPair,
+          delimiter: parentheses,
+          delimiterInclusion: includeDelimiters,
+        },
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/textual/takeRound3.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/textual/takeRound3.yml
new file mode 100644
index 0000000000..bcdfb8cabe
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/textual/takeRound3.yml
@@ -0,0 +1,34 @@
+languageId: plaintext
+command:
+  version: 1
+  spokenForm: clear round
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier: { type: surroundingPair, delimiter: parentheses }
+initialState:
+  documentContents: (hello)
+  selections:
+    - anchor: { line: 0, character: 6 }
+      active: { line: 0, character: 6 }
+finalState:
+  documentContents: ""
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        {
+          type: surroundingPair,
+          delimiter: parentheses,
+          delimiterInclusion: includeDelimiters,
+        },
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/textual/takeRound4.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/textual/takeRound4.yml
new file mode 100644
index 0000000000..95f1b05747
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/textual/takeRound4.yml
@@ -0,0 +1,34 @@
+languageId: plaintext
+command:
+  version: 1
+  spokenForm: clear round
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier: { type: surroundingPair, delimiter: parentheses }
+initialState:
+  documentContents: (hello)
+  selections:
+    - anchor: { line: 0, character: 7 }
+      active: { line: 0, character: 7 }
+finalState:
+  documentContents: ""
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        {
+          type: surroundingPair,
+          delimiter: parentheses,
+          delimiterInclusion: includeDelimiters,
+        },
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/textual/takeRound5.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/textual/takeRound5.yml
new file mode 100644
index 0000000000..69ca6d981b
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/textual/takeRound5.yml
@@ -0,0 +1,34 @@
+languageId: plaintext
+command:
+  version: 1
+  spokenForm: clear round
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier: { type: surroundingPair, delimiter: parentheses }
+initialState:
+  documentContents: (hello)
+  selections:
+    - anchor: { line: 0, character: 1 }
+      active: { line: 0, character: 1 }
+finalState:
+  documentContents: ""
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        {
+          type: surroundingPair,
+          delimiter: parentheses,
+          delimiterInclusion: includeDelimiters,
+        },
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/textual/takeRound6.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/textual/takeRound6.yml
new file mode 100644
index 0000000000..f731e2a063
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/textual/takeRound6.yml
@@ -0,0 +1,34 @@
+languageId: plaintext
+command:
+  version: 1
+  spokenForm: clear round
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier: { type: surroundingPair, delimiter: parentheses }
+initialState:
+  documentContents: ()
+  selections:
+    - anchor: { line: 0, character: 1 }
+      active: { line: 0, character: 1 }
+finalState:
+  documentContents: ""
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        {
+          type: surroundingPair,
+          delimiter: parentheses,
+          delimiterInclusion: includeDelimiters,
+        },
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/textual/takeRound7.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/textual/takeRound7.yml
new file mode 100644
index 0000000000..4e32e04fc4
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/textual/takeRound7.yml
@@ -0,0 +1,34 @@
+languageId: plaintext
+command:
+  version: 1
+  spokenForm: clear round
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier: { type: surroundingPair, delimiter: parentheses }
+initialState:
+  documentContents: (())
+  selections:
+    - anchor: { line: 0, character: 2 }
+      active: { line: 0, character: 2 }
+finalState:
+  documentContents: ()
+  selections:
+    - anchor: { line: 0, character: 1 }
+      active: { line: 0, character: 1 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        {
+          type: surroundingPair,
+          delimiter: parentheses,
+          delimiterInclusion: includeDelimiters,
+        },
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/textual/takeRound8.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/textual/takeRound8.yml
new file mode 100644
index 0000000000..04a03f230d
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/textual/takeRound8.yml
@@ -0,0 +1,34 @@
+languageId: plaintext
+command:
+  version: 1
+  spokenForm: clear round
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier: { type: surroundingPair, delimiter: parentheses }
+initialState:
+  documentContents: (())
+  selections:
+    - anchor: { line: 0, character: 3 }
+      active: { line: 0, character: 3 }
+finalState:
+  documentContents: ""
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        {
+          type: surroundingPair,
+          delimiter: parentheses,
+          delimiterInclusion: includeDelimiters,
+        },
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/textual/takeRound9.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/textual/takeRound9.yml
new file mode 100644
index 0000000000..93831074c8
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/textual/takeRound9.yml
@@ -0,0 +1,34 @@
+languageId: plaintext
+command:
+  version: 1
+  spokenForm: clear round
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier: { type: surroundingPair, delimiter: parentheses }
+initialState:
+  documentContents: (())
+  selections:
+    - anchor: { line: 0, character: 1 }
+      active: { line: 0, character: 1 }
+finalState:
+  documentContents: ()
+  selections:
+    - anchor: { line: 0, character: 1 }
+      active: { line: 0, character: 1 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        {
+          type: surroundingPair,
+          delimiter: parentheses,
+          delimiterInclusion: includeDelimiters,
+        },
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/textual/takeRoundLeper.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/textual/takeRoundLeper.yml
new file mode 100644
index 0000000000..32024e99ae
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/textual/takeRoundLeper.yml
@@ -0,0 +1,35 @@
+languageId: plaintext
+command:
+  version: 1
+  spokenForm: clear round leper
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier: { type: surroundingPair, delimiter: parentheses }
+      mark: { type: decoratedSymbol, symbolColor: default, character: ( }
+initialState:
+  documentContents: (hello)
+  selections:
+    - anchor: { line: 0, character: 4 }
+      active: { line: 0, character: 4 }
+finalState:
+  documentContents: ""
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: decoratedSymbol, symbolColor: default, character: ( },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        {
+          type: surroundingPair,
+          delimiter: parentheses,
+          delimiterInclusion: includeDelimiters,
+        },
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/textual/takeRoundRepper.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/textual/takeRoundRepper.yml
new file mode 100644
index 0000000000..39c7e0d6a5
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/textual/takeRoundRepper.yml
@@ -0,0 +1,35 @@
+languageId: plaintext
+command:
+  version: 1
+  spokenForm: clear round repper
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier: { type: surroundingPair, delimiter: parentheses }
+      mark: { type: decoratedSymbol, symbolColor: default, character: ) }
+initialState:
+  documentContents: (hello)
+  selections:
+    - anchor: { line: 0, character: 4 }
+      active: { line: 0, character: 4 }
+finalState:
+  documentContents: ""
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: decoratedSymbol, symbolColor: default, character: ) },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        {
+          type: surroundingPair,
+          delimiter: parentheses,
+          delimiterInclusion: includeDelimiters,
+        },
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/textual/takeSquare.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/textual/takeSquare.yml
new file mode 100644
index 0000000000..2cbca81624
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/surroundingPair/textual/takeSquare.yml
@@ -0,0 +1,34 @@
+languageId: plaintext
+command:
+  version: 1
+  spokenForm: clear square
+  action: clearAndSetSelection
+  targets:
+    - type: primitive
+      modifier: { type: surroundingPair, delimiter: squareBrackets }
+initialState:
+  documentContents: "[(hello)]"
+  selections:
+    - anchor: { line: 0, character: 5 }
+      active: { line: 0, character: 5 }
+finalState:
+  documentContents: ""
+  selections:
+    - anchor: { line: 0, character: 0 }
+      active: { line: 0, character: 0 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier:
+        {
+          type: surroundingPair,
+          delimiter: squareBrackets,
+          delimiterInclusion: includeDelimiters,
+        },
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/targets/scopeType/bringSectionMadeAfterThis.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/targets/scopeType/bringSectionMadeAfterThis.yml
new file mode 100644
index 0000000000..8b88f96894
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/targets/scopeType/bringSectionMadeAfterThis.yml
@@ -0,0 +1,63 @@
+languageId: markdown
+command:
+  spokenForm: bring section made after this
+  version: 3
+  targets:
+    - type: primitive
+      modifiers:
+        - type: containingScope
+          scopeType: { type: section }
+      mark: { type: decoratedSymbol, symbolColor: default, character: m }
+    - type: primitive
+      mark: { type: cursor }
+      modifiers:
+        - { type: position, position: after }
+  usePrePhraseSnapshot: true
+  action: { name: replaceWithTarget }
+initialState:
+  documentContents: |-
+    # Some section
+
+    Some text
+
+    # Another section
+
+    Another text
+  selections:
+    - anchor: { line: 4, character: 9 }
+      active: { line: 4, character: 9 }
+  marks:
+    default.m:
+      start: { line: 2, character: 0 }
+      end: { line: 2, character: 4 }
+finalState:
+  documentContents: |-
+    # Some section
+
+    Some text
+
+    # Another section
+
+    Another text
+
+    # Some section
+
+    Some text
+  selections:
+    - anchor: { line: 4, character: 9 }
+      active: { line: 4, character: 9 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: decoratedSymbol, symbolColor: default, character: m },
+      modifiers:
+        [&ref_0 { type: containingScope, scopeType: { type: section } }],
+    },
+    {
+      type: primitive,
+      mark: { type: cursor },
+      modifiers: [*ref_0],
+      positionModifier: { type: position, position: after },
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/targets/scopeType/pourComment.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/targets/scopeType/pourComment.yml
new file mode 100644
index 0000000000..ea6fb504a3
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/targets/scopeType/pourComment.yml
@@ -0,0 +1,31 @@
+languageId: typescript
+command:
+  spokenForm: pour comment
+  version: 3
+  targets:
+    - type: primitive
+      modifiers:
+        - type: containingScope
+          scopeType: { type: comment }
+  usePrePhraseSnapshot: true
+  action: { name: editNewLineAfter }
+initialState:
+  documentContents: // Testing comment
+  selections:
+    - anchor: { line: 0, character: 17 }
+      active: { line: 0, character: 17 }
+  marks: {}
+finalState:
+  documentContents: |
+    // Testing comment
+  selections:
+    - anchor: { line: 1, character: 0 }
+      active: { line: 1, character: 0 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      modifiers: [{ type: containingScope, scopeType: { type: comment } }],
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/targets/scopeType/pourElm.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/targets/scopeType/pourElm.yml
new file mode 100644
index 0000000000..4379b029ff
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/targets/scopeType/pourElm.yml
@@ -0,0 +1,36 @@
+languageId: html
+command:
+  spokenForm: pour elm
+  version: 3
+  targets:
+    - type: primitive
+      modifiers:
+        - type: containingScope
+          scopeType: { type: xmlElement }
+  usePrePhraseSnapshot: true
+  action: { name: editNewLineAfter }
+initialState:
+  documentContents: |-
+    <html>
+
+    </html>
+  selections:
+    - anchor: { line: 1, character: 4 }
+      active: { line: 1, character: 4 }
+  marks: {}
+finalState:
+  documentContents: |
+    <html>
+
+    </html>
+  selections:
+    - anchor: { line: 3, character: 0 }
+      active: { line: 3, character: 0 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      modifiers: [{ type: containingScope, scopeType: { type: xmlElement } }],
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/targets/scopeType/pourEntry.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/targets/scopeType/pourEntry.yml
new file mode 100644
index 0000000000..4c3d76449e
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/targets/scopeType/pourEntry.yml
@@ -0,0 +1,36 @@
+languageId: markdown
+command:
+  spokenForm: pour entry
+  version: 3
+  targets:
+    - type: primitive
+      modifiers:
+        - type: containingScope
+          scopeType: { type: collectionItem }
+  usePrePhraseSnapshot: true
+  action: { name: editNewLineAfter }
+initialState:
+  documentContents: |-
+    - Testing
+    - Another test
+  selections:
+    - anchor: { line: 0, character: 5 }
+      active: { line: 0, character: 5 }
+  marks: {}
+finalState:
+  documentContents: |-
+    - Testing
+
+    - Another test
+  selections:
+    - anchor: { line: 1, character: 0 }
+      active: { line: 1, character: 0 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      modifiers:
+        [{ type: containingScope, scopeType: { type: collectionItem } }],
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/targets/scopeType/pourIfState.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/targets/scopeType/pourIfState.yml
new file mode 100644
index 0000000000..69eea25fca
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/targets/scopeType/pourIfState.yml
@@ -0,0 +1,36 @@
+languageId: typescript
+command:
+  spokenForm: pour if state
+  version: 3
+  targets:
+    - type: primitive
+      modifiers:
+        - type: containingScope
+          scopeType: { type: ifStatement }
+  usePrePhraseSnapshot: true
+  action: { name: editNewLineAfter }
+initialState:
+  documentContents: |-
+    if (false) {
+
+    }
+  selections:
+    - anchor: { line: 1, character: 4 }
+      active: { line: 1, character: 4 }
+  marks: {}
+finalState:
+  documentContents: |
+    if (false) {
+
+    }
+  selections:
+    - anchor: { line: 3, character: 0 }
+      active: { line: 3, character: 0 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      modifiers: [{ type: containingScope, scopeType: { type: ifStatement } }],
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/targets/scopeType/pourSection.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/targets/scopeType/pourSection.yml
new file mode 100644
index 0000000000..6f2ab5cd06
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/targets/scopeType/pourSection.yml
@@ -0,0 +1,37 @@
+languageId: markdown
+command:
+  spokenForm: pour section
+  version: 3
+  targets:
+    - type: primitive
+      modifiers:
+        - type: containingScope
+          scopeType: { type: section }
+  usePrePhraseSnapshot: true
+  action: { name: editNewLineAfter }
+initialState:
+  documentContents: |-
+    # Some section
+
+    Some text
+  selections:
+    - anchor: { line: 2, character: 8 }
+      active: { line: 2, character: 8 }
+  marks: {}
+finalState:
+  documentContents: |+
+    # Some section
+
+    Some text
+
+  selections:
+    - anchor: { line: 4, character: 0 }
+      active: { line: 4, character: 0 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursor },
+      modifiers: [{ type: containingScope, scopeType: { type: section } }],
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/updateSelections/bringFine.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/updateSelections/bringFine.yml
new file mode 100644
index 0000000000..005e4a97ed
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/updateSelections/bringFine.yml
@@ -0,0 +1,42 @@
+languageId: plaintext
+command:
+  version: 1
+  spokenForm: bring fine
+  action: replaceWithTarget
+  targets:
+    - type: primitive
+      mark: { type: decoratedSymbol, symbolColor: default, character: f }
+    - { type: primitive, isImplicit: true }
+initialState:
+  documentContents: foo world
+  selections:
+    - anchor: { line: 0, character: 4 }
+      active: { line: 0, character: 4 }
+  marks:
+    default.f:
+      start: { line: 0, character: 0 }
+      end: { line: 0, character: 3 }
+finalState:
+  documentContents: foo fooworld
+  selections:
+    - anchor: { line: 0, character: 7 }
+      active: { line: 0, character: 7 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: decoratedSymbol, symbolColor: default, character: f },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: null,
+      modifier: { type: identity },
+    },
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier: { type: identity },
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/updateSelections/bringFineAfterThirdCarThis.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/updateSelections/bringFineAfterThirdCarThis.yml
new file mode 100644
index 0000000000..647467966e
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/updateSelections/bringFineAfterThirdCarThis.yml
@@ -0,0 +1,62 @@
+languageId: plaintext
+command:
+  version: 1
+  spokenForm: bring fine after third car this
+  action: replaceWithTarget
+  targets:
+    - type: primitive
+      mark: { type: decoratedSymbol, symbolColor: default, character: f }
+    - type: primitive
+      selectionType: token
+      modifier:
+        {
+          type: subpiece,
+          pieceType: character,
+          anchor: 2,
+          active: 2,
+          excludeAnchor: false,
+          excludeActive: false,
+        }
+      mark: { type: cursor }
+      position: after
+initialState:
+  documentContents: foo world whatever
+  selections:
+    - anchor: { line: 0, character: 4 }
+      active: { line: 0, character: 9 }
+  marks:
+    default.f:
+      start: { line: 0, character: 0 }
+      end: { line: 0, character: 3 }
+finalState:
+  documentContents: foo worfoold whatever
+  selections:
+    - anchor: { line: 0, character: 4 }
+      active: { line: 0, character: 12 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: decoratedSymbol, symbolColor: default, character: f },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: null,
+      modifier: { type: identity },
+    },
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: after,
+      insideOutsideType: null,
+      modifier:
+        {
+          type: subpiece,
+          pieceType: character,
+          anchor: 2,
+          active: 2,
+          excludeAnchor: false,
+          excludeActive: false,
+        },
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/updateSelections/bringFineAfterThis.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/updateSelections/bringFineAfterThis.yml
new file mode 100644
index 0000000000..4a11ff3533
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/updateSelections/bringFineAfterThis.yml
@@ -0,0 +1,44 @@
+languageId: plaintext
+command:
+  version: 1
+  spokenForm: bring fine after this
+  action: replaceWithTarget
+  targets:
+    - type: primitive
+      mark: { type: decoratedSymbol, symbolColor: default, character: f }
+    - type: primitive
+      mark: { type: cursor }
+      position: after
+initialState:
+  documentContents: foo world
+  selections:
+    - anchor: { line: 0, character: 4 }
+      active: { line: 0, character: 4 }
+  marks:
+    default.f:
+      start: { line: 0, character: 0 }
+      end: { line: 0, character: 3 }
+finalState:
+  documentContents: foo  fooworld
+  selections:
+    - anchor: { line: 0, character: 4 }
+      active: { line: 0, character: 4 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: decoratedSymbol, symbolColor: default, character: f },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: null,
+      modifier: { type: identity },
+    },
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: after,
+      insideOutsideType: null,
+      modifier: { type: identity },
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/updateSelections/bringFineAfterThis2.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/updateSelections/bringFineAfterThis2.yml
new file mode 100644
index 0000000000..4d5b71c1ff
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/updateSelections/bringFineAfterThis2.yml
@@ -0,0 +1,44 @@
+languageId: plaintext
+command:
+  version: 1
+  spokenForm: bring fine after this
+  action: replaceWithTarget
+  targets:
+    - type: primitive
+      mark: { type: decoratedSymbol, symbolColor: default, character: f }
+    - type: primitive
+      mark: { type: cursor }
+      position: after
+initialState:
+  documentContents: foo world
+  selections:
+    - anchor: { line: 0, character: 9 }
+      active: { line: 0, character: 9 }
+  marks:
+    default.f:
+      start: { line: 0, character: 0 }
+      end: { line: 0, character: 3 }
+finalState:
+  documentContents: foo world foo
+  selections:
+    - anchor: { line: 0, character: 9 }
+      active: { line: 0, character: 9 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: decoratedSymbol, symbolColor: default, character: f },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: null,
+      modifier: { type: identity },
+    },
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: after,
+      insideOutsideType: null,
+      modifier: { type: identity },
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/updateSelections/bringFineBeforeThis.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/updateSelections/bringFineBeforeThis.yml
new file mode 100644
index 0000000000..3b174cecef
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/updateSelections/bringFineBeforeThis.yml
@@ -0,0 +1,44 @@
+languageId: plaintext
+command:
+  version: 1
+  spokenForm: bring fine before this
+  action: replaceWithTarget
+  targets:
+    - type: primitive
+      mark: { type: decoratedSymbol, symbolColor: default, character: f }
+    - type: primitive
+      mark: { type: cursor }
+      position: before
+initialState:
+  documentContents: foo world
+  selections:
+    - anchor: { line: 0, character: 4 }
+      active: { line: 0, character: 4 }
+  marks:
+    default.f:
+      start: { line: 0, character: 0 }
+      end: { line: 0, character: 3 }
+finalState:
+  documentContents: foo foo world
+  selections:
+    - anchor: { line: 0, character: 8 }
+      active: { line: 0, character: 8 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: decoratedSymbol, symbolColor: default, character: f },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: null,
+      modifier: { type: identity },
+    },
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: before,
+      insideOutsideType: null,
+      modifier: { type: identity },
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/updateSelections/bringFineToFirstCarWhale.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/updateSelections/bringFineToFirstCarWhale.yml
new file mode 100644
index 0000000000..7af1211667
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/updateSelections/bringFineToFirstCarWhale.yml
@@ -0,0 +1,64 @@
+languageId: plaintext
+command:
+  version: 1
+  spokenForm: bring fine to first car whale
+  action: replaceWithTarget
+  targets:
+    - type: primitive
+      mark: { type: decoratedSymbol, symbolColor: default, character: f }
+    - type: primitive
+      selectionType: token
+      modifier:
+        {
+          type: subpiece,
+          pieceType: character,
+          anchor: 0,
+          active: 0,
+          excludeAnchor: false,
+          excludeActive: false,
+        }
+      mark: { type: decoratedSymbol, symbolColor: default, character: w }
+initialState:
+  documentContents: foo world whatever
+  selections:
+    - anchor: { line: 0, character: 5 }
+      active: { line: 0, character: 8 }
+  marks:
+    default.f:
+      start: { line: 0, character: 0 }
+      end: { line: 0, character: 3 }
+    default.w:
+      start: { line: 0, character: 4 }
+      end: { line: 0, character: 9 }
+finalState:
+  documentContents: foo fooorld whatever
+  selections:
+    - anchor: { line: 0, character: 7 }
+      active: { line: 0, character: 10 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: decoratedSymbol, symbolColor: default, character: f },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: null,
+      modifier: { type: identity },
+    },
+    {
+      type: primitive,
+      mark: { type: decoratedSymbol, symbolColor: default, character: w },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: null,
+      modifier:
+        {
+          type: subpiece,
+          pieceType: character,
+          anchor: 0,
+          active: 0,
+          excludeAnchor: false,
+          excludeActive: false,
+        },
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/updateSelections/bringFineToFirstTwoCar.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/updateSelections/bringFineToFirstTwoCar.yml
new file mode 100644
index 0000000000..e67e71a8de
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/updateSelections/bringFineToFirstTwoCar.yml
@@ -0,0 +1,44 @@
+languageId: plaintext
+command:
+  version: 1
+  spokenForm: bring fine to first two car
+  action: replaceWithTarget
+  targets:
+    - type: primitive
+      mark: { type: decoratedSymbol, symbolColor: default, character: f }
+    - type: primitive
+      selectionType: token
+      modifier: { type: subpiece, pieceType: character, anchor: 0, active: 1 }
+initialState:
+  documentContents: foo world whatever
+  selections:
+    - anchor: { line: 0, character: 4 }
+      active: { line: 0, character: 9 }
+  marks:
+    default.f:
+      start: { line: 0, character: 0 }
+      end: { line: 0, character: 3 }
+finalState:
+  documentContents: foo foorld whatever
+  selections:
+    - anchor: { line: 0, character: 4 }
+      active: { line: 0, character: 10 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: decoratedSymbol, symbolColor: default, character: f },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: null,
+      modifier: { type: identity },
+    },
+    {
+      type: primitive,
+      mark: { type: cursorToken },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: null,
+      modifier: { type: subpiece, pieceType: character, anchor: 0, active: 1 },
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/updateSelections/bringFineToLastCarWhale.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/updateSelections/bringFineToLastCarWhale.yml
new file mode 100644
index 0000000000..c0286c01b3
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/updateSelections/bringFineToLastCarWhale.yml
@@ -0,0 +1,64 @@
+languageId: plaintext
+command:
+  version: 1
+  spokenForm: bring fine to last car whale
+  action: replaceWithTarget
+  targets:
+    - type: primitive
+      mark: { type: decoratedSymbol, symbolColor: default, character: f }
+    - type: primitive
+      selectionType: token
+      modifier:
+        {
+          type: subpiece,
+          pieceType: character,
+          anchor: -1,
+          active: -1,
+          excludeAnchor: false,
+          excludeActive: false,
+        }
+      mark: { type: decoratedSymbol, symbolColor: default, character: w }
+initialState:
+  documentContents: foo world whatever
+  selections:
+    - anchor: { line: 0, character: 5 }
+      active: { line: 0, character: 8 }
+  marks:
+    default.f:
+      start: { line: 0, character: 0 }
+      end: { line: 0, character: 3 }
+    default.w:
+      start: { line: 0, character: 4 }
+      end: { line: 0, character: 9 }
+finalState:
+  documentContents: foo worlfoo whatever
+  selections:
+    - anchor: { line: 0, character: 5 }
+      active: { line: 0, character: 8 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: decoratedSymbol, symbolColor: default, character: f },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: null,
+      modifier: { type: identity },
+    },
+    {
+      type: primitive,
+      mark: { type: decoratedSymbol, symbolColor: default, character: w },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: null,
+      modifier:
+        {
+          type: subpiece,
+          pieceType: character,
+          anchor: -1,
+          active: -1,
+          excludeAnchor: false,
+          excludeActive: false,
+        },
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/updateSelections/bringFineToLastTwoCar.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/updateSelections/bringFineToLastTwoCar.yml
new file mode 100644
index 0000000000..78ba03b87e
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/updateSelections/bringFineToLastTwoCar.yml
@@ -0,0 +1,45 @@
+languageId: plaintext
+command:
+  version: 1
+  spokenForm: bring fine to last two car
+  action: replaceWithTarget
+  targets:
+    - type: primitive
+      mark: { type: decoratedSymbol, symbolColor: default, character: f }
+    - type: primitive
+      selectionType: token
+      modifier: { type: subpiece, pieceType: character, anchor: -2, active: -1 }
+initialState:
+  documentContents: foo world whatever
+  selections:
+    - anchor: { line: 0, character: 4 }
+      active: { line: 0, character: 9 }
+  marks:
+    default.f:
+      start: { line: 0, character: 0 }
+      end: { line: 0, character: 3 }
+finalState:
+  documentContents: foo worfoo whatever
+  selections:
+    - anchor: { line: 0, character: 4 }
+      active: { line: 0, character: 10 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: decoratedSymbol, symbolColor: default, character: f },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: null,
+      modifier: { type: identity },
+    },
+    {
+      type: primitive,
+      mark: { type: cursorToken },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: null,
+      modifier:
+        { type: subpiece, pieceType: character, anchor: -2, active: -1 },
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/updateSelections/bringFineToThirdCarWhale.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/updateSelections/bringFineToThirdCarWhale.yml
new file mode 100644
index 0000000000..b748f274ee
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/updateSelections/bringFineToThirdCarWhale.yml
@@ -0,0 +1,64 @@
+languageId: plaintext
+command:
+  version: 1
+  spokenForm: bring fine to third car whale
+  action: replaceWithTarget
+  targets:
+    - type: primitive
+      mark: { type: decoratedSymbol, symbolColor: default, character: f }
+    - type: primitive
+      selectionType: token
+      modifier:
+        {
+          type: subpiece,
+          pieceType: character,
+          anchor: 2,
+          active: 2,
+          excludeAnchor: false,
+          excludeActive: false,
+        }
+      mark: { type: decoratedSymbol, symbolColor: default, character: w }
+initialState:
+  documentContents: foo world whatever
+  selections:
+    - anchor: { line: 0, character: 4 }
+      active: { line: 0, character: 9 }
+  marks:
+    default.f:
+      start: { line: 0, character: 0 }
+      end: { line: 0, character: 3 }
+    default.w:
+      start: { line: 0, character: 4 }
+      end: { line: 0, character: 9 }
+finalState:
+  documentContents: foo wofoold whatever
+  selections:
+    - anchor: { line: 0, character: 4 }
+      active: { line: 0, character: 11 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: decoratedSymbol, symbolColor: default, character: f },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: null,
+      modifier: { type: identity },
+    },
+    {
+      type: primitive,
+      mark: { type: decoratedSymbol, symbolColor: default, character: w },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: null,
+      modifier:
+        {
+          type: subpiece,
+          pieceType: character,
+          anchor: 2,
+          active: 2,
+          excludeAnchor: false,
+          excludeActive: false,
+        },
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/updateSelections/bringFineToWhale.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/updateSelections/bringFineToWhale.yml
new file mode 100644
index 0000000000..93e4f70132
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/updateSelections/bringFineToWhale.yml
@@ -0,0 +1,46 @@
+languageId: plaintext
+command:
+  version: 1
+  spokenForm: bring fine to whale
+  action: replaceWithTarget
+  targets:
+    - type: primitive
+      mark: { type: decoratedSymbol, symbolColor: default, character: f }
+    - type: primitive
+      mark: { type: decoratedSymbol, symbolColor: default, character: w }
+initialState:
+  documentContents: foo world
+  selections:
+    - anchor: { line: 0, character: 4 }
+      active: { line: 0, character: 4 }
+  marks:
+    default.f:
+      start: { line: 0, character: 0 }
+      end: { line: 0, character: 3 }
+    default.w:
+      start: { line: 0, character: 4 }
+      end: { line: 0, character: 9 }
+finalState:
+  documentContents: foo foo
+  selections:
+    - anchor: { line: 0, character: 4 }
+      active: { line: 0, character: 4 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: decoratedSymbol, symbolColor: default, character: f },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: null,
+      modifier: { type: identity },
+    },
+    {
+      type: primitive,
+      mark: { type: decoratedSymbol, symbolColor: default, character: w },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: null,
+      modifier: { type: identity },
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/updateSelections/bringFineToWhale2.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/updateSelections/bringFineToWhale2.yml
new file mode 100644
index 0000000000..a47c44f693
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/updateSelections/bringFineToWhale2.yml
@@ -0,0 +1,46 @@
+languageId: plaintext
+command:
+  version: 1
+  spokenForm: bring fine to whale
+  action: replaceWithTarget
+  targets:
+    - type: primitive
+      mark: { type: decoratedSymbol, symbolColor: default, character: f }
+    - type: primitive
+      mark: { type: decoratedSymbol, symbolColor: default, character: w }
+initialState:
+  documentContents: foo world
+  selections:
+    - anchor: { line: 0, character: 5 }
+      active: { line: 0, character: 5 }
+  marks:
+    default.f:
+      start: { line: 0, character: 0 }
+      end: { line: 0, character: 3 }
+    default.w:
+      start: { line: 0, character: 4 }
+      end: { line: 0, character: 9 }
+finalState:
+  documentContents: foo foo
+  selections:
+    - anchor: { line: 0, character: 5 }
+      active: { line: 0, character: 5 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: decoratedSymbol, symbolColor: default, character: f },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: null,
+      modifier: { type: identity },
+    },
+    {
+      type: primitive,
+      mark: { type: decoratedSymbol, symbolColor: default, character: w },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: null,
+      modifier: { type: identity },
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/updateSelections/bringFineToWhale3.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/updateSelections/bringFineToWhale3.yml
new file mode 100644
index 0000000000..45ad435090
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/updateSelections/bringFineToWhale3.yml
@@ -0,0 +1,46 @@
+languageId: plaintext
+command:
+  version: 1
+  spokenForm: bring fine to whale
+  action: replaceWithTarget
+  targets:
+    - type: primitive
+      mark: { type: decoratedSymbol, symbolColor: default, character: f }
+    - type: primitive
+      mark: { type: decoratedSymbol, symbolColor: default, character: w }
+initialState:
+  documentContents: foo world
+  selections:
+    - anchor: { line: 0, character: 9 }
+      active: { line: 0, character: 9 }
+  marks:
+    default.f:
+      start: { line: 0, character: 0 }
+      end: { line: 0, character: 3 }
+    default.w:
+      start: { line: 0, character: 4 }
+      end: { line: 0, character: 9 }
+finalState:
+  documentContents: foo foo
+  selections:
+    - anchor: { line: 0, character: 7 }
+      active: { line: 0, character: 7 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: decoratedSymbol, symbolColor: default, character: f },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: null,
+      modifier: { type: identity },
+    },
+    {
+      type: primitive,
+      mark: { type: decoratedSymbol, symbolColor: default, character: w },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: null,
+      modifier: { type: identity },
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/updateSelections/bringFineToWhale4.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/updateSelections/bringFineToWhale4.yml
new file mode 100644
index 0000000000..504f620c61
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/updateSelections/bringFineToWhale4.yml
@@ -0,0 +1,46 @@
+languageId: plaintext
+command:
+  version: 1
+  spokenForm: bring fine to whale
+  action: replaceWithTarget
+  targets:
+    - type: primitive
+      mark: { type: decoratedSymbol, symbolColor: default, character: f }
+    - type: primitive
+      mark: { type: decoratedSymbol, symbolColor: default, character: w }
+initialState:
+  documentContents: foo world
+  selections:
+    - anchor: { line: 0, character: 5 }
+      active: { line: 0, character: 7 }
+  marks:
+    default.f:
+      start: { line: 0, character: 0 }
+      end: { line: 0, character: 3 }
+    default.w:
+      start: { line: 0, character: 4 }
+      end: { line: 0, character: 9 }
+finalState:
+  documentContents: foo foo
+  selections:
+    - anchor: { line: 0, character: 5 }
+      active: { line: 0, character: 7 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: decoratedSymbol, symbolColor: default, character: f },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: null,
+      modifier: { type: identity },
+    },
+    {
+      type: primitive,
+      mark: { type: decoratedSymbol, symbolColor: default, character: w },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: null,
+      modifier: { type: identity },
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/updateSelections/bringFineToWhale5.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/updateSelections/bringFineToWhale5.yml
new file mode 100644
index 0000000000..2e58d713b4
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/updateSelections/bringFineToWhale5.yml
@@ -0,0 +1,46 @@
+languageId: plaintext
+command:
+  version: 1
+  spokenForm: bring fine to whale
+  action: replaceWithTarget
+  targets:
+    - type: primitive
+      mark: { type: decoratedSymbol, symbolColor: default, character: f }
+    - type: primitive
+      mark: { type: decoratedSymbol, symbolColor: default, character: w }
+initialState:
+  documentContents: foo world whatever
+  selections:
+    - anchor: { line: 0, character: 5 }
+      active: { line: 0, character: 8 }
+  marks:
+    default.f:
+      start: { line: 0, character: 0 }
+      end: { line: 0, character: 3 }
+    default.w:
+      start: { line: 0, character: 4 }
+      end: { line: 0, character: 9 }
+finalState:
+  documentContents: foo foo whatever
+  selections:
+    - anchor: { line: 0, character: 5 }
+      active: { line: 0, character: 7 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: decoratedSymbol, symbolColor: default, character: f },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: null,
+      modifier: { type: identity },
+    },
+    {
+      type: primitive,
+      mark: { type: decoratedSymbol, symbolColor: default, character: w },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: null,
+      modifier: { type: identity },
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/updateSelections/bringHarpToEndOfWhale.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/updateSelections/bringHarpToEndOfWhale.yml
new file mode 100644
index 0000000000..5dc2a611d1
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/updateSelections/bringHarpToEndOfWhale.yml
@@ -0,0 +1,48 @@
+languageId: plaintext
+command:
+  version: 1
+  spokenForm: bring harp to end of whale
+  action: replaceWithTarget
+  targets:
+    - type: primitive
+      mark: { type: decoratedSymbol, symbolColor: default, character: h }
+    - type: primitive
+      position: after
+      insideOutsideType: inside
+      mark: { type: decoratedSymbol, symbolColor: default, character: w }
+initialState:
+  documentContents: foo world whatever
+  selections:
+    - anchor: { line: 0, character: 4 }
+      active: { line: 0, character: 9 }
+  marks:
+    default.h:
+      start: { line: 0, character: 10 }
+      end: { line: 0, character: 18 }
+    default.w:
+      start: { line: 0, character: 4 }
+      end: { line: 0, character: 9 }
+finalState:
+  documentContents: foo worldwhatever whatever
+  selections:
+    - anchor: { line: 0, character: 4 }
+      active: { line: 0, character: 9 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: decoratedSymbol, symbolColor: default, character: h },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: null,
+      modifier: { type: identity },
+    },
+    {
+      type: primitive,
+      mark: { type: decoratedSymbol, symbolColor: default, character: w },
+      selectionType: token,
+      position: after,
+      insideOutsideType: inside,
+      modifier: { type: identity },
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/updateSelections/bringHarpToFourthCarWhalePastSecondCarHarp.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/updateSelections/bringHarpToFourthCarWhalePastSecondCarHarp.yml
new file mode 100644
index 0000000000..079be33cf6
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/updateSelections/bringHarpToFourthCarWhalePastSecondCarHarp.yml
@@ -0,0 +1,104 @@
+languageId: plaintext
+command:
+  version: 1
+  spokenForm: bring harp to fourth car whale past second car harp
+  action: replaceWithTarget
+  targets:
+    - type: primitive
+      mark: { type: decoratedSymbol, symbolColor: default, character: h }
+    - type: range
+      start:
+        type: primitive
+        selectionType: token
+        modifier:
+          {
+            type: subpiece,
+            pieceType: character,
+            anchor: 3,
+            active: 3,
+            excludeAnchor: false,
+            excludeActive: false,
+          }
+        mark: { type: decoratedSymbol, symbolColor: default, character: w }
+      end:
+        type: primitive
+        selectionType: token
+        modifier:
+          {
+            type: subpiece,
+            pieceType: character,
+            anchor: 1,
+            active: 1,
+            excludeAnchor: false,
+            excludeActive: false,
+          }
+        mark: { type: decoratedSymbol, symbolColor: default, character: h }
+      excludeStart: false
+      excludeEnd: false
+initialState:
+  documentContents: foo world whatever
+  selections:
+    - anchor: { line: 0, character: 4 }
+      active: { line: 0, character: 9 }
+  marks:
+    default.h:
+      start: { line: 0, character: 10 }
+      end: { line: 0, character: 18 }
+    default.w:
+      start: { line: 0, character: 4 }
+      end: { line: 0, character: 9 }
+finalState:
+  documentContents: foo worwhateveratever
+  selections:
+    - anchor: { line: 0, character: 4 }
+      active: { line: 0, character: 9 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: decoratedSymbol, symbolColor: default, character: h },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: null,
+      modifier: { type: identity },
+    },
+    {
+      type: range,
+      excludeAnchor: false,
+      excludeActive: false,
+      anchor:
+        {
+          type: primitive,
+          mark: { type: decoratedSymbol, symbolColor: default, character: w },
+          selectionType: token,
+          position: contents,
+          insideOutsideType: null,
+          modifier:
+            {
+              type: subpiece,
+              pieceType: character,
+              anchor: 3,
+              active: 3,
+              excludeAnchor: false,
+              excludeActive: false,
+            },
+        },
+      active:
+        {
+          type: primitive,
+          mark: { type: decoratedSymbol, symbolColor: default, character: h },
+          selectionType: token,
+          position: contents,
+          insideOutsideType: null,
+          modifier:
+            {
+              type: subpiece,
+              pieceType: character,
+              anchor: 1,
+              active: 1,
+              excludeAnchor: false,
+              excludeActive: false,
+            },
+        },
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/updateSelections/bringHarpToSecondCarFinePastThirdCarHarp.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/updateSelections/bringHarpToSecondCarFinePastThirdCarHarp.yml
new file mode 100644
index 0000000000..f3330f21c9
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/updateSelections/bringHarpToSecondCarFinePastThirdCarHarp.yml
@@ -0,0 +1,104 @@
+languageId: plaintext
+command:
+  version: 1
+  spokenForm: bring harp to second car fine past third car harp
+  action: replaceWithTarget
+  targets:
+    - type: primitive
+      mark: { type: decoratedSymbol, symbolColor: default, character: h }
+    - type: range
+      start:
+        type: primitive
+        selectionType: token
+        modifier:
+          {
+            type: subpiece,
+            pieceType: character,
+            anchor: 1,
+            active: 1,
+            excludeAnchor: false,
+            excludeActive: false,
+          }
+        mark: { type: decoratedSymbol, symbolColor: default, character: f }
+      end:
+        type: primitive
+        selectionType: token
+        modifier:
+          {
+            type: subpiece,
+            pieceType: character,
+            anchor: 2,
+            active: 2,
+            excludeAnchor: false,
+            excludeActive: false,
+          }
+        mark: { type: decoratedSymbol, symbolColor: default, character: h }
+      excludeStart: false
+      excludeEnd: false
+initialState:
+  documentContents: foo world whateverspaghetti
+  selections:
+    - anchor: { line: 0, character: 4 }
+      active: { line: 0, character: 9 }
+  marks:
+    default.h:
+      start: { line: 0, character: 10 }
+      end: { line: 0, character: 27 }
+    default.f:
+      start: { line: 0, character: 0 }
+      end: { line: 0, character: 3 }
+finalState:
+  documentContents: fwhateverspaghettiteverspaghetti
+  selections:
+    - anchor: { line: 0, character: 4 }
+      active: { line: 0, character: 9 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: decoratedSymbol, symbolColor: default, character: h },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: null,
+      modifier: { type: identity },
+    },
+    {
+      type: range,
+      excludeAnchor: false,
+      excludeActive: false,
+      anchor:
+        {
+          type: primitive,
+          mark: { type: decoratedSymbol, symbolColor: default, character: f },
+          selectionType: token,
+          position: contents,
+          insideOutsideType: null,
+          modifier:
+            {
+              type: subpiece,
+              pieceType: character,
+              anchor: 1,
+              active: 1,
+              excludeAnchor: false,
+              excludeActive: false,
+            },
+        },
+      active:
+        {
+          type: primitive,
+          mark: { type: decoratedSymbol, symbolColor: default, character: h },
+          selectionType: token,
+          position: contents,
+          insideOutsideType: null,
+          modifier:
+            {
+              type: subpiece,
+              pieceType: character,
+              anchor: 2,
+              active: 2,
+              excludeAnchor: false,
+              excludeActive: false,
+            },
+        },
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/updateSelections/bringHarpToSecondCarFinePastThirdCarWhale.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/updateSelections/bringHarpToSecondCarFinePastThirdCarWhale.yml
new file mode 100644
index 0000000000..4c45fdf850
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/updateSelections/bringHarpToSecondCarFinePastThirdCarWhale.yml
@@ -0,0 +1,107 @@
+languageId: plaintext
+command:
+  version: 1
+  spokenForm: bring harp to second car fine past third car whale
+  action: replaceWithTarget
+  targets:
+    - type: primitive
+      mark: { type: decoratedSymbol, symbolColor: default, character: h }
+    - type: range
+      start:
+        type: primitive
+        selectionType: token
+        modifier:
+          {
+            type: subpiece,
+            pieceType: character,
+            anchor: 1,
+            active: 1,
+            excludeAnchor: false,
+            excludeActive: false,
+          }
+        mark: { type: decoratedSymbol, symbolColor: default, character: f }
+      end:
+        type: primitive
+        selectionType: token
+        modifier:
+          {
+            type: subpiece,
+            pieceType: character,
+            anchor: 2,
+            active: 2,
+            excludeAnchor: false,
+            excludeActive: false,
+          }
+        mark: { type: decoratedSymbol, symbolColor: default, character: w }
+      excludeStart: false
+      excludeEnd: false
+initialState:
+  documentContents: foo world whatever
+  selections:
+    - anchor: { line: 0, character: 4 }
+      active: { line: 0, character: 9 }
+  marks:
+    default.h:
+      start: { line: 0, character: 10 }
+      end: { line: 0, character: 18 }
+    default.f:
+      start: { line: 0, character: 0 }
+      end: { line: 0, character: 3 }
+    default.w:
+      start: { line: 0, character: 4 }
+      end: { line: 0, character: 9 }
+finalState:
+  documentContents: fwhateverld whatever
+  selections:
+    - anchor: { line: 0, character: 4 }
+      active: { line: 0, character: 11 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: decoratedSymbol, symbolColor: default, character: h },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: null,
+      modifier: { type: identity },
+    },
+    {
+      type: range,
+      excludeAnchor: false,
+      excludeActive: false,
+      anchor:
+        {
+          type: primitive,
+          mark: { type: decoratedSymbol, symbolColor: default, character: f },
+          selectionType: token,
+          position: contents,
+          insideOutsideType: null,
+          modifier:
+            {
+              type: subpiece,
+              pieceType: character,
+              anchor: 1,
+              active: 1,
+              excludeAnchor: false,
+              excludeActive: false,
+            },
+        },
+      active:
+        {
+          type: primitive,
+          mark: { type: decoratedSymbol, symbolColor: default, character: w },
+          selectionType: token,
+          position: contents,
+          insideOutsideType: null,
+          modifier:
+            {
+              type: subpiece,
+              pieceType: character,
+              anchor: 2,
+              active: 2,
+              excludeAnchor: false,
+              excludeActive: false,
+            },
+        },
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/updateSelections/bringHarpToStartOfWhale.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/updateSelections/bringHarpToStartOfWhale.yml
new file mode 100644
index 0000000000..c251fdbf82
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/updateSelections/bringHarpToStartOfWhale.yml
@@ -0,0 +1,48 @@
+languageId: plaintext
+command:
+  version: 1
+  spokenForm: bring harp to start of whale
+  action: replaceWithTarget
+  targets:
+    - type: primitive
+      mark: { type: decoratedSymbol, symbolColor: default, character: h }
+    - type: primitive
+      position: before
+      insideOutsideType: inside
+      mark: { type: decoratedSymbol, symbolColor: default, character: w }
+initialState:
+  documentContents: foo world whatever
+  selections:
+    - anchor: { line: 0, character: 4 }
+      active: { line: 0, character: 9 }
+  marks:
+    default.h:
+      start: { line: 0, character: 10 }
+      end: { line: 0, character: 18 }
+    default.w:
+      start: { line: 0, character: 4 }
+      end: { line: 0, character: 9 }
+finalState:
+  documentContents: foo whateverworld whatever
+  selections:
+    - anchor: { line: 0, character: 12 }
+      active: { line: 0, character: 17 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: decoratedSymbol, symbolColor: default, character: h },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: null,
+      modifier: { type: identity },
+    },
+    {
+      type: primitive,
+      mark: { type: decoratedSymbol, symbolColor: default, character: w },
+      selectionType: token,
+      position: before,
+      insideOutsideType: inside,
+      modifier: { type: identity },
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/updateSelections/bringWhale.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/updateSelections/bringWhale.yml
new file mode 100644
index 0000000000..5087b5e6a4
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/updateSelections/bringWhale.yml
@@ -0,0 +1,42 @@
+languageId: plaintext
+command:
+  version: 1
+  spokenForm: bring whale
+  action: replaceWithTarget
+  targets:
+    - type: primitive
+      mark: { type: decoratedSymbol, symbolColor: default, character: w }
+    - { type: primitive, isImplicit: true }
+initialState:
+  documentContents: foo world
+  selections:
+    - anchor: { line: 0, character: 3 }
+      active: { line: 0, character: 3 }
+  marks:
+    default.w:
+      start: { line: 0, character: 4 }
+      end: { line: 0, character: 9 }
+finalState:
+  documentContents: fooworld world
+  selections:
+    - anchor: { line: 0, character: 8 }
+      active: { line: 0, character: 8 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: decoratedSymbol, symbolColor: default, character: w },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: null,
+      modifier: { type: identity },
+    },
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier: { type: identity },
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/updateSelections/bringWhaleAfterFine.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/updateSelections/bringWhaleAfterFine.yml
new file mode 100644
index 0000000000..1c09f83027
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/updateSelections/bringWhaleAfterFine.yml
@@ -0,0 +1,47 @@
+languageId: plaintext
+command:
+  version: 1
+  spokenForm: bring whale after fine
+  action: replaceWithTarget
+  targets:
+    - type: primitive
+      mark: { type: decoratedSymbol, symbolColor: default, character: w }
+    - type: primitive
+      mark: { type: decoratedSymbol, symbolColor: default, character: f }
+      position: after
+initialState:
+  documentContents: foo world
+  selections:
+    - anchor: { line: 0, character: 3 }
+      active: { line: 0, character: 3 }
+  marks:
+    default.w:
+      start: { line: 0, character: 4 }
+      end: { line: 0, character: 9 }
+    default.f:
+      start: { line: 0, character: 0 }
+      end: { line: 0, character: 3 }
+finalState:
+  documentContents: foo world world
+  selections:
+    - anchor: { line: 0, character: 3 }
+      active: { line: 0, character: 3 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: decoratedSymbol, symbolColor: default, character: w },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: null,
+      modifier: { type: identity },
+    },
+    {
+      type: primitive,
+      mark: { type: decoratedSymbol, symbolColor: default, character: f },
+      selectionType: token,
+      position: after,
+      insideOutsideType: null,
+      modifier: { type: identity },
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/updateSelections/bringWhaleAfterThis.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/updateSelections/bringWhaleAfterThis.yml
new file mode 100644
index 0000000000..febc9c5da5
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/updateSelections/bringWhaleAfterThis.yml
@@ -0,0 +1,44 @@
+languageId: plaintext
+command:
+  version: 1
+  spokenForm: bring whale after this
+  action: replaceWithTarget
+  targets:
+    - type: primitive
+      mark: { type: decoratedSymbol, symbolColor: default, character: w }
+    - type: primitive
+      mark: { type: cursor }
+      position: after
+initialState:
+  documentContents: foo world
+  selections:
+    - anchor: { line: 0, character: 3 }
+      active: { line: 0, character: 3 }
+  marks:
+    default.w:
+      start: { line: 0, character: 4 }
+      end: { line: 0, character: 9 }
+finalState:
+  documentContents: foo world world
+  selections:
+    - anchor: { line: 0, character: 3 }
+      active: { line: 0, character: 3 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: decoratedSymbol, symbolColor: default, character: w },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: null,
+      modifier: { type: identity },
+    },
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: after,
+      insideOutsideType: null,
+      modifier: { type: identity },
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/updateSelections/bringWhaleAfterThis2.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/updateSelections/bringWhaleAfterThis2.yml
new file mode 100644
index 0000000000..febc9c5da5
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/updateSelections/bringWhaleAfterThis2.yml
@@ -0,0 +1,44 @@
+languageId: plaintext
+command:
+  version: 1
+  spokenForm: bring whale after this
+  action: replaceWithTarget
+  targets:
+    - type: primitive
+      mark: { type: decoratedSymbol, symbolColor: default, character: w }
+    - type: primitive
+      mark: { type: cursor }
+      position: after
+initialState:
+  documentContents: foo world
+  selections:
+    - anchor: { line: 0, character: 3 }
+      active: { line: 0, character: 3 }
+  marks:
+    default.w:
+      start: { line: 0, character: 4 }
+      end: { line: 0, character: 9 }
+finalState:
+  documentContents: foo world world
+  selections:
+    - anchor: { line: 0, character: 3 }
+      active: { line: 0, character: 3 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: decoratedSymbol, symbolColor: default, character: w },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: null,
+      modifier: { type: identity },
+    },
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: after,
+      insideOutsideType: null,
+      modifier: { type: identity },
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/updateSelections/bringWhaleBeforeThis.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/updateSelections/bringWhaleBeforeThis.yml
new file mode 100644
index 0000000000..a3f43f402b
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/updateSelections/bringWhaleBeforeThis.yml
@@ -0,0 +1,44 @@
+languageId: plaintext
+command:
+  version: 1
+  spokenForm: bring whale before this
+  action: replaceWithTarget
+  targets:
+    - type: primitive
+      mark: { type: decoratedSymbol, symbolColor: default, character: w }
+    - type: primitive
+      mark: { type: cursor }
+      position: before
+initialState:
+  documentContents: foo world
+  selections:
+    - anchor: { line: 0, character: 3 }
+      active: { line: 0, character: 3 }
+  marks:
+    default.w:
+      start: { line: 0, character: 4 }
+      end: { line: 0, character: 9 }
+finalState:
+  documentContents: fooworld  world
+  selections:
+    - anchor: { line: 0, character: 9 }
+      active: { line: 0, character: 9 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: decoratedSymbol, symbolColor: default, character: w },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: null,
+      modifier: { type: identity },
+    },
+    {
+      type: primitive,
+      mark: { type: cursor },
+      selectionType: token,
+      position: before,
+      insideOutsideType: null,
+      modifier: { type: identity },
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/updateSelections/bringWhaleToEndOfFine.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/updateSelections/bringWhaleToEndOfFine.yml
new file mode 100644
index 0000000000..56f43c0829
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/updateSelections/bringWhaleToEndOfFine.yml
@@ -0,0 +1,48 @@
+languageId: plaintext
+command:
+  version: 1
+  spokenForm: bring whale to end of fine
+  action: replaceWithTarget
+  targets:
+    - type: primitive
+      mark: { type: decoratedSymbol, symbolColor: default, character: w }
+    - type: primitive
+      position: after
+      insideOutsideType: inside
+      mark: { type: decoratedSymbol, symbolColor: default, character: f }
+initialState:
+  documentContents: foo world
+  selections:
+    - anchor: { line: 0, character: 3 }
+      active: { line: 0, character: 3 }
+  marks:
+    default.w:
+      start: { line: 0, character: 4 }
+      end: { line: 0, character: 9 }
+    default.f:
+      start: { line: 0, character: 0 }
+      end: { line: 0, character: 3 }
+finalState:
+  documentContents: fooworld world
+  selections:
+    - anchor: { line: 0, character: 8 }
+      active: { line: 0, character: 8 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: decoratedSymbol, symbolColor: default, character: w },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: null,
+      modifier: { type: identity },
+    },
+    {
+      type: primitive,
+      mark: { type: decoratedSymbol, symbolColor: default, character: f },
+      selectionType: token,
+      position: after,
+      insideOutsideType: inside,
+      modifier: { type: identity },
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/updateSelections/bringWhaleToFine.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/updateSelections/bringWhaleToFine.yml
new file mode 100644
index 0000000000..5c2005a322
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/updateSelections/bringWhaleToFine.yml
@@ -0,0 +1,46 @@
+languageId: plaintext
+command:
+  version: 1
+  spokenForm: bring whale to fine
+  action: replaceWithTarget
+  targets:
+    - type: primitive
+      mark: { type: decoratedSymbol, symbolColor: default, character: w }
+    - type: primitive
+      mark: { type: decoratedSymbol, symbolColor: default, character: f }
+initialState:
+  documentContents: foo world
+  selections:
+    - anchor: { line: 0, character: 3 }
+      active: { line: 0, character: 3 }
+  marks:
+    default.w:
+      start: { line: 0, character: 4 }
+      end: { line: 0, character: 9 }
+    default.f:
+      start: { line: 0, character: 0 }
+      end: { line: 0, character: 3 }
+finalState:
+  documentContents: world world
+  selections:
+    - anchor: { line: 0, character: 5 }
+      active: { line: 0, character: 5 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: decoratedSymbol, symbolColor: default, character: w },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: null,
+      modifier: { type: identity },
+    },
+    {
+      type: primitive,
+      mark: { type: decoratedSymbol, symbolColor: default, character: f },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: null,
+      modifier: { type: identity },
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/updateSelections/chuckFirstCarWhale.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/updateSelections/chuckFirstCarWhale.yml
new file mode 100644
index 0000000000..7c522badd1
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/updateSelections/chuckFirstCarWhale.yml
@@ -0,0 +1,51 @@
+languageId: plaintext
+command:
+  version: 1
+  spokenForm: chuck first car whale
+  action: remove
+  targets:
+    - type: primitive
+      selectionType: token
+      modifier:
+        {
+          type: subpiece,
+          pieceType: character,
+          anchor: 0,
+          active: 0,
+          excludeAnchor: false,
+          excludeActive: false,
+        }
+      mark: { type: decoratedSymbol, symbolColor: default, character: w }
+initialState:
+  documentContents: foo world whatever
+  selections:
+    - anchor: { line: 0, character: 5 }
+      active: { line: 0, character: 8 }
+  marks:
+    default.w:
+      start: { line: 0, character: 4 }
+      end: { line: 0, character: 9 }
+finalState:
+  documentContents: foo orld whatever
+  selections:
+    - anchor: { line: 0, character: 4 }
+      active: { line: 0, character: 7 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: decoratedSymbol, symbolColor: default, character: w },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: outside,
+      modifier:
+        {
+          type: subpiece,
+          pieceType: character,
+          anchor: 0,
+          active: 0,
+          excludeAnchor: false,
+          excludeActive: false,
+        },
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/updateSelections/chuckFirstPastSecondCar.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/updateSelections/chuckFirstPastSecondCar.yml
new file mode 100644
index 0000000000..66e095a8e5
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/updateSelections/chuckFirstPastSecondCar.yml
@@ -0,0 +1,47 @@
+languageId: plaintext
+command:
+  version: 1
+  spokenForm: chuck first past second car
+  action: remove
+  targets:
+    - type: primitive
+      selectionType: token
+      modifier:
+        {
+          type: subpiece,
+          pieceType: character,
+          anchor: 0,
+          active: 1,
+          excludeAnchor: false,
+          excludeActive: false,
+        }
+initialState:
+  documentContents: foo world whatever
+  selections:
+    - anchor: { line: 0, character: 4 }
+      active: { line: 0, character: 9 }
+  marks: {}
+finalState:
+  documentContents: foo rld whatever
+  selections:
+    - anchor: { line: 0, character: 4 }
+      active: { line: 0, character: 7 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursorToken },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: outside,
+      modifier:
+        {
+          type: subpiece,
+          pieceType: character,
+          anchor: 0,
+          active: 1,
+          excludeAnchor: false,
+          excludeActive: false,
+        },
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/updateSelections/chuckFourthPastFifthCar.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/updateSelections/chuckFourthPastFifthCar.yml
new file mode 100644
index 0000000000..d84ff07973
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/updateSelections/chuckFourthPastFifthCar.yml
@@ -0,0 +1,47 @@
+languageId: plaintext
+command:
+  version: 1
+  spokenForm: chuck fourth past fifth car
+  action: remove
+  targets:
+    - type: primitive
+      selectionType: token
+      modifier:
+        {
+          type: subpiece,
+          pieceType: character,
+          anchor: 3,
+          active: 4,
+          excludeAnchor: false,
+          excludeActive: false,
+        }
+initialState:
+  documentContents: foo world whatever
+  selections:
+    - anchor: { line: 0, character: 4 }
+      active: { line: 0, character: 9 }
+  marks: {}
+finalState:
+  documentContents: foo wor whatever
+  selections:
+    - anchor: { line: 0, character: 4 }
+      active: { line: 0, character: 7 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursorToken },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: outside,
+      modifier:
+        {
+          type: subpiece,
+          pieceType: character,
+          anchor: 3,
+          active: 4,
+          excludeAnchor: false,
+          excludeActive: false,
+        },
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/updateSelections/chuckLastCarWhale.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/updateSelections/chuckLastCarWhale.yml
new file mode 100644
index 0000000000..6375232b28
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/updateSelections/chuckLastCarWhale.yml
@@ -0,0 +1,51 @@
+languageId: plaintext
+command:
+  version: 1
+  spokenForm: chuck last car whale
+  action: remove
+  targets:
+    - type: primitive
+      selectionType: token
+      modifier:
+        {
+          type: subpiece,
+          pieceType: character,
+          anchor: -1,
+          active: -1,
+          excludeAnchor: false,
+          excludeActive: false,
+        }
+      mark: { type: decoratedSymbol, symbolColor: default, character: w }
+initialState:
+  documentContents: foo world whatever
+  selections:
+    - anchor: { line: 0, character: 5 }
+      active: { line: 0, character: 8 }
+  marks:
+    default.w:
+      start: { line: 0, character: 4 }
+      end: { line: 0, character: 9 }
+finalState:
+  documentContents: foo worl whatever
+  selections:
+    - anchor: { line: 0, character: 5 }
+      active: { line: 0, character: 8 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: decoratedSymbol, symbolColor: default, character: w },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: outside,
+      modifier:
+        {
+          type: subpiece,
+          pieceType: character,
+          anchor: -1,
+          active: -1,
+          excludeAnchor: false,
+          excludeActive: false,
+        },
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/updateSelections/chuckSecondCarFinePastThirdCarWhale.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/updateSelections/chuckSecondCarFinePastThirdCarWhale.yml
new file mode 100644
index 0000000000..99dae7eb6d
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/updateSelections/chuckSecondCarFinePastThirdCarWhale.yml
@@ -0,0 +1,94 @@
+languageId: plaintext
+command:
+  version: 1
+  spokenForm: chuck second car fine past third car whale
+  action: remove
+  targets:
+    - type: range
+      start:
+        type: primitive
+        selectionType: token
+        modifier:
+          {
+            type: subpiece,
+            pieceType: character,
+            anchor: 1,
+            active: 1,
+            excludeAnchor: false,
+            excludeActive: false,
+          }
+        mark: { type: decoratedSymbol, symbolColor: default, character: f }
+      end:
+        type: primitive
+        selectionType: token
+        modifier:
+          {
+            type: subpiece,
+            pieceType: character,
+            anchor: 2,
+            active: 2,
+            excludeAnchor: false,
+            excludeActive: false,
+          }
+        mark: { type: decoratedSymbol, symbolColor: default, character: w }
+      excludeStart: false
+      excludeEnd: false
+initialState:
+  documentContents: foo world whatever
+  selections:
+    - anchor: { line: 0, character: 4 }
+      active: { line: 0, character: 9 }
+  marks:
+    default.f:
+      start: { line: 0, character: 0 }
+      end: { line: 0, character: 3 }
+    default.w:
+      start: { line: 0, character: 4 }
+      end: { line: 0, character: 9 }
+finalState:
+  documentContents: fld whatever
+  selections:
+    - anchor: { line: 0, character: 1 }
+      active: { line: 0, character: 3 }
+fullTargets:
+  [
+    {
+      type: range,
+      excludeAnchor: false,
+      excludeActive: false,
+      anchor:
+        {
+          type: primitive,
+          mark: { type: decoratedSymbol, symbolColor: default, character: f },
+          selectionType: token,
+          position: contents,
+          insideOutsideType: outside,
+          modifier:
+            {
+              type: subpiece,
+              pieceType: character,
+              anchor: 1,
+              active: 1,
+              excludeAnchor: false,
+              excludeActive: false,
+            },
+        },
+      active:
+        {
+          type: primitive,
+          mark: { type: decoratedSymbol, symbolColor: default, character: w },
+          selectionType: token,
+          position: contents,
+          insideOutsideType: outside,
+          modifier:
+            {
+              type: subpiece,
+              pieceType: character,
+              anchor: 2,
+              active: 2,
+              excludeAnchor: false,
+              excludeActive: false,
+            },
+        },
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/updateSelections/chuckSecondPastThirdCar.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/updateSelections/chuckSecondPastThirdCar.yml
new file mode 100644
index 0000000000..75f3b59746
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/updateSelections/chuckSecondPastThirdCar.yml
@@ -0,0 +1,47 @@
+languageId: plaintext
+command:
+  version: 1
+  spokenForm: chuck second past third car
+  action: remove
+  targets:
+    - type: primitive
+      selectionType: token
+      modifier:
+        {
+          type: subpiece,
+          pieceType: character,
+          anchor: 1,
+          active: 2,
+          excludeAnchor: false,
+          excludeActive: false,
+        }
+initialState:
+  documentContents: foo world whatever
+  selections:
+    - anchor: { line: 0, character: 4 }
+      active: { line: 0, character: 9 }
+  marks: {}
+finalState:
+  documentContents: foo wld whatever
+  selections:
+    - anchor: { line: 0, character: 4 }
+      active: { line: 0, character: 7 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: cursorToken },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: outside,
+      modifier:
+        {
+          type: subpiece,
+          pieceType: character,
+          anchor: 1,
+          active: 2,
+          excludeAnchor: false,
+          excludeActive: false,
+        },
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/updateSelections/chuckThirdCarWhalePastSecondCarHarp.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/updateSelections/chuckThirdCarWhalePastSecondCarHarp.yml
new file mode 100644
index 0000000000..c1d15860e8
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/updateSelections/chuckThirdCarWhalePastSecondCarHarp.yml
@@ -0,0 +1,94 @@
+languageId: plaintext
+command:
+  version: 1
+  spokenForm: chuck third car whale past second car harp
+  action: remove
+  targets:
+    - type: range
+      start:
+        type: primitive
+        selectionType: token
+        modifier:
+          {
+            type: subpiece,
+            pieceType: character,
+            anchor: 2,
+            active: 2,
+            excludeAnchor: false,
+            excludeActive: false,
+          }
+        mark: { type: decoratedSymbol, symbolColor: default, character: w }
+      end:
+        type: primitive
+        selectionType: token
+        modifier:
+          {
+            type: subpiece,
+            pieceType: character,
+            anchor: 1,
+            active: 1,
+            excludeAnchor: false,
+            excludeActive: false,
+          }
+        mark: { type: decoratedSymbol, symbolColor: default, character: h }
+      excludeStart: false
+      excludeEnd: false
+initialState:
+  documentContents: foo world whatever
+  selections:
+    - anchor: { line: 0, character: 4 }
+      active: { line: 0, character: 9 }
+  marks:
+    default.w:
+      start: { line: 0, character: 4 }
+      end: { line: 0, character: 9 }
+    default.h:
+      start: { line: 0, character: 10 }
+      end: { line: 0, character: 18 }
+finalState:
+  documentContents: foo woatever
+  selections:
+    - anchor: { line: 0, character: 4 }
+      active: { line: 0, character: 6 }
+fullTargets:
+  [
+    {
+      type: range,
+      excludeAnchor: false,
+      excludeActive: false,
+      anchor:
+        {
+          type: primitive,
+          mark: { type: decoratedSymbol, symbolColor: default, character: w },
+          selectionType: token,
+          position: contents,
+          insideOutsideType: outside,
+          modifier:
+            {
+              type: subpiece,
+              pieceType: character,
+              anchor: 2,
+              active: 2,
+              excludeAnchor: false,
+              excludeActive: false,
+            },
+        },
+      active:
+        {
+          type: primitive,
+          mark: { type: decoratedSymbol, symbolColor: default, character: h },
+          selectionType: token,
+          position: contents,
+          insideOutsideType: outside,
+          modifier:
+            {
+              type: subpiece,
+              pieceType: character,
+              anchor: 1,
+              active: 1,
+              excludeAnchor: false,
+              excludeActive: false,
+            },
+        },
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/updateSelections/commentTrap.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/updateSelections/commentTrap.yml
new file mode 100644
index 0000000000..988df68f59
--- /dev/null
+++ b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/updateSelections/commentTrap.yml
@@ -0,0 +1,37 @@
+languageId: typescript
+command:
+  version: 1
+  spokenForm: comment trap
+  action: toggleLineComment
+  targets:
+    - type: primitive
+      mark: { type: decoratedSymbol, symbolColor: default, character: t }
+initialState:
+  documentContents: |-
+    'hello'
+    'there'
+  selections:
+    - anchor: { line: 0, character: 1 }
+      active: { line: 1, character: 6 }
+  marks:
+    default.t:
+      start: { line: 1, character: 1 }
+      end: { line: 1, character: 6 }
+finalState:
+  documentContents: |-
+    'hello'
+    // 'there'
+  selections:
+    - anchor: { line: 0, character: 1 }
+      active: { line: 1, character: 9 }
+fullTargets:
+  [
+    {
+      type: primitive,
+      mark: { type: decoratedSymbol, symbolColor: default, character: t },
+      selectionType: token,
+      position: contents,
+      insideOutsideType: inside,
+      modifier: { type: identity },
+    },
+  ]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/subtoken.fixture.ts b/packages/cursorless-vscode-e2e/src/suite/fixtures/subtoken.fixture.ts
similarity index 100%
rename from packages/cursorless-vscode-e2e/suite/fixtures/subtoken.fixture.ts
rename to packages/cursorless-vscode-e2e/src/suite/fixtures/subtoken.fixture.ts
diff --git a/packages/cursorless-vscode-e2e/suite/fold.test.ts b/packages/cursorless-vscode-e2e/src/suite/fold.test.ts
similarity index 100%
rename from packages/cursorless-vscode-e2e/suite/fold.test.ts
rename to packages/cursorless-vscode-e2e/src/suite/fold.test.ts
diff --git a/packages/cursorless-vscode-e2e/suite/followLink.test.ts b/packages/cursorless-vscode-e2e/src/suite/followLink.test.ts
similarity index 100%
rename from packages/cursorless-vscode-e2e/suite/followLink.test.ts
rename to packages/cursorless-vscode-e2e/src/suite/followLink.test.ts
diff --git a/packages/cursorless-vscode-e2e/suite/groupByDocument.test.ts b/packages/cursorless-vscode-e2e/src/suite/groupByDocument.test.ts
similarity index 100%
rename from packages/cursorless-vscode-e2e/suite/groupByDocument.test.ts
rename to packages/cursorless-vscode-e2e/src/suite/groupByDocument.test.ts
diff --git a/packages/cursorless-vscode-e2e/suite/intraCellSetSelection.test.ts b/packages/cursorless-vscode-e2e/src/suite/intraCellSetSelection.test.ts
similarity index 100%
rename from packages/cursorless-vscode-e2e/suite/intraCellSetSelection.test.ts
rename to packages/cursorless-vscode-e2e/src/suite/intraCellSetSelection.test.ts
diff --git a/packages/cursorless-vscode-e2e/suite/keyboard/basic.test.ts b/packages/cursorless-vscode-e2e/src/suite/keyboard/basic.test.ts
similarity index 100%
rename from packages/cursorless-vscode-e2e/suite/keyboard/basic.test.ts
rename to packages/cursorless-vscode-e2e/src/suite/keyboard/basic.test.ts
diff --git a/packages/cursorless-vscode-e2e/suite/pourAcrossSplit.test.ts b/packages/cursorless-vscode-e2e/src/suite/pourAcrossSplit.test.ts
similarity index 100%
rename from packages/cursorless-vscode-e2e/suite/pourAcrossSplit.test.ts
rename to packages/cursorless-vscode-e2e/src/suite/pourAcrossSplit.test.ts
diff --git a/packages/cursorless-vscode-e2e/suite/prePhraseSnapshot.test.ts b/packages/cursorless-vscode-e2e/src/suite/prePhraseSnapshot.test.ts
similarity index 100%
rename from packages/cursorless-vscode-e2e/suite/prePhraseSnapshot.test.ts
rename to packages/cursorless-vscode-e2e/src/suite/prePhraseSnapshot.test.ts
diff --git a/packages/cursorless-vscode-e2e/suite/scroll.test.ts b/packages/cursorless-vscode-e2e/src/suite/scroll.test.ts
similarity index 100%
rename from packages/cursorless-vscode-e2e/suite/scroll.test.ts
rename to packages/cursorless-vscode-e2e/src/suite/scroll.test.ts
diff --git a/packages/cursorless-vscode-e2e/suite/setupFake.ts b/packages/cursorless-vscode-e2e/src/suite/setupFake.ts
similarity index 100%
rename from packages/cursorless-vscode-e2e/suite/setupFake.ts
rename to packages/cursorless-vscode-e2e/src/suite/setupFake.ts
diff --git a/packages/cursorless-vscode-e2e/suite/skipIfWindowsCi.ts b/packages/cursorless-vscode-e2e/src/suite/skipIfWindowsCi.ts
similarity index 100%
rename from packages/cursorless-vscode-e2e/suite/skipIfWindowsCi.ts
rename to packages/cursorless-vscode-e2e/src/suite/skipIfWindowsCi.ts
diff --git a/packages/cursorless-vscode-e2e/suite/toggleDecorations.test.ts b/packages/cursorless-vscode-e2e/src/suite/toggleDecorations.test.ts
similarity index 100%
rename from packages/cursorless-vscode-e2e/suite/toggleDecorations.test.ts
rename to packages/cursorless-vscode-e2e/src/suite/toggleDecorations.test.ts
diff --git a/packages/cursorless-vscode-e2e/suite/wrapWithSnippetAcrossSplit.test.ts b/packages/cursorless-vscode-e2e/src/suite/wrapWithSnippetAcrossSplit.test.ts
similarity index 100%
rename from packages/cursorless-vscode-e2e/suite/wrapWithSnippetAcrossSplit.test.ts
rename to packages/cursorless-vscode-e2e/src/suite/wrapWithSnippetAcrossSplit.test.ts
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/actions/_bringLineHarpAndWhale.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/actions/_bringLineHarpAndWhale.yml
deleted file mode 100644
index 4d38606591..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/actions/_bringLineHarpAndWhale.yml
+++ /dev/null
@@ -1,62 +0,0 @@
-languageId: plaintext
-command:
-  version: 1
-  spokenForm: bring line harp and whale
-  action: replaceWithTarget
-  targets:
-    - type: list
-      elements:
-        - type: primitive
-          selectionType: line
-          mark: {type: decoratedSymbol, symbolColor: default, character: h}
-        - type: primitive
-          mark: {type: decoratedSymbol, symbolColor: default, character: w}
-    - {type: primitive, isImplicit: true}
-initialState:
-  documentContents: |+
-    hello
-    there
-    whatever
-
-  selections:
-    - anchor: {line: 4, character: 0}
-      active: {line: 4, character: 0}
-  marks:
-    default.h:
-      start: {line: 0, character: 0}
-      end: {line: 0, character: 5}
-    default.w:
-      start: {line: 2, character: 0}
-      end: {line: 2, character: 8}
-finalState:
-  documentContents: |-
-    hello
-    there
-    whatever
-
-    hello
-    whatever
-  selections:
-    - anchor: {line: 5, character: 8}
-      active: {line: 5, character: 8}
-  thatMark:
-    - type: UntypedTarget
-      contentRange:
-        start: {line: 4, character: 0}
-        end: {line: 5, character: 8}
-      isReversed: false
-      hasExplicitRange: true
-  sourceMark:
-    - type: UntypedTarget
-      contentRange:
-        start: {line: 0, character: 0}
-        end: {line: 0, character: 5}
-      isReversed: false
-      hasExplicitRange: true
-    - type: UntypedTarget
-      contentRange:
-        start: {line: 2, character: 0}
-        end: {line: 2, character: 8}
-      isReversed: false
-      hasExplicitRange: true
-fullTargets: [{type: list, elements: [{type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: h}, selectionType: line, position: contents, insideOutsideType: null, modifier: {type: identity}, isImplicit: false}, {type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: w}, selectionType: line, position: contents, insideOutsideType: null, modifier: {type: identity}, isImplicit: false}]}, {type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: null, modifier: {type: identity}, isImplicit: true}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/actions/alternateHighlightHarp.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/actions/alternateHighlightHarp.yml
deleted file mode 100644
index a1ccbd51f1..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/actions/alternateHighlightHarp.yml
+++ /dev/null
@@ -1,40 +0,0 @@
-languageId: plaintext
-command:
-  version: 4
-  spokenForm: alternate highlight harp
-  action:
-    name: highlight
-    args: [highlight1]
-  targets:
-    - type: primitive
-      mark: {type: decoratedSymbol, symbolColor: default, character: h}
-  usePrePhraseSnapshot: true
-initialState:
-  documentContents: hello world
-  selections:
-    - anchor: {line: 0, character: 11}
-      active: {line: 0, character: 11}
-  marks:
-    default.h:
-      start: {line: 0, character: 0}
-      end: {line: 0, character: 5}
-finalState:
-  documentContents: hello world
-  selections:
-    - anchor: {line: 0, character: 11}
-      active: {line: 0, character: 11}
-  thatMark:
-    - type: UntypedTarget
-      contentRange:
-        start: {line: 0, character: 0}
-        end: {line: 0, character: 5}
-      isReversed: false
-      hasExplicitRange: false
-ide:
-  highlights:
-    - highlightId: highlight1
-      ranges:
-        - type: character
-          start: {line: 0, character: 0}
-          end: {line: 0, character: 5}
-fullTargets: [{type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: h}, modifiers: []}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/actions/bringAirAndBatAndCap.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/actions/bringAirAndBatAndCap.yml
deleted file mode 100644
index e572a6a9cc..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/actions/bringAirAndBatAndCap.yml
+++ /dev/null
@@ -1,71 +0,0 @@
-languageId: typescript
-command:
-  version: 1
-  spokenForm: bring air and bat and cap
-  action: replaceWithTarget
-  targets:
-    - type: list
-      elements:
-        - type: primitive
-          mark: {type: decoratedSymbol, symbolColor: default, character: a}
-        - type: primitive
-          mark: {type: decoratedSymbol, symbolColor: default, character: b}
-        - type: primitive
-          mark: {type: decoratedSymbol, symbolColor: default, character: c}
-    - {type: primitive, isImplicit: true}
-initialState:
-  documentContents: |+
-    a
-    b
-    c
-
-  selections:
-    - anchor: {line: 4, character: 0}
-      active: {line: 4, character: 0}
-  marks:
-    default.a:
-      start: {line: 0, character: 0}
-      end: {line: 0, character: 1}
-    default.b:
-      start: {line: 1, character: 0}
-      end: {line: 1, character: 1}
-    default.c:
-      start: {line: 2, character: 0}
-      end: {line: 2, character: 1}
-finalState:
-  documentContents: |-
-    a
-    b
-    c
-
-    a b c
-  selections:
-    - anchor: {line: 4, character: 5}
-      active: {line: 4, character: 5}
-  thatMark:
-    - type: UntypedTarget
-      contentRange:
-        start: {line: 4, character: 0}
-        end: {line: 4, character: 5}
-      isReversed: false
-      hasExplicitRange: true
-  sourceMark:
-    - type: UntypedTarget
-      contentRange:
-        start: {line: 0, character: 0}
-        end: {line: 0, character: 1}
-      isReversed: false
-      hasExplicitRange: true
-    - type: UntypedTarget
-      contentRange:
-        start: {line: 1, character: 0}
-        end: {line: 1, character: 1}
-      isReversed: false
-      hasExplicitRange: true
-    - type: UntypedTarget
-      contentRange:
-        start: {line: 2, character: 0}
-        end: {line: 2, character: 1}
-      isReversed: false
-      hasExplicitRange: true
-fullTargets: [{type: list, elements: [{type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: a}, selectionType: token, position: contents, insideOutsideType: null, modifier: {type: identity}}, {type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: b}, selectionType: token, position: contents, insideOutsideType: null, modifier: {type: identity}}, {type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: c}, selectionType: token, position: contents, insideOutsideType: null, modifier: {type: identity}}]}, {type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: identity}}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/actions/bringAirAndBatAndCapToAfterDrum.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/actions/bringAirAndBatAndCapToAfterDrum.yml
deleted file mode 100644
index 05f7f43b2f..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/actions/bringAirAndBatAndCapToAfterDrum.yml
+++ /dev/null
@@ -1,77 +0,0 @@
-languageId: typescript
-command:
-  version: 1
-  spokenForm: bring air and bat and cap to after drum
-  action: replaceWithTarget
-  targets:
-    - type: list
-      elements:
-        - type: primitive
-          mark: {type: decoratedSymbol, symbolColor: default, character: a}
-        - type: primitive
-          mark: {type: decoratedSymbol, symbolColor: default, character: b}
-        - type: primitive
-          mark: {type: decoratedSymbol, symbolColor: default, character: c}
-    - type: primitive
-      position: after
-      mark: {type: decoratedSymbol, symbolColor: default, character: d}
-initialState:
-  documentContents: |
-    a
-    b
-    c
-
-    d
-  selections:
-    - anchor: {line: 5, character: 0}
-      active: {line: 5, character: 0}
-  marks:
-    default.a:
-      start: {line: 0, character: 0}
-      end: {line: 0, character: 1}
-    default.b:
-      start: {line: 1, character: 0}
-      end: {line: 1, character: 1}
-    default.c:
-      start: {line: 2, character: 0}
-      end: {line: 2, character: 1}
-    default.d:
-      start: {line: 4, character: 0}
-      end: {line: 4, character: 1}
-finalState:
-  documentContents: |
-    a
-    b
-    c
-
-    d a b c
-  selections:
-    - anchor: {line: 5, character: 0}
-      active: {line: 5, character: 0}
-  thatMark:
-    - type: UntypedTarget
-      contentRange:
-        start: {line: 4, character: 2}
-        end: {line: 4, character: 7}
-      isReversed: false
-      hasExplicitRange: true
-  sourceMark:
-    - type: UntypedTarget
-      contentRange:
-        start: {line: 0, character: 0}
-        end: {line: 0, character: 1}
-      isReversed: false
-      hasExplicitRange: true
-    - type: UntypedTarget
-      contentRange:
-        start: {line: 1, character: 0}
-        end: {line: 1, character: 1}
-      isReversed: false
-      hasExplicitRange: true
-    - type: UntypedTarget
-      contentRange:
-        start: {line: 2, character: 0}
-        end: {line: 2, character: 1}
-      isReversed: false
-      hasExplicitRange: true
-fullTargets: [{type: list, elements: [{type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: a}, selectionType: token, position: contents, insideOutsideType: null, modifier: {type: identity}}, {type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: b}, selectionType: token, position: contents, insideOutsideType: null, modifier: {type: identity}}, {type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: c}, selectionType: token, position: contents, insideOutsideType: null, modifier: {type: identity}}]}, {type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: d}, selectionType: token, position: after, insideOutsideType: null, modifier: {type: identity}}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/actions/bringAirAndBatAndCapToAfterItemEach.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/actions/bringAirAndBatAndCapToAfterItemEach.yml
deleted file mode 100644
index 50934020f3..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/actions/bringAirAndBatAndCapToAfterItemEach.yml
+++ /dev/null
@@ -1,78 +0,0 @@
-languageId: typescript
-command:
-  version: 1
-  spokenForm: bring air and bat and cap to after item each
-  action: replaceWithTarget
-  targets:
-    - type: list
-      elements:
-        - type: primitive
-          mark: {type: decoratedSymbol, symbolColor: default, character: a}
-        - type: primitive
-          mark: {type: decoratedSymbol, symbolColor: default, character: b}
-        - type: primitive
-          mark: {type: decoratedSymbol, symbolColor: default, character: c}
-    - type: primitive
-      position: after
-      modifier: {type: containingScope, scopeType: collectionItem, includeSiblings: false}
-      mark: {type: decoratedSymbol, symbolColor: default, character: e}
-initialState:
-  documentContents: |
-    a
-    b
-    c
-
-    const values = [e]
-  selections:
-    - anchor: {line: 5, character: 0}
-      active: {line: 5, character: 0}
-  marks:
-    default.a:
-      start: {line: 0, character: 0}
-      end: {line: 0, character: 1}
-    default.b:
-      start: {line: 1, character: 0}
-      end: {line: 1, character: 1}
-    default.c:
-      start: {line: 2, character: 0}
-      end: {line: 2, character: 1}
-    default.e:
-      start: {line: 4, character: 16}
-      end: {line: 4, character: 17}
-finalState:
-  documentContents: |
-    a
-    b
-    c
-
-    const values = [e, a, b, c]
-  selections:
-    - anchor: {line: 5, character: 0}
-      active: {line: 5, character: 0}
-  thatMark:
-    - type: UntypedTarget
-      contentRange:
-        start: {line: 4, character: 19}
-        end: {line: 4, character: 26}
-      isReversed: false
-      hasExplicitRange: true
-  sourceMark:
-    - type: UntypedTarget
-      contentRange:
-        start: {line: 0, character: 0}
-        end: {line: 0, character: 1}
-      isReversed: false
-      hasExplicitRange: true
-    - type: UntypedTarget
-      contentRange:
-        start: {line: 1, character: 0}
-        end: {line: 1, character: 1}
-      isReversed: false
-      hasExplicitRange: true
-    - type: UntypedTarget
-      contentRange:
-        start: {line: 2, character: 0}
-        end: {line: 2, character: 1}
-      isReversed: false
-      hasExplicitRange: true
-fullTargets: [{type: list, elements: [{type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: a}, selectionType: token, position: contents, insideOutsideType: null, modifier: {type: identity}}, {type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: b}, selectionType: token, position: contents, insideOutsideType: null, modifier: {type: identity}}, {type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: c}, selectionType: token, position: contents, insideOutsideType: null, modifier: {type: identity}}]}, {type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: e}, selectionType: token, position: after, insideOutsideType: null, modifier: {type: containingScope, scopeType: collectionItem, includeSiblings: false}}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/actions/bringAirAndBatAndCapToBeforeDrum.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/actions/bringAirAndBatAndCapToBeforeDrum.yml
deleted file mode 100644
index e124b87e9d..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/actions/bringAirAndBatAndCapToBeforeDrum.yml
+++ /dev/null
@@ -1,77 +0,0 @@
-languageId: typescript
-command:
-  version: 1
-  spokenForm: bring air and bat and cap to before drum
-  action: replaceWithTarget
-  targets:
-    - type: list
-      elements:
-        - type: primitive
-          mark: {type: decoratedSymbol, symbolColor: default, character: a}
-        - type: primitive
-          mark: {type: decoratedSymbol, symbolColor: default, character: b}
-        - type: primitive
-          mark: {type: decoratedSymbol, symbolColor: default, character: c}
-    - type: primitive
-      position: before
-      mark: {type: decoratedSymbol, symbolColor: default, character: d}
-initialState:
-  documentContents: |
-    a
-    b
-    c
-
-    d
-  selections:
-    - anchor: {line: 5, character: 0}
-      active: {line: 5, character: 0}
-  marks:
-    default.a:
-      start: {line: 0, character: 0}
-      end: {line: 0, character: 1}
-    default.b:
-      start: {line: 1, character: 0}
-      end: {line: 1, character: 1}
-    default.c:
-      start: {line: 2, character: 0}
-      end: {line: 2, character: 1}
-    default.d:
-      start: {line: 4, character: 0}
-      end: {line: 4, character: 1}
-finalState:
-  documentContents: |
-    a
-    b
-    c
-
-    a b c d
-  selections:
-    - anchor: {line: 5, character: 0}
-      active: {line: 5, character: 0}
-  thatMark:
-    - type: UntypedTarget
-      contentRange:
-        start: {line: 4, character: 0}
-        end: {line: 4, character: 5}
-      isReversed: false
-      hasExplicitRange: true
-  sourceMark:
-    - type: UntypedTarget
-      contentRange:
-        start: {line: 0, character: 0}
-        end: {line: 0, character: 1}
-      isReversed: false
-      hasExplicitRange: true
-    - type: UntypedTarget
-      contentRange:
-        start: {line: 1, character: 0}
-        end: {line: 1, character: 1}
-      isReversed: false
-      hasExplicitRange: true
-    - type: UntypedTarget
-      contentRange:
-        start: {line: 2, character: 0}
-        end: {line: 2, character: 1}
-      isReversed: false
-      hasExplicitRange: true
-fullTargets: [{type: list, elements: [{type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: a}, selectionType: token, position: contents, insideOutsideType: null, modifier: {type: identity}}, {type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: b}, selectionType: token, position: contents, insideOutsideType: null, modifier: {type: identity}}, {type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: c}, selectionType: token, position: contents, insideOutsideType: null, modifier: {type: identity}}]}, {type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: d}, selectionType: token, position: before, insideOutsideType: null, modifier: {type: identity}}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/actions/bringAirAndBatAndCapToBeforeItemEach.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/actions/bringAirAndBatAndCapToBeforeItemEach.yml
deleted file mode 100644
index 9dcc232b7e..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/actions/bringAirAndBatAndCapToBeforeItemEach.yml
+++ /dev/null
@@ -1,78 +0,0 @@
-languageId: typescript
-command:
-  version: 1
-  spokenForm: bring air and bat and cap to before item each
-  action: replaceWithTarget
-  targets:
-    - type: list
-      elements:
-        - type: primitive
-          mark: {type: decoratedSymbol, symbolColor: default, character: a}
-        - type: primitive
-          mark: {type: decoratedSymbol, symbolColor: default, character: b}
-        - type: primitive
-          mark: {type: decoratedSymbol, symbolColor: default, character: c}
-    - type: primitive
-      position: before
-      modifier: {type: containingScope, scopeType: collectionItem, includeSiblings: false}
-      mark: {type: decoratedSymbol, symbolColor: default, character: e}
-initialState:
-  documentContents: |
-    a
-    b
-    c
-
-    const values = [e]
-  selections:
-    - anchor: {line: 5, character: 0}
-      active: {line: 5, character: 0}
-  marks:
-    default.a:
-      start: {line: 0, character: 0}
-      end: {line: 0, character: 1}
-    default.b:
-      start: {line: 1, character: 0}
-      end: {line: 1, character: 1}
-    default.c:
-      start: {line: 2, character: 0}
-      end: {line: 2, character: 1}
-    default.e:
-      start: {line: 4, character: 16}
-      end: {line: 4, character: 17}
-finalState:
-  documentContents: |
-    a
-    b
-    c
-
-    const values = [a, b, c, e]
-  selections:
-    - anchor: {line: 5, character: 0}
-      active: {line: 5, character: 0}
-  thatMark:
-    - type: UntypedTarget
-      contentRange:
-        start: {line: 4, character: 16}
-        end: {line: 4, character: 23}
-      isReversed: false
-      hasExplicitRange: true
-  sourceMark:
-    - type: UntypedTarget
-      contentRange:
-        start: {line: 0, character: 0}
-        end: {line: 0, character: 1}
-      isReversed: false
-      hasExplicitRange: true
-    - type: UntypedTarget
-      contentRange:
-        start: {line: 1, character: 0}
-        end: {line: 1, character: 1}
-      isReversed: false
-      hasExplicitRange: true
-    - type: UntypedTarget
-      contentRange:
-        start: {line: 2, character: 0}
-        end: {line: 2, character: 1}
-      isReversed: false
-      hasExplicitRange: true
-fullTargets: [{type: list, elements: [{type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: a}, selectionType: token, position: contents, insideOutsideType: null, modifier: {type: identity}}, {type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: b}, selectionType: token, position: contents, insideOutsideType: null, modifier: {type: identity}}, {type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: c}, selectionType: token, position: contents, insideOutsideType: null, modifier: {type: identity}}]}, {type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: e}, selectionType: token, position: before, insideOutsideType: null, modifier: {type: containingScope, scopeType: collectionItem, includeSiblings: false}}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/actions/bringArgMadeAfterLook.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/actions/bringArgMadeAfterLook.yml
deleted file mode 100644
index 4e4cf9f92b..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/actions/bringArgMadeAfterLook.yml
+++ /dev/null
@@ -1,59 +0,0 @@
-languageId: typescript
-command:
-  spokenForm: bring arg made after look
-  version: 2
-  targets:
-    - type: primitive
-      mark: {type: decoratedSymbol, symbolColor: default, character: m}
-      modifiers:
-        - type: containingScope
-          scopeType: {type: argumentOrParameter}
-    - type: primitive
-      mark: {type: decoratedSymbol, symbolColor: default, character: l}
-      modifiers:
-        - {type: position, position: after}
-  usePrePhraseSnapshot: true
-  action: {name: replaceWithTarget}
-initialState:
-  documentContents: |-
-    function myFunk(
-        name: string,
-        value: number,
-        whatever: boolean
-    ) {}
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-  marks:
-    default.m:
-      start: {line: 1, character: 4}
-      end: {line: 1, character: 8}
-    default.l:
-      start: {line: 2, character: 4}
-      end: {line: 2, character: 9}
-finalState:
-  documentContents: |-
-    function myFunk(
-        name: string,
-        value: number,
-        name: string,
-        whatever: boolean
-    ) {}
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-  thatMark:
-    - type: UntypedTarget
-      contentRange:
-        start: {line: 3, character: 4}
-        end: {line: 3, character: 16}
-      isReversed: false
-      hasExplicitRange: true
-  sourceMark:
-    - type: UntypedTarget
-      contentRange:
-        start: {line: 1, character: 4}
-        end: {line: 1, character: 16}
-      isReversed: false
-      hasExplicitRange: true
-fullTargets: [{type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: m}, modifiers: [&ref_0 {type: containingScope, scopeType: {type: argumentOrParameter}}]}, {type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: l}, modifiers: [{type: position, position: after}, *ref_0]}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/actions/bringArgMadeAfterVest.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/actions/bringArgMadeAfterVest.yml
deleted file mode 100644
index 39cd1f8d34..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/actions/bringArgMadeAfterVest.yml
+++ /dev/null
@@ -1,57 +0,0 @@
-languageId: typescript
-command:
-  spokenForm: bring arg made after vest
-  version: 2
-  targets:
-    - type: primitive
-      mark: {type: decoratedSymbol, symbolColor: default, character: m}
-      modifiers:
-        - type: containingScope
-          scopeType: {type: argumentOrParameter}
-    - type: primitive
-      mark: {type: decoratedSymbol, symbolColor: default, character: v}
-      modifiers:
-        - {type: position, position: after}
-  usePrePhraseSnapshot: true
-  action: {name: replaceWithTarget}
-initialState:
-  documentContents: |-
-    function myFunk(
-        name: string,
-        value: number
-    ) {}
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-  marks:
-    default.m:
-      start: {line: 1, character: 4}
-      end: {line: 1, character: 8}
-    default.v:
-      start: {line: 2, character: 4}
-      end: {line: 2, character: 9}
-finalState:
-  documentContents: |-
-    function myFunk(
-        name: string,
-        value: number,
-        name: string
-    ) {}
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-  thatMark:
-    - type: UntypedTarget
-      contentRange:
-        start: {line: 3, character: 4}
-        end: {line: 3, character: 16}
-      isReversed: false
-      hasExplicitRange: true
-  sourceMark:
-    - type: UntypedTarget
-      contentRange:
-        start: {line: 1, character: 4}
-        end: {line: 1, character: 16}
-      isReversed: false
-      hasExplicitRange: true
-fullTargets: [{type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: m}, modifiers: [&ref_0 {type: containingScope, scopeType: {type: argumentOrParameter}}]}, {type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: v}, modifiers: [{type: position, position: after}, *ref_0]}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/actions/bringArgWhaleBeforeLook.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/actions/bringArgWhaleBeforeLook.yml
deleted file mode 100644
index 1fbee31eec..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/actions/bringArgWhaleBeforeLook.yml
+++ /dev/null
@@ -1,59 +0,0 @@
-languageId: typescript
-command:
-  spokenForm: bring arg whale before look
-  version: 2
-  targets:
-    - type: primitive
-      mark: {type: decoratedSymbol, symbolColor: default, character: w}
-      modifiers:
-        - type: containingScope
-          scopeType: {type: argumentOrParameter}
-    - type: primitive
-      mark: {type: decoratedSymbol, symbolColor: default, character: l}
-      modifiers:
-        - {type: position, position: before}
-  usePrePhraseSnapshot: true
-  action: {name: replaceWithTarget}
-initialState:
-  documentContents: |-
-    function myFunk(
-        name: string,
-        value: number,
-        whatever: boolean
-    ) {}
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-  marks:
-    default.w:
-      start: {line: 3, character: 4}
-      end: {line: 3, character: 12}
-    default.l:
-      start: {line: 2, character: 4}
-      end: {line: 2, character: 9}
-finalState:
-  documentContents: |-
-    function myFunk(
-        name: string,
-        whatever: boolean,
-        value: number,
-        whatever: boolean
-    ) {}
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-  thatMark:
-    - type: UntypedTarget
-      contentRange:
-        start: {line: 2, character: 4}
-        end: {line: 2, character: 21}
-      isReversed: false
-      hasExplicitRange: true
-  sourceMark:
-    - type: UntypedTarget
-      contentRange:
-        start: {line: 4, character: 4}
-        end: {line: 4, character: 21}
-      isReversed: false
-      hasExplicitRange: true
-fullTargets: [{type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: w}, modifiers: [&ref_0 {type: containingScope, scopeType: {type: argumentOrParameter}}]}, {type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: l}, modifiers: [{type: position, position: before}, *ref_0]}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/actions/bringArgueFineAndZip.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/actions/bringArgueFineAndZip.yml
deleted file mode 100644
index 82500b8ea7..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/actions/bringArgueFineAndZip.yml
+++ /dev/null
@@ -1,66 +0,0 @@
-languageId: typescript
-command:
-  version: 1
-  spokenForm: bring argue fine and zip
-  action: replaceWithTarget
-  targets:
-    - type: list
-      elements:
-        - type: primitive
-          modifier: {type: containingScope, scopeType: argumentOrParameter, includeSiblings: false}
-          mark: {type: decoratedSymbol, symbolColor: default, character: f}
-        - type: primitive
-          mark: {type: decoratedSymbol, symbolColor: default, character: z}
-    - {type: primitive, isImplicit: true}
-initialState:
-  documentContents: |-
-    function helloWorld(foo: string, bar: number, baz: string) {
-
-    }
-
-    function bongo() {
-        
-    }
-  selections:
-    - anchor: {line: 4, character: 15}
-      active: {line: 4, character: 15}
-  marks:
-    default.f:
-      start: {line: 0, character: 20}
-      end: {line: 0, character: 23}
-    default.z:
-      start: {line: 0, character: 46}
-      end: {line: 0, character: 49}
-finalState:
-  documentContents: |-
-    function helloWorld(foo: string, bar: number, baz: string) {
-
-    }
-
-    function bongo(foo: string, baz: string) {
-        
-    }
-  selections:
-    - anchor: {line: 4, character: 39}
-      active: {line: 4, character: 39}
-  thatMark:
-    - type: UntypedTarget
-      contentRange:
-        start: {line: 4, character: 15}
-        end: {line: 4, character: 39}
-      isReversed: false
-      hasExplicitRange: true
-  sourceMark:
-    - type: UntypedTarget
-      contentRange:
-        start: {line: 0, character: 20}
-        end: {line: 0, character: 31}
-      isReversed: false
-      hasExplicitRange: true
-    - type: UntypedTarget
-      contentRange:
-        start: {line: 0, character: 46}
-        end: {line: 0, character: 57}
-      isReversed: false
-      hasExplicitRange: true
-fullTargets: [{type: list, elements: [{type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: f}, selectionType: token, position: contents, insideOutsideType: null, modifier: {type: containingScope, scopeType: argumentOrParameter, includeSiblings: false}, isImplicit: false}, {type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: z}, selectionType: token, position: contents, insideOutsideType: null, modifier: {type: containingScope, scopeType: argumentOrParameter, includeSiblings: false}, isImplicit: false}]}, {type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: null, modifier: {type: identity}, isImplicit: true}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/actions/bringArgueOxAndZipToAfterJustLeper.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/actions/bringArgueOxAndZipToAfterJustLeper.yml
deleted file mode 100644
index 09fe942849..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/actions/bringArgueOxAndZipToAfterJustLeper.yml
+++ /dev/null
@@ -1,72 +0,0 @@
-languageId: typescript
-command:
-  version: 1
-  spokenForm: bring argue ox and zip to after just leper
-  action: replaceWithTarget
-  targets:
-    - type: list
-      elements:
-        - type: primitive
-          modifier: {type: containingScope, scopeType: argumentOrParameter, includeSiblings: false}
-          mark: {type: decoratedSymbol, symbolColor: default, character: o}
-        - type: primitive
-          mark: {type: decoratedSymbol, symbolColor: default, character: z}
-    - type: primitive
-      position: after
-      modifier: {type: toRawSelection}
-      mark: {type: decoratedSymbol, symbolColor: default, character: (}
-initialState:
-  documentContents: |-
-    function helloWorld(foo: string, bar: number, baz: string) {
-
-    }
-
-    function bongo() {
-        
-    }
-  selections:
-    - anchor: {line: 3, character: 0}
-      active: {line: 3, character: 0}
-  marks:
-    default.o:
-      start: {line: 0, character: 20}
-      end: {line: 0, character: 23}
-    default.z:
-      start: {line: 0, character: 46}
-      end: {line: 0, character: 49}
-    default.(:
-      start: {line: 4, character: 14}
-      end: {line: 4, character: 15}
-finalState:
-  documentContents: |-
-    function helloWorld(foo: string, bar: number, baz: string) {
-
-    }
-
-    function bongo(foo: string, baz: string) {
-        
-    }
-  selections:
-    - anchor: {line: 3, character: 0}
-      active: {line: 3, character: 0}
-  thatMark:
-    - type: UntypedTarget
-      contentRange:
-        start: {line: 4, character: 15}
-        end: {line: 4, character: 39}
-      isReversed: false
-      hasExplicitRange: true
-  sourceMark:
-    - type: UntypedTarget
-      contentRange:
-        start: {line: 0, character: 20}
-        end: {line: 0, character: 31}
-      isReversed: false
-      hasExplicitRange: true
-    - type: UntypedTarget
-      contentRange:
-        start: {line: 0, character: 46}
-        end: {line: 0, character: 57}
-      isReversed: false
-      hasExplicitRange: true
-fullTargets: [{type: list, elements: [{type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: o}, selectionType: token, position: contents, insideOutsideType: null, modifier: {type: containingScope, scopeType: argumentOrParameter, includeSiblings: false}, isImplicit: false}, {type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: z}, selectionType: token, position: contents, insideOutsideType: null, modifier: {type: containingScope, scopeType: argumentOrParameter, includeSiblings: false}, isImplicit: false}]}, {type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: (}, selectionType: token, position: after, insideOutsideType: null, modifier: {type: toRawSelection}, isImplicit: false}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/actions/bringFineAfterLineVest.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/actions/bringFineAfterLineVest.yml
deleted file mode 100644
index 1f2f05dc2e..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/actions/bringFineAfterLineVest.yml
+++ /dev/null
@@ -1,52 +0,0 @@
-languageId: plaintext
-command:
-  spokenForm: bring fine after line vest
-  version: 2
-  targets:
-    - type: primitive
-      mark: {type: decoratedSymbol, symbolColor: default, character: f}
-    - type: primitive
-      mark: {type: decoratedSymbol, symbolColor: default, character: v}
-      modifiers:
-        - {type: position, position: after}
-        - type: containingScope
-          scopeType: {type: line}
-  usePrePhraseSnapshot: true
-  action: {name: replaceWithTarget}
-initialState:
-  documentContents: |
-    foo
-        const value = "Hello world";
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-  marks:
-    default.f:
-      start: {line: 0, character: 0}
-      end: {line: 0, character: 3}
-    default.v:
-      start: {line: 1, character: 10}
-      end: {line: 1, character: 15}
-finalState:
-  documentContents: |
-    foo
-        const value = "Hello world";
-        foo
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-  thatMark:
-    - type: UntypedTarget
-      contentRange:
-        start: {line: 2, character: 4}
-        end: {line: 2, character: 7}
-      isReversed: false
-      hasExplicitRange: true
-  sourceMark:
-    - type: UntypedTarget
-      contentRange:
-        start: {line: 0, character: 0}
-        end: {line: 0, character: 3}
-      isReversed: false
-      hasExplicitRange: true
-fullTargets: [{type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: f}, modifiers: []}, {type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: v}, modifiers: [{type: position, position: after}, {type: containingScope, scopeType: {type: line}}]}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/actions/bringFineBeforeLineVest.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/actions/bringFineBeforeLineVest.yml
deleted file mode 100644
index 49ce8f6441..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/actions/bringFineBeforeLineVest.yml
+++ /dev/null
@@ -1,54 +0,0 @@
-languageId: plaintext
-command:
-  spokenForm: bring fine before line vest
-  version: 2
-  targets:
-    - type: primitive
-      mark: {type: decoratedSymbol, symbolColor: default, character: f}
-    - type: primitive
-      mark: {type: decoratedSymbol, symbolColor: default, character: v}
-      modifiers:
-        - {type: position, position: before}
-        - type: containingScope
-          scopeType: {type: line}
-  usePrePhraseSnapshot: true
-  action: {name: replaceWithTarget}
-initialState:
-  documentContents: |2
-
-        const value = "Hello world";
-    foo
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-  marks:
-    default.f:
-      start: {line: 2, character: 0}
-      end: {line: 2, character: 3}
-    default.v:
-      start: {line: 1, character: 10}
-      end: {line: 1, character: 15}
-finalState:
-  documentContents: |2
-
-        foo
-        const value = "Hello world";
-    foo
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-  thatMark:
-    - type: UntypedTarget
-      contentRange:
-        start: {line: 1, character: 4}
-        end: {line: 1, character: 7}
-      isReversed: false
-      hasExplicitRange: true
-  sourceMark:
-    - type: UntypedTarget
-      contentRange:
-        start: {line: 3, character: 0}
-        end: {line: 3, character: 3}
-      isReversed: false
-      hasExplicitRange: true
-fullTargets: [{type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: f}, modifiers: []}, {type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: v}, modifiers: [{type: position, position: before}, {type: containingScope, scopeType: {type: line}}]}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/actions/bringItemAirAfterCap.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/actions/bringItemAirAfterCap.yml
deleted file mode 100644
index 189e337de6..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/actions/bringItemAirAfterCap.yml
+++ /dev/null
@@ -1,59 +0,0 @@
-languageId: typescript
-command:
-  spokenForm: bring item air after cap
-  version: 2
-  targets:
-    - type: primitive
-      mark: {type: decoratedSymbol, symbolColor: default, character: a}
-      modifiers:
-        - type: containingScope
-          scopeType: {type: collectionItem}
-    - type: primitive
-      mark: {type: decoratedSymbol, symbolColor: default, character: c}
-      modifiers:
-        - {type: position, position: after}
-  usePrePhraseSnapshot: true
-  action: {name: replaceWithTarget}
-initialState:
-  documentContents: |-
-    [
-        a,
-        b,
-        c
-    ]
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-  marks:
-    default.a:
-      start: {line: 1, character: 4}
-      end: {line: 1, character: 5}
-    default.c:
-      start: {line: 3, character: 4}
-      end: {line: 3, character: 5}
-finalState:
-  documentContents: |-
-    [
-        a,
-        b,
-        c,
-        a
-    ]
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-  thatMark:
-    - type: UntypedTarget
-      contentRange:
-        start: {line: 4, character: 4}
-        end: {line: 4, character: 5}
-      isReversed: false
-      hasExplicitRange: true
-  sourceMark:
-    - type: UntypedTarget
-      contentRange:
-        start: {line: 1, character: 4}
-        end: {line: 1, character: 5}
-      isReversed: false
-      hasExplicitRange: true
-fullTargets: [{type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: a}, modifiers: [&ref_0 {type: containingScope, scopeType: {type: collectionItem}}]}, {type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: c}, modifiers: [{type: position, position: after}, *ref_0]}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/actions/bringLineAirAndBatAndCapToAfterDrum.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/actions/bringLineAirAndBatAndCapToAfterDrum.yml
deleted file mode 100644
index aa3184c3f5..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/actions/bringLineAirAndBatAndCapToAfterDrum.yml
+++ /dev/null
@@ -1,81 +0,0 @@
-languageId: typescript
-command:
-  version: 1
-  spokenForm: bring line air and bat and cap to after drum
-  action: replaceWithTarget
-  targets:
-    - type: list
-      elements:
-        - type: primitive
-          selectionType: line
-          mark: {type: decoratedSymbol, symbolColor: default, character: a}
-        - type: primitive
-          mark: {type: decoratedSymbol, symbolColor: default, character: b}
-        - type: primitive
-          mark: {type: decoratedSymbol, symbolColor: default, character: c}
-    - type: primitive
-      position: after
-      mark: {type: decoratedSymbol, symbolColor: default, character: d}
-initialState:
-  documentContents: |
-    a
-    b
-    c
-
-    d
-  selections:
-    - anchor: {line: 5, character: 0}
-      active: {line: 5, character: 0}
-  marks:
-    default.a:
-      start: {line: 0, character: 0}
-      end: {line: 0, character: 1}
-    default.b:
-      start: {line: 1, character: 0}
-      end: {line: 1, character: 1}
-    default.c:
-      start: {line: 2, character: 0}
-      end: {line: 2, character: 1}
-    default.d:
-      start: {line: 4, character: 0}
-      end: {line: 4, character: 1}
-finalState:
-  documentContents: |
-    a
-    b
-    c
-
-    d
-    a
-    b
-    c
-  selections:
-    - anchor: {line: 8, character: 0}
-      active: {line: 8, character: 0}
-  thatMark:
-    - type: UntypedTarget
-      contentRange:
-        start: {line: 5, character: 0}
-        end: {line: 7, character: 1}
-      isReversed: false
-      hasExplicitRange: true
-  sourceMark:
-    - type: UntypedTarget
-      contentRange:
-        start: {line: 0, character: 0}
-        end: {line: 0, character: 1}
-      isReversed: false
-      hasExplicitRange: true
-    - type: UntypedTarget
-      contentRange:
-        start: {line: 1, character: 0}
-        end: {line: 1, character: 1}
-      isReversed: false
-      hasExplicitRange: true
-    - type: UntypedTarget
-      contentRange:
-        start: {line: 2, character: 0}
-        end: {line: 2, character: 1}
-      isReversed: false
-      hasExplicitRange: true
-fullTargets: [{type: list, elements: [{type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: a}, selectionType: line, position: contents, insideOutsideType: null, modifier: {type: identity}}, {type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: b}, selectionType: line, position: contents, insideOutsideType: null, modifier: {type: identity}}, {type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: c}, selectionType: line, position: contents, insideOutsideType: null, modifier: {type: identity}}]}, {type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: d}, selectionType: line, position: after, insideOutsideType: null, modifier: {type: identity}}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/actions/bringLineAirAndBatAndCapToBeforeDrum.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/actions/bringLineAirAndBatAndCapToBeforeDrum.yml
deleted file mode 100644
index 9cf64acbb6..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/actions/bringLineAirAndBatAndCapToBeforeDrum.yml
+++ /dev/null
@@ -1,81 +0,0 @@
-languageId: typescript
-command:
-  version: 1
-  spokenForm: bring line air and bat and cap to before drum
-  action: replaceWithTarget
-  targets:
-    - type: list
-      elements:
-        - type: primitive
-          selectionType: line
-          mark: {type: decoratedSymbol, symbolColor: default, character: a}
-        - type: primitive
-          mark: {type: decoratedSymbol, symbolColor: default, character: b}
-        - type: primitive
-          mark: {type: decoratedSymbol, symbolColor: default, character: c}
-    - type: primitive
-      position: before
-      mark: {type: decoratedSymbol, symbolColor: default, character: d}
-initialState:
-  documentContents: |
-    a
-    b
-    c
-
-    d
-  selections:
-    - anchor: {line: 5, character: 0}
-      active: {line: 5, character: 0}
-  marks:
-    default.a:
-      start: {line: 0, character: 0}
-      end: {line: 0, character: 1}
-    default.b:
-      start: {line: 1, character: 0}
-      end: {line: 1, character: 1}
-    default.c:
-      start: {line: 2, character: 0}
-      end: {line: 2, character: 1}
-    default.d:
-      start: {line: 4, character: 0}
-      end: {line: 4, character: 1}
-finalState:
-  documentContents: |
-    a
-    b
-    c
-
-    a
-    b
-    c
-    d
-  selections:
-    - anchor: {line: 8, character: 0}
-      active: {line: 8, character: 0}
-  thatMark:
-    - type: UntypedTarget
-      contentRange:
-        start: {line: 4, character: 0}
-        end: {line: 6, character: 1}
-      isReversed: false
-      hasExplicitRange: true
-  sourceMark:
-    - type: UntypedTarget
-      contentRange:
-        start: {line: 0, character: 0}
-        end: {line: 0, character: 1}
-      isReversed: false
-      hasExplicitRange: true
-    - type: UntypedTarget
-      contentRange:
-        start: {line: 1, character: 0}
-        end: {line: 1, character: 1}
-      isReversed: false
-      hasExplicitRange: true
-    - type: UntypedTarget
-      contentRange:
-        start: {line: 2, character: 0}
-        end: {line: 2, character: 1}
-      isReversed: false
-      hasExplicitRange: true
-fullTargets: [{type: list, elements: [{type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: a}, selectionType: line, position: contents, insideOutsideType: null, modifier: {type: identity}}, {type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: b}, selectionType: line, position: contents, insideOutsideType: null, modifier: {type: identity}}, {type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: c}, selectionType: line, position: contents, insideOutsideType: null, modifier: {type: identity}}]}, {type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: d}, selectionType: line, position: before, insideOutsideType: null, modifier: {type: identity}}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/actions/bringVest.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/actions/bringVest.yml
deleted file mode 100644
index 6573462e9b..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/actions/bringVest.yml
+++ /dev/null
@@ -1,42 +0,0 @@
-languageId: typescript
-command:
-  version: 1
-  spokenForm: bring vest
-  action: replaceWithTarget
-  targets:
-    - type: primitive
-      mark: {type: decoratedSymbol, symbolColor: default, character: v}
-    - {type: primitive, isImplicit: true}
-initialState:
-  documentContents: |
-
-    const value = "Hello world";
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-  marks:
-    default.v:
-      start: {line: 1, character: 6}
-      end: {line: 1, character: 11}
-finalState:
-  documentContents: |
-    value
-    const value = "Hello world";
-  selections:
-    - anchor: {line: 0, character: 5}
-      active: {line: 0, character: 5}
-  thatMark:
-    - type: UntypedTarget
-      contentRange:
-        start: {line: 0, character: 0}
-        end: {line: 0, character: 5}
-      isReversed: false
-      hasExplicitRange: true
-  sourceMark:
-    - type: UntypedTarget
-      contentRange:
-        start: {line: 1, character: 6}
-        end: {line: 1, character: 11}
-      isReversed: false
-      hasExplicitRange: true
-fullTargets: [{type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: v}, selectionType: token, position: contents, modifier: {type: identity}, insideOutsideType: null}, {type: primitive, mark: {type: cursor}, selectionType: token, position: contents, modifier: {type: identity}, insideOutsideType: inside}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/actions/bringVestToCap.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/actions/bringVestToCap.yml
deleted file mode 100644
index 0757bcea17..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/actions/bringVestToCap.yml
+++ /dev/null
@@ -1,46 +0,0 @@
-languageId: typescript
-command:
-  version: 1
-  spokenForm: bring vest to cap
-  action: replaceWithTarget
-  targets:
-    - type: primitive
-      mark: {type: decoratedSymbol, symbolColor: default, character: v}
-    - type: primitive
-      mark: {type: decoratedSymbol, symbolColor: default, character: c}
-initialState:
-  documentContents: |
-
-    const value = "Hello world";
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-  marks:
-    default.v:
-      start: {line: 1, character: 6}
-      end: {line: 1, character: 11}
-    default.c:
-      start: {line: 1, character: 0}
-      end: {line: 1, character: 5}
-finalState:
-  documentContents: |
-
-    value value = "Hello world";
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-  thatMark:
-    - type: UntypedTarget
-      contentRange:
-        start: {line: 1, character: 0}
-        end: {line: 1, character: 5}
-      isReversed: false
-      hasExplicitRange: true
-  sourceMark:
-    - type: UntypedTarget
-      contentRange:
-        start: {line: 1, character: 6}
-        end: {line: 1, character: 11}
-      isReversed: false
-      hasExplicitRange: true
-fullTargets: [{type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: v}, selectionType: token, position: contents, modifier: {type: identity}, insideOutsideType: null}, {type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: c}, selectionType: token, position: contents, modifier: {type: identity}, insideOutsideType: null}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/actions/callFine.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/actions/callFine.yml
deleted file mode 100644
index d1794681c5..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/actions/callFine.yml
+++ /dev/null
@@ -1,47 +0,0 @@
-languageId: typescript
-command:
-  version: 1
-  spokenForm: call fine
-  action: callAsFunction
-  targets:
-    - type: primitive
-      mark: {type: decoratedSymbol, symbolColor: default, character: f}
-    - {type: primitive, isImplicit: true}
-initialState:
-  documentContents: |-
-    foo;
-    bar;
-    baz;
-  selections:
-    - anchor: {line: 1, character: 0}
-      active: {line: 1, character: 3}
-    - anchor: {line: 2, character: 0}
-      active: {line: 2, character: 3}
-  marks:
-    default.f:
-      start: {line: 0, character: 0}
-      end: {line: 0, character: 3}
-finalState:
-  documentContents: |-
-    foo;
-    foo(bar);
-    foo(baz);
-  selections:
-    - anchor: {line: 1, character: 4}
-      active: {line: 1, character: 7}
-    - anchor: {line: 2, character: 4}
-      active: {line: 2, character: 7}
-  thatMark:
-    - type: UntypedTarget
-      contentRange:
-        start: {line: 1, character: 0}
-        end: {line: 1, character: 8}
-      isReversed: false
-      hasExplicitRange: true
-    - type: UntypedTarget
-      contentRange:
-        start: {line: 2, character: 0}
-        end: {line: 2, character: 8}
-      isReversed: false
-      hasExplicitRange: true
-fullTargets: [{type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: f}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: identity}}, {type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: identity}}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/actions/callVest.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/actions/callVest.yml
deleted file mode 100644
index 70ab25eef4..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/actions/callVest.yml
+++ /dev/null
@@ -1,35 +0,0 @@
-languageId: typescript
-command:
-  version: 1
-  spokenForm: call vest
-  action: callAsFunction
-  targets:
-    - type: primitive
-      mark: {type: decoratedSymbol, symbolColor: default, character: v}
-    - {type: primitive, isImplicit: true}
-initialState:
-  documentContents: |
-
-    const value = "Hello world";
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-  marks:
-    default.v:
-      start: {line: 1, character: 6}
-      end: {line: 1, character: 11}
-finalState:
-  documentContents: |
-    value()
-    const value = "Hello world";
-  selections:
-    - anchor: {line: 0, character: 6}
-      active: {line: 0, character: 6}
-  thatMark:
-    - type: UntypedTarget
-      contentRange:
-        start: {line: 0, character: 0}
-        end: {line: 0, character: 7}
-      isReversed: false
-      hasExplicitRange: true
-fullTargets: [{type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: v}, selectionType: token, position: contents, modifier: {type: identity}, insideOutsideType: inside}, {type: primitive, mark: {type: cursor}, selectionType: token, position: contents, modifier: {type: identity}, insideOutsideType: inside}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/actions/callVestOnCap.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/actions/callVestOnCap.yml
deleted file mode 100644
index 32335574f5..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/actions/callVestOnCap.yml
+++ /dev/null
@@ -1,39 +0,0 @@
-languageId: typescript
-command:
-  version: 1
-  spokenForm: call vest on cap
-  action: callAsFunction
-  targets:
-    - type: primitive
-      mark: {type: decoratedSymbol, symbolColor: default, character: v}
-    - type: primitive
-      mark: {type: decoratedSymbol, symbolColor: default, character: c}
-initialState:
-  documentContents: |
-
-    const value = "Hello world";
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-  marks:
-    default.v:
-      start: {line: 1, character: 6}
-      end: {line: 1, character: 11}
-    default.c:
-      start: {line: 1, character: 0}
-      end: {line: 1, character: 5}
-finalState:
-  documentContents: |
-
-    value(const) value = "Hello world";
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-  thatMark:
-    - type: UntypedTarget
-      contentRange:
-        start: {line: 1, character: 0}
-        end: {line: 1, character: 12}
-      isReversed: false
-      hasExplicitRange: true
-fullTargets: [{type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: v}, selectionType: token, position: contents, modifier: {type: identity}, insideOutsideType: inside}, {type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: c}, selectionType: token, position: contents, modifier: {type: identity}, insideOutsideType: inside}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/actions/carveVest.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/actions/carveVest.yml
deleted file mode 100644
index 595bf71395..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/actions/carveVest.yml
+++ /dev/null
@@ -1,34 +0,0 @@
-languageId: typescript
-command:
-  version: 1
-  spokenForm: carve vest
-  action: cutToClipboard
-  targets:
-    - type: primitive
-      mark: {type: decoratedSymbol, symbolColor: default, character: v}
-initialState:
-  documentContents: |
-
-    const value = "Hello world";
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-  marks:
-    default.v:
-      start: {line: 1, character: 6}
-      end: {line: 1, character: 11}
-finalState:
-  documentContents: |
-
-    const = "Hello world";
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-  thatMark:
-    - type: RawSelectionTarget
-      contentRange:
-        start: {line: 1, character: 6}
-        end: {line: 1, character: 6}
-      isReversed: false
-      hasExplicitRange: true
-fullTargets: [{type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: v}, selectionType: token, position: contents, modifier: {type: identity}, insideOutsideType: null}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/actions/chuckArgMadeAndAir.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/actions/chuckArgMadeAndAir.yml
deleted file mode 100644
index 92c9b0ffe5..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/actions/chuckArgMadeAndAir.yml
+++ /dev/null
@@ -1,38 +0,0 @@
-languageId: typescript
-command:
-  version: 1
-  spokenForm: chuck arg made and air
-  action: remove
-  targets:
-    - type: list
-      elements:
-        - type: primitive
-          modifier: {type: containingScope, scopeType: argumentOrParameter, includeSiblings: false}
-          mark: {type: decoratedSymbol, symbolColor: default, character: m}
-        - type: primitive
-          mark: {type: decoratedSymbol, symbolColor: default, character: a}
-initialState:
-  documentContents: "function myFunk(value: string, name: string, age: number) { };"
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-  marks:
-    default.m:
-      start: {line: 0, character: 31}
-      end: {line: 0, character: 35}
-    default.a:
-      start: {line: 0, character: 45}
-      end: {line: 0, character: 48}
-finalState:
-  documentContents: "function myFunk(value: string) { };"
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-  thatMark:
-    - type: RawSelectionTarget
-      contentRange:
-        start: {line: 0, character: 29}
-        end: {line: 0, character: 29}
-      isReversed: false
-      hasExplicitRange: true
-fullTargets: [{type: list, elements: [{type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: m}, selectionType: token, position: contents, insideOutsideType: outside, modifier: {type: containingScope, scopeType: argumentOrParameter, includeSiblings: false}, isImplicit: false}, {type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: a}, selectionType: token, position: contents, insideOutsideType: outside, modifier: {type: containingScope, scopeType: argumentOrParameter, includeSiblings: false}, isImplicit: false}]}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/actions/chuckArgMadeAndAirAndJustSoon.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/actions/chuckArgMadeAndAirAndJustSoon.yml
deleted file mode 100644
index bb45051db0..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/actions/chuckArgMadeAndAirAndJustSoon.yml
+++ /dev/null
@@ -1,44 +0,0 @@
-languageId: typescript
-command:
-  version: 1
-  spokenForm: chuck arg made and air and just soon
-  action: remove
-  targets:
-    - type: list
-      elements:
-        - type: primitive
-          modifier: {type: containingScope, scopeType: argumentOrParameter, includeSiblings: false}
-          mark: {type: decoratedSymbol, symbolColor: default, character: m}
-        - type: primitive
-          mark: {type: decoratedSymbol, symbolColor: default, character: a}
-        - type: primitive
-          modifier: {type: toRawSelection}
-          mark: {type: decoratedSymbol, symbolColor: default, character: s}
-initialState:
-  documentContents: "function myFunk(value: string, name: string, age: number) { };"
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-  marks:
-    default.m:
-      start: {line: 0, character: 31}
-      end: {line: 0, character: 35}
-    default.a:
-      start: {line: 0, character: 45}
-      end: {line: 0, character: 48}
-    default.s:
-      start: {line: 0, character: 23}
-      end: {line: 0, character: 29}
-finalState:
-  documentContents: function myFunk(value:) { };
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-  thatMark:
-    - type: RawSelectionTarget
-      contentRange:
-        start: {line: 0, character: 22}
-        end: {line: 0, character: 22}
-      isReversed: false
-      hasExplicitRange: true
-fullTargets: [{type: list, elements: [{type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: m}, selectionType: token, position: contents, insideOutsideType: outside, modifier: {type: containingScope, scopeType: argumentOrParameter, includeSiblings: false}, isImplicit: false}, {type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: a}, selectionType: token, position: contents, insideOutsideType: outside, modifier: {type: containingScope, scopeType: argumentOrParameter, includeSiblings: false}, isImplicit: false}, {type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: s}, selectionType: token, position: contents, insideOutsideType: outside, modifier: {type: toRawSelection}, isImplicit: false}]}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/actions/chuckEveryArgMade.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/actions/chuckEveryArgMade.yml
deleted file mode 100644
index 146029e068..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/actions/chuckEveryArgMade.yml
+++ /dev/null
@@ -1,31 +0,0 @@
-languageId: typescript
-command:
-  version: 1
-  spokenForm: chuck every arg made
-  action: remove
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: argumentOrParameter, includeSiblings: true}
-      mark: {type: decoratedSymbol, symbolColor: default, character: m}
-initialState:
-  documentContents: "function myFunk(value: string, name: string, age: number) { };"
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-  marks:
-    default.m:
-      start: {line: 0, character: 31}
-      end: {line: 0, character: 35}
-finalState:
-  documentContents: function myFunk() { };
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-  thatMark:
-    - type: RawSelectionTarget
-      contentRange:
-        start: {line: 0, character: 16}
-        end: {line: 0, character: 16}
-      isReversed: false
-      hasExplicitRange: true
-fullTargets: [{type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: m}, selectionType: token, position: contents, insideOutsideType: outside, modifier: {type: containingScope, scopeType: argumentOrParameter, includeSiblings: true}, isImplicit: false}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/actions/chuckVest.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/actions/chuckVest.yml
deleted file mode 100644
index ffff1c80ae..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/actions/chuckVest.yml
+++ /dev/null
@@ -1,34 +0,0 @@
-languageId: typescript
-command:
-  version: 1
-  spokenForm: chuck vest
-  action: remove
-  targets:
-    - type: primitive
-      mark: {type: decoratedSymbol, symbolColor: default, character: v}
-initialState:
-  documentContents: |
-
-    const value = "Hello world";
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-  marks:
-    default.v:
-      start: {line: 1, character: 6}
-      end: {line: 1, character: 11}
-finalState:
-  documentContents: |
-
-    const = "Hello world";
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-  thatMark:
-    - type: RawSelectionTarget
-      contentRange:
-        start: {line: 1, character: 6}
-        end: {line: 1, character: 6}
-      isReversed: false
-      hasExplicitRange: true
-fullTargets: [{type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: v}, selectionType: token, position: contents, modifier: {type: identity}, insideOutsideType: outside}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/actions/clearVest.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/actions/clearVest.yml
deleted file mode 100644
index 75701ac7d3..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/actions/clearVest.yml
+++ /dev/null
@@ -1,34 +0,0 @@
-languageId: typescript
-command:
-  version: 1
-  spokenForm: clear vest
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      mark: {type: decoratedSymbol, symbolColor: default, character: v}
-initialState:
-  documentContents: |
-
-    const value = "Hello world";
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-  marks:
-    default.v:
-      start: {line: 1, character: 6}
-      end: {line: 1, character: 11}
-finalState:
-  documentContents: |
-
-    const  = "Hello world";
-  selections:
-    - anchor: {line: 1, character: 6}
-      active: {line: 1, character: 6}
-  thatMark:
-    - type: RawSelectionTarget
-      contentRange:
-        start: {line: 1, character: 6}
-        end: {line: 1, character: 6}
-      isReversed: false
-      hasExplicitRange: true
-fullTargets: [{type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: v}, selectionType: token, position: contents, modifier: {type: identity}, insideOutsideType: inside}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/actions/cloneArgue.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/actions/cloneArgue.yml
deleted file mode 100644
index afe4be00c9..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/actions/cloneArgue.yml
+++ /dev/null
@@ -1,54 +0,0 @@
-languageId: typescript
-command:
-  spokenForm: clone argue
-  version: 2
-  targets:
-    - type: primitive
-      modifiers:
-        - type: containingScope
-          scopeType: {type: argumentOrParameter}
-  usePrePhraseSnapshot: true
-  action: {name: insertCopyAfter}
-initialState:
-  documentContents: |-
-    function foo(bar: number) {
-        
-    }
-  selections:
-    - anchor: {line: 0, character: 15}
-      active: {line: 0, character: 15}
-    - anchor: {line: 0, character: 20}
-      active: {line: 0, character: 20}
-  marks: {}
-finalState:
-  documentContents: |-
-    function foo(bar: number, bar: number) {
-        
-    }
-  selections:
-    - anchor: {line: 0, character: 28}
-      active: {line: 0, character: 28}
-    - anchor: {line: 0, character: 33}
-      active: {line: 0, character: 33}
-  thatMark:
-    - type: UntypedTarget
-      contentRange:
-        start: {line: 0, character: 26}
-        end: {line: 0, character: 37}
-      isReversed: false
-      hasExplicitRange: true
-  sourceMark:
-    - type: UntypedTarget
-      contentRange:
-        start: {line: 0, character: 13}
-        end: {line: 0, character: 24}
-      isReversed: false
-      hasExplicitRange: true
-ide:
-  flashes:
-    - range:
-        type: character
-        start: {line: 0, character: 26}
-        end: {line: 0, character: 37}
-      style: justAdded
-fullTargets: [{type: primitive, mark: {type: cursor}, modifiers: [{type: containingScope, scopeType: {type: argumentOrParameter}}]}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/actions/cloneArgue2.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/actions/cloneArgue2.yml
deleted file mode 100644
index 80746520f3..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/actions/cloneArgue2.yml
+++ /dev/null
@@ -1,43 +0,0 @@
-languageId: typescript
-command:
-  spokenForm: clone argue
-  version: 2
-  targets:
-    - type: primitive
-      modifiers:
-        - type: containingScope
-          scopeType: {type: argumentOrParameter}
-  usePrePhraseSnapshot: true
-  action: {name: insertCopyAfter}
-initialState:
-  documentContents: |-
-    function foo(bar: number) {
-        
-    }
-  selections:
-    - anchor: {line: 0, character: 24}
-      active: {line: 0, character: 24}
-  marks: {}
-finalState:
-  documentContents: |-
-    function foo(bar: number, bar: number) {
-        
-    }
-  selections:
-    - anchor: {line: 0, character: 37}
-      active: {line: 0, character: 37}
-  thatMark:
-    - type: UntypedTarget
-      contentRange:
-        start: {line: 0, character: 26}
-        end: {line: 0, character: 37}
-      isReversed: false
-      hasExplicitRange: true
-  sourceMark:
-    - type: UntypedTarget
-      contentRange:
-        start: {line: 0, character: 13}
-        end: {line: 0, character: 24}
-      isReversed: false
-      hasExplicitRange: true
-fullTargets: [{type: primitive, mark: {type: cursor}, modifiers: [{type: containingScope, scopeType: {type: argumentOrParameter}}]}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/actions/cloneEveryArg.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/actions/cloneEveryArg.yml
deleted file mode 100644
index 9d6ff45b02..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/actions/cloneEveryArg.yml
+++ /dev/null
@@ -1,49 +0,0 @@
-languageId: typescript
-command:
-  spokenForm: clone every arg
-  version: 2
-  targets:
-    - type: primitive
-      modifiers:
-        - type: everyScope
-          scopeType: {type: argumentOrParameter}
-  usePrePhraseSnapshot: true
-  action: {name: insertCopyAfter}
-initialState:
-  documentContents: "function myFunk(a: number, b: number) {}"
-  selections:
-    - anchor: {line: 0, character: 20}
-      active: {line: 0, character: 20}
-  marks: {}
-finalState:
-  documentContents: "function myFunk(a: number, a: number, b: number, b: number) {}"
-  selections:
-    - anchor: {line: 0, character: 31}
-      active: {line: 0, character: 31}
-  thatMark:
-    - type: UntypedTarget
-      contentRange:
-        start: {line: 0, character: 27}
-        end: {line: 0, character: 36}
-      isReversed: false
-      hasExplicitRange: true
-    - type: UntypedTarget
-      contentRange:
-        start: {line: 0, character: 49}
-        end: {line: 0, character: 58}
-      isReversed: false
-      hasExplicitRange: true
-  sourceMark:
-    - type: UntypedTarget
-      contentRange:
-        start: {line: 0, character: 16}
-        end: {line: 0, character: 25}
-      isReversed: false
-      hasExplicitRange: true
-    - type: UntypedTarget
-      contentRange:
-        start: {line: 0, character: 38}
-        end: {line: 0, character: 47}
-      isReversed: false
-      hasExplicitRange: true
-fullTargets: [{type: primitive, mark: {type: cursor}, modifiers: [{type: everyScope, scopeType: {type: argumentOrParameter}}]}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/actions/cloneHarp.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/actions/cloneHarp.yml
deleted file mode 100644
index 555b12b840..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/actions/cloneHarp.yml
+++ /dev/null
@@ -1,39 +0,0 @@
-languageId: plaintext
-command:
-  version: 1
-  spokenForm: clone harp
-  action: insertCopyAfter
-  targets:
-    - type: primitive
-      mark: {type: decoratedSymbol, symbolColor: default, character: h}
-initialState:
-  documentContents: hello
-  selections:
-    - anchor: {line: 0, character: 5}
-      active: {line: 0, character: 5}
-  marks:
-    default.h:
-      start: {line: 0, character: 0}
-      end: {line: 0, character: 5}
-finalState:
-  documentContents: |-
-    hello
-    hello
-  selections:
-    - anchor: {line: 1, character: 5}
-      active: {line: 1, character: 5}
-  thatMark:
-    - type: UntypedTarget
-      contentRange:
-        start: {line: 1, character: 0}
-        end: {line: 1, character: 5}
-      isReversed: false
-      hasExplicitRange: true
-  sourceMark:
-    - type: UntypedTarget
-      contentRange:
-        start: {line: 0, character: 0}
-        end: {line: 0, character: 5}
-      isReversed: false
-      hasExplicitRange: true
-fullTargets: [{type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: h}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: identity}}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/actions/cloneHarp2.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/actions/cloneHarp2.yml
deleted file mode 100644
index 5868048b98..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/actions/cloneHarp2.yml
+++ /dev/null
@@ -1,39 +0,0 @@
-languageId: plaintext
-command:
-  version: 1
-  spokenForm: clone harp
-  action: insertCopyAfter
-  targets:
-    - type: primitive
-      mark: {type: decoratedSymbol, symbolColor: default, character: h}
-initialState:
-  documentContents: hello
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-  marks:
-    default.h:
-      start: {line: 0, character: 0}
-      end: {line: 0, character: 5}
-finalState:
-  documentContents: |-
-    hello
-    hello
-  selections:
-    - anchor: {line: 1, character: 0}
-      active: {line: 1, character: 0}
-  thatMark:
-    - type: UntypedTarget
-      contentRange:
-        start: {line: 1, character: 0}
-        end: {line: 1, character: 5}
-      isReversed: false
-      hasExplicitRange: true
-  sourceMark:
-    - type: UntypedTarget
-      contentRange:
-        start: {line: 0, character: 0}
-        end: {line: 0, character: 5}
-      isReversed: false
-      hasExplicitRange: true
-fullTargets: [{type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: h}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: identity}}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/actions/cloneToken.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/actions/cloneToken.yml
deleted file mode 100644
index 7c9d8911ee..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/actions/cloneToken.yml
+++ /dev/null
@@ -1,44 +0,0 @@
-languageId: plaintext
-command:
-  spokenForm: clone token
-  version: 2
-  targets:
-    - type: primitive
-      modifiers:
-        - type: containingScope
-          scopeType: {type: token}
-  usePrePhraseSnapshot: true
-  action: {name: insertCopyAfter}
-initialState:
-  documentContents: hello world
-  selections:
-    - anchor: {line: 0, character: 8}
-      active: {line: 0, character: 8}
-  marks: {}
-finalState:
-  documentContents: hello world world
-  selections:
-    - anchor: {line: 0, character: 14}
-      active: {line: 0, character: 14}
-  thatMark:
-    - type: UntypedTarget
-      contentRange:
-        start: {line: 0, character: 12}
-        end: {line: 0, character: 17}
-      isReversed: false
-      hasExplicitRange: true
-  sourceMark:
-    - type: UntypedTarget
-      contentRange:
-        start: {line: 0, character: 6}
-        end: {line: 0, character: 11}
-      isReversed: false
-      hasExplicitRange: true
-ide:
-  flashes:
-    - range:
-        type: character
-        start: {line: 0, character: 12}
-        end: {line: 0, character: 17}
-      style: justAdded
-fullTargets: [{type: primitive, mark: {type: cursor}, modifiers: [{type: containingScope, scopeType: {type: token}}]}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/actions/cloneToken2.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/actions/cloneToken2.yml
deleted file mode 100644
index 9329141cb4..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/actions/cloneToken2.yml
+++ /dev/null
@@ -1,44 +0,0 @@
-languageId: plaintext
-command:
-  spokenForm: clone token
-  version: 2
-  targets:
-    - type: primitive
-      modifiers:
-        - type: containingScope
-          scopeType: {type: token}
-  usePrePhraseSnapshot: true
-  action: {name: insertCopyAfter}
-initialState:
-  documentContents: hello
-  selections:
-    - anchor: {line: 0, character: 3}
-      active: {line: 0, character: 3}
-  marks: {}
-finalState:
-  documentContents: hello hello
-  selections:
-    - anchor: {line: 0, character: 9}
-      active: {line: 0, character: 9}
-  thatMark:
-    - type: UntypedTarget
-      contentRange:
-        start: {line: 0, character: 6}
-        end: {line: 0, character: 11}
-      isReversed: false
-      hasExplicitRange: true
-  sourceMark:
-    - type: UntypedTarget
-      contentRange:
-        start: {line: 0, character: 0}
-        end: {line: 0, character: 5}
-      isReversed: false
-      hasExplicitRange: true
-ide:
-  flashes:
-    - range:
-        type: character
-        start: {line: 0, character: 6}
-        end: {line: 0, character: 11}
-      style: justAdded
-fullTargets: [{type: primitive, mark: {type: cursor}, modifiers: [{type: containingScope, scopeType: {type: token}}]}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/actions/cloneToken3.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/actions/cloneToken3.yml
deleted file mode 100644
index 036ed49e43..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/actions/cloneToken3.yml
+++ /dev/null
@@ -1,37 +0,0 @@
-languageId: plaintext
-command:
-  spokenForm: clone token
-  version: 2
-  targets:
-    - type: primitive
-      modifiers:
-        - type: containingScope
-          scopeType: {type: token}
-  usePrePhraseSnapshot: true
-  action: {name: insertCopyAfter}
-initialState:
-  documentContents: hello
-  selections:
-    - anchor: {line: 0, character: 5}
-      active: {line: 0, character: 5}
-  marks: {}
-finalState:
-  documentContents: hello hello
-  selections:
-    - anchor: {line: 0, character: 11}
-      active: {line: 0, character: 11}
-  thatMark:
-    - type: UntypedTarget
-      contentRange:
-        start: {line: 0, character: 6}
-        end: {line: 0, character: 11}
-      isReversed: false
-      hasExplicitRange: true
-  sourceMark:
-    - type: UntypedTarget
-      contentRange:
-        start: {line: 0, character: 0}
-        end: {line: 0, character: 5}
-      isReversed: false
-      hasExplicitRange: true
-fullTargets: [{type: primitive, mark: {type: cursor}, modifiers: [{type: containingScope, scopeType: {type: token}}]}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/actions/cloneToken4.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/actions/cloneToken4.yml
deleted file mode 100644
index 58cceb28f2..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/actions/cloneToken4.yml
+++ /dev/null
@@ -1,37 +0,0 @@
-languageId: plaintext
-command:
-  spokenForm: clone token
-  version: 2
-  targets:
-    - type: primitive
-      modifiers:
-        - type: containingScope
-          scopeType: {type: token}
-  usePrePhraseSnapshot: true
-  action: {name: insertCopyAfter}
-initialState:
-  documentContents: hello
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-  marks: {}
-finalState:
-  documentContents: hello hello
-  selections:
-    - anchor: {line: 0, character: 6}
-      active: {line: 0, character: 6}
-  thatMark:
-    - type: UntypedTarget
-      contentRange:
-        start: {line: 0, character: 6}
-        end: {line: 0, character: 11}
-      isReversed: false
-      hasExplicitRange: true
-  sourceMark:
-    - type: UntypedTarget
-      contentRange:
-        start: {line: 0, character: 0}
-        end: {line: 0, character: 5}
-      isReversed: false
-      hasExplicitRange: true
-fullTargets: [{type: primitive, mark: {type: cursor}, modifiers: [{type: containingScope, scopeType: {type: token}}]}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/actions/cloneToken5.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/actions/cloneToken5.yml
deleted file mode 100644
index befe5dc593..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/actions/cloneToken5.yml
+++ /dev/null
@@ -1,37 +0,0 @@
-languageId: plaintext
-command:
-  spokenForm: clone token
-  version: 2
-  targets:
-    - type: primitive
-      modifiers:
-        - type: containingScope
-          scopeType: {type: token}
-  usePrePhraseSnapshot: true
-  action: {name: insertCopyAfter}
-initialState:
-  documentContents: hello
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 5}
-  marks: {}
-finalState:
-  documentContents: hello hello
-  selections:
-    - anchor: {line: 0, character: 6}
-      active: {line: 0, character: 11}
-  thatMark:
-    - type: UntypedTarget
-      contentRange:
-        start: {line: 0, character: 6}
-        end: {line: 0, character: 11}
-      isReversed: false
-      hasExplicitRange: true
-  sourceMark:
-    - type: UntypedTarget
-      contentRange:
-        start: {line: 0, character: 0}
-        end: {line: 0, character: 5}
-      isReversed: false
-      hasExplicitRange: true
-fullTargets: [{type: primitive, mark: {type: cursor}, modifiers: [{type: containingScope, scopeType: {type: token}}]}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/actions/cloneUpArgue.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/actions/cloneUpArgue.yml
deleted file mode 100644
index eee8dd348e..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/actions/cloneUpArgue.yml
+++ /dev/null
@@ -1,54 +0,0 @@
-languageId: typescript
-command:
-  spokenForm: clone up argue
-  version: 2
-  targets:
-    - type: primitive
-      modifiers:
-        - type: containingScope
-          scopeType: {type: argumentOrParameter}
-  usePrePhraseSnapshot: true
-  action: {name: insertCopyBefore}
-initialState:
-  documentContents: |-
-    function foo(bar: number) {
-        
-    }
-  selections:
-    - anchor: {line: 0, character: 15}
-      active: {line: 0, character: 15}
-    - anchor: {line: 0, character: 20}
-      active: {line: 0, character: 20}
-  marks: {}
-finalState:
-  documentContents: |-
-    function foo(bar: number, bar: number) {
-        
-    }
-  selections:
-    - anchor: {line: 0, character: 15}
-      active: {line: 0, character: 15}
-    - anchor: {line: 0, character: 20}
-      active: {line: 0, character: 20}
-  thatMark:
-    - type: UntypedTarget
-      contentRange:
-        start: {line: 0, character: 13}
-        end: {line: 0, character: 24}
-      isReversed: false
-      hasExplicitRange: true
-  sourceMark:
-    - type: UntypedTarget
-      contentRange:
-        start: {line: 0, character: 26}
-        end: {line: 0, character: 37}
-      isReversed: false
-      hasExplicitRange: true
-ide:
-  flashes:
-    - range:
-        type: character
-        start: {line: 0, character: 13}
-        end: {line: 0, character: 24}
-      style: justAdded
-fullTargets: [{type: primitive, mark: {type: cursor}, modifiers: [{type: containingScope, scopeType: {type: argumentOrParameter}}]}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/actions/cloneUpArgue2.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/actions/cloneUpArgue2.yml
deleted file mode 100644
index ff53fe569b..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/actions/cloneUpArgue2.yml
+++ /dev/null
@@ -1,43 +0,0 @@
-languageId: typescript
-command:
-  spokenForm: clone up argue
-  version: 2
-  targets:
-    - type: primitive
-      modifiers:
-        - type: containingScope
-          scopeType: {type: argumentOrParameter}
-  usePrePhraseSnapshot: true
-  action: {name: insertCopyBefore}
-initialState:
-  documentContents: |-
-    function foo(bar: number) {
-        
-    }
-  selections:
-    - anchor: {line: 0, character: 13}
-      active: {line: 0, character: 13}
-  marks: {}
-finalState:
-  documentContents: |-
-    function foo(bar: number, bar: number) {
-        
-    }
-  selections:
-    - anchor: {line: 0, character: 13}
-      active: {line: 0, character: 13}
-  thatMark:
-    - type: UntypedTarget
-      contentRange:
-        start: {line: 0, character: 13}
-        end: {line: 0, character: 24}
-      isReversed: false
-      hasExplicitRange: true
-  sourceMark:
-    - type: UntypedTarget
-      contentRange:
-        start: {line: 0, character: 26}
-        end: {line: 0, character: 37}
-      isReversed: false
-      hasExplicitRange: true
-fullTargets: [{type: primitive, mark: {type: cursor}, modifiers: [{type: containingScope, scopeType: {type: argumentOrParameter}}]}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/actions/cloneUpEveryArg.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/actions/cloneUpEveryArg.yml
deleted file mode 100644
index a1d54f10f8..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/actions/cloneUpEveryArg.yml
+++ /dev/null
@@ -1,49 +0,0 @@
-languageId: typescript
-command:
-  spokenForm: clone up every arg
-  version: 2
-  targets:
-    - type: primitive
-      modifiers:
-        - type: everyScope
-          scopeType: {type: argumentOrParameter}
-  usePrePhraseSnapshot: true
-  action: {name: insertCopyBefore}
-initialState:
-  documentContents: "function myFunk(a: number, b: number) {}"
-  selections:
-    - anchor: {line: 0, character: 20}
-      active: {line: 0, character: 20}
-  marks: {}
-finalState:
-  documentContents: "function myFunk(a: number, a: number, b: number, b: number) {}"
-  selections:
-    - anchor: {line: 0, character: 20}
-      active: {line: 0, character: 20}
-  thatMark:
-    - type: UntypedTarget
-      contentRange:
-        start: {line: 0, character: 16}
-        end: {line: 0, character: 25}
-      isReversed: false
-      hasExplicitRange: true
-    - type: UntypedTarget
-      contentRange:
-        start: {line: 0, character: 38}
-        end: {line: 0, character: 47}
-      isReversed: false
-      hasExplicitRange: true
-  sourceMark:
-    - type: UntypedTarget
-      contentRange:
-        start: {line: 0, character: 27}
-        end: {line: 0, character: 36}
-      isReversed: false
-      hasExplicitRange: true
-    - type: UntypedTarget
-      contentRange:
-        start: {line: 0, character: 49}
-        end: {line: 0, character: 58}
-      isReversed: false
-      hasExplicitRange: true
-fullTargets: [{type: primitive, mark: {type: cursor}, modifiers: [{type: everyScope, scopeType: {type: argumentOrParameter}}]}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/actions/cloneUpHarp.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/actions/cloneUpHarp.yml
deleted file mode 100644
index 5e516f9fe3..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/actions/cloneUpHarp.yml
+++ /dev/null
@@ -1,39 +0,0 @@
-languageId: plaintext
-command:
-  version: 1
-  spokenForm: clone up harp
-  action: insertCopyBefore
-  targets:
-    - type: primitive
-      mark: {type: decoratedSymbol, symbolColor: default, character: h}
-initialState:
-  documentContents: hello
-  selections:
-    - anchor: {line: 0, character: 5}
-      active: {line: 0, character: 5}
-  marks:
-    default.h:
-      start: {line: 0, character: 0}
-      end: {line: 0, character: 5}
-finalState:
-  documentContents: |-
-    hello
-    hello
-  selections:
-    - anchor: {line: 0, character: 5}
-      active: {line: 0, character: 5}
-  thatMark:
-    - type: UntypedTarget
-      contentRange:
-        start: {line: 0, character: 0}
-        end: {line: 0, character: 5}
-      isReversed: false
-      hasExplicitRange: true
-  sourceMark:
-    - type: UntypedTarget
-      contentRange:
-        start: {line: 1, character: 0}
-        end: {line: 1, character: 5}
-      isReversed: false
-      hasExplicitRange: true
-fullTargets: [{type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: h}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: identity}}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/actions/cloneUpHarp2.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/actions/cloneUpHarp2.yml
deleted file mode 100644
index 6a8eb81d54..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/actions/cloneUpHarp2.yml
+++ /dev/null
@@ -1,39 +0,0 @@
-languageId: plaintext
-command:
-  version: 1
-  spokenForm: clone up harp
-  action: insertCopyBefore
-  targets:
-    - type: primitive
-      mark: {type: decoratedSymbol, symbolColor: default, character: h}
-initialState:
-  documentContents: hello
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-  marks:
-    default.h:
-      start: {line: 0, character: 0}
-      end: {line: 0, character: 5}
-finalState:
-  documentContents: |-
-    hello
-    hello
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-  thatMark:
-    - type: UntypedTarget
-      contentRange:
-        start: {line: 0, character: 0}
-        end: {line: 0, character: 5}
-      isReversed: false
-      hasExplicitRange: true
-  sourceMark:
-    - type: UntypedTarget
-      contentRange:
-        start: {line: 1, character: 0}
-        end: {line: 1, character: 5}
-      isReversed: false
-      hasExplicitRange: true
-fullTargets: [{type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: h}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: identity}}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/actions/cloneUpToken.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/actions/cloneUpToken.yml
deleted file mode 100644
index df248e74ae..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/actions/cloneUpToken.yml
+++ /dev/null
@@ -1,44 +0,0 @@
-languageId: plaintext
-command:
-  spokenForm: clone up token
-  version: 2
-  targets:
-    - type: primitive
-      modifiers:
-        - type: containingScope
-          scopeType: {type: token}
-  usePrePhraseSnapshot: true
-  action: {name: insertCopyBefore}
-initialState:
-  documentContents: hello world
-  selections:
-    - anchor: {line: 0, character: 8}
-      active: {line: 0, character: 8}
-  marks: {}
-finalState:
-  documentContents: hello world world
-  selections:
-    - anchor: {line: 0, character: 8}
-      active: {line: 0, character: 8}
-  thatMark:
-    - type: UntypedTarget
-      contentRange:
-        start: {line: 0, character: 6}
-        end: {line: 0, character: 11}
-      isReversed: false
-      hasExplicitRange: true
-  sourceMark:
-    - type: UntypedTarget
-      contentRange:
-        start: {line: 0, character: 12}
-        end: {line: 0, character: 17}
-      isReversed: false
-      hasExplicitRange: true
-ide:
-  flashes:
-    - range:
-        type: character
-        start: {line: 0, character: 6}
-        end: {line: 0, character: 11}
-      style: justAdded
-fullTargets: [{type: primitive, mark: {type: cursor}, modifiers: [{type: containingScope, scopeType: {type: token}}]}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/actions/cloneUpToken2.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/actions/cloneUpToken2.yml
deleted file mode 100644
index 3117918943..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/actions/cloneUpToken2.yml
+++ /dev/null
@@ -1,44 +0,0 @@
-languageId: plaintext
-command:
-  spokenForm: clone up token
-  version: 2
-  targets:
-    - type: primitive
-      modifiers:
-        - type: containingScope
-          scopeType: {type: token}
-  usePrePhraseSnapshot: true
-  action: {name: insertCopyBefore}
-initialState:
-  documentContents: hello
-  selections:
-    - anchor: {line: 0, character: 3}
-      active: {line: 0, character: 3}
-  marks: {}
-finalState:
-  documentContents: hello hello
-  selections:
-    - anchor: {line: 0, character: 3}
-      active: {line: 0, character: 3}
-  thatMark:
-    - type: UntypedTarget
-      contentRange:
-        start: {line: 0, character: 0}
-        end: {line: 0, character: 5}
-      isReversed: false
-      hasExplicitRange: true
-  sourceMark:
-    - type: UntypedTarget
-      contentRange:
-        start: {line: 0, character: 6}
-        end: {line: 0, character: 11}
-      isReversed: false
-      hasExplicitRange: true
-ide:
-  flashes:
-    - range:
-        type: character
-        start: {line: 0, character: 0}
-        end: {line: 0, character: 5}
-      style: justAdded
-fullTargets: [{type: primitive, mark: {type: cursor}, modifiers: [{type: containingScope, scopeType: {type: token}}]}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/actions/cloneUpToken3.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/actions/cloneUpToken3.yml
deleted file mode 100644
index c8ac072a67..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/actions/cloneUpToken3.yml
+++ /dev/null
@@ -1,37 +0,0 @@
-languageId: plaintext
-command:
-  spokenForm: clone up token
-  version: 2
-  targets:
-    - type: primitive
-      modifiers:
-        - type: containingScope
-          scopeType: {type: token}
-  usePrePhraseSnapshot: true
-  action: {name: insertCopyBefore}
-initialState:
-  documentContents: hello
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-  marks: {}
-finalState:
-  documentContents: hello hello
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-  thatMark:
-    - type: UntypedTarget
-      contentRange:
-        start: {line: 0, character: 0}
-        end: {line: 0, character: 5}
-      isReversed: false
-      hasExplicitRange: true
-  sourceMark:
-    - type: UntypedTarget
-      contentRange:
-        start: {line: 0, character: 6}
-        end: {line: 0, character: 11}
-      isReversed: false
-      hasExplicitRange: true
-fullTargets: [{type: primitive, mark: {type: cursor}, modifiers: [{type: containingScope, scopeType: {type: token}}]}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/actions/cloneUpToken4.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/actions/cloneUpToken4.yml
deleted file mode 100644
index f53b055e17..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/actions/cloneUpToken4.yml
+++ /dev/null
@@ -1,37 +0,0 @@
-languageId: plaintext
-command:
-  spokenForm: clone up token
-  version: 2
-  targets:
-    - type: primitive
-      modifiers:
-        - type: containingScope
-          scopeType: {type: token}
-  usePrePhraseSnapshot: false
-  action: {name: insertCopyBefore}
-initialState:
-  documentContents: hello
-  selections:
-    - anchor: {line: 0, character: 5}
-      active: {line: 0, character: 5}
-  marks: {}
-finalState:
-  documentContents: hello hello
-  selections:
-    - anchor: {line: 0, character: 5}
-      active: {line: 0, character: 5}
-  thatMark:
-    - type: UntypedTarget
-      contentRange:
-        start: {line: 0, character: 0}
-        end: {line: 0, character: 5}
-      isReversed: false
-      hasExplicitRange: true
-  sourceMark:
-    - type: UntypedTarget
-      contentRange:
-        start: {line: 0, character: 6}
-        end: {line: 0, character: 11}
-      isReversed: false
-      hasExplicitRange: true
-fullTargets: [{type: primitive, mark: {type: cursor}, modifiers: [{type: containingScope, scopeType: {type: token}}]}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/actions/cloneUpToken5.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/actions/cloneUpToken5.yml
deleted file mode 100644
index 06974d8333..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/actions/cloneUpToken5.yml
+++ /dev/null
@@ -1,37 +0,0 @@
-languageId: plaintext
-command:
-  spokenForm: clone up token
-  version: 2
-  targets:
-    - type: primitive
-      modifiers:
-        - type: containingScope
-          scopeType: {type: token}
-  usePrePhraseSnapshot: true
-  action: {name: insertCopyBefore}
-initialState:
-  documentContents: hello
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 5}
-  marks: {}
-finalState:
-  documentContents: hello hello
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 5}
-  thatMark:
-    - type: UntypedTarget
-      contentRange:
-        start: {line: 0, character: 0}
-        end: {line: 0, character: 5}
-      isReversed: false
-      hasExplicitRange: true
-  sourceMark:
-    - type: UntypedTarget
-      contentRange:
-        start: {line: 0, character: 6}
-        end: {line: 0, character: 11}
-      isReversed: false
-      hasExplicitRange: true
-fullTargets: [{type: primitive, mark: {type: cursor}, modifiers: [{type: containingScope, scopeType: {type: token}}]}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/actions/cloneUpVest.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/actions/cloneUpVest.yml
deleted file mode 100644
index c0608a4ad5..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/actions/cloneUpVest.yml
+++ /dev/null
@@ -1,39 +0,0 @@
-languageId: plaintext
-command:
-  version: 1
-  spokenForm: clone up vest
-  action: insertCopyBefore
-  targets:
-    - type: primitive
-      mark: {type: decoratedSymbol, symbolColor: default, character: v}
-initialState:
-  documentContents: "    const value = \"Hello world\";"
-  selections:
-    - anchor: {line: 0, character: 15}
-      active: {line: 0, character: 15}
-  marks:
-    default.v:
-      start: {line: 0, character: 10}
-      end: {line: 0, character: 15}
-finalState:
-  documentContents: |2-
-        const value = "Hello world";
-        const value = "Hello world";
-  selections:
-    - anchor: {line: 0, character: 15}
-      active: {line: 0, character: 15}
-  thatMark:
-    - type: UntypedTarget
-      contentRange:
-        start: {line: 0, character: 4}
-        end: {line: 0, character: 32}
-      isReversed: false
-      hasExplicitRange: true
-  sourceMark:
-    - type: UntypedTarget
-      contentRange:
-        start: {line: 1, character: 4}
-        end: {line: 1, character: 32}
-      isReversed: false
-      hasExplicitRange: true
-fullTargets: [{type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: v}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: identity}}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/actions/cloneVest.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/actions/cloneVest.yml
deleted file mode 100644
index 4579e5f6b8..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/actions/cloneVest.yml
+++ /dev/null
@@ -1,39 +0,0 @@
-languageId: plaintext
-command:
-  version: 1
-  spokenForm: clone vest
-  action: insertCopyAfter
-  targets:
-    - type: primitive
-      mark: {type: decoratedSymbol, symbolColor: default, character: v}
-initialState:
-  documentContents: "    const value = \"Hello world\";"
-  selections:
-    - anchor: {line: 0, character: 15}
-      active: {line: 0, character: 15}
-  marks:
-    default.v:
-      start: {line: 0, character: 10}
-      end: {line: 0, character: 15}
-finalState:
-  documentContents: |2-
-        const value = "Hello world";
-        const value = "Hello world";
-  selections:
-    - anchor: {line: 1, character: 15}
-      active: {line: 1, character: 15}
-  thatMark:
-    - type: UntypedTarget
-      contentRange:
-        start: {line: 1, character: 4}
-        end: {line: 1, character: 32}
-      isReversed: false
-      hasExplicitRange: true
-  sourceMark:
-    - type: UntypedTarget
-      contentRange:
-        start: {line: 0, character: 4}
-        end: {line: 0, character: 32}
-      isReversed: false
-      hasExplicitRange: true
-fullTargets: [{type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: v}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: identity}}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/actions/commentVest.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/actions/commentVest.yml
deleted file mode 100644
index ee4f2580e7..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/actions/commentVest.yml
+++ /dev/null
@@ -1,34 +0,0 @@
-languageId: typescript
-command:
-  version: 1
-  spokenForm: comment vest
-  action: toggleLineComment
-  targets:
-    - type: primitive
-      mark: {type: decoratedSymbol, symbolColor: default, character: v}
-initialState:
-  documentContents: |
-
-    const value = "Hello world";
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-  marks:
-    default.v:
-      start: {line: 1, character: 6}
-      end: {line: 1, character: 11}
-finalState:
-  documentContents: |
-
-    // const value = "Hello world";
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-  thatMark:
-    - type: UntypedTarget
-      contentRange:
-        start: {line: 1, character: 9}
-        end: {line: 1, character: 14}
-      isReversed: false
-      hasExplicitRange: true
-fullTargets: [{type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: v}, selectionType: token, position: contents, modifier: {type: identity}, insideOutsideType: inside}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/actions/copyVest.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/actions/copyVest.yml
deleted file mode 100644
index 8861c317e8..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/actions/copyVest.yml
+++ /dev/null
@@ -1,36 +0,0 @@
-languageId: typescript
-command:
-  version: 1
-  spokenForm: copy vest
-  action: copyToClipboard
-  targets:
-    - type: primitive
-      mark: {type: decoratedSymbol, symbolColor: default, character: v}
-initialState:
-  documentContents: |
-
-    const value = "Hello world";
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-  clipboard: value
-  marks:
-    default.v:
-      start: {line: 1, character: 6}
-      end: {line: 1, character: 11}
-finalState:
-  documentContents: |
-
-    const value = "Hello world";
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-  clipboard: value
-  thatMark:
-    - type: UntypedTarget
-      contentRange:
-        start: {line: 1, character: 6}
-        end: {line: 1, character: 11}
-      isReversed: false
-      hasExplicitRange: false
-fullTargets: [{type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: v}, selectionType: token, position: contents, modifier: {type: identity}, insideOutsideType: inside}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/actions/curlyRepackRound.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/actions/curlyRepackRound.yml
deleted file mode 100644
index 77dd101890..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/actions/curlyRepackRound.yml
+++ /dev/null
@@ -1,55 +0,0 @@
-languageId: plaintext
-command:
-  version: 1
-  spokenForm: curly repack round
-  action: rewrapWithPairedDelimiter
-  targets:
-    - type: primitive
-      modifier: {type: surroundingPair, delimiter: parentheses}
-  extraArgs: ['{', '}']
-initialState:
-  documentContents: |-
-    ([hello])
-    (there)
-  selections:
-    - anchor: {line: 0, character: 5}
-      active: {line: 0, character: 5}
-    - anchor: {line: 1, character: 5}
-      active: {line: 1, character: 5}
-  marks: {}
-finalState:
-  documentContents: |-
-    {[hello]}
-    {there}
-  selections:
-    - anchor: {line: 0, character: 5}
-      active: {line: 0, character: 5}
-    - anchor: {line: 1, character: 5}
-      active: {line: 1, character: 5}
-  thatMark:
-    - type: UntypedTarget
-      contentRange:
-        start: {line: 0, character: 0}
-        end: {line: 0, character: 9}
-      isReversed: false
-      hasExplicitRange: true
-    - type: UntypedTarget
-      contentRange:
-        start: {line: 1, character: 0}
-        end: {line: 1, character: 7}
-      isReversed: false
-      hasExplicitRange: true
-  sourceMark:
-    - type: UntypedTarget
-      contentRange:
-        start: {line: 0, character: 0}
-        end: {line: 0, character: 9}
-      isReversed: false
-      hasExplicitRange: true
-    - type: UntypedTarget
-      contentRange:
-        start: {line: 1, character: 0}
-        end: {line: 1, character: 7}
-      isReversed: false
-      hasExplicitRange: true
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: surroundingPair, delimiter: parentheses}}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/actions/customHarp.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/actions/customHarp.yml
deleted file mode 100644
index 24643143d0..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/actions/customHarp.yml
+++ /dev/null
@@ -1,35 +0,0 @@
-languageId: markdown
-command:
-  version: 1
-  spokenForm: custom harp
-  action: executeCommand
-  targets:
-    - type: primitive
-      mark: {type: decoratedSymbol, symbolColor: default, character: h}
-  extraArgs:
-    - editor.action.addCommentLine
-    - {}
-initialState:
-  documentContents: |
-    hello world
-  selections:
-    - anchor: {line: 1, character: 0}
-      active: {line: 1, character: 0}
-  marks:
-    default.h:
-      start: {line: 0, character: 0}
-      end: {line: 0, character: 5}
-finalState:
-  documentContents: |
-    <!-- hello world -->
-  selections:
-    - anchor: {line: 1, character: 0}
-      active: {line: 1, character: 0}
-  thatMark:
-    - type: UntypedTarget
-      contentRange:
-        start: {line: 0, character: 5}
-        end: {line: 0, character: 10}
-      isReversed: false
-      hasExplicitRange: true
-fullTargets: [{type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: h}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: identity}}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/actions/cutEveryArgMade.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/actions/cutEveryArgMade.yml
deleted file mode 100644
index 1cc5e284cf..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/actions/cutEveryArgMade.yml
+++ /dev/null
@@ -1,31 +0,0 @@
-languageId: typescript
-command:
-  version: 1
-  spokenForm: cut every arg made
-  action: cutToClipboard
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: argumentOrParameter, includeSiblings: true}
-      mark: {type: decoratedSymbol, symbolColor: default, character: m}
-initialState:
-  documentContents: "function myFunk(value: string, name: string, age: number) { };"
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-  marks:
-    default.m:
-      start: {line: 0, character: 31}
-      end: {line: 0, character: 35}
-finalState:
-  documentContents: function myFunk() { };
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-  thatMark:
-    - type: RawSelectionTarget
-      contentRange:
-        start: {line: 0, character: 16}
-        end: {line: 0, character: 16}
-      isReversed: false
-      hasExplicitRange: true
-fullTargets: [{type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: m}, selectionType: token, position: contents, insideOutsideType: null, modifier: {type: containingScope, scopeType: argumentOrParameter, includeSiblings: true}, isImplicit: false}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/actions/dedentVest.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/actions/dedentVest.yml
deleted file mode 100644
index adabcb3b0f..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/actions/dedentVest.yml
+++ /dev/null
@@ -1,34 +0,0 @@
-languageId: typescript
-command:
-  version: 1
-  spokenForm: dedent vest
-  action: outdentLine
-  targets:
-    - type: primitive
-      mark: {type: decoratedSymbol, symbolColor: default, character: v}
-initialState:
-  documentContents: |2
-
-        const value = "Hello world";
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-  marks:
-    default.v:
-      start: {line: 1, character: 10}
-      end: {line: 1, character: 15}
-finalState:
-  documentContents: |
-
-    const value = "Hello world";
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-  thatMark:
-    - type: UntypedTarget
-      contentRange:
-        start: {line: 1, character: 6}
-        end: {line: 1, character: 11}
-      isReversed: false
-      hasExplicitRange: true
-fullTargets: [{type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: v}, selectionType: token, position: contents, modifier: {type: identity}, insideOutsideType: inside}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/actions/defineVest.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/actions/defineVest.yml
deleted file mode 100644
index a0e5e4ac4d..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/actions/defineVest.yml
+++ /dev/null
@@ -1,39 +0,0 @@
-languageId: typescript
-command:
-  version: 1
-  spokenForm: define vest
-  action: executeCommand
-  targets:
-    - type: primitive
-      mark: {type: decoratedSymbol, symbolColor: default, character: v}
-  extraArgs:
-    - editor.action.revealDefinition
-    - {restoreSelection: false}
-initialState:
-  documentContents: |
-    const value = "value";
-
-    console.log(value);
-  selections:
-    - anchor: {line: 3, character: 0}
-      active: {line: 3, character: 0}
-  marks:
-    default.v:
-      start: {line: 2, character: 12}
-      end: {line: 2, character: 17}
-finalState:
-  documentContents: |
-    const value = "value";
-
-    console.log(value);
-  selections:
-    - anchor: {line: 0, character: 6}
-      active: {line: 0, character: 6}
-  thatMark:
-    - type: UntypedTarget
-      contentRange:
-        start: {line: 2, character: 12}
-        end: {line: 2, character: 17}
-      isReversed: false
-      hasExplicitRange: false
-fullTargets: [{type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: v}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: identity}}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/actions/drinkArg.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/actions/drinkArg.yml
deleted file mode 100644
index 487d95c956..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/actions/drinkArg.yml
+++ /dev/null
@@ -1,32 +0,0 @@
-languageId: typescript
-command:
-  spokenForm: drink arg
-  version: 2
-  action: {name: editNewLineBefore}
-  targets:
-    - type: primitive
-      modifiers:
-        - type: containingScope
-          scopeType: {type: argumentOrParameter}
-  usePrePhraseSnapshot: true
-initialState:
-  documentContents: |
-    function helloWorld(foo: string, bar: number, baz: string) {}
-  selections:
-    - anchor: {line: 0, character: 40}
-      active: {line: 0, character: 40}
-  marks: {}
-finalState:
-  documentContents: |
-    function helloWorld(foo: string, , bar: number, baz: string) {}
-  selections:
-    - anchor: {line: 0, character: 33}
-      active: {line: 0, character: 33}
-  thatMark:
-    - type: UntypedTarget
-      contentRange:
-        start: {line: 0, character: 35}
-        end: {line: 0, character: 46}
-      isReversed: false
-      hasExplicitRange: true
-fullTargets: [{type: primitive, mark: {type: cursor}, modifiers: [{type: containingScope, scopeType: argumentOrParameter}]}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/actions/drinkArg2.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/actions/drinkArg2.yml
deleted file mode 100644
index eb7dcebfe8..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/actions/drinkArg2.yml
+++ /dev/null
@@ -1,39 +0,0 @@
-languageId: typescript
-command:
-  spokenForm: drink arg
-  version: 2
-  targets:
-    - type: primitive
-      modifiers:
-        - type: containingScope
-          scopeType: {type: argumentOrParameter}
-  usePrePhraseSnapshot: true
-  action: {name: editNewLineBefore}
-initialState:
-  documentContents: |-
-    function myFunk(
-        name: string,
-        value: number,
-    ) {}
-  selections:
-    - anchor: {line: 2, character: 9}
-      active: {line: 2, character: 9}
-  marks: {}
-finalState:
-  documentContents: |-
-    function myFunk(
-        name: string,
-        ,
-        value: number,
-    ) {}
-  selections:
-    - anchor: {line: 2, character: 4}
-      active: {line: 2, character: 4}
-  thatMark:
-    - type: UntypedTarget
-      contentRange:
-        start: {line: 3, character: 4}
-        end: {line: 3, character: 17}
-      isReversed: false
-      hasExplicitRange: true
-fullTargets: [{type: primitive, mark: {type: cursor}, modifiers: [{type: containingScope, scopeType: {type: argumentOrParameter}}]}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/actions/drinkArg3.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/actions/drinkArg3.yml
deleted file mode 100644
index 5848d7ac9f..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/actions/drinkArg3.yml
+++ /dev/null
@@ -1,39 +0,0 @@
-languageId: typescript
-command:
-  spokenForm: drink arg
-  version: 2
-  targets:
-    - type: primitive
-      modifiers:
-        - type: containingScope
-          scopeType: {type: argumentOrParameter}
-  usePrePhraseSnapshot: true
-  action: {name: editNewLineBefore}
-initialState:
-  documentContents: |-
-    function myFunk(
-        name: string,
-        value: number
-    ) {}
-  selections:
-    - anchor: {line: 2, character: 9}
-      active: {line: 2, character: 9}
-  marks: {}
-finalState:
-  documentContents: |-
-    function myFunk(
-        name: string,
-        ,
-        value: number
-    ) {}
-  selections:
-    - anchor: {line: 2, character: 4}
-      active: {line: 2, character: 4}
-  thatMark:
-    - type: UntypedTarget
-      contentRange:
-        start: {line: 3, character: 4}
-        end: {line: 3, character: 17}
-      isReversed: false
-      hasExplicitRange: true
-fullTargets: [{type: primitive, mark: {type: cursor}, modifiers: [{type: containingScope, scopeType: {type: argumentOrParameter}}]}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/actions/drinkArg4.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/actions/drinkArg4.yml
deleted file mode 100644
index 1d2a73383e..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/actions/drinkArg4.yml
+++ /dev/null
@@ -1,39 +0,0 @@
-languageId: typescript
-command:
-  spokenForm: drink arg
-  version: 2
-  targets:
-    - type: primitive
-      modifiers:
-        - type: containingScope
-          scopeType: {type: argumentOrParameter}
-  usePrePhraseSnapshot: true
-  action: {name: editNewLineBefore}
-initialState:
-  documentContents: |-
-    function myFunk(
-        name: string,
-        value: number
-    ) {}
-  selections:
-    - anchor: {line: 1, character: 8}
-      active: {line: 1, character: 8}
-  marks: {}
-finalState:
-  documentContents: |-
-    function myFunk(
-        ,
-        name: string,
-        value: number
-    ) {}
-  selections:
-    - anchor: {line: 1, character: 4}
-      active: {line: 1, character: 4}
-  thatMark:
-    - type: UntypedTarget
-      contentRange:
-        start: {line: 2, character: 4}
-        end: {line: 2, character: 16}
-      isReversed: false
-      hasExplicitRange: true
-fullTargets: [{type: primitive, mark: {type: cursor}, modifiers: [{type: containingScope, scopeType: {type: argumentOrParameter}}]}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/actions/drinkArg5.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/actions/drinkArg5.yml
deleted file mode 100644
index 59d2e0068b..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/actions/drinkArg5.yml
+++ /dev/null
@@ -1,41 +0,0 @@
-languageId: typescript
-command:
-  spokenForm: drink arg
-  version: 2
-  targets:
-    - type: primitive
-      modifiers:
-        - type: containingScope
-          scopeType: {type: argumentOrParameter}
-  usePrePhraseSnapshot: true
-  action: {name: editNewLineBefore}
-initialState:
-  documentContents: |-
-    function myFunk(
-        name: string,
-        value: number,
-        stuff: boolean
-    ) {}
-  selections:
-    - anchor: {line: 2, character: 9}
-      active: {line: 2, character: 9}
-  marks: {}
-finalState:
-  documentContents: |-
-    function myFunk(
-        name: string,
-        ,
-        value: number,
-        stuff: boolean
-    ) {}
-  selections:
-    - anchor: {line: 2, character: 4}
-      active: {line: 2, character: 4}
-  thatMark:
-    - type: UntypedTarget
-      contentRange:
-        start: {line: 3, character: 4}
-        end: {line: 3, character: 17}
-      isReversed: false
-      hasExplicitRange: true
-fullTargets: [{type: primitive, mark: {type: cursor}, modifiers: [{type: containingScope, scopeType: {type: argumentOrParameter}}]}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/actions/drinkBlock.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/actions/drinkBlock.yml
deleted file mode 100644
index bb1bccc542..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/actions/drinkBlock.yml
+++ /dev/null
@@ -1,34 +0,0 @@
-languageId: typescript
-command:
-  spokenForm: drink block
-  version: 2
-  action: {name: editNewLineBefore}
-  targets:
-    - type: primitive
-      modifiers:
-        - type: containingScope
-          scopeType: {type: paragraph}
-  usePrePhraseSnapshot: true
-initialState:
-  documentContents: |
-    function helloWorld(foo: string, bar: number, baz: string) {}
-  selections:
-    - anchor: {line: 0, character: 40}
-      active: {line: 0, character: 40}
-  marks: {}
-finalState:
-  documentContents: |
-
-
-    function helloWorld(foo: string, bar: number, baz: string) {}
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-  thatMark:
-    - type: UntypedTarget
-      contentRange:
-        start: {line: 2, character: 0}
-        end: {line: 2, character: 61}
-      isReversed: false
-      hasExplicitRange: true
-fullTargets: [{type: primitive, mark: {type: cursor}, modifiers: [{type: containingScope, scopeType: paragraph}]}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/actions/drinkDrumAndSpunAndTrap.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/actions/drinkDrumAndSpunAndTrap.yml
deleted file mode 100644
index 4542a493b0..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/actions/drinkDrumAndSpunAndTrap.yml
+++ /dev/null
@@ -1,59 +0,0 @@
-languageId: plaintext
-command:
-  spokenForm: drink drum and spun and trap
-  version: 2
-  targets:
-    - type: list
-      elements:
-        - type: primitive
-          mark: {type: decoratedSymbol, symbolColor: default, character: d}
-        - type: primitive
-          mark: {type: decoratedSymbol, symbolColor: default, character: s}
-        - type: primitive
-          mark: {type: decoratedSymbol, symbolColor: default, character: t}
-  usePrePhraseSnapshot: true
-  action: {name: editNewLineBefore}
-initialState:
-  documentContents: |
-    hello world there now
-
-    testing
-  selections:
-    - anchor: {line: 2, character: 7}
-      active: {line: 2, character: 7}
-  marks:
-    default.d:
-      start: {line: 0, character: 6}
-      end: {line: 0, character: 11}
-    default.s:
-      start: {line: 2, character: 0}
-      end: {line: 2, character: 7}
-    default.t:
-      start: {line: 0, character: 12}
-      end: {line: 0, character: 17}
-finalState:
-  documentContents: |
-
-    hello world there now
-
-
-    testing
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-    - anchor: {line: 3, character: 0}
-      active: {line: 3, character: 0}
-  thatMark:
-    - type: UntypedTarget
-      contentRange:
-        start: {line: 1, character: 6}
-        end: {line: 1, character: 11}
-      isReversed: false
-      hasExplicitRange: true
-    - type: UntypedTarget
-      contentRange:
-        start: {line: 4, character: 0}
-        end: {line: 4, character: 7}
-      isReversed: false
-      hasExplicitRange: true
-fullTargets: [{type: list, elements: [{type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: d}, modifiers: []}, {type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: s}, modifiers: []}, {type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: t}, modifiers: []}]}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/actions/drinkHarpAndLookAndTrap.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/actions/drinkHarpAndLookAndTrap.yml
deleted file mode 100644
index 564a556b87..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/actions/drinkHarpAndLookAndTrap.yml
+++ /dev/null
@@ -1,46 +0,0 @@
-languageId: plaintext
-command:
-  spokenForm: drink harp and look and trap
-  version: 2
-  targets:
-    - type: list
-      elements:
-        - type: primitive
-          mark: {type: decoratedSymbol, symbolColor: default, character: h}
-        - type: primitive
-          mark: {type: decoratedSymbol, symbolColor: default, character: l}
-        - type: primitive
-          mark: {type: decoratedSymbol, symbolColor: default, character: t}
-  usePrePhraseSnapshot: true
-  action: {name: editNewLineBefore}
-initialState:
-  documentContents: |
-    hello world there now
-  selections:
-    - anchor: {line: 1, character: 0}
-      active: {line: 1, character: 0}
-  marks:
-    default.h:
-      start: {line: 0, character: 0}
-      end: {line: 0, character: 5}
-    default.l:
-      start: {line: 0, character: 6}
-      end: {line: 0, character: 11}
-    default.t:
-      start: {line: 0, character: 12}
-      end: {line: 0, character: 17}
-finalState:
-  documentContents: |
-
-    hello world there now
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-  thatMark:
-    - type: UntypedTarget
-      contentRange:
-        start: {line: 1, character: 0}
-        end: {line: 1, character: 5}
-      isReversed: false
-      hasExplicitRange: true
-fullTargets: [{type: list, elements: [{type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: h}, modifiers: []}, {type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: l}, modifiers: []}, {type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: t}, modifiers: []}]}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/actions/drinkItem.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/actions/drinkItem.yml
deleted file mode 100644
index 12e6fb9dbf..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/actions/drinkItem.yml
+++ /dev/null
@@ -1,41 +0,0 @@
-languageId: typescript
-command:
-  spokenForm: drink item
-  version: 2
-  targets:
-    - type: primitive
-      modifiers:
-        - type: containingScope
-          scopeType: {type: collectionItem}
-  usePrePhraseSnapshot: true
-  action: {name: editNewLineBefore}
-initialState:
-  documentContents: |-
-    [
-        a,
-        b,
-        c
-    ]
-  selections:
-    - anchor: {line: 3, character: 5}
-      active: {line: 3, character: 5}
-  marks: {}
-finalState:
-  documentContents: |-
-    [
-        a,
-        b,
-        ,
-        c
-    ]
-  selections:
-    - anchor: {line: 3, character: 4}
-      active: {line: 3, character: 4}
-  thatMark:
-    - type: UntypedTarget
-      contentRange:
-        start: {line: 4, character: 4}
-        end: {line: 4, character: 5}
-      isReversed: false
-      hasExplicitRange: true
-fullTargets: [{type: primitive, mark: {type: cursor}, modifiers: [{type: containingScope, scopeType: {type: collectionItem}}]}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/actions/drinkItem2.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/actions/drinkItem2.yml
deleted file mode 100644
index 7284b3b420..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/actions/drinkItem2.yml
+++ /dev/null
@@ -1,41 +0,0 @@
-languageId: typescript
-command:
-  spokenForm: drink item
-  version: 2
-  targets:
-    - type: primitive
-      modifiers:
-        - type: containingScope
-          scopeType: {type: collectionItem}
-  usePrePhraseSnapshot: true
-  action: {name: editNewLineBefore}
-initialState:
-  documentContents: |-
-    [
-        a,
-        b,
-        c,
-    ]
-  selections:
-    - anchor: {line: 3, character: 5}
-      active: {line: 3, character: 5}
-  marks: {}
-finalState:
-  documentContents: |-
-    [
-        a,
-        b,
-        ,
-        c,
-    ]
-  selections:
-    - anchor: {line: 3, character: 4}
-      active: {line: 3, character: 4}
-  thatMark:
-    - type: UntypedTarget
-      contentRange:
-        start: {line: 4, character: 4}
-        end: {line: 4, character: 5}
-      isReversed: false
-      hasExplicitRange: true
-fullTargets: [{type: primitive, mark: {type: cursor}, modifiers: [{type: containingScope, scopeType: {type: collectionItem}}]}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/actions/drinkItem3.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/actions/drinkItem3.yml
deleted file mode 100644
index 0b74a009f7..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/actions/drinkItem3.yml
+++ /dev/null
@@ -1,41 +0,0 @@
-languageId: typescript
-command:
-  spokenForm: drink item
-  version: 2
-  targets:
-    - type: primitive
-      modifiers:
-        - type: containingScope
-          scopeType: {type: collectionItem}
-  usePrePhraseSnapshot: true
-  action: {name: editNewLineBefore}
-initialState:
-  documentContents: |-
-    [
-        a,
-        b,
-        c,
-    ]
-  selections:
-    - anchor: {line: 1, character: 5}
-      active: {line: 1, character: 5}
-  marks: {}
-finalState:
-  documentContents: |-
-    [
-        ,
-        a,
-        b,
-        c,
-    ]
-  selections:
-    - anchor: {line: 1, character: 4}
-      active: {line: 1, character: 4}
-  thatMark:
-    - type: UntypedTarget
-      contentRange:
-        start: {line: 2, character: 4}
-        end: {line: 2, character: 5}
-      isReversed: false
-      hasExplicitRange: true
-fullTargets: [{type: primitive, mark: {type: cursor}, modifiers: [{type: containingScope, scopeType: {type: collectionItem}}]}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/actions/drinkLine.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/actions/drinkLine.yml
deleted file mode 100644
index 0333a4090c..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/actions/drinkLine.yml
+++ /dev/null
@@ -1,37 +0,0 @@
-languageId: python
-command:
-  spokenForm: drink line
-  version: 2
-  targets:
-    - type: primitive
-      modifiers:
-        - type: containingScope
-          scopeType: {type: line}
-  usePrePhraseSnapshot: true
-  action: {name: editNewLineBefore}
-initialState:
-  documentContents: |
-    class MyClass:
-        def my_funk():
-            pass
-  selections:
-    - anchor: {line: 1, character: 11}
-      active: {line: 1, character: 11}
-  marks: {}
-finalState:
-  documentContents: |
-    class MyClass:
-        
-        def my_funk():
-            pass
-  selections:
-    - anchor: {line: 1, character: 4}
-      active: {line: 1, character: 4}
-  thatMark:
-    - type: UntypedTarget
-      contentRange:
-        start: {line: 2, character: 4}
-        end: {line: 2, character: 18}
-      isReversed: false
-      hasExplicitRange: true
-fullTargets: [{type: primitive, mark: {type: cursor}, modifiers: [{type: containingScope, scopeType: {type: line}}]}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/actions/drinkThis.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/actions/drinkThis.yml
deleted file mode 100644
index 0ce5c1d4bb..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/actions/drinkThis.yml
+++ /dev/null
@@ -1,34 +0,0 @@
-languageId: plaintext
-command:
-  spokenForm: drink this
-  version: 2
-  targets:
-    - type: primitive
-      mark: {type: cursor}
-  usePrePhraseSnapshot: true
-  action: {name: editNewLineBefore}
-initialState:
-  documentContents: hello world
-  selections:
-    - anchor: {line: 0, character: 2}
-      active: {line: 0, character: 2}
-    - anchor: {line: 0, character: 4}
-      active: {line: 0, character: 4}
-    - anchor: {line: 0, character: 8}
-      active: {line: 0, character: 8}
-  marks: {}
-finalState:
-  documentContents: |-
-
-    hello world
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-  thatMark:
-    - type: UntypedTarget
-      contentRange:
-        start: {line: 1, character: 2}
-        end: {line: 1, character: 2}
-      isReversed: false
-      hasExplicitRange: false
-fullTargets: [{type: primitive, mark: {type: cursor}, modifiers: []}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/actions/drinkVest.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/actions/drinkVest.yml
deleted file mode 100644
index 503334441c..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/actions/drinkVest.yml
+++ /dev/null
@@ -1,35 +0,0 @@
-languageId: typescript
-command:
-  version: 1
-  spokenForm: drink vest
-  action: editNewLineBefore
-  targets:
-    - type: primitive
-      mark: {type: decoratedSymbol, symbolColor: default, character: v}
-initialState:
-  documentContents: |
-
-    const value = "Hello world";
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-  marks:
-    default.v:
-      start: {line: 1, character: 6}
-      end: {line: 1, character: 11}
-finalState:
-  documentContents: |
-
-
-    const value = "Hello world";
-  selections:
-    - anchor: {line: 1, character: 0}
-      active: {line: 1, character: 0}
-  thatMark:
-    - type: UntypedTarget
-      contentRange:
-        start: {line: 2, character: 6}
-        end: {line: 2, character: 11}
-      isReversed: false
-      hasExplicitRange: true
-fullTargets: [{type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: v}, selectionType: token, position: contents, modifier: {type: identity}, insideOutsideType: outside}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/actions/drinkVest2.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/actions/drinkVest2.yml
deleted file mode 100644
index fb235fbd08..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/actions/drinkVest2.yml
+++ /dev/null
@@ -1,36 +0,0 @@
-languageId: plaintext
-command:
-  spokenForm: drink vest
-  version: 2
-  targets:
-    - type: primitive
-      mark: {type: decoratedSymbol, symbolColor: default, character: v}
-  usePrePhraseSnapshot: true
-  action: {name: editNewLineBefore}
-initialState:
-  documentContents: |2
-
-        const value = "Hello world";
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-  marks:
-    default.v:
-      start: {line: 1, character: 10}
-      end: {line: 1, character: 15}
-finalState:
-  documentContents: |2
-
-        
-        const value = "Hello world";
-  selections:
-    - anchor: {line: 1, character: 4}
-      active: {line: 1, character: 4}
-  thatMark:
-    - type: UntypedTarget
-      contentRange:
-        start: {line: 2, character: 10}
-        end: {line: 2, character: 15}
-      isReversed: false
-      hasExplicitRange: true
-fullTargets: [{type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: v}, modifiers: []}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/actions/findVest.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/actions/findVest.yml
deleted file mode 100644
index 6af798abbc..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/actions/findVest.yml
+++ /dev/null
@@ -1,37 +0,0 @@
-languageId: typescript
-command:
-  version: 1
-  spokenForm: find vest
-  action: getText
-  targets:
-    - type: primitive
-      mark: {type: decoratedSymbol, symbolColor: default, character: v}
-  extraArgs:
-    - {showDecorations: null, ensureSingleTarget: true}
-initialState:
-  documentContents: |
-
-    const value = "Hello world";
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-  marks:
-    default.v:
-      start: {line: 1, character: 6}
-      end: {line: 1, character: 11}
-finalState:
-  documentContents: |
-
-    const value = "Hello world";
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-  thatMark:
-    - type: UntypedTarget
-      contentRange:
-        start: {line: 1, character: 6}
-        end: {line: 1, character: 11}
-      isReversed: false
-      hasExplicitRange: false
-returnValue: [value]
-fullTargets: [{type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: v}, selectionType: token, position: contents, modifier: {type: identity}, insideOutsideType: inside}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/actions/giveAfterDot.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/actions/giveAfterDot.yml
deleted file mode 100644
index 9b3da19638..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/actions/giveAfterDot.yml
+++ /dev/null
@@ -1,37 +0,0 @@
-languageId: typescript
-command:
-  version: 1
-  spokenForm: give after dot
-  action: deselect
-  targets:
-    - type: primitive
-      position: after
-      mark: {type: decoratedSymbol, symbolColor: default, character: .}
-initialState:
-  documentContents: a b.c
-  selections:
-    - anchor: {line: 0, character: 1}
-      active: {line: 0, character: 1}
-    - anchor: {line: 0, character: 3}
-      active: {line: 0, character: 3}
-    - anchor: {line: 0, character: 4}
-      active: {line: 0, character: 4}
-  marks:
-    default..:
-      start: {line: 0, character: 3}
-      end: {line: 0, character: 4}
-finalState:
-  documentContents: a b.c
-  selections:
-    - anchor: {line: 0, character: 1}
-      active: {line: 0, character: 1}
-    - anchor: {line: 0, character: 3}
-      active: {line: 0, character: 3}
-  thatMark:
-    - type: PositionTarget
-      contentRange:
-        start: {line: 0, character: 4}
-        end: {line: 0, character: 4}
-      isReversed: false
-      hasExplicitRange: true
-fullTargets: [{type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: .}, selectionType: token, position: after, insideOutsideType: inside, modifier: {type: identity}}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/actions/giveAirAndBang.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/actions/giveAirAndBang.yml
deleted file mode 100644
index c2029598d5..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/actions/giveAirAndBang.yml
+++ /dev/null
@@ -1,49 +0,0 @@
-languageId: typescript
-command:
-  version: 1
-  spokenForm: give air and bang
-  action: deselect
-  targets:
-    - type: list
-      elements:
-        - type: primitive
-          mark: {type: decoratedSymbol, symbolColor: default, character: a}
-        - type: primitive
-          mark: {type: decoratedSymbol, symbolColor: default, character: '!'}
-initialState:
-  documentContents: |
-    "a!
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 1}
-    - anchor: {line: 0, character: 1}
-      active: {line: 0, character: 2}
-    - anchor: {line: 0, character: 2}
-      active: {line: 0, character: 3}
-  marks:
-    default.a:
-      start: {line: 0, character: 1}
-      end: {line: 0, character: 2}
-    default.!:
-      start: {line: 0, character: 2}
-      end: {line: 0, character: 3}
-finalState:
-  documentContents: |
-    "a!
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 1}
-  thatMark:
-    - type: UntypedTarget
-      contentRange:
-        start: {line: 0, character: 1}
-        end: {line: 0, character: 2}
-      isReversed: false
-      hasExplicitRange: false
-    - type: UntypedTarget
-      contentRange:
-        start: {line: 0, character: 2}
-        end: {line: 0, character: 3}
-      isReversed: false
-      hasExplicitRange: false
-fullTargets: [{type: list, elements: [{type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: a}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: identity}}, {type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: '!'}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: identity}}]}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/actions/giveBat.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/actions/giveBat.yml
deleted file mode 100644
index 5dcb863b9c..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/actions/giveBat.yml
+++ /dev/null
@@ -1,32 +0,0 @@
-languageId: typescript
-command:
-  version: 1
-  spokenForm: give bat
-  action: deselect
-  targets:
-    - type: primitive
-      mark: {type: decoratedSymbol, symbolColor: default, character: b}
-initialState:
-  documentContents: a b c d
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 1}
-    - anchor: {line: 0, character: 2}
-      active: {line: 0, character: 7}
-  marks:
-    default.b:
-      start: {line: 0, character: 2}
-      end: {line: 0, character: 3}
-finalState:
-  documentContents: a b c d
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 1}
-  thatMark:
-    - type: UntypedTarget
-      contentRange:
-        start: {line: 0, character: 2}
-        end: {line: 0, character: 3}
-      isReversed: false
-      hasExplicitRange: false
-fullTargets: [{type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: b}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: identity}}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/actions/giveBat2.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/actions/giveBat2.yml
deleted file mode 100644
index 0f6e8f0cf1..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/actions/giveBat2.yml
+++ /dev/null
@@ -1,32 +0,0 @@
-languageId: markdown
-command:
-  version: 1
-  spokenForm: give bat
-  action: deselect
-  targets:
-    - type: primitive
-      mark: {type: decoratedSymbol, symbolColor: default, character: b}
-initialState:
-  documentContents: a b.
-  selections:
-    - anchor: {line: 0, character: 1}
-      active: {line: 0, character: 1}
-    - anchor: {line: 0, character: 3}
-      active: {line: 0, character: 3}
-  marks:
-    default.b:
-      start: {line: 0, character: 2}
-      end: {line: 0, character: 3}
-finalState:
-  documentContents: a b.
-  selections:
-    - anchor: {line: 0, character: 1}
-      active: {line: 0, character: 1}
-  thatMark:
-    - type: UntypedTarget
-      contentRange:
-        start: {line: 0, character: 2}
-        end: {line: 0, character: 3}
-      isReversed: false
-      hasExplicitRange: false
-fullTargets: [{type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: b}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: identity}}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/actions/giveBeforeDot.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/actions/giveBeforeDot.yml
deleted file mode 100644
index 7bf8e70d4d..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/actions/giveBeforeDot.yml
+++ /dev/null
@@ -1,37 +0,0 @@
-languageId: typescript
-command:
-  version: 1
-  spokenForm: give before dot
-  action: deselect
-  targets:
-    - type: primitive
-      position: before
-      mark: {type: decoratedSymbol, symbolColor: default, character: .}
-initialState:
-  documentContents: a b.c
-  selections:
-    - anchor: {line: 0, character: 1}
-      active: {line: 0, character: 1}
-    - anchor: {line: 0, character: 3}
-      active: {line: 0, character: 3}
-    - anchor: {line: 0, character: 4}
-      active: {line: 0, character: 4}
-  marks:
-    default..:
-      start: {line: 0, character: 3}
-      end: {line: 0, character: 4}
-finalState:
-  documentContents: a b.c
-  selections:
-    - anchor: {line: 0, character: 1}
-      active: {line: 0, character: 1}
-    - anchor: {line: 0, character: 4}
-      active: {line: 0, character: 4}
-  thatMark:
-    - type: PositionTarget
-      contentRange:
-        start: {line: 0, character: 3}
-        end: {line: 0, character: 3}
-      isReversed: false
-      hasExplicitRange: true
-fullTargets: [{type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: .}, selectionType: token, position: before, insideOutsideType: inside, modifier: {type: identity}}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/actions/giveBlueQuote.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/actions/giveBlueQuote.yml
deleted file mode 100644
index 427072a327..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/actions/giveBlueQuote.yml
+++ /dev/null
@@ -1,38 +0,0 @@
-languageId: typescript
-command:
-  version: 1
-  spokenForm: give blue quote
-  action: deselect
-  targets:
-    - type: primitive
-      mark: {type: decoratedSymbol, symbolColor: blue, character: '"'}
-initialState:
-  documentContents: |
-    "hello"
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 1}
-    - anchor: {line: 0, character: 1}
-      active: {line: 0, character: 6}
-    - anchor: {line: 0, character: 6}
-      active: {line: 0, character: 7}
-  marks:
-    blue.":
-      start: {line: 0, character: 6}
-      end: {line: 0, character: 7}
-finalState:
-  documentContents: |
-    "hello"
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 1}
-    - anchor: {line: 0, character: 1}
-      active: {line: 0, character: 6}
-  thatMark:
-    - type: UntypedTarget
-      contentRange:
-        start: {line: 0, character: 6}
-        end: {line: 0, character: 7}
-      isReversed: false
-      hasExplicitRange: false
-fullTargets: [{type: primitive, mark: {type: decoratedSymbol, symbolColor: blue, character: '"'}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: identity}}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/actions/giveBlueQuoteAndQuote.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/actions/giveBlueQuoteAndQuote.yml
deleted file mode 100644
index 1edc1b80ba..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/actions/giveBlueQuoteAndQuote.yml
+++ /dev/null
@@ -1,49 +0,0 @@
-languageId: typescript
-command:
-  version: 1
-  spokenForm: give blue quote and quote
-  action: deselect
-  targets:
-    - type: list
-      elements:
-        - type: primitive
-          mark: {type: decoratedSymbol, symbolColor: blue, character: '"'}
-        - type: primitive
-          mark: {type: decoratedSymbol, symbolColor: default, character: '"'}
-initialState:
-  documentContents: |
-    "hello"
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 1}
-    - anchor: {line: 0, character: 1}
-      active: {line: 0, character: 6}
-    - anchor: {line: 0, character: 6}
-      active: {line: 0, character: 7}
-  marks:
-    blue.":
-      start: {line: 0, character: 6}
-      end: {line: 0, character: 7}
-    default.":
-      start: {line: 0, character: 0}
-      end: {line: 0, character: 1}
-finalState:
-  documentContents: |
-    "hello"
-  selections:
-    - anchor: {line: 0, character: 1}
-      active: {line: 0, character: 6}
-  thatMark:
-    - type: UntypedTarget
-      contentRange:
-        start: {line: 0, character: 6}
-        end: {line: 0, character: 7}
-      isReversed: false
-      hasExplicitRange: false
-    - type: UntypedTarget
-      contentRange:
-        start: {line: 0, character: 0}
-        end: {line: 0, character: 1}
-      isReversed: false
-      hasExplicitRange: false
-fullTargets: [{type: list, elements: [{type: primitive, mark: {type: decoratedSymbol, symbolColor: blue, character: '"'}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: identity}}, {type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: '"'}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: identity}}]}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/actions/giveCap.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/actions/giveCap.yml
deleted file mode 100644
index bdeb78ad01..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/actions/giveCap.yml
+++ /dev/null
@@ -1,32 +0,0 @@
-languageId: typescript
-command:
-  version: 1
-  spokenForm: give cap
-  action: deselect
-  targets:
-    - type: primitive
-      mark: {type: decoratedSymbol, symbolColor: default, character: c}
-initialState:
-  documentContents: a b c d
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 1}
-    - anchor: {line: 0, character: 2}
-      active: {line: 0, character: 7}
-  marks:
-    default.c:
-      start: {line: 0, character: 4}
-      end: {line: 0, character: 5}
-finalState:
-  documentContents: a b c d
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 1}
-  thatMark:
-    - type: UntypedTarget
-      contentRange:
-        start: {line: 0, character: 4}
-        end: {line: 0, character: 5}
-      isReversed: false
-      hasExplicitRange: false
-fullTargets: [{type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: c}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: identity}}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/actions/giveDot.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/actions/giveDot.yml
deleted file mode 100644
index 07634b147d..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/actions/giveDot.yml
+++ /dev/null
@@ -1,32 +0,0 @@
-languageId: markdown
-command:
-  version: 1
-  spokenForm: give dot
-  action: deselect
-  targets:
-    - type: primitive
-      mark: {type: decoratedSymbol, symbolColor: default, character: .}
-initialState:
-  documentContents: a b.
-  selections:
-    - anchor: {line: 0, character: 1}
-      active: {line: 0, character: 1}
-    - anchor: {line: 0, character: 3}
-      active: {line: 0, character: 3}
-  marks:
-    default..:
-      start: {line: 0, character: 3}
-      end: {line: 0, character: 4}
-finalState:
-  documentContents: a b.
-  selections:
-    - anchor: {line: 0, character: 1}
-      active: {line: 0, character: 1}
-  thatMark:
-    - type: UntypedTarget
-      contentRange:
-        start: {line: 0, character: 3}
-        end: {line: 0, character: 4}
-      isReversed: false
-      hasExplicitRange: false
-fullTargets: [{type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: .}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: identity}}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/actions/giveDot2.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/actions/giveDot2.yml
deleted file mode 100644
index bf5cb6763e..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/actions/giveDot2.yml
+++ /dev/null
@@ -1,34 +0,0 @@
-languageId: typescript
-command:
-  version: 1
-  spokenForm: give dot
-  action: deselect
-  targets:
-    - type: primitive
-      mark: {type: decoratedSymbol, symbolColor: default, character: .}
-initialState:
-  documentContents: a b.c
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 1}
-    - anchor: {line: 0, character: 3}
-      active: {line: 0, character: 3}
-    - anchor: {line: 0, character: 4}
-      active: {line: 0, character: 4}
-  marks:
-    default..:
-      start: {line: 0, character: 3}
-      end: {line: 0, character: 4}
-finalState:
-  documentContents: a b.c
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 1}
-  thatMark:
-    - type: UntypedTarget
-      contentRange:
-        start: {line: 0, character: 3}
-        end: {line: 0, character: 4}
-      isReversed: false
-      hasExplicitRange: false
-fullTargets: [{type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: .}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: identity}}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/actions/giveDrum.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/actions/giveDrum.yml
deleted file mode 100644
index 7004e63bb8..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/actions/giveDrum.yml
+++ /dev/null
@@ -1,32 +0,0 @@
-languageId: typescript
-command:
-  version: 1
-  spokenForm: give drum
-  action: deselect
-  targets:
-    - type: primitive
-      mark: {type: decoratedSymbol, symbolColor: default, character: d}
-initialState:
-  documentContents: a b c d
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 1}
-    - anchor: {line: 0, character: 2}
-      active: {line: 0, character: 7}
-  marks:
-    default.d:
-      start: {line: 0, character: 6}
-      end: {line: 0, character: 7}
-finalState:
-  documentContents: a b c d
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 1}
-  thatMark:
-    - type: UntypedTarget
-      contentRange:
-        start: {line: 0, character: 6}
-        end: {line: 0, character: 7}
-      isReversed: false
-      hasExplicitRange: false
-fullTargets: [{type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: d}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: identity}}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/actions/giveEqualsPastColon.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/actions/giveEqualsPastColon.yml
deleted file mode 100644
index ee8fd23802..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/actions/giveEqualsPastColon.yml
+++ /dev/null
@@ -1,52 +0,0 @@
-languageId: typescript
-command:
-  version: 1
-  spokenForm: give equals past colon
-  action: deselect
-  targets:
-    - type: range
-      start:
-        type: primitive
-        mark: {type: decoratedSymbol, symbolColor: default, character: '='}
-      end:
-        type: primitive
-        mark: {type: decoratedSymbol, symbolColor: default, character: ':'}
-      excludeStart: false
-      excludeEnd: false
-initialState:
-  documentContents: |
-    const values: string = "hello"
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 5}
-    - anchor: {line: 0, character: 6}
-      active: {line: 0, character: 12}
-    - anchor: {line: 0, character: 14}
-      active: {line: 0, character: 20}
-    - anchor: {line: 0, character: 24}
-      active: {line: 0, character: 29}
-  marks:
-    default.=:
-      start: {line: 0, character: 21}
-      end: {line: 0, character: 22}
-    "default.:":
-      start: {line: 0, character: 12}
-      end: {line: 0, character: 13}
-finalState:
-  documentContents: |
-    const values: string = "hello"
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 5}
-    - anchor: {line: 0, character: 6}
-      active: {line: 0, character: 12}
-    - anchor: {line: 0, character: 24}
-      active: {line: 0, character: 29}
-  thatMark:
-    - type: UntypedTarget
-      contentRange:
-        start: {line: 0, character: 12}
-        end: {line: 0, character: 22}
-      isReversed: true
-      hasExplicitRange: true
-fullTargets: [{type: range, excludeAnchor: false, excludeActive: false, anchor: {type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: '='}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: identity}}, active: {type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: ':'}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: identity}}}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/actions/giveHarp.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/actions/giveHarp.yml
deleted file mode 100644
index cf3127b253..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/actions/giveHarp.yml
+++ /dev/null
@@ -1,38 +0,0 @@
-languageId: typescript
-command:
-  version: 1
-  spokenForm: give harp
-  action: deselect
-  targets:
-    - type: primitive
-      mark: {type: decoratedSymbol, symbolColor: default, character: h}
-initialState:
-  documentContents: |
-    "hello"
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 1}
-    - anchor: {line: 0, character: 1}
-      active: {line: 0, character: 6}
-    - anchor: {line: 0, character: 6}
-      active: {line: 0, character: 7}
-  marks:
-    default.h:
-      start: {line: 0, character: 1}
-      end: {line: 0, character: 6}
-finalState:
-  documentContents: |
-    "hello"
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 1}
-    - anchor: {line: 0, character: 6}
-      active: {line: 0, character: 7}
-  thatMark:
-    - type: UntypedTarget
-      contentRange:
-        start: {line: 0, character: 1}
-        end: {line: 0, character: 6}
-      isReversed: false
-      hasExplicitRange: false
-fullTargets: [{type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: h}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: identity}}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/actions/giveHarpAndWhale.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/actions/giveHarpAndWhale.yml
deleted file mode 100644
index 6bfb31c2c2..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/actions/giveHarpAndWhale.yml
+++ /dev/null
@@ -1,28 +0,0 @@
-languageId: typescript
-command:
-  version: 1
-  spokenForm: give harp and whale
-  action: deselect
-  targets:
-    - type: list
-      elements:
-        - type: primitive
-          mark: {type: decoratedSymbol, symbolColor: default, character: h}
-        - type: primitive
-          mark: {type: decoratedSymbol, symbolColor: default, character: w}
-initialState:
-  documentContents: hello world
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 5}
-    - anchor: {line: 0, character: 6}
-      active: {line: 0, character: 11}
-  marks:
-    default.h:
-      start: {line: 0, character: 0}
-      end: {line: 0, character: 5}
-    default.w:
-      start: {line: 0, character: 6}
-      end: {line: 0, character: 11}
-fullTargets: [{type: list, elements: [{type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: h}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: identity}}, {type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: w}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: identity}}]}]
-thrownError: {name: SelectionRequiredError}
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/actions/giveQuote.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/actions/giveQuote.yml
deleted file mode 100644
index a140236bca..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/actions/giveQuote.yml
+++ /dev/null
@@ -1,38 +0,0 @@
-languageId: typescript
-command:
-  version: 1
-  spokenForm: give quote
-  action: deselect
-  targets:
-    - type: primitive
-      mark: {type: decoratedSymbol, symbolColor: default, character: '"'}
-initialState:
-  documentContents: |
-    "hello"
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 1}
-    - anchor: {line: 0, character: 1}
-      active: {line: 0, character: 6}
-    - anchor: {line: 0, character: 6}
-      active: {line: 0, character: 7}
-  marks:
-    default.":
-      start: {line: 0, character: 0}
-      end: {line: 0, character: 1}
-finalState:
-  documentContents: |
-    "hello"
-  selections:
-    - anchor: {line: 0, character: 1}
-      active: {line: 0, character: 6}
-    - anchor: {line: 0, character: 6}
-      active: {line: 0, character: 7}
-  thatMark:
-    - type: UntypedTarget
-      contentRange:
-        start: {line: 0, character: 0}
-        end: {line: 0, character: 1}
-      isReversed: false
-      hasExplicitRange: false
-fullTargets: [{type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: '"'}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: identity}}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/actions/giveQuoteAndAir.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/actions/giveQuoteAndAir.yml
deleted file mode 100644
index f8d1f6780a..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/actions/giveQuoteAndAir.yml
+++ /dev/null
@@ -1,49 +0,0 @@
-languageId: typescript
-command:
-  version: 1
-  spokenForm: give quote and air
-  action: deselect
-  targets:
-    - type: list
-      elements:
-        - type: primitive
-          mark: {type: decoratedSymbol, symbolColor: default, character: '"'}
-        - type: primitive
-          mark: {type: decoratedSymbol, symbolColor: default, character: a}
-initialState:
-  documentContents: |
-    "a!
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 1}
-    - anchor: {line: 0, character: 1}
-      active: {line: 0, character: 2}
-    - anchor: {line: 0, character: 2}
-      active: {line: 0, character: 3}
-  marks:
-    default.":
-      start: {line: 0, character: 0}
-      end: {line: 0, character: 1}
-    default.a:
-      start: {line: 0, character: 1}
-      end: {line: 0, character: 2}
-finalState:
-  documentContents: |
-    "a!
-  selections:
-    - anchor: {line: 0, character: 2}
-      active: {line: 0, character: 3}
-  thatMark:
-    - type: UntypedTarget
-      contentRange:
-        start: {line: 0, character: 0}
-        end: {line: 0, character: 1}
-      isReversed: false
-      hasExplicitRange: false
-    - type: UntypedTarget
-      contentRange:
-        start: {line: 0, character: 1}
-        end: {line: 0, character: 2}
-      isReversed: false
-      hasExplicitRange: false
-fullTargets: [{type: list, elements: [{type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: '"'}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: identity}}, {type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: a}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: identity}}]}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/actions/giveQuoteAndBang.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/actions/giveQuoteAndBang.yml
deleted file mode 100644
index 69dcef8cde..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/actions/giveQuoteAndBang.yml
+++ /dev/null
@@ -1,49 +0,0 @@
-languageId: typescript
-command:
-  version: 1
-  spokenForm: give quote and bang
-  action: deselect
-  targets:
-    - type: list
-      elements:
-        - type: primitive
-          mark: {type: decoratedSymbol, symbolColor: default, character: '"'}
-        - type: primitive
-          mark: {type: decoratedSymbol, symbolColor: default, character: '!'}
-initialState:
-  documentContents: |
-    "a!
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 1}
-    - anchor: {line: 0, character: 1}
-      active: {line: 0, character: 2}
-    - anchor: {line: 0, character: 2}
-      active: {line: 0, character: 3}
-  marks:
-    default.":
-      start: {line: 0, character: 0}
-      end: {line: 0, character: 1}
-    default.!:
-      start: {line: 0, character: 2}
-      end: {line: 0, character: 3}
-finalState:
-  documentContents: |
-    "a!
-  selections:
-    - anchor: {line: 0, character: 1}
-      active: {line: 0, character: 2}
-  thatMark:
-    - type: UntypedTarget
-      contentRange:
-        start: {line: 0, character: 0}
-        end: {line: 0, character: 1}
-      isReversed: false
-      hasExplicitRange: false
-    - type: UntypedTarget
-      contentRange:
-        start: {line: 0, character: 2}
-        end: {line: 0, character: 3}
-      isReversed: false
-      hasExplicitRange: false
-fullTargets: [{type: list, elements: [{type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: '"'}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: identity}}, {type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: '!'}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: identity}}]}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/actions/giveVestAndHarp.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/actions/giveVestAndHarp.yml
deleted file mode 100644
index 99e4a16373..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/actions/giveVestAndHarp.yml
+++ /dev/null
@@ -1,53 +0,0 @@
-languageId: typescript
-command:
-  version: 1
-  spokenForm: give vest and harp
-  action: deselect
-  targets:
-    - type: list
-      elements:
-        - type: primitive
-          mark: {type: decoratedSymbol, symbolColor: default, character: v}
-        - type: primitive
-          mark: {type: decoratedSymbol, symbolColor: default, character: h}
-initialState:
-  documentContents: |
-    const values: string = "hello"
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 5}
-    - anchor: {line: 0, character: 6}
-      active: {line: 0, character: 12}
-    - anchor: {line: 0, character: 14}
-      active: {line: 0, character: 20}
-    - anchor: {line: 0, character: 24}
-      active: {line: 0, character: 29}
-  marks:
-    default.v:
-      start: {line: 0, character: 6}
-      end: {line: 0, character: 12}
-    default.h:
-      start: {line: 0, character: 24}
-      end: {line: 0, character: 29}
-finalState:
-  documentContents: |
-    const values: string = "hello"
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 5}
-    - anchor: {line: 0, character: 14}
-      active: {line: 0, character: 20}
-  thatMark:
-    - type: UntypedTarget
-      contentRange:
-        start: {line: 0, character: 6}
-        end: {line: 0, character: 12}
-      isReversed: false
-      hasExplicitRange: false
-    - type: UntypedTarget
-      contentRange:
-        start: {line: 0, character: 24}
-        end: {line: 0, character: 29}
-      isReversed: false
-      hasExplicitRange: false
-fullTargets: [{type: list, elements: [{type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: v}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: identity}}, {type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: h}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: identity}}]}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/actions/highlightNothing.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/actions/highlightNothing.yml
deleted file mode 100644
index dbe163b316..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/actions/highlightNothing.yml
+++ /dev/null
@@ -1,25 +0,0 @@
-languageId: plaintext
-command:
-  version: 4
-  spokenForm: highlight nothing
-  action: {name: highlight}
-  targets:
-    - type: primitive
-      mark: {type: nothing}
-  usePrePhraseSnapshot: true
-initialState:
-  documentContents: ""
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-  marks: {}
-finalState:
-  documentContents: ""
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-  thatMark: []
-ide:
-  highlights:
-    - ranges: []
-fullTargets: [{type: primitive, mark: {type: nothing}, modifiers: []}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/actions/indentVest.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/actions/indentVest.yml
deleted file mode 100644
index 49cd40d7b2..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/actions/indentVest.yml
+++ /dev/null
@@ -1,34 +0,0 @@
-languageId: typescript
-command:
-  version: 1
-  spokenForm: indent vest
-  action: indentLine
-  targets:
-    - type: primitive
-      mark: {type: decoratedSymbol, symbolColor: default, character: v}
-initialState:
-  documentContents: |
-
-    const value = "Hello world";
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-  marks:
-    default.v:
-      start: {line: 1, character: 6}
-      end: {line: 1, character: 11}
-finalState:
-  documentContents: |2
-
-        const value = "Hello world";
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-  thatMark:
-    - type: UntypedTarget
-      contentRange:
-        start: {line: 1, character: 10}
-        end: {line: 1, character: 15}
-      isReversed: false
-      hasExplicitRange: true
-fullTargets: [{type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: v}, selectionType: token, position: contents, modifier: {type: identity}, insideOutsideType: inside}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/actions/insertEmptyLines/dropThis.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/actions/insertEmptyLines/dropThis.yml
deleted file mode 100644
index bc69d4ebee..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/actions/insertEmptyLines/dropThis.yml
+++ /dev/null
@@ -1,33 +0,0 @@
-languageId: plaintext
-command:
-  spokenForm: drop this
-  version: 2
-  targets:
-    - type: primitive
-      mark: {type: cursor}
-  usePrePhraseSnapshot: true
-  action: {name: insertEmptyLineBefore}
-initialState:
-  documentContents: ""
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-  marks: {}
-finalState:
-  documentContents: |+
-
-  selections:
-    - anchor: {line: 1, character: 0}
-      active: {line: 1, character: 0}
-  thatMark:
-    - type: UntypedTarget
-      contentRange:
-        start: {line: 1, character: 0}
-        end: {line: 1, character: 0}
-      isReversed: false
-      hasExplicitRange: false
-ide:
-  flashes:
-    - range: {type: line, start: 0, end: 0}
-      style: justAdded
-fullTargets: [{type: primitive, mark: {type: cursor}, modifiers: []}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/actions/insertEmptyLines/dropThis10.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/actions/insertEmptyLines/dropThis10.yml
deleted file mode 100644
index 20a22e6398..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/actions/insertEmptyLines/dropThis10.yml
+++ /dev/null
@@ -1,37 +0,0 @@
-languageId: plaintext
-command:
-  spokenForm: drop this
-  version: 2
-  targets:
-    - type: primitive
-      mark: {type: cursor}
-  usePrePhraseSnapshot: false
-  action: {name: insertEmptyLineBefore}
-initialState:
-  documentContents: |-
-    hello
-    there
-  selections:
-    - anchor: {line: 1, character: 0}
-      active: {line: 1, character: 0}
-  marks: {}
-finalState:
-  documentContents: |-
-    hello
-
-    there
-  selections:
-    - anchor: {line: 2, character: 0}
-      active: {line: 2, character: 0}
-  thatMark:
-    - type: UntypedTarget
-      contentRange:
-        start: {line: 2, character: 0}
-        end: {line: 2, character: 0}
-      isReversed: false
-      hasExplicitRange: false
-ide:
-  flashes:
-    - range: {type: line, start: 1, end: 1}
-      style: justAdded
-fullTargets: [{type: primitive, mark: {type: cursor}, modifiers: []}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/actions/insertEmptyLines/dropThis11.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/actions/insertEmptyLines/dropThis11.yml
deleted file mode 100644
index 22dd085352..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/actions/insertEmptyLines/dropThis11.yml
+++ /dev/null
@@ -1,37 +0,0 @@
-languageId: plaintext
-command:
-  spokenForm: drop this
-  version: 2
-  targets:
-    - type: primitive
-      mark: {type: cursor}
-  usePrePhraseSnapshot: false
-  action: {name: insertEmptyLineBefore}
-initialState:
-  documentContents: |2-
-        hello
-        there
-  selections:
-    - anchor: {line: 1, character: 0}
-      active: {line: 1, character: 0}
-  marks: {}
-finalState:
-  documentContents: |2-
-        hello
-
-        there
-  selections:
-    - anchor: {line: 2, character: 0}
-      active: {line: 2, character: 0}
-  thatMark:
-    - type: UntypedTarget
-      contentRange:
-        start: {line: 2, character: 0}
-        end: {line: 2, character: 0}
-      isReversed: false
-      hasExplicitRange: false
-ide:
-  flashes:
-    - range: {type: line, start: 1, end: 1}
-      style: justAdded
-fullTargets: [{type: primitive, mark: {type: cursor}, modifiers: []}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/actions/insertEmptyLines/dropThis12.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/actions/insertEmptyLines/dropThis12.yml
deleted file mode 100644
index 30274f4f2f..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/actions/insertEmptyLines/dropThis12.yml
+++ /dev/null
@@ -1,37 +0,0 @@
-languageId: plaintext
-command:
-  spokenForm: drop this
-  version: 2
-  targets:
-    - type: primitive
-      mark: {type: cursor}
-  usePrePhraseSnapshot: true
-  action: {name: insertEmptyLineBefore}
-initialState:
-  documentContents: |2-
-        hello
-        
-  selections:
-    - anchor: {line: 1, character: 0}
-      active: {line: 1, character: 0}
-  marks: {}
-finalState:
-  documentContents: |2-
-        hello
-
-        
-  selections:
-    - anchor: {line: 2, character: 0}
-      active: {line: 2, character: 0}
-  thatMark:
-    - type: UntypedTarget
-      contentRange:
-        start: {line: 2, character: 0}
-        end: {line: 2, character: 0}
-      isReversed: false
-      hasExplicitRange: false
-ide:
-  flashes:
-    - range: {type: line, start: 1, end: 1}
-      style: justAdded
-fullTargets: [{type: primitive, mark: {type: cursor}, modifiers: []}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/actions/insertEmptyLines/dropThis2.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/actions/insertEmptyLines/dropThis2.yml
deleted file mode 100644
index 18884ab486..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/actions/insertEmptyLines/dropThis2.yml
+++ /dev/null
@@ -1,34 +0,0 @@
-languageId: plaintext
-command:
-  spokenForm: drop this
-  version: 2
-  targets:
-    - type: primitive
-      mark: {type: cursor}
-  usePrePhraseSnapshot: true
-  action: {name: insertEmptyLineBefore}
-initialState:
-  documentContents: hello
-  selections:
-    - anchor: {line: 0, character: 5}
-      active: {line: 0, character: 5}
-  marks: {}
-finalState:
-  documentContents: |-
-
-    hello
-  selections:
-    - anchor: {line: 1, character: 5}
-      active: {line: 1, character: 5}
-  thatMark:
-    - type: UntypedTarget
-      contentRange:
-        start: {line: 1, character: 5}
-        end: {line: 1, character: 5}
-      isReversed: false
-      hasExplicitRange: false
-ide:
-  flashes:
-    - range: {type: line, start: 0, end: 0}
-      style: justAdded
-fullTargets: [{type: primitive, mark: {type: cursor}, modifiers: []}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/actions/insertEmptyLines/dropThis3.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/actions/insertEmptyLines/dropThis3.yml
deleted file mode 100644
index d55e6694e2..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/actions/insertEmptyLines/dropThis3.yml
+++ /dev/null
@@ -1,34 +0,0 @@
-languageId: plaintext
-command:
-  spokenForm: drop this
-  version: 2
-  targets:
-    - type: primitive
-      mark: {type: cursor}
-  usePrePhraseSnapshot: false
-  action: {name: insertEmptyLineBefore}
-initialState:
-  documentContents: hello
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-  marks: {}
-finalState:
-  documentContents: |-
-
-    hello
-  selections:
-    - anchor: {line: 1, character: 0}
-      active: {line: 1, character: 0}
-  thatMark:
-    - type: UntypedTarget
-      contentRange:
-        start: {line: 1, character: 0}
-        end: {line: 1, character: 0}
-      isReversed: false
-      hasExplicitRange: false
-ide:
-  flashes:
-    - range: {type: line, start: 0, end: 0}
-      style: justAdded
-fullTargets: [{type: primitive, mark: {type: cursor}, modifiers: []}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/actions/insertEmptyLines/dropThis4.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/actions/insertEmptyLines/dropThis4.yml
deleted file mode 100644
index eaeeba0c97..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/actions/insertEmptyLines/dropThis4.yml
+++ /dev/null
@@ -1,34 +0,0 @@
-languageId: plaintext
-command:
-  spokenForm: drop this
-  version: 2
-  targets:
-    - type: primitive
-      mark: {type: cursor}
-  usePrePhraseSnapshot: false
-  action: {name: insertEmptyLineBefore}
-initialState:
-  documentContents: "    hello"
-  selections:
-    - anchor: {line: 0, character: 4}
-      active: {line: 0, character: 4}
-  marks: {}
-finalState:
-  documentContents: |2-
-
-        hello
-  selections:
-    - anchor: {line: 1, character: 4}
-      active: {line: 1, character: 4}
-  thatMark:
-    - type: UntypedTarget
-      contentRange:
-        start: {line: 1, character: 4}
-        end: {line: 1, character: 4}
-      isReversed: false
-      hasExplicitRange: false
-ide:
-  flashes:
-    - range: {type: line, start: 0, end: 0}
-      style: justAdded
-fullTargets: [{type: primitive, mark: {type: cursor}, modifiers: []}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/actions/insertEmptyLines/dropThis5.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/actions/insertEmptyLines/dropThis5.yml
deleted file mode 100644
index c6128aaba8..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/actions/insertEmptyLines/dropThis5.yml
+++ /dev/null
@@ -1,34 +0,0 @@
-languageId: plaintext
-command:
-  spokenForm: drop this
-  version: 2
-  targets:
-    - type: primitive
-      mark: {type: cursor}
-  usePrePhraseSnapshot: false
-  action: {name: insertEmptyLineBefore}
-initialState:
-  documentContents: "    hello"
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-  marks: {}
-finalState:
-  documentContents: |2-
-
-        hello
-  selections:
-    - anchor: {line: 1, character: 0}
-      active: {line: 1, character: 0}
-  thatMark:
-    - type: UntypedTarget
-      contentRange:
-        start: {line: 1, character: 0}
-        end: {line: 1, character: 0}
-      isReversed: false
-      hasExplicitRange: false
-ide:
-  flashes:
-    - range: {type: line, start: 0, end: 0}
-      style: justAdded
-fullTargets: [{type: primitive, mark: {type: cursor}, modifiers: []}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/actions/insertEmptyLines/dropThis6.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/actions/insertEmptyLines/dropThis6.yml
deleted file mode 100644
index e164c08dc4..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/actions/insertEmptyLines/dropThis6.yml
+++ /dev/null
@@ -1,34 +0,0 @@
-languageId: plaintext
-command:
-  spokenForm: drop this
-  version: 2
-  targets:
-    - type: primitive
-      mark: {type: cursor}
-  usePrePhraseSnapshot: false
-  action: {name: insertEmptyLineBefore}
-initialState:
-  documentContents: "    hello"
-  selections:
-    - anchor: {line: 0, character: 9}
-      active: {line: 0, character: 9}
-  marks: {}
-finalState:
-  documentContents: |2-
-
-        hello
-  selections:
-    - anchor: {line: 1, character: 9}
-      active: {line: 1, character: 9}
-  thatMark:
-    - type: UntypedTarget
-      contentRange:
-        start: {line: 1, character: 9}
-        end: {line: 1, character: 9}
-      isReversed: false
-      hasExplicitRange: false
-ide:
-  flashes:
-    - range: {type: line, start: 0, end: 0}
-      style: justAdded
-fullTargets: [{type: primitive, mark: {type: cursor}, modifiers: []}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/actions/insertEmptyLines/dropThis7.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/actions/insertEmptyLines/dropThis7.yml
deleted file mode 100644
index 94c128650b..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/actions/insertEmptyLines/dropThis7.yml
+++ /dev/null
@@ -1,34 +0,0 @@
-languageId: plaintext
-command:
-  spokenForm: drop this
-  version: 2
-  targets:
-    - type: primitive
-      mark: {type: cursor}
-  usePrePhraseSnapshot: false
-  action: {name: insertEmptyLineBefore}
-initialState:
-  documentContents: "    "
-  selections:
-    - anchor: {line: 0, character: 4}
-      active: {line: 0, character: 4}
-  marks: {}
-finalState:
-  documentContents: |2-
-
-        
-  selections:
-    - anchor: {line: 1, character: 4}
-      active: {line: 1, character: 4}
-  thatMark:
-    - type: UntypedTarget
-      contentRange:
-        start: {line: 1, character: 4}
-        end: {line: 1, character: 4}
-      isReversed: false
-      hasExplicitRange: false
-ide:
-  flashes:
-    - range: {type: line, start: 0, end: 0}
-      style: justAdded
-fullTargets: [{type: primitive, mark: {type: cursor}, modifiers: []}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/actions/insertEmptyLines/dropThis8.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/actions/insertEmptyLines/dropThis8.yml
deleted file mode 100644
index 5b14db3d6d..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/actions/insertEmptyLines/dropThis8.yml
+++ /dev/null
@@ -1,34 +0,0 @@
-languageId: plaintext
-command:
-  spokenForm: drop this
-  version: 2
-  targets:
-    - type: primitive
-      mark: {type: cursor}
-  usePrePhraseSnapshot: false
-  action: {name: insertEmptyLineBefore}
-initialState:
-  documentContents: "    "
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-  marks: {}
-finalState:
-  documentContents: |2-
-
-        
-  selections:
-    - anchor: {line: 1, character: 0}
-      active: {line: 1, character: 0}
-  thatMark:
-    - type: UntypedTarget
-      contentRange:
-        start: {line: 1, character: 0}
-        end: {line: 1, character: 0}
-      isReversed: false
-      hasExplicitRange: false
-ide:
-  flashes:
-    - range: {type: line, start: 0, end: 0}
-      style: justAdded
-fullTargets: [{type: primitive, mark: {type: cursor}, modifiers: []}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/actions/insertEmptyLines/dropThis9.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/actions/insertEmptyLines/dropThis9.yml
deleted file mode 100644
index 6931240d0e..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/actions/insertEmptyLines/dropThis9.yml
+++ /dev/null
@@ -1,37 +0,0 @@
-languageId: plaintext
-command:
-  spokenForm: drop this
-  version: 2
-  targets:
-    - type: primitive
-      mark: {type: cursor}
-  usePrePhraseSnapshot: false
-  action: {name: insertEmptyLineBefore}
-initialState:
-  documentContents: |-
-    hello
-    there
-  selections:
-    - anchor: {line: 1, character: 5}
-      active: {line: 1, character: 5}
-  marks: {}
-finalState:
-  documentContents: |-
-    hello
-
-    there
-  selections:
-    - anchor: {line: 2, character: 5}
-      active: {line: 2, character: 5}
-  thatMark:
-    - type: UntypedTarget
-      contentRange:
-        start: {line: 2, character: 5}
-        end: {line: 2, character: 5}
-      isReversed: false
-      hasExplicitRange: false
-ide:
-  flashes:
-    - range: {type: line, start: 1, end: 1}
-      style: justAdded
-fullTargets: [{type: primitive, mark: {type: cursor}, modifiers: []}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/actions/insertEmptyLines/dropVest.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/actions/insertEmptyLines/dropVest.yml
deleted file mode 100644
index 40793746c9..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/actions/insertEmptyLines/dropVest.yml
+++ /dev/null
@@ -1,35 +0,0 @@
-languageId: typescript
-command:
-  version: 1
-  spokenForm: drop vest
-  action: insertEmptyLineBefore
-  targets:
-    - type: primitive
-      mark: {type: decoratedSymbol, symbolColor: default, character: v}
-initialState:
-  documentContents: |
-
-    const value = "Hello world";
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-  marks:
-    default.v:
-      start: {line: 1, character: 6}
-      end: {line: 1, character: 11}
-finalState:
-  documentContents: |
-
-
-    const value = "Hello world";
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-  thatMark:
-    - type: UntypedTarget
-      contentRange:
-        start: {line: 2, character: 6}
-        end: {line: 2, character: 11}
-      isReversed: false
-      hasExplicitRange: true
-fullTargets: [{type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: v}, selectionType: token, position: contents, modifier: {type: identity}, insideOutsideType: inside}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/actions/insertEmptyLines/dropVest2.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/actions/insertEmptyLines/dropVest2.yml
deleted file mode 100644
index d31d7b51f8..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/actions/insertEmptyLines/dropVest2.yml
+++ /dev/null
@@ -1,36 +0,0 @@
-languageId: plaintext
-command:
-  spokenForm: drop vest
-  version: 2
-  targets:
-    - type: primitive
-      mark: {type: decoratedSymbol, symbolColor: default, character: v}
-  usePrePhraseSnapshot: true
-  action: {name: insertEmptyLineBefore}
-initialState:
-  documentContents: |2
-
-        const value = "Hello world";
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-  marks:
-    default.v:
-      start: {line: 1, character: 10}
-      end: {line: 1, character: 15}
-finalState:
-  documentContents: |2
-
-
-        const value = "Hello world";
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-  thatMark:
-    - type: UntypedTarget
-      contentRange:
-        start: {line: 2, character: 10}
-        end: {line: 2, character: 15}
-      isReversed: false
-      hasExplicitRange: true
-fullTargets: [{type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: v}, modifiers: []}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/actions/insertEmptyLines/floatThis.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/actions/insertEmptyLines/floatThis.yml
deleted file mode 100644
index 0c7dcef502..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/actions/insertEmptyLines/floatThis.yml
+++ /dev/null
@@ -1,33 +0,0 @@
-languageId: plaintext
-command:
-  spokenForm: float this
-  version: 2
-  targets:
-    - type: primitive
-      mark: {type: cursor}
-  usePrePhraseSnapshot: true
-  action: {name: insertEmptyLineAfter}
-initialState:
-  documentContents: ""
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-  marks: {}
-finalState:
-  documentContents: |+
-
-  selections:
-    - anchor: {line: 1, character: 0}
-      active: {line: 1, character: 0}
-  thatMark:
-    - type: UntypedTarget
-      contentRange:
-        start: {line: 1, character: 0}
-        end: {line: 1, character: 0}
-      isReversed: false
-      hasExplicitRange: false
-ide:
-  flashes:
-    - range: {type: line, start: 1, end: 1}
-      style: justAdded
-fullTargets: [{type: primitive, mark: {type: cursor}, modifiers: []}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/actions/insertEmptyLines/floatThis10.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/actions/insertEmptyLines/floatThis10.yml
deleted file mode 100644
index 1e8fffc607..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/actions/insertEmptyLines/floatThis10.yml
+++ /dev/null
@@ -1,36 +0,0 @@
-languageId: plaintext
-command:
-  spokenForm: float this
-  version: 2
-  targets:
-    - type: primitive
-      mark: {type: cursor}
-  usePrePhraseSnapshot: true
-  action: {name: insertEmptyLineAfter}
-initialState:
-  documentContents: |2-
-        
-        hello
-  selections:
-    - anchor: {line: 1, character: 9}
-      active: {line: 1, character: 9}
-  marks: {}
-finalState:
-  documentContents: |2
-        
-        hello
-  selections:
-    - anchor: {line: 2, character: 0}
-      active: {line: 2, character: 0}
-  thatMark:
-    - type: UntypedTarget
-      contentRange:
-        start: {line: 2, character: 0}
-        end: {line: 2, character: 0}
-      isReversed: false
-      hasExplicitRange: false
-ide:
-  flashes:
-    - range: {type: line, start: 2, end: 2}
-      style: justAdded
-fullTargets: [{type: primitive, mark: {type: cursor}, modifiers: []}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/actions/insertEmptyLines/floatThis11.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/actions/insertEmptyLines/floatThis11.yml
deleted file mode 100644
index 2f533a2785..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/actions/insertEmptyLines/floatThis11.yml
+++ /dev/null
@@ -1,35 +0,0 @@
-languageId: plaintext
-command:
-  spokenForm: float this
-  version: 2
-  targets:
-    - type: primitive
-      mark: {type: cursor}
-  usePrePhraseSnapshot: true
-  action: {name: insertEmptyLineAfter}
-initialState:
-  documentContents: |
-    there
-  selections:
-    - anchor: {line: 0, character: 5}
-      active: {line: 0, character: 5}
-  marks: {}
-finalState:
-  documentContents: |+
-    there
-
-  selections:
-    - anchor: {line: 0, character: 5}
-      active: {line: 0, character: 5}
-  thatMark:
-    - type: UntypedTarget
-      contentRange:
-        start: {line: 0, character: 5}
-        end: {line: 0, character: 5}
-      isReversed: false
-      hasExplicitRange: false
-ide:
-  flashes:
-    - range: {type: line, start: 1, end: 1}
-      style: justAdded
-fullTargets: [{type: primitive, mark: {type: cursor}, modifiers: []}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/actions/insertEmptyLines/floatThis12.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/actions/insertEmptyLines/floatThis12.yml
deleted file mode 100644
index a75fa06406..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/actions/insertEmptyLines/floatThis12.yml
+++ /dev/null
@@ -1,35 +0,0 @@
-languageId: plaintext
-command:
-  spokenForm: float this
-  version: 2
-  targets:
-    - type: primitive
-      mark: {type: cursor}
-  usePrePhraseSnapshot: true
-  action: {name: insertEmptyLineAfter}
-initialState:
-  documentContents: |2
-        
-  selections:
-    - anchor: {line: 0, character: 4}
-      active: {line: 0, character: 4}
-  marks: {}
-finalState:
-  documentContents: |2+
-        
-
-  selections:
-    - anchor: {line: 0, character: 4}
-      active: {line: 0, character: 4}
-  thatMark:
-    - type: UntypedTarget
-      contentRange:
-        start: {line: 0, character: 4}
-        end: {line: 0, character: 4}
-      isReversed: false
-      hasExplicitRange: false
-ide:
-  flashes:
-    - range: {type: line, start: 1, end: 1}
-      style: justAdded
-fullTargets: [{type: primitive, mark: {type: cursor}, modifiers: []}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/actions/insertEmptyLines/floatThis13.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/actions/insertEmptyLines/floatThis13.yml
deleted file mode 100644
index 429f4fe629..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/actions/insertEmptyLines/floatThis13.yml
+++ /dev/null
@@ -1,35 +0,0 @@
-languageId: plaintext
-command:
-  spokenForm: float this
-  version: 2
-  targets:
-    - type: primitive
-      mark: {type: cursor}
-  usePrePhraseSnapshot: false
-  action: {name: insertEmptyLineAfter}
-initialState:
-  documentContents: |2
-        there
-  selections:
-    - anchor: {line: 0, character: 9}
-      active: {line: 0, character: 9}
-  marks: {}
-finalState:
-  documentContents: |2+
-        there
-
-  selections:
-    - anchor: {line: 0, character: 9}
-      active: {line: 0, character: 9}
-  thatMark:
-    - type: UntypedTarget
-      contentRange:
-        start: {line: 0, character: 9}
-        end: {line: 0, character: 9}
-      isReversed: false
-      hasExplicitRange: false
-ide:
-  flashes:
-    - range: {type: line, start: 1, end: 1}
-      style: justAdded
-fullTargets: [{type: primitive, mark: {type: cursor}, modifiers: []}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/actions/insertEmptyLines/floatThis2.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/actions/insertEmptyLines/floatThis2.yml
deleted file mode 100644
index 7ff44871ee..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/actions/insertEmptyLines/floatThis2.yml
+++ /dev/null
@@ -1,33 +0,0 @@
-languageId: plaintext
-command:
-  spokenForm: float this
-  version: 2
-  targets:
-    - type: primitive
-      mark: {type: cursor}
-  usePrePhraseSnapshot: true
-  action: {name: insertEmptyLineAfter}
-initialState:
-  documentContents: hello
-  selections:
-    - anchor: {line: 0, character: 5}
-      active: {line: 0, character: 5}
-  marks: {}
-finalState:
-  documentContents: |
-    hello
-  selections:
-    - anchor: {line: 1, character: 0}
-      active: {line: 1, character: 0}
-  thatMark:
-    - type: UntypedTarget
-      contentRange:
-        start: {line: 1, character: 0}
-        end: {line: 1, character: 0}
-      isReversed: false
-      hasExplicitRange: false
-ide:
-  flashes:
-    - range: {type: line, start: 1, end: 1}
-      style: justAdded
-fullTargets: [{type: primitive, mark: {type: cursor}, modifiers: []}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/actions/insertEmptyLines/floatThis3.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/actions/insertEmptyLines/floatThis3.yml
deleted file mode 100644
index 5669aab6cb..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/actions/insertEmptyLines/floatThis3.yml
+++ /dev/null
@@ -1,33 +0,0 @@
-languageId: plaintext
-command:
-  spokenForm: float this
-  version: 2
-  targets:
-    - type: primitive
-      mark: {type: cursor}
-  usePrePhraseSnapshot: true
-  action: {name: insertEmptyLineAfter}
-initialState:
-  documentContents: "    hello"
-  selections:
-    - anchor: {line: 0, character: 9}
-      active: {line: 0, character: 9}
-  marks: {}
-finalState:
-  documentContents: |2
-        hello
-  selections:
-    - anchor: {line: 1, character: 0}
-      active: {line: 1, character: 0}
-  thatMark:
-    - type: UntypedTarget
-      contentRange:
-        start: {line: 1, character: 0}
-        end: {line: 1, character: 0}
-      isReversed: false
-      hasExplicitRange: false
-ide:
-  flashes:
-    - range: {type: line, start: 1, end: 1}
-      style: justAdded
-fullTargets: [{type: primitive, mark: {type: cursor}, modifiers: []}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/actions/insertEmptyLines/floatThis4.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/actions/insertEmptyLines/floatThis4.yml
deleted file mode 100644
index fb4e6bdd3b..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/actions/insertEmptyLines/floatThis4.yml
+++ /dev/null
@@ -1,33 +0,0 @@
-languageId: plaintext
-command:
-  spokenForm: float this
-  version: 2
-  targets:
-    - type: primitive
-      mark: {type: cursor}
-  usePrePhraseSnapshot: true
-  action: {name: insertEmptyLineAfter}
-initialState:
-  documentContents: "    "
-  selections:
-    - anchor: {line: 0, character: 4}
-      active: {line: 0, character: 4}
-  marks: {}
-finalState:
-  documentContents: |2
-        
-  selections:
-    - anchor: {line: 1, character: 0}
-      active: {line: 1, character: 0}
-  thatMark:
-    - type: UntypedTarget
-      contentRange:
-        start: {line: 1, character: 0}
-        end: {line: 1, character: 0}
-      isReversed: false
-      hasExplicitRange: false
-ide:
-  flashes:
-    - range: {type: line, start: 1, end: 1}
-      style: justAdded
-fullTargets: [{type: primitive, mark: {type: cursor}, modifiers: []}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/actions/insertEmptyLines/floatThis5.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/actions/insertEmptyLines/floatThis5.yml
deleted file mode 100644
index 153520cd72..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/actions/insertEmptyLines/floatThis5.yml
+++ /dev/null
@@ -1,36 +0,0 @@
-languageId: plaintext
-command:
-  spokenForm: float this
-  version: 2
-  targets:
-    - type: primitive
-      mark: {type: cursor}
-  usePrePhraseSnapshot: true
-  action: {name: insertEmptyLineAfter}
-initialState:
-  documentContents: |2-
-        whatever
-        hello
-  selections:
-    - anchor: {line: 1, character: 9}
-      active: {line: 1, character: 9}
-  marks: {}
-finalState:
-  documentContents: |2
-        whatever
-        hello
-  selections:
-    - anchor: {line: 2, character: 0}
-      active: {line: 2, character: 0}
-  thatMark:
-    - type: UntypedTarget
-      contentRange:
-        start: {line: 2, character: 0}
-        end: {line: 2, character: 0}
-      isReversed: false
-      hasExplicitRange: false
-ide:
-  flashes:
-    - range: {type: line, start: 2, end: 2}
-      style: justAdded
-fullTargets: [{type: primitive, mark: {type: cursor}, modifiers: []}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/actions/insertEmptyLines/floatThis6.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/actions/insertEmptyLines/floatThis6.yml
deleted file mode 100644
index e8d52e468a..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/actions/insertEmptyLines/floatThis6.yml
+++ /dev/null
@@ -1,36 +0,0 @@
-languageId: plaintext
-command:
-  spokenForm: float this
-  version: 2
-  targets:
-    - type: primitive
-      mark: {type: cursor}
-  usePrePhraseSnapshot: true
-  action: {name: insertEmptyLineAfter}
-initialState:
-  documentContents: |-
-    whatever
-    hello
-  selections:
-    - anchor: {line: 1, character: 5}
-      active: {line: 1, character: 5}
-  marks: {}
-finalState:
-  documentContents: |
-    whatever
-    hello
-  selections:
-    - anchor: {line: 2, character: 0}
-      active: {line: 2, character: 0}
-  thatMark:
-    - type: UntypedTarget
-      contentRange:
-        start: {line: 2, character: 0}
-        end: {line: 2, character: 0}
-      isReversed: false
-      hasExplicitRange: false
-ide:
-  flashes:
-    - range: {type: line, start: 2, end: 2}
-      style: justAdded
-fullTargets: [{type: primitive, mark: {type: cursor}, modifiers: []}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/actions/insertEmptyLines/floatThis7.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/actions/insertEmptyLines/floatThis7.yml
deleted file mode 100644
index 58fd85e21b..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/actions/insertEmptyLines/floatThis7.yml
+++ /dev/null
@@ -1,35 +0,0 @@
-languageId: plaintext
-command:
-  spokenForm: float this
-  version: 2
-  targets:
-    - type: primitive
-      mark: {type: cursor}
-  usePrePhraseSnapshot: true
-  action: {name: insertEmptyLineAfter}
-initialState:
-  documentContents: |
-    hello
-  selections:
-    - anchor: {line: 1, character: 0}
-      active: {line: 1, character: 0}
-  marks: {}
-finalState:
-  documentContents: |+
-    hello
-
-  selections:
-    - anchor: {line: 2, character: 0}
-      active: {line: 2, character: 0}
-  thatMark:
-    - type: UntypedTarget
-      contentRange:
-        start: {line: 2, character: 0}
-        end: {line: 2, character: 0}
-      isReversed: false
-      hasExplicitRange: false
-ide:
-  flashes:
-    - range: {type: line, start: 2, end: 2}
-      style: justAdded
-fullTargets: [{type: primitive, mark: {type: cursor}, modifiers: []}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/actions/insertEmptyLines/floatThis8.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/actions/insertEmptyLines/floatThis8.yml
deleted file mode 100644
index f4a520ea37..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/actions/insertEmptyLines/floatThis8.yml
+++ /dev/null
@@ -1,35 +0,0 @@
-languageId: plaintext
-command:
-  spokenForm: float this
-  version: 2
-  targets:
-    - type: primitive
-      mark: {type: cursor}
-  usePrePhraseSnapshot: true
-  action: {name: insertEmptyLineAfter}
-initialState:
-  documentContents: |2
-        hello
-  selections:
-    - anchor: {line: 1, character: 0}
-      active: {line: 1, character: 0}
-  marks: {}
-finalState:
-  documentContents: |2+
-        hello
-
-  selections:
-    - anchor: {line: 2, character: 0}
-      active: {line: 2, character: 0}
-  thatMark:
-    - type: UntypedTarget
-      contentRange:
-        start: {line: 2, character: 0}
-        end: {line: 2, character: 0}
-      isReversed: false
-      hasExplicitRange: false
-ide:
-  flashes:
-    - range: {type: line, start: 2, end: 2}
-      style: justAdded
-fullTargets: [{type: primitive, mark: {type: cursor}, modifiers: []}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/actions/insertEmptyLines/floatThis9.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/actions/insertEmptyLines/floatThis9.yml
deleted file mode 100644
index 347aac6d46..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/actions/insertEmptyLines/floatThis9.yml
+++ /dev/null
@@ -1,36 +0,0 @@
-languageId: plaintext
-command:
-  spokenForm: float this
-  version: 2
-  targets:
-    - type: primitive
-      mark: {type: cursor}
-  usePrePhraseSnapshot: true
-  action: {name: insertEmptyLineAfter}
-initialState:
-  documentContents: |2-
-        hello
-        
-  selections:
-    - anchor: {line: 1, character: 4}
-      active: {line: 1, character: 4}
-  marks: {}
-finalState:
-  documentContents: |2
-        hello
-        
-  selections:
-    - anchor: {line: 2, character: 0}
-      active: {line: 2, character: 0}
-  thatMark:
-    - type: UntypedTarget
-      contentRange:
-        start: {line: 2, character: 0}
-        end: {line: 2, character: 0}
-      isReversed: false
-      hasExplicitRange: false
-ide:
-  flashes:
-    - range: {type: line, start: 2, end: 2}
-      style: justAdded
-fullTargets: [{type: primitive, mark: {type: cursor}, modifiers: []}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/actions/insertEmptyLines/floatVest.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/actions/insertEmptyLines/floatVest.yml
deleted file mode 100644
index 0234ed73a3..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/actions/insertEmptyLines/floatVest.yml
+++ /dev/null
@@ -1,39 +0,0 @@
-languageId: typescript
-command:
-  version: 1
-  spokenForm: float vest
-  action: insertEmptyLineAfter
-  targets:
-    - type: primitive
-      mark: {type: decoratedSymbol, symbolColor: default, character: v}
-initialState:
-  documentContents: |
-
-    const value = "Hello world";
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-  marks:
-    default.v:
-      start: {line: 1, character: 6}
-      end: {line: 1, character: 11}
-finalState:
-  documentContents: |+
-
-    const value = "Hello world";
-
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-  thatMark:
-    - type: UntypedTarget
-      contentRange:
-        start: {line: 1, character: 6}
-        end: {line: 1, character: 11}
-      isReversed: false
-      hasExplicitRange: true
-ide:
-  flashes:
-    - range: {type: line, start: 2, end: 2}
-      style: justAdded
-fullTargets: [{type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: v}, selectionType: token, position: contents, modifier: {type: identity}, insideOutsideType: inside}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/actions/insertEmptyLines/floatVest2.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/actions/insertEmptyLines/floatVest2.yml
deleted file mode 100644
index 0c7a4bf9dc..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/actions/insertEmptyLines/floatVest2.yml
+++ /dev/null
@@ -1,40 +0,0 @@
-languageId: plaintext
-command:
-  spokenForm: float vest
-  version: 2
-  targets:
-    - type: primitive
-      mark: {type: decoratedSymbol, symbolColor: default, character: v}
-  usePrePhraseSnapshot: true
-  action: {name: insertEmptyLineAfter}
-initialState:
-  documentContents: |2
-
-        const value = "Hello world";
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-  marks:
-    default.v:
-      start: {line: 1, character: 10}
-      end: {line: 1, character: 15}
-finalState:
-  documentContents: |2+
-
-        const value = "Hello world";
-
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-  thatMark:
-    - type: UntypedTarget
-      contentRange:
-        start: {line: 1, character: 10}
-        end: {line: 1, character: 15}
-      isReversed: false
-      hasExplicitRange: true
-ide:
-  flashes:
-    - range: {type: line, start: 2, end: 2}
-      style: justAdded
-fullTargets: [{type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: v}, modifiers: []}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/actions/insertEmptyLines/puffThis.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/actions/insertEmptyLines/puffThis.yml
deleted file mode 100644
index 06243cd6fa..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/actions/insertEmptyLines/puffThis.yml
+++ /dev/null
@@ -1,36 +0,0 @@
-languageId: plaintext
-command:
-  spokenForm: puff this
-  version: 2
-  targets:
-    - type: primitive
-      mark: {type: cursor}
-  usePrePhraseSnapshot: true
-  action: {name: insertEmptyLinesAround}
-initialState:
-  documentContents: ""
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-  marks: {}
-finalState:
-  documentContents: |+
-
-
-  selections:
-    - anchor: {line: 2, character: 0}
-      active: {line: 2, character: 0}
-  thatMark:
-    - type: UntypedTarget
-      contentRange:
-        start: {line: 2, character: 0}
-        end: {line: 2, character: 0}
-      isReversed: false
-      hasExplicitRange: false
-ide:
-  flashes:
-    - range: {type: line, start: 1, end: 1}
-      style: justAdded
-    - range: {type: line, start: 1, end: 1}
-      style: justAdded
-fullTargets: [{type: primitive, mark: {type: cursor}, modifiers: []}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/actions/insertEmptyLines/puffThis10.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/actions/insertEmptyLines/puffThis10.yml
deleted file mode 100644
index 9dbf53ac75..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/actions/insertEmptyLines/puffThis10.yml
+++ /dev/null
@@ -1,39 +0,0 @@
-languageId: plaintext
-command:
-  spokenForm: puff this
-  version: 2
-  targets:
-    - type: primitive
-      mark: {type: cursor}
-  usePrePhraseSnapshot: true
-  action: {name: insertEmptyLinesAround}
-initialState:
-  documentContents: |2-
-        hello
-        
-  selections:
-    - anchor: {line: 1, character: 4}
-      active: {line: 1, character: 4}
-  marks: {}
-finalState:
-  documentContents: |2
-        hello
-
-        
-  selections:
-    - anchor: {line: 3, character: 0}
-      active: {line: 3, character: 0}
-  thatMark:
-    - type: UntypedTarget
-      contentRange:
-        start: {line: 3, character: 0}
-        end: {line: 3, character: 0}
-      isReversed: false
-      hasExplicitRange: false
-ide:
-  flashes:
-    - range: {type: line, start: 1, end: 1}
-      style: justAdded
-    - range: {type: line, start: 2, end: 2}
-      style: justAdded
-fullTargets: [{type: primitive, mark: {type: cursor}, modifiers: []}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/actions/insertEmptyLines/puffThis11.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/actions/insertEmptyLines/puffThis11.yml
deleted file mode 100644
index e317c9cf93..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/actions/insertEmptyLines/puffThis11.yml
+++ /dev/null
@@ -1,39 +0,0 @@
-languageId: plaintext
-command:
-  spokenForm: puff this
-  version: 2
-  targets:
-    - type: primitive
-      mark: {type: cursor}
-  usePrePhraseSnapshot: true
-  action: {name: insertEmptyLinesAround}
-initialState:
-  documentContents: |2-
-        
-        hello
-  selections:
-    - anchor: {line: 1, character: 9}
-      active: {line: 1, character: 9}
-  marks: {}
-finalState:
-  documentContents: |2
-        
-
-        hello
-  selections:
-    - anchor: {line: 3, character: 0}
-      active: {line: 3, character: 0}
-  thatMark:
-    - type: UntypedTarget
-      contentRange:
-        start: {line: 3, character: 0}
-        end: {line: 3, character: 0}
-      isReversed: false
-      hasExplicitRange: false
-ide:
-  flashes:
-    - range: {type: line, start: 1, end: 1}
-      style: justAdded
-    - range: {type: line, start: 2, end: 2}
-      style: justAdded
-fullTargets: [{type: primitive, mark: {type: cursor}, modifiers: []}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/actions/insertEmptyLines/puffThis12.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/actions/insertEmptyLines/puffThis12.yml
deleted file mode 100644
index e54df3d423..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/actions/insertEmptyLines/puffThis12.yml
+++ /dev/null
@@ -1,38 +0,0 @@
-languageId: plaintext
-command:
-  spokenForm: puff this
-  version: 2
-  targets:
-    - type: primitive
-      mark: {type: cursor}
-  usePrePhraseSnapshot: true
-  action: {name: insertEmptyLinesAround}
-initialState:
-  documentContents: |
-    there
-  selections:
-    - anchor: {line: 0, character: 5}
-      active: {line: 0, character: 5}
-  marks: {}
-finalState:
-  documentContents: |+
-
-    there
-
-  selections:
-    - anchor: {line: 1, character: 5}
-      active: {line: 1, character: 5}
-  thatMark:
-    - type: UntypedTarget
-      contentRange:
-        start: {line: 1, character: 5}
-        end: {line: 1, character: 5}
-      isReversed: false
-      hasExplicitRange: false
-ide:
-  flashes:
-    - range: {type: line, start: 0, end: 0}
-      style: justAdded
-    - range: {type: line, start: 2, end: 2}
-      style: justAdded
-fullTargets: [{type: primitive, mark: {type: cursor}, modifiers: []}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/actions/insertEmptyLines/puffThis13.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/actions/insertEmptyLines/puffThis13.yml
deleted file mode 100644
index 945a14a264..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/actions/insertEmptyLines/puffThis13.yml
+++ /dev/null
@@ -1,38 +0,0 @@
-languageId: plaintext
-command:
-  spokenForm: puff this
-  version: 2
-  targets:
-    - type: primitive
-      mark: {type: cursor}
-  usePrePhraseSnapshot: false
-  action: {name: insertEmptyLinesAround}
-initialState:
-  documentContents: |
-    there
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-  marks: {}
-finalState:
-  documentContents: |+
-
-    there
-
-  selections:
-    - anchor: {line: 1, character: 0}
-      active: {line: 1, character: 0}
-  thatMark:
-    - type: UntypedTarget
-      contentRange:
-        start: {line: 1, character: 0}
-        end: {line: 1, character: 0}
-      isReversed: false
-      hasExplicitRange: false
-ide:
-  flashes:
-    - range: {type: line, start: 0, end: 0}
-      style: justAdded
-    - range: {type: line, start: 2, end: 2}
-      style: justAdded
-fullTargets: [{type: primitive, mark: {type: cursor}, modifiers: []}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/actions/insertEmptyLines/puffThis14.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/actions/insertEmptyLines/puffThis14.yml
deleted file mode 100644
index c0338cd047..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/actions/insertEmptyLines/puffThis14.yml
+++ /dev/null
@@ -1,38 +0,0 @@
-languageId: plaintext
-command:
-  spokenForm: puff this
-  version: 2
-  targets:
-    - type: primitive
-      mark: {type: cursor}
-  usePrePhraseSnapshot: false
-  action: {name: insertEmptyLinesAround}
-initialState:
-  documentContents: |2
-        there
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-  marks: {}
-finalState:
-  documentContents: |2+
-
-        there
-
-  selections:
-    - anchor: {line: 1, character: 0}
-      active: {line: 1, character: 0}
-  thatMark:
-    - type: UntypedTarget
-      contentRange:
-        start: {line: 1, character: 0}
-        end: {line: 1, character: 0}
-      isReversed: false
-      hasExplicitRange: false
-ide:
-  flashes:
-    - range: {type: line, start: 0, end: 0}
-      style: justAdded
-    - range: {type: line, start: 2, end: 2}
-      style: justAdded
-fullTargets: [{type: primitive, mark: {type: cursor}, modifiers: []}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/actions/insertEmptyLines/puffThis15.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/actions/insertEmptyLines/puffThis15.yml
deleted file mode 100644
index f48eb1a431..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/actions/insertEmptyLines/puffThis15.yml
+++ /dev/null
@@ -1,38 +0,0 @@
-languageId: plaintext
-command:
-  spokenForm: puff this
-  version: 2
-  targets:
-    - type: primitive
-      mark: {type: cursor}
-  usePrePhraseSnapshot: false
-  action: {name: insertEmptyLinesAround}
-initialState:
-  documentContents: |2
-        there
-  selections:
-    - anchor: {line: 0, character: 9}
-      active: {line: 0, character: 9}
-  marks: {}
-finalState:
-  documentContents: |2+
-
-        there
-
-  selections:
-    - anchor: {line: 1, character: 9}
-      active: {line: 1, character: 9}
-  thatMark:
-    - type: UntypedTarget
-      contentRange:
-        start: {line: 1, character: 9}
-        end: {line: 1, character: 9}
-      isReversed: false
-      hasExplicitRange: false
-ide:
-  flashes:
-    - range: {type: line, start: 0, end: 0}
-      style: justAdded
-    - range: {type: line, start: 2, end: 2}
-      style: justAdded
-fullTargets: [{type: primitive, mark: {type: cursor}, modifiers: []}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/actions/insertEmptyLines/puffThis16.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/actions/insertEmptyLines/puffThis16.yml
deleted file mode 100644
index a576bdab1d..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/actions/insertEmptyLines/puffThis16.yml
+++ /dev/null
@@ -1,38 +0,0 @@
-languageId: plaintext
-command:
-  spokenForm: puff this
-  version: 2
-  targets:
-    - type: primitive
-      mark: {type: cursor}
-  usePrePhraseSnapshot: false
-  action: {name: insertEmptyLinesAround}
-initialState:
-  documentContents: |2
-        
-  selections:
-    - anchor: {line: 0, character: 4}
-      active: {line: 0, character: 4}
-  marks: {}
-finalState:
-  documentContents: |2+
-
-        
-
-  selections:
-    - anchor: {line: 1, character: 4}
-      active: {line: 1, character: 4}
-  thatMark:
-    - type: UntypedTarget
-      contentRange:
-        start: {line: 1, character: 4}
-        end: {line: 1, character: 4}
-      isReversed: false
-      hasExplicitRange: false
-ide:
-  flashes:
-    - range: {type: line, start: 0, end: 0}
-      style: justAdded
-    - range: {type: line, start: 2, end: 2}
-      style: justAdded
-fullTargets: [{type: primitive, mark: {type: cursor}, modifiers: []}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/actions/insertEmptyLines/puffThis17.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/actions/insertEmptyLines/puffThis17.yml
deleted file mode 100644
index 36cce63abe..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/actions/insertEmptyLines/puffThis17.yml
+++ /dev/null
@@ -1,38 +0,0 @@
-languageId: plaintext
-command:
-  spokenForm: puff this
-  version: 2
-  targets:
-    - type: primitive
-      mark: {type: cursor}
-  usePrePhraseSnapshot: false
-  action: {name: insertEmptyLinesAround}
-initialState:
-  documentContents: |2
-        
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-  marks: {}
-finalState:
-  documentContents: |2+
-
-        
-
-  selections:
-    - anchor: {line: 1, character: 0}
-      active: {line: 1, character: 0}
-  thatMark:
-    - type: UntypedTarget
-      contentRange:
-        start: {line: 1, character: 0}
-        end: {line: 1, character: 0}
-      isReversed: false
-      hasExplicitRange: false
-ide:
-  flashes:
-    - range: {type: line, start: 0, end: 0}
-      style: justAdded
-    - range: {type: line, start: 2, end: 2}
-      style: justAdded
-fullTargets: [{type: primitive, mark: {type: cursor}, modifiers: []}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/actions/insertEmptyLines/puffThis18.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/actions/insertEmptyLines/puffThis18.yml
deleted file mode 100644
index 673a8e8d55..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/actions/insertEmptyLines/puffThis18.yml
+++ /dev/null
@@ -1,40 +0,0 @@
-languageId: plaintext
-command:
-  spokenForm: puff this
-  version: 2
-  targets:
-    - type: primitive
-      mark: {type: cursor}
-  usePrePhraseSnapshot: true
-  action: {name: insertEmptyLinesAround}
-initialState:
-  documentContents: |
-    hello
-    there
-  selections:
-    - anchor: {line: 1, character: 5}
-      active: {line: 1, character: 5}
-  marks: {}
-finalState:
-  documentContents: |+
-    hello
-
-    there
-
-  selections:
-    - anchor: {line: 2, character: 5}
-      active: {line: 2, character: 5}
-  thatMark:
-    - type: UntypedTarget
-      contentRange:
-        start: {line: 2, character: 5}
-        end: {line: 2, character: 5}
-      isReversed: false
-      hasExplicitRange: false
-ide:
-  flashes:
-    - range: {type: line, start: 1, end: 1}
-      style: justAdded
-    - range: {type: line, start: 3, end: 3}
-      style: justAdded
-fullTargets: [{type: primitive, mark: {type: cursor}, modifiers: []}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/actions/insertEmptyLines/puffThis19.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/actions/insertEmptyLines/puffThis19.yml
deleted file mode 100644
index 0832985c7a..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/actions/insertEmptyLines/puffThis19.yml
+++ /dev/null
@@ -1,40 +0,0 @@
-languageId: plaintext
-command:
-  spokenForm: puff this
-  version: 2
-  targets:
-    - type: primitive
-      mark: {type: cursor}
-  usePrePhraseSnapshot: false
-  action: {name: insertEmptyLinesAround}
-initialState:
-  documentContents: |+
-    hello
-
-  selections:
-    - anchor: {line: 1, character: 0}
-      active: {line: 1, character: 0}
-  marks: {}
-finalState:
-  documentContents: |+
-    hello
-
-
-
-  selections:
-    - anchor: {line: 2, character: 0}
-      active: {line: 2, character: 0}
-  thatMark:
-    - type: UntypedTarget
-      contentRange:
-        start: {line: 2, character: 0}
-        end: {line: 2, character: 0}
-      isReversed: false
-      hasExplicitRange: false
-ide:
-  flashes:
-    - range: {type: line, start: 1, end: 1}
-      style: justAdded
-    - range: {type: line, start: 3, end: 3}
-      style: justAdded
-fullTargets: [{type: primitive, mark: {type: cursor}, modifiers: []}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/actions/insertEmptyLines/puffThis2.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/actions/insertEmptyLines/puffThis2.yml
deleted file mode 100644
index 4ba44ce4d0..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/actions/insertEmptyLines/puffThis2.yml
+++ /dev/null
@@ -1,36 +0,0 @@
-languageId: plaintext
-command:
-  spokenForm: puff this
-  version: 2
-  targets:
-    - type: primitive
-      mark: {type: cursor}
-  usePrePhraseSnapshot: true
-  action: {name: insertEmptyLinesAround}
-initialState:
-  documentContents: hello
-  selections:
-    - anchor: {line: 0, character: 5}
-      active: {line: 0, character: 5}
-  marks: {}
-finalState:
-  documentContents: |
-
-    hello
-  selections:
-    - anchor: {line: 2, character: 0}
-      active: {line: 2, character: 0}
-  thatMark:
-    - type: UntypedTarget
-      contentRange:
-        start: {line: 2, character: 0}
-        end: {line: 2, character: 0}
-      isReversed: false
-      hasExplicitRange: false
-ide:
-  flashes:
-    - range: {type: line, start: 0, end: 0}
-      style: justAdded
-    - range: {type: line, start: 1, end: 1}
-      style: justAdded
-fullTargets: [{type: primitive, mark: {type: cursor}, modifiers: []}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/actions/insertEmptyLines/puffThis20.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/actions/insertEmptyLines/puffThis20.yml
deleted file mode 100644
index b5e72bd826..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/actions/insertEmptyLines/puffThis20.yml
+++ /dev/null
@@ -1,42 +0,0 @@
-languageId: plaintext
-command:
-  spokenForm: puff this
-  version: 2
-  targets:
-    - type: primitive
-      mark: {type: cursor}
-  usePrePhraseSnapshot: false
-  action: {name: insertEmptyLinesAround}
-initialState:
-  documentContents: |-
-    hello
-
-    there
-  selections:
-    - anchor: {line: 1, character: 0}
-      active: {line: 1, character: 0}
-  marks: {}
-finalState:
-  documentContents: |-
-    hello
-
-
-
-    there
-  selections:
-    - anchor: {line: 2, character: 0}
-      active: {line: 2, character: 0}
-  thatMark:
-    - type: UntypedTarget
-      contentRange:
-        start: {line: 2, character: 0}
-        end: {line: 2, character: 0}
-      isReversed: false
-      hasExplicitRange: false
-ide:
-  flashes:
-    - range: {type: line, start: 1, end: 1}
-      style: justAdded
-    - range: {type: line, start: 3, end: 3}
-      style: justAdded
-fullTargets: [{type: primitive, mark: {type: cursor}, modifiers: []}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/actions/insertEmptyLines/puffThis21.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/actions/insertEmptyLines/puffThis21.yml
deleted file mode 100644
index 17971435d1..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/actions/insertEmptyLines/puffThis21.yml
+++ /dev/null
@@ -1,42 +0,0 @@
-languageId: plaintext
-command:
-  spokenForm: puff this
-  version: 2
-  targets:
-    - type: primitive
-      mark: {type: cursor}
-  usePrePhraseSnapshot: false
-  action: {name: insertEmptyLinesAround}
-initialState:
-  documentContents: |-
-    hello
-    now
-    there
-  selections:
-    - anchor: {line: 1, character: 3}
-      active: {line: 1, character: 3}
-  marks: {}
-finalState:
-  documentContents: |-
-    hello
-
-    now
-
-    there
-  selections:
-    - anchor: {line: 2, character: 3}
-      active: {line: 2, character: 3}
-  thatMark:
-    - type: UntypedTarget
-      contentRange:
-        start: {line: 2, character: 3}
-        end: {line: 2, character: 3}
-      isReversed: false
-      hasExplicitRange: false
-ide:
-  flashes:
-    - range: {type: line, start: 1, end: 1}
-      style: justAdded
-    - range: {type: line, start: 3, end: 3}
-      style: justAdded
-fullTargets: [{type: primitive, mark: {type: cursor}, modifiers: []}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/actions/insertEmptyLines/puffThis22.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/actions/insertEmptyLines/puffThis22.yml
deleted file mode 100644
index 8768c22bd6..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/actions/insertEmptyLines/puffThis22.yml
+++ /dev/null
@@ -1,42 +0,0 @@
-languageId: plaintext
-command:
-  spokenForm: puff this
-  version: 2
-  targets:
-    - type: primitive
-      mark: {type: cursor}
-  usePrePhraseSnapshot: false
-  action: {name: insertEmptyLinesAround}
-initialState:
-  documentContents: |2-
-        hello
-        now
-        there
-  selections:
-    - anchor: {line: 1, character: 7}
-      active: {line: 1, character: 7}
-  marks: {}
-finalState:
-  documentContents: |2-
-        hello
-
-        now
-
-        there
-  selections:
-    - anchor: {line: 2, character: 7}
-      active: {line: 2, character: 7}
-  thatMark:
-    - type: UntypedTarget
-      contentRange:
-        start: {line: 2, character: 7}
-        end: {line: 2, character: 7}
-      isReversed: false
-      hasExplicitRange: false
-ide:
-  flashes:
-    - range: {type: line, start: 1, end: 1}
-      style: justAdded
-    - range: {type: line, start: 3, end: 3}
-      style: justAdded
-fullTargets: [{type: primitive, mark: {type: cursor}, modifiers: []}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/actions/insertEmptyLines/puffThis3.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/actions/insertEmptyLines/puffThis3.yml
deleted file mode 100644
index d79bd75a20..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/actions/insertEmptyLines/puffThis3.yml
+++ /dev/null
@@ -1,36 +0,0 @@
-languageId: plaintext
-command:
-  spokenForm: puff this
-  version: 2
-  targets:
-    - type: primitive
-      mark: {type: cursor}
-  usePrePhraseSnapshot: true
-  action: {name: insertEmptyLinesAround}
-initialState:
-  documentContents: "    hello"
-  selections:
-    - anchor: {line: 0, character: 9}
-      active: {line: 0, character: 9}
-  marks: {}
-finalState:
-  documentContents: |2
-
-        hello
-  selections:
-    - anchor: {line: 2, character: 0}
-      active: {line: 2, character: 0}
-  thatMark:
-    - type: UntypedTarget
-      contentRange:
-        start: {line: 2, character: 0}
-        end: {line: 2, character: 0}
-      isReversed: false
-      hasExplicitRange: false
-ide:
-  flashes:
-    - range: {type: line, start: 0, end: 0}
-      style: justAdded
-    - range: {type: line, start: 1, end: 1}
-      style: justAdded
-fullTargets: [{type: primitive, mark: {type: cursor}, modifiers: []}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/actions/insertEmptyLines/puffThis4.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/actions/insertEmptyLines/puffThis4.yml
deleted file mode 100644
index 80506b4778..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/actions/insertEmptyLines/puffThis4.yml
+++ /dev/null
@@ -1,36 +0,0 @@
-languageId: plaintext
-command:
-  spokenForm: puff this
-  version: 2
-  targets:
-    - type: primitive
-      mark: {type: cursor}
-  usePrePhraseSnapshot: true
-  action: {name: insertEmptyLinesAround}
-initialState:
-  documentContents: "    "
-  selections:
-    - anchor: {line: 0, character: 4}
-      active: {line: 0, character: 4}
-  marks: {}
-finalState:
-  documentContents: |2
-
-        
-  selections:
-    - anchor: {line: 2, character: 0}
-      active: {line: 2, character: 0}
-  thatMark:
-    - type: UntypedTarget
-      contentRange:
-        start: {line: 2, character: 0}
-        end: {line: 2, character: 0}
-      isReversed: false
-      hasExplicitRange: false
-ide:
-  flashes:
-    - range: {type: line, start: 0, end: 0}
-      style: justAdded
-    - range: {type: line, start: 1, end: 1}
-      style: justAdded
-fullTargets: [{type: primitive, mark: {type: cursor}, modifiers: []}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/actions/insertEmptyLines/puffThis5.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/actions/insertEmptyLines/puffThis5.yml
deleted file mode 100644
index cdb63adee4..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/actions/insertEmptyLines/puffThis5.yml
+++ /dev/null
@@ -1,39 +0,0 @@
-languageId: plaintext
-command:
-  spokenForm: puff this
-  version: 2
-  targets:
-    - type: primitive
-      mark: {type: cursor}
-  usePrePhraseSnapshot: true
-  action: {name: insertEmptyLinesAround}
-initialState:
-  documentContents: |2-
-        whatever
-        hello
-  selections:
-    - anchor: {line: 1, character: 9}
-      active: {line: 1, character: 9}
-  marks: {}
-finalState:
-  documentContents: |2
-        whatever
-
-        hello
-  selections:
-    - anchor: {line: 3, character: 0}
-      active: {line: 3, character: 0}
-  thatMark:
-    - type: UntypedTarget
-      contentRange:
-        start: {line: 3, character: 0}
-        end: {line: 3, character: 0}
-      isReversed: false
-      hasExplicitRange: false
-ide:
-  flashes:
-    - range: {type: line, start: 1, end: 1}
-      style: justAdded
-    - range: {type: line, start: 2, end: 2}
-      style: justAdded
-fullTargets: [{type: primitive, mark: {type: cursor}, modifiers: []}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/actions/insertEmptyLines/puffThis6.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/actions/insertEmptyLines/puffThis6.yml
deleted file mode 100644
index 0434215851..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/actions/insertEmptyLines/puffThis6.yml
+++ /dev/null
@@ -1,39 +0,0 @@
-languageId: plaintext
-command:
-  spokenForm: puff this
-  version: 2
-  targets:
-    - type: primitive
-      mark: {type: cursor}
-  usePrePhraseSnapshot: true
-  action: {name: insertEmptyLinesAround}
-initialState:
-  documentContents: |-
-    whatever
-    hello
-  selections:
-    - anchor: {line: 1, character: 5}
-      active: {line: 1, character: 5}
-  marks: {}
-finalState:
-  documentContents: |
-    whatever
-
-    hello
-  selections:
-    - anchor: {line: 3, character: 0}
-      active: {line: 3, character: 0}
-  thatMark:
-    - type: UntypedTarget
-      contentRange:
-        start: {line: 3, character: 0}
-        end: {line: 3, character: 0}
-      isReversed: false
-      hasExplicitRange: false
-ide:
-  flashes:
-    - range: {type: line, start: 1, end: 1}
-      style: justAdded
-    - range: {type: line, start: 2, end: 2}
-      style: justAdded
-fullTargets: [{type: primitive, mark: {type: cursor}, modifiers: []}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/actions/insertEmptyLines/puffThis7.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/actions/insertEmptyLines/puffThis7.yml
deleted file mode 100644
index 656a3c52ce..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/actions/insertEmptyLines/puffThis7.yml
+++ /dev/null
@@ -1,39 +0,0 @@
-languageId: plaintext
-command:
-  spokenForm: puff this
-  version: 2
-  targets:
-    - type: primitive
-      mark: {type: cursor}
-  usePrePhraseSnapshot: true
-  action: {name: insertEmptyLinesAround}
-initialState:
-  documentContents: |-
-    whatever
-    hello
-  selections:
-    - anchor: {line: 1, character: 0}
-      active: {line: 1, character: 0}
-  marks: {}
-finalState:
-  documentContents: |
-    whatever
-
-    hello
-  selections:
-    - anchor: {line: 2, character: 0}
-      active: {line: 2, character: 0}
-  thatMark:
-    - type: UntypedTarget
-      contentRange:
-        start: {line: 2, character: 0}
-        end: {line: 2, character: 0}
-      isReversed: false
-      hasExplicitRange: false
-ide:
-  flashes:
-    - range: {type: line, start: 1, end: 1}
-      style: justAdded
-    - range: {type: line, start: 2, end: 2}
-      style: justAdded
-fullTargets: [{type: primitive, mark: {type: cursor}, modifiers: []}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/actions/insertEmptyLines/puffThis8.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/actions/insertEmptyLines/puffThis8.yml
deleted file mode 100644
index 0bce7861b2..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/actions/insertEmptyLines/puffThis8.yml
+++ /dev/null
@@ -1,38 +0,0 @@
-languageId: plaintext
-command:
-  spokenForm: puff this
-  version: 2
-  targets:
-    - type: primitive
-      mark: {type: cursor}
-  usePrePhraseSnapshot: true
-  action: {name: insertEmptyLinesAround}
-initialState:
-  documentContents: |
-    hello
-  selections:
-    - anchor: {line: 1, character: 0}
-      active: {line: 1, character: 0}
-  marks: {}
-finalState:
-  documentContents: |+
-    hello
-
-
-  selections:
-    - anchor: {line: 3, character: 0}
-      active: {line: 3, character: 0}
-  thatMark:
-    - type: UntypedTarget
-      contentRange:
-        start: {line: 3, character: 0}
-        end: {line: 3, character: 0}
-      isReversed: false
-      hasExplicitRange: false
-ide:
-  flashes:
-    - range: {type: line, start: 2, end: 2}
-      style: justAdded
-    - range: {type: line, start: 2, end: 2}
-      style: justAdded
-fullTargets: [{type: primitive, mark: {type: cursor}, modifiers: []}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/actions/insertEmptyLines/puffThis9.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/actions/insertEmptyLines/puffThis9.yml
deleted file mode 100644
index 1e676892c7..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/actions/insertEmptyLines/puffThis9.yml
+++ /dev/null
@@ -1,38 +0,0 @@
-languageId: plaintext
-command:
-  spokenForm: puff this
-  version: 2
-  targets:
-    - type: primitive
-      mark: {type: cursor}
-  usePrePhraseSnapshot: true
-  action: {name: insertEmptyLinesAround}
-initialState:
-  documentContents: |2
-        hello
-  selections:
-    - anchor: {line: 1, character: 0}
-      active: {line: 1, character: 0}
-  marks: {}
-finalState:
-  documentContents: |2+
-        hello
-
-
-  selections:
-    - anchor: {line: 3, character: 0}
-      active: {line: 3, character: 0}
-  thatMark:
-    - type: UntypedTarget
-      contentRange:
-        start: {line: 3, character: 0}
-        end: {line: 3, character: 0}
-      isReversed: false
-      hasExplicitRange: false
-ide:
-  flashes:
-    - range: {type: line, start: 2, end: 2}
-      style: justAdded
-    - range: {type: line, start: 2, end: 2}
-      style: justAdded
-fullTargets: [{type: primitive, mark: {type: cursor}, modifiers: []}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/actions/insertEmptyLines/puffVest.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/actions/insertEmptyLines/puffVest.yml
deleted file mode 100644
index e036ef3291..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/actions/insertEmptyLines/puffVest.yml
+++ /dev/null
@@ -1,42 +0,0 @@
-languageId: typescript
-command:
-  version: 1
-  spokenForm: puff vest
-  action: insertEmptyLinesAround
-  targets:
-    - type: primitive
-      mark: {type: decoratedSymbol, symbolColor: default, character: v}
-initialState:
-  documentContents: |
-
-    const value = "Hello world";
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-  marks:
-    default.v:
-      start: {line: 1, character: 6}
-      end: {line: 1, character: 11}
-finalState:
-  documentContents: |+
-
-
-    const value = "Hello world";
-
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-  thatMark:
-    - type: UntypedTarget
-      contentRange:
-        start: {line: 2, character: 6}
-        end: {line: 2, character: 11}
-      isReversed: false
-      hasExplicitRange: true
-ide:
-  flashes:
-    - range: {type: line, start: 1, end: 1}
-      style: justAdded
-    - range: {type: line, start: 3, end: 3}
-      style: justAdded
-fullTargets: [{type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: v}, selectionType: token, position: contents, modifier: {type: identity}, insideOutsideType: inside}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/actions/insertEmptyLines/puffVest2.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/actions/insertEmptyLines/puffVest2.yml
deleted file mode 100644
index e98a68202e..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/actions/insertEmptyLines/puffVest2.yml
+++ /dev/null
@@ -1,43 +0,0 @@
-languageId: plaintext
-command:
-  spokenForm: puff vest
-  version: 2
-  targets:
-    - type: primitive
-      mark: {type: decoratedSymbol, symbolColor: default, character: v}
-  usePrePhraseSnapshot: true
-  action: {name: insertEmptyLinesAround}
-initialState:
-  documentContents: |2
-
-        const value = "Hello world";
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-  marks:
-    default.v:
-      start: {line: 1, character: 10}
-      end: {line: 1, character: 15}
-finalState:
-  documentContents: |2+
-
-
-        const value = "Hello world";
-
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-  thatMark:
-    - type: UntypedTarget
-      contentRange:
-        start: {line: 2, character: 10}
-        end: {line: 2, character: 15}
-      isReversed: false
-      hasExplicitRange: true
-ide:
-  flashes:
-    - range: {type: line, start: 1, end: 1}
-      style: justAdded
-    - range: {type: line, start: 3, end: 3}
-      style: justAdded
-fullTargets: [{type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: v}, modifiers: []}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/actions/moveEveryArgMade.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/actions/moveEveryArgMade.yml
deleted file mode 100644
index 6b0da1aa6d..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/actions/moveEveryArgMade.yml
+++ /dev/null
@@ -1,42 +0,0 @@
-languageId: typescript
-command:
-  version: 1
-  spokenForm: move every arg made
-  action: moveToTarget
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: argumentOrParameter, includeSiblings: true}
-      mark: {type: decoratedSymbol, symbolColor: default, character: m}
-    - {type: primitive, isImplicit: true}
-initialState:
-  documentContents: |
-    function myFunk(value: string, name: string, age: number) { };
-  selections:
-    - anchor: {line: 1, character: 0}
-      active: {line: 1, character: 0}
-  marks:
-    default.m:
-      start: {line: 0, character: 31}
-      end: {line: 0, character: 35}
-finalState:
-  documentContents: |-
-    function myFunk() { };
-    value: string, name: string, age: number
-  selections:
-    - anchor: {line: 1, character: 40}
-      active: {line: 1, character: 40}
-  thatMark:
-    - type: UntypedTarget
-      contentRange:
-        start: {line: 1, character: 0}
-        end: {line: 1, character: 40}
-      isReversed: false
-      hasExplicitRange: true
-  sourceMark:
-    - type: UntypedTarget
-      contentRange:
-        start: {line: 0, character: 16}
-        end: {line: 0, character: 16}
-      isReversed: false
-      hasExplicitRange: false
-fullTargets: [{type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: m}, selectionType: token, position: contents, insideOutsideType: null, modifier: {type: containingScope, scopeType: argumentOrParameter, includeSiblings: true}, isImplicit: false}, {type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: null, modifier: {type: identity}, isImplicit: true}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/actions/moveVest.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/actions/moveVest.yml
deleted file mode 100644
index 116f2c5053..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/actions/moveVest.yml
+++ /dev/null
@@ -1,42 +0,0 @@
-languageId: typescript
-command:
-  version: 1
-  spokenForm: move vest
-  action: moveToTarget
-  targets:
-    - type: primitive
-      mark: {type: decoratedSymbol, symbolColor: default, character: v}
-    - {type: primitive, isImplicit: true}
-initialState:
-  documentContents: |
-
-    const value = "Hello world";
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-  marks:
-    default.v:
-      start: {line: 1, character: 6}
-      end: {line: 1, character: 11}
-finalState:
-  documentContents: |
-    value
-    const = "Hello world";
-  selections:
-    - anchor: {line: 0, character: 5}
-      active: {line: 0, character: 5}
-  thatMark:
-    - type: UntypedTarget
-      contentRange:
-        start: {line: 0, character: 0}
-        end: {line: 0, character: 5}
-      isReversed: false
-      hasExplicitRange: true
-  sourceMark:
-    - type: UntypedTarget
-      contentRange:
-        start: {line: 1, character: 6}
-        end: {line: 1, character: 6}
-      isReversed: false
-      hasExplicitRange: false
-fullTargets: [{type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: v}, selectionType: token, position: contents, modifier: {type: identity}, insideOutsideType: null}, {type: primitive, mark: {type: cursor}, selectionType: token, position: contents, modifier: {type: identity}, insideOutsideType: inside}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/actions/moveVestToCap.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/actions/moveVestToCap.yml
deleted file mode 100644
index 849c54e535..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/actions/moveVestToCap.yml
+++ /dev/null
@@ -1,46 +0,0 @@
-languageId: typescript
-command:
-  version: 1
-  spokenForm: move vest to cap
-  action: moveToTarget
-  targets:
-    - type: primitive
-      mark: {type: decoratedSymbol, symbolColor: default, character: v}
-    - type: primitive
-      mark: {type: decoratedSymbol, symbolColor: default, character: c}
-initialState:
-  documentContents: |
-
-    const value = "Hello world";
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-  marks:
-    default.v:
-      start: {line: 1, character: 6}
-      end: {line: 1, character: 11}
-    default.c:
-      start: {line: 1, character: 0}
-      end: {line: 1, character: 5}
-finalState:
-  documentContents: |
-
-    value = "Hello world";
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-  thatMark:
-    - type: UntypedTarget
-      contentRange:
-        start: {line: 1, character: 0}
-        end: {line: 1, character: 5}
-      isReversed: false
-      hasExplicitRange: true
-  sourceMark:
-    - type: UntypedTarget
-      contentRange:
-        start: {line: 1, character: 6}
-        end: {line: 1, character: 6}
-      isReversed: false
-      hasExplicitRange: false
-fullTargets: [{type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: v}, selectionType: token, position: contents, modifier: {type: identity}, insideOutsideType: null}, {type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: c}, selectionType: token, position: contents, modifier: {type: identity}, insideOutsideType: null}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/actions/pasteAfterArgueBat.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/actions/pasteAfterArgueBat.yml
deleted file mode 100644
index 04d52e7e38..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/actions/pasteAfterArgueBat.yml
+++ /dev/null
@@ -1,43 +0,0 @@
-languageId: typescript
-command:
-  spokenForm: paste after argue bat
-  version: 2
-  targets:
-    - type: primitive
-      mark: {type: decoratedSymbol, symbolColor: default, character: b}
-      modifiers:
-        - {type: position, position: after}
-        - type: containingScope
-          scopeType: {type: argumentOrParameter}
-  usePrePhraseSnapshot: true
-  action: {name: pasteFromClipboard}
-initialState:
-  documentContents: foo(bar, baz, bongo)
-  selections:
-    - anchor: {line: 0, character: 6}
-      active: {line: 0, character: 6}
-  marks:
-    default.b:
-      start: {line: 0, character: 14}
-      end: {line: 0, character: 19}
-  clipboard: baz
-finalState:
-  documentContents: foo(bar, baz, bongo, baz)
-  selections:
-    - anchor: {line: 0, character: 6}
-      active: {line: 0, character: 6}
-  thatMark:
-    - type: UntypedTarget
-      contentRange:
-        start: {line: 0, character: 21}
-        end: {line: 0, character: 24}
-      isReversed: false
-      hasExplicitRange: true
-ide:
-  flashes:
-    - range:
-        type: character
-        start: {line: 0, character: 21}
-        end: {line: 0, character: 24}
-      style: justAdded
-fullTargets: [{type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: b}, modifiers: [{type: position, position: after}, {type: containingScope, scopeType: {type: argumentOrParameter}}]}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/actions/pasteAfterLineSpunAndAfterBlockLookAndBeforeLineSpun.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/actions/pasteAfterLineSpunAndAfterBlockLookAndBeforeLineSpun.yml
deleted file mode 100644
index 8842f2aa13..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/actions/pasteAfterLineSpunAndAfterBlockLookAndBeforeLineSpun.yml
+++ /dev/null
@@ -1,98 +0,0 @@
-languageId: plaintext
-command:
-  spokenForm: paste after line spun and after block look and before line spun
-  version: 2
-  targets:
-    - type: list
-      elements:
-        - type: primitive
-          mark: {type: decoratedSymbol, symbolColor: default, character: s}
-          modifiers:
-            - {type: position, position: after}
-            - type: containingScope
-              scopeType: {type: line}
-        - type: primitive
-          mark: {type: decoratedSymbol, symbolColor: default, character: l}
-          modifiers:
-            - {type: position, position: after}
-            - type: containingScope
-              scopeType: {type: paragraph}
-        - type: primitive
-          mark: {type: decoratedSymbol, symbolColor: default, character: s}
-          modifiers:
-            - {type: position, position: before}
-            - type: containingScope
-              scopeType: {type: line}
-  usePrePhraseSnapshot: true
-  action: {name: pasteFromClipboard}
-initialState:
-  documentContents: |-
-    testing
-
-    hello
-    there
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-    - anchor: {line: 3, character: 5}
-      active: {line: 3, character: 5}
-  marks:
-    default.s:
-      start: {line: 0, character: 0}
-      end: {line: 0, character: 7}
-    default.l:
-      start: {line: 2, character: 0}
-      end: {line: 2, character: 5}
-  clipboard: baz
-finalState:
-  documentContents: |-
-    baz
-    testing
-    baz
-
-    hello
-    there
-
-    baz
-  selections:
-    - anchor: {line: 1, character: 0}
-      active: {line: 1, character: 0}
-    - anchor: {line: 5, character: 5}
-      active: {line: 5, character: 5}
-  thatMark:
-    - type: UntypedTarget
-      contentRange:
-        start: {line: 2, character: 0}
-        end: {line: 2, character: 3}
-      isReversed: false
-      hasExplicitRange: true
-    - type: UntypedTarget
-      contentRange:
-        start: {line: 7, character: 0}
-        end: {line: 7, character: 3}
-      isReversed: false
-      hasExplicitRange: true
-    - type: UntypedTarget
-      contentRange:
-        start: {line: 0, character: 0}
-        end: {line: 0, character: 3}
-      isReversed: false
-      hasExplicitRange: true
-ide:
-  flashes:
-    - range:
-        type: character
-        start: {line: 2, character: 0}
-        end: {line: 2, character: 3}
-      style: justAdded
-    - range:
-        type: character
-        start: {line: 7, character: 0}
-        end: {line: 7, character: 3}
-      style: justAdded
-    - range:
-        type: character
-        start: {line: 0, character: 0}
-        end: {line: 0, character: 3}
-      style: justAdded
-fullTargets: [{type: list, elements: [{type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: s}, modifiers: [{type: position, position: after}, {type: containingScope, scopeType: {type: line}}]}, {type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: l}, modifiers: [{type: position, position: after}, {type: containingScope, scopeType: {type: paragraph}}]}, {type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: s}, modifiers: [{type: position, position: before}, {type: containingScope, scopeType: {type: line}}]}]}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/actions/pasteAfterLineTrapAndAfterBlockTrap.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/actions/pasteAfterLineTrapAndAfterBlockTrap.yml
deleted file mode 100644
index c56da1eea5..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/actions/pasteAfterLineTrapAndAfterBlockTrap.yml
+++ /dev/null
@@ -1,57 +0,0 @@
-languageId: python
-command:
-  spokenForm: paste after line trap and after block trap
-  version: 2
-  targets:
-    - type: list
-      elements:
-        - type: primitive
-          mark: {type: decoratedSymbol, symbolColor: default, character: t}
-          modifiers:
-            - {type: position, position: after}
-            - type: containingScope
-              scopeType: {type: line}
-        - type: primitive
-          mark: {type: decoratedSymbol, symbolColor: default, character: t}
-          modifiers:
-            - {type: position, position: after}
-            - type: containingScope
-              scopeType: {type: paragraph}
-  usePrePhraseSnapshot: true
-  action: {name: pasteFromClipboard}
-initialState:
-  documentContents: |
-    if True:
-        pass
-  selections:
-    - anchor: {line: 2, character: 0}
-      active: {line: 2, character: 0}
-  marks:
-    default.t:
-      start: {line: 0, character: 3}
-      end: {line: 0, character: 7}
-  clipboard: print("hello")
-finalState:
-  documentContents: |
-    if True:
-        print("hello")
-        pass
-
-    print("hello")
-  selections:
-    - anchor: {line: 5, character: 0}
-      active: {line: 5, character: 0}
-  thatMark:
-    - type: UntypedTarget
-      contentRange:
-        start: {line: 1, character: 4}
-        end: {line: 1, character: 18}
-      isReversed: false
-      hasExplicitRange: true
-    - type: UntypedTarget
-      contentRange:
-        start: {line: 4, character: 0}
-        end: {line: 4, character: 14}
-      isReversed: false
-      hasExplicitRange: true
-fullTargets: [{type: list, elements: [{type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: t}, modifiers: [{type: position, position: after}, {type: containingScope, scopeType: {type: line}}]}, {type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: t}, modifiers: [{type: position, position: after}, {type: containingScope, scopeType: {type: paragraph}}]}]}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/actions/pasteAfterState.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/actions/pasteAfterState.yml
deleted file mode 100644
index 458967065f..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/actions/pasteAfterState.yml
+++ /dev/null
@@ -1,45 +0,0 @@
-languageId: typescript
-command:
-  spokenForm: paste after state
-  version: 2
-  targets:
-    - type: primitive
-      modifiers:
-        - {type: position, position: after}
-        - type: containingScope
-          scopeType: {type: statement}
-  usePrePhraseSnapshot: true
-  action: {name: pasteFromClipboard}
-initialState:
-  documentContents: const whatever = "hello";
-  selections:
-    - anchor: {line: 0, character: 9}
-      active: {line: 0, character: 9}
-    - anchor: {line: 0, character: 21}
-      active: {line: 0, character: 21}
-  marks: {}
-  clipboard: const whatever = "hello";
-finalState:
-  documentContents: |-
-    const whatever = "hello";
-    const whatever = "hello";
-  selections:
-    - anchor: {line: 0, character: 9}
-      active: {line: 0, character: 9}
-    - anchor: {line: 0, character: 21}
-      active: {line: 0, character: 21}
-  thatMark:
-    - type: UntypedTarget
-      contentRange:
-        start: {line: 1, character: 0}
-        end: {line: 1, character: 25}
-      isReversed: false
-      hasExplicitRange: true
-ide:
-  flashes:
-    - range:
-        type: character
-        start: {line: 1, character: 0}
-        end: {line: 1, character: 25}
-      style: justAdded
-fullTargets: [{type: primitive, mark: {type: cursor}, modifiers: [{type: position, position: after}, {type: containingScope, scopeType: {type: statement}}]}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/actions/pasteBeforeArgueZip.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/actions/pasteBeforeArgueZip.yml
deleted file mode 100644
index 8464148afe..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/actions/pasteBeforeArgueZip.yml
+++ /dev/null
@@ -1,43 +0,0 @@
-languageId: typescript
-command:
-  spokenForm: paste before argue zip
-  version: 2
-  targets:
-    - type: primitive
-      mark: {type: decoratedSymbol, symbolColor: default, character: z}
-      modifiers:
-        - {type: position, position: before}
-        - type: containingScope
-          scopeType: {type: argumentOrParameter}
-  usePrePhraseSnapshot: true
-  action: {name: pasteFromClipboard}
-initialState:
-  documentContents: foo(bar, baz, bongo)
-  selections:
-    - anchor: {line: 0, character: 19}
-      active: {line: 0, character: 19}
-  marks:
-    default.z:
-      start: {line: 0, character: 9}
-      end: {line: 0, character: 12}
-  clipboard: baz
-finalState:
-  documentContents: foo(bar, baz, baz, bongo)
-  selections:
-    - anchor: {line: 0, character: 24}
-      active: {line: 0, character: 24}
-  thatMark:
-    - type: UntypedTarget
-      contentRange:
-        start: {line: 0, character: 9}
-        end: {line: 0, character: 12}
-      isReversed: false
-      hasExplicitRange: true
-ide:
-  flashes:
-    - range:
-        type: character
-        start: {line: 0, character: 9}
-        end: {line: 0, character: 12}
-      style: justAdded
-fullTargets: [{type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: z}, modifiers: [{type: position, position: before}, {type: containingScope, scopeType: {type: argumentOrParameter}}]}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/actions/pasteBeforeState.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/actions/pasteBeforeState.yml
deleted file mode 100644
index 7dce20307b..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/actions/pasteBeforeState.yml
+++ /dev/null
@@ -1,45 +0,0 @@
-languageId: typescript
-command:
-  spokenForm: paste before state
-  version: 2
-  targets:
-    - type: primitive
-      modifiers:
-        - {type: position, position: before}
-        - type: containingScope
-          scopeType: {type: statement}
-  usePrePhraseSnapshot: true
-  action: {name: pasteFromClipboard}
-initialState:
-  documentContents: const whatever = "hello";
-  selections:
-    - anchor: {line: 0, character: 9}
-      active: {line: 0, character: 9}
-    - anchor: {line: 0, character: 21}
-      active: {line: 0, character: 21}
-  marks: {}
-  clipboard: const whatever = "hello";
-finalState:
-  documentContents: |-
-    const whatever = "hello";
-    const whatever = "hello";
-  selections:
-    - anchor: {line: 1, character: 9}
-      active: {line: 1, character: 9}
-    - anchor: {line: 1, character: 21}
-      active: {line: 1, character: 21}
-  thatMark:
-    - type: UntypedTarget
-      contentRange:
-        start: {line: 0, character: 0}
-        end: {line: 0, character: 25}
-      isReversed: false
-      hasExplicitRange: true
-ide:
-  flashes:
-    - range:
-        type: character
-        start: {line: 0, character: 0}
-        end: {line: 0, character: 25}
-      style: justAdded
-fullTargets: [{type: primitive, mark: {type: cursor}, modifiers: [{type: position, position: before}, {type: containingScope, scopeType: {type: statement}}]}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/actions/pasteCap.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/actions/pasteCap.yml
deleted file mode 100644
index 786d6557c8..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/actions/pasteCap.yml
+++ /dev/null
@@ -1,35 +0,0 @@
-languageId: typescript
-command:
-  version: 1
-  spokenForm: paste cap
-  action: pasteFromClipboard
-  targets:
-    - type: primitive
-      mark: {type: decoratedSymbol, symbolColor: default, character: c}
-initialState:
-  documentContents: |
-
-    const value = "Hello world";
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-  clipboard: value
-  marks:
-    default.c:
-      start: {line: 1, character: 0}
-      end: {line: 1, character: 5}
-finalState:
-  documentContents: |
-
-    value value = "Hello world";
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-  thatMark:
-    - type: UntypedTarget
-      contentRange:
-        start: {line: 1, character: 0}
-        end: {line: 1, character: 5}
-      isReversed: false
-      hasExplicitRange: true
-fullTargets: [{type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: c}, selectionType: token, position: contents, modifier: {type: identity}, insideOutsideType: inside}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/actions/phonesSpy.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/actions/phonesSpy.yml
deleted file mode 100644
index f29e43a993..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/actions/phonesSpy.yml
+++ /dev/null
@@ -1,36 +0,0 @@
-languageId: typescript
-command:
-  version: 1
-  spokenForm: phones spy
-  action: replace
-  targets:
-    - type: primitive
-      mark: {type: decoratedSymbol, symbolColor: default, character: s}
-  extraArgs:
-    - [sum]
-initialState:
-  documentContents: |
-
-    const value = "some";
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-  marks:
-    default.s:
-      start: {line: 1, character: 15}
-      end: {line: 1, character: 19}
-finalState:
-  documentContents: |
-
-    const value = "sum";
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-  thatMark:
-    - type: UntypedTarget
-      contentRange:
-        start: {line: 1, character: 15}
-        end: {line: 1, character: 18}
-      isReversed: false
-      hasExplicitRange: true
-fullTargets: [{type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: s}, selectionType: token, position: contents, modifier: {type: identity}, insideOutsideType: null}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/actions/postVest.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/actions/postVest.yml
deleted file mode 100644
index f197372007..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/actions/postVest.yml
+++ /dev/null
@@ -1,34 +0,0 @@
-languageId: typescript
-command:
-  version: 1
-  spokenForm: post vest
-  action: setSelectionAfter
-  targets:
-    - type: primitive
-      mark: {type: decoratedSymbol, symbolColor: default, character: v}
-initialState:
-  documentContents: |
-
-    const value = "Hello world";
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-  marks:
-    default.v:
-      start: {line: 1, character: 6}
-      end: {line: 1, character: 11}
-finalState:
-  documentContents: |
-
-    const value = "Hello world";
-  selections:
-    - anchor: {line: 1, character: 11}
-      active: {line: 1, character: 11}
-  thatMark:
-    - type: UntypedTarget
-      contentRange:
-        start: {line: 1, character: 6}
-        end: {line: 1, character: 11}
-      isReversed: false
-      hasExplicitRange: false
-fullTargets: [{type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: v}, selectionType: token, position: contents, modifier: {type: identity}, insideOutsideType: inside}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/actions/pourArg.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/actions/pourArg.yml
deleted file mode 100644
index 5692e20ca9..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/actions/pourArg.yml
+++ /dev/null
@@ -1,32 +0,0 @@
-languageId: typescript
-command:
-  spokenForm: pour arg
-  version: 2
-  action: {name: editNewLineAfter}
-  targets:
-    - type: primitive
-      modifiers:
-        - type: containingScope
-          scopeType: {type: argumentOrParameter}
-  usePrePhraseSnapshot: true
-initialState:
-  documentContents: |
-    function helloWorld(foo: string, bar: number, baz: string) {}
-  selections:
-    - anchor: {line: 0, character: 40}
-      active: {line: 0, character: 40}
-  marks: {}
-finalState:
-  documentContents: |
-    function helloWorld(foo: string, bar: number, , baz: string) {}
-  selections:
-    - anchor: {line: 0, character: 46}
-      active: {line: 0, character: 46}
-  thatMark:
-    - type: UntypedTarget
-      contentRange:
-        start: {line: 0, character: 33}
-        end: {line: 0, character: 44}
-      isReversed: false
-      hasExplicitRange: true
-fullTargets: [{type: primitive, mark: {type: cursor}, modifiers: [{type: containingScope, scopeType: argumentOrParameter}]}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/actions/pourArg2.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/actions/pourArg2.yml
deleted file mode 100644
index 6558b76a81..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/actions/pourArg2.yml
+++ /dev/null
@@ -1,39 +0,0 @@
-languageId: typescript
-command:
-  spokenForm: pour arg
-  version: 2
-  targets:
-    - type: primitive
-      modifiers:
-        - type: containingScope
-          scopeType: {type: argumentOrParameter}
-  usePrePhraseSnapshot: true
-  action: {name: editNewLineAfter}
-initialState:
-  documentContents: |-
-    function myFunk(
-        name: string,
-        value: number
-    ) {}
-  selections:
-    - anchor: {line: 1, character: 8}
-      active: {line: 1, character: 8}
-  marks: {}
-finalState:
-  documentContents: |-
-    function myFunk(
-        name: string,
-        ,
-        value: number
-    ) {}
-  selections:
-    - anchor: {line: 2, character: 4}
-      active: {line: 2, character: 4}
-  thatMark:
-    - type: UntypedTarget
-      contentRange:
-        start: {line: 1, character: 4}
-        end: {line: 1, character: 16}
-      isReversed: false
-      hasExplicitRange: true
-fullTargets: [{type: primitive, mark: {type: cursor}, modifiers: [{type: containingScope, scopeType: {type: argumentOrParameter}}]}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/actions/pourArg3.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/actions/pourArg3.yml
deleted file mode 100644
index df3de924e2..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/actions/pourArg3.yml
+++ /dev/null
@@ -1,39 +0,0 @@
-languageId: typescript
-command:
-  spokenForm: pour arg
-  version: 2
-  targets:
-    - type: primitive
-      modifiers:
-        - type: containingScope
-          scopeType: {type: argumentOrParameter}
-  usePrePhraseSnapshot: true
-  action: {name: editNewLineAfter}
-initialState:
-  documentContents: |-
-    function myFunk(
-        name: string,
-        value: number
-    ) {}
-  selections:
-    - anchor: {line: 2, character: 9}
-      active: {line: 2, character: 9}
-  marks: {}
-finalState:
-  documentContents: |-
-    function myFunk(
-        name: string,
-        value: number,
-        
-    ) {}
-  selections:
-    - anchor: {line: 3, character: 4}
-      active: {line: 3, character: 4}
-  thatMark:
-    - type: UntypedTarget
-      contentRange:
-        start: {line: 2, character: 4}
-        end: {line: 2, character: 17}
-      isReversed: false
-      hasExplicitRange: true
-fullTargets: [{type: primitive, mark: {type: cursor}, modifiers: [{type: containingScope, scopeType: {type: argumentOrParameter}}]}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/actions/pourArg4.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/actions/pourArg4.yml
deleted file mode 100644
index a3b13147d4..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/actions/pourArg4.yml
+++ /dev/null
@@ -1,39 +0,0 @@
-languageId: typescript
-command:
-  spokenForm: pour arg
-  version: 2
-  targets:
-    - type: primitive
-      modifiers:
-        - type: containingScope
-          scopeType: {type: argumentOrParameter}
-  usePrePhraseSnapshot: true
-  action: {name: editNewLineAfter}
-initialState:
-  documentContents: |-
-    function myFunk(
-        name: string,
-        value: number,
-    ) {}
-  selections:
-    - anchor: {line: 2, character: 9}
-      active: {line: 2, character: 9}
-  marks: {}
-finalState:
-  documentContents: |-
-    function myFunk(
-        name: string,
-        value: number,
-        ,
-    ) {}
-  selections:
-    - anchor: {line: 3, character: 4}
-      active: {line: 3, character: 4}
-  thatMark:
-    - type: UntypedTarget
-      contentRange:
-        start: {line: 2, character: 4}
-        end: {line: 2, character: 17}
-      isReversed: false
-      hasExplicitRange: true
-fullTargets: [{type: primitive, mark: {type: cursor}, modifiers: [{type: containingScope, scopeType: {type: argumentOrParameter}}]}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/actions/pourBlock.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/actions/pourBlock.yml
deleted file mode 100644
index 173bc6dcf4..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/actions/pourBlock.yml
+++ /dev/null
@@ -1,34 +0,0 @@
-languageId: typescript
-command:
-  spokenForm: pour block
-  version: 2
-  action: {name: editNewLineAfter}
-  targets:
-    - type: primitive
-      modifiers:
-        - type: containingScope
-          scopeType: {type: paragraph}
-  usePrePhraseSnapshot: true
-initialState:
-  documentContents: |
-    function helloWorld(foo: string, bar: number, baz: string) {}
-  selections:
-    - anchor: {line: 0, character: 40}
-      active: {line: 0, character: 40}
-  marks: {}
-finalState:
-  documentContents: |+
-    function helloWorld(foo: string, bar: number, baz: string) {}
-
-
-  selections:
-    - anchor: {line: 2, character: 0}
-      active: {line: 2, character: 0}
-  thatMark:
-    - type: UntypedTarget
-      contentRange:
-        start: {line: 0, character: 0}
-        end: {line: 0, character: 61}
-      isReversed: false
-      hasExplicitRange: true
-fullTargets: [{type: primitive, mark: {type: cursor}, modifiers: [{type: containingScope, scopeType: paragraph}]}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/actions/pourBlockHarpAndLineWhale.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/actions/pourBlockHarpAndLineWhale.yml
deleted file mode 100644
index 35a32a361c..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/actions/pourBlockHarpAndLineWhale.yml
+++ /dev/null
@@ -1,63 +0,0 @@
-languageId: plaintext
-command:
-  spokenForm: pour block harp and line whale
-  version: 2
-  targets:
-    - type: list
-      elements:
-        - type: primitive
-          mark: {type: decoratedSymbol, symbolColor: default, character: h}
-          modifiers:
-            - type: containingScope
-              scopeType: {type: paragraph}
-        - type: primitive
-          mark: {type: decoratedSymbol, symbolColor: default, character: w}
-          modifiers:
-            - type: containingScope
-              scopeType: {type: line}
-  usePrePhraseSnapshot: true
-  action: {name: editNewLineAfter}
-initialState:
-  documentContents: |2-
-        hello
-
-        world
-        foo
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-  marks:
-    default.h:
-      start: {line: 0, character: 4}
-      end: {line: 0, character: 9}
-    default.w:
-      start: {line: 2, character: 4}
-      end: {line: 2, character: 9}
-finalState:
-  documentContents: |2-
-        hello
-
-        
-
-        world
-        
-        foo
-  selections:
-    - anchor: {line: 2, character: 4}
-      active: {line: 2, character: 4}
-    - anchor: {line: 5, character: 4}
-      active: {line: 5, character: 4}
-  thatMark:
-    - type: UntypedTarget
-      contentRange:
-        start: {line: 0, character: 4}
-        end: {line: 0, character: 9}
-      isReversed: false
-      hasExplicitRange: true
-    - type: UntypedTarget
-      contentRange:
-        start: {line: 4, character: 4}
-        end: {line: 4, character: 9}
-      isReversed: false
-      hasExplicitRange: true
-fullTargets: [{type: list, elements: [{type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: h}, modifiers: [{type: containingScope, scopeType: {type: paragraph}}]}, {type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: w}, modifiers: [{type: containingScope, scopeType: {type: line}}]}]}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/actions/pourHarpAndLookAndTrap.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/actions/pourHarpAndLookAndTrap.yml
deleted file mode 100644
index 17a36bbc77..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/actions/pourHarpAndLookAndTrap.yml
+++ /dev/null
@@ -1,46 +0,0 @@
-languageId: plaintext
-command:
-  spokenForm: pour harp and look and trap
-  version: 2
-  targets:
-    - type: list
-      elements:
-        - type: primitive
-          mark: {type: decoratedSymbol, symbolColor: default, character: h}
-        - type: primitive
-          mark: {type: decoratedSymbol, symbolColor: default, character: l}
-        - type: primitive
-          mark: {type: decoratedSymbol, symbolColor: default, character: t}
-  usePrePhraseSnapshot: true
-  action: {name: editNewLineAfter}
-initialState:
-  documentContents: |
-    hello world there now
-  selections:
-    - anchor: {line: 1, character: 0}
-      active: {line: 1, character: 0}
-  marks:
-    default.h:
-      start: {line: 0, character: 0}
-      end: {line: 0, character: 5}
-    default.l:
-      start: {line: 0, character: 6}
-      end: {line: 0, character: 11}
-    default.t:
-      start: {line: 0, character: 12}
-      end: {line: 0, character: 17}
-finalState:
-  documentContents: |+
-    hello world there now
-
-  selections:
-    - anchor: {line: 1, character: 0}
-      active: {line: 1, character: 0}
-  thatMark:
-    - type: UntypedTarget
-      contentRange:
-        start: {line: 0, character: 0}
-        end: {line: 0, character: 5}
-      isReversed: false
-      hasExplicitRange: true
-fullTargets: [{type: list, elements: [{type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: h}, modifiers: []}, {type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: l}, modifiers: []}, {type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: t}, modifiers: []}]}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/actions/pourItem.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/actions/pourItem.yml
deleted file mode 100644
index a61f40d398..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/actions/pourItem.yml
+++ /dev/null
@@ -1,41 +0,0 @@
-languageId: typescript
-command:
-  spokenForm: pour item
-  version: 2
-  targets:
-    - type: primitive
-      modifiers:
-        - type: containingScope
-          scopeType: {type: collectionItem}
-  usePrePhraseSnapshot: true
-  action: {name: editNewLineAfter}
-initialState:
-  documentContents: |-
-    [
-        a,
-        b,
-        c
-    ]
-  selections:
-    - anchor: {line: 3, character: 5}
-      active: {line: 3, character: 5}
-  marks: {}
-finalState:
-  documentContents: |-
-    [
-        a,
-        b,
-        c,
-        
-    ]
-  selections:
-    - anchor: {line: 4, character: 4}
-      active: {line: 4, character: 4}
-  thatMark:
-    - type: UntypedTarget
-      contentRange:
-        start: {line: 3, character: 4}
-        end: {line: 3, character: 5}
-      isReversed: false
-      hasExplicitRange: true
-fullTargets: [{type: primitive, mark: {type: cursor}, modifiers: [{type: containingScope, scopeType: {type: collectionItem}}]}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/actions/pourItem2.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/actions/pourItem2.yml
deleted file mode 100644
index ea09ae0303..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/actions/pourItem2.yml
+++ /dev/null
@@ -1,41 +0,0 @@
-languageId: typescript
-command:
-  spokenForm: pour item
-  version: 2
-  targets:
-    - type: primitive
-      modifiers:
-        - type: containingScope
-          scopeType: {type: collectionItem}
-  usePrePhraseSnapshot: true
-  action: {name: editNewLineAfter}
-initialState:
-  documentContents: |-
-    [
-        a,
-        b,
-        c,
-    ]
-  selections:
-    - anchor: {line: 3, character: 5}
-      active: {line: 3, character: 5}
-  marks: {}
-finalState:
-  documentContents: |-
-    [
-        a,
-        b,
-        c,
-        ,
-    ]
-  selections:
-    - anchor: {line: 4, character: 4}
-      active: {line: 4, character: 4}
-  thatMark:
-    - type: UntypedTarget
-      contentRange:
-        start: {line: 3, character: 4}
-        end: {line: 3, character: 5}
-      isReversed: false
-      hasExplicitRange: true
-fullTargets: [{type: primitive, mark: {type: cursor}, modifiers: [{type: containingScope, scopeType: {type: collectionItem}}]}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/actions/pourItem3.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/actions/pourItem3.yml
deleted file mode 100644
index b83246c1f0..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/actions/pourItem3.yml
+++ /dev/null
@@ -1,41 +0,0 @@
-languageId: typescript
-command:
-  spokenForm: pour item
-  version: 2
-  targets:
-    - type: primitive
-      modifiers:
-        - type: containingScope
-          scopeType: {type: collectionItem}
-  usePrePhraseSnapshot: true
-  action: {name: editNewLineAfter}
-initialState:
-  documentContents: |-
-    [
-        a,
-        b,
-        c,
-    ]
-  selections:
-    - anchor: {line: 1, character: 5}
-      active: {line: 1, character: 5}
-  marks: {}
-finalState:
-  documentContents: |-
-    [
-        a,
-        ,
-        b,
-        c,
-    ]
-  selections:
-    - anchor: {line: 2, character: 4}
-      active: {line: 2, character: 4}
-  thatMark:
-    - type: UntypedTarget
-      contentRange:
-        start: {line: 1, character: 4}
-        end: {line: 1, character: 5}
-      isReversed: false
-      hasExplicitRange: true
-fullTargets: [{type: primitive, mark: {type: cursor}, modifiers: [{type: containingScope, scopeType: {type: collectionItem}}]}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/actions/pourLineHarpAndBlockWhale.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/actions/pourLineHarpAndBlockWhale.yml
deleted file mode 100644
index 6c3194eb3e..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/actions/pourLineHarpAndBlockWhale.yml
+++ /dev/null
@@ -1,63 +0,0 @@
-languageId: plaintext
-command:
-  spokenForm: pour line harp and block whale
-  version: 2
-  targets:
-    - type: list
-      elements:
-        - type: primitive
-          mark: {type: decoratedSymbol, symbolColor: default, character: h}
-          modifiers:
-            - type: containingScope
-              scopeType: {type: line}
-        - type: primitive
-          mark: {type: decoratedSymbol, symbolColor: default, character: w}
-          modifiers:
-            - type: containingScope
-              scopeType: {type: paragraph}
-  usePrePhraseSnapshot: true
-  action: {name: editNewLineAfter}
-initialState:
-  documentContents: |2-
-        hello
-
-        world
-        foo
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-  marks:
-    default.h:
-      start: {line: 0, character: 4}
-      end: {line: 0, character: 9}
-    default.w:
-      start: {line: 2, character: 4}
-      end: {line: 2, character: 9}
-finalState:
-  documentContents: |2-
-        hello
-        
-
-        world
-        foo
-
-        
-  selections:
-    - anchor: {line: 1, character: 4}
-      active: {line: 1, character: 4}
-    - anchor: {line: 6, character: 4}
-      active: {line: 6, character: 4}
-  thatMark:
-    - type: UntypedTarget
-      contentRange:
-        start: {line: 0, character: 4}
-        end: {line: 0, character: 9}
-      isReversed: false
-      hasExplicitRange: true
-    - type: UntypedTarget
-      contentRange:
-        start: {line: 3, character: 4}
-        end: {line: 4, character: 7}
-      isReversed: false
-      hasExplicitRange: true
-fullTargets: [{type: list, elements: [{type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: h}, modifiers: [{type: containingScope, scopeType: {type: line}}]}, {type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: w}, modifiers: [{type: containingScope, scopeType: {type: paragraph}}]}]}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/actions/pourThis.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/actions/pourThis.yml
deleted file mode 100644
index 97a52d74da..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/actions/pourThis.yml
+++ /dev/null
@@ -1,33 +0,0 @@
-languageId: plaintext
-command:
-  spokenForm: pour this
-  version: 2
-  targets:
-    - type: primitive
-      mark: {type: cursor}
-  usePrePhraseSnapshot: true
-  action: {name: editNewLineAfter}
-initialState:
-  documentContents: hello world
-  selections:
-    - anchor: {line: 0, character: 2}
-      active: {line: 0, character: 2}
-    - anchor: {line: 0, character: 4}
-      active: {line: 0, character: 4}
-    - anchor: {line: 0, character: 8}
-      active: {line: 0, character: 8}
-  marks: {}
-finalState:
-  documentContents: |
-    hello world
-  selections:
-    - anchor: {line: 1, character: 0}
-      active: {line: 1, character: 0}
-  thatMark:
-    - type: UntypedTarget
-      contentRange:
-        start: {line: 0, character: 2}
-        end: {line: 0, character: 2}
-      isReversed: false
-      hasExplicitRange: false
-fullTargets: [{type: primitive, mark: {type: cursor}, modifiers: []}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/actions/pourVest.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/actions/pourVest.yml
deleted file mode 100644
index fe6e06438e..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/actions/pourVest.yml
+++ /dev/null
@@ -1,35 +0,0 @@
-languageId: typescript
-command:
-  version: 1
-  spokenForm: pour vest
-  action: editNewLineAfter
-  targets:
-    - type: primitive
-      mark: {type: decoratedSymbol, symbolColor: default, character: v}
-initialState:
-  documentContents: |
-
-    const value = "Hello world";
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-  marks:
-    default.v:
-      start: {line: 1, character: 6}
-      end: {line: 1, character: 11}
-finalState:
-  documentContents: |+
-
-    const value = "Hello world";
-
-  selections:
-    - anchor: {line: 2, character: 0}
-      active: {line: 2, character: 0}
-  thatMark:
-    - type: UntypedTarget
-      contentRange:
-        start: {line: 1, character: 6}
-        end: {line: 1, character: 11}
-      isReversed: false
-      hasExplicitRange: true
-fullTargets: [{type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: v}, selectionType: token, position: contents, modifier: {type: identity}, insideOutsideType: outside}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/actions/pourVest2.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/actions/pourVest2.yml
deleted file mode 100644
index 3d879953ba..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/actions/pourVest2.yml
+++ /dev/null
@@ -1,36 +0,0 @@
-languageId: plaintext
-command:
-  spokenForm: pour vest
-  version: 2
-  targets:
-    - type: primitive
-      mark: {type: decoratedSymbol, symbolColor: default, character: v}
-  usePrePhraseSnapshot: true
-  action: {name: editNewLineAfter}
-initialState:
-  documentContents: |2
-
-        const value = "Hello world";
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-  marks:
-    default.v:
-      start: {line: 1, character: 10}
-      end: {line: 1, character: 15}
-finalState:
-  documentContents: |2
-
-        const value = "Hello world";
-        
-  selections:
-    - anchor: {line: 2, character: 4}
-      active: {line: 2, character: 4}
-  thatMark:
-    - type: UntypedTarget
-      contentRange:
-        start: {line: 1, character: 10}
-        end: {line: 1, character: 15}
-      isReversed: false
-      hasExplicitRange: true
-fullTargets: [{type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: v}, modifiers: []}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/actions/preeVest.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/actions/preeVest.yml
deleted file mode 100644
index 17c7d7d226..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/actions/preeVest.yml
+++ /dev/null
@@ -1,34 +0,0 @@
-languageId: typescript
-command:
-  version: 1
-  spokenForm: pree vest
-  action: setSelectionBefore
-  targets:
-    - type: primitive
-      mark: {type: decoratedSymbol, symbolColor: default, character: v}
-initialState:
-  documentContents: |
-
-    const value = "Hello world";
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-  marks:
-    default.v:
-      start: {line: 1, character: 6}
-      end: {line: 1, character: 11}
-finalState:
-  documentContents: |
-
-    const value = "Hello world";
-  selections:
-    - anchor: {line: 1, character: 6}
-      active: {line: 1, character: 6}
-  thatMark:
-    - type: UntypedTarget
-      contentRange:
-        start: {line: 1, character: 6}
-        end: {line: 1, character: 11}
-      isReversed: false
-      hasExplicitRange: false
-fullTargets: [{type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: v}, selectionType: token, position: contents, modifier: {type: identity}, insideOutsideType: inside}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/actions/reformatHarpAsSnake.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/actions/reformatHarpAsSnake.yml
deleted file mode 100644
index 931c2543ef..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/actions/reformatHarpAsSnake.yml
+++ /dev/null
@@ -1,37 +0,0 @@
-languageId: typescript
-command:
-  version: 1
-  spokenForm: reformat harp as snake
-  action: getText
-  targets:
-    - type: primitive
-      mark: {type: decoratedSymbol, symbolColor: default, character: h}
-  extraArgs:
-    - {showDecorations: false, ensureSingleTarget: null}
-initialState:
-  documentContents: |
-
-    const value = "helloWorld";
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-  marks:
-    default.h:
-      start: {line: 1, character: 15}
-      end: {line: 1, character: 25}
-finalState:
-  documentContents: |
-
-    const value = "helloWorld";
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-  thatMark:
-    - type: UntypedTarget
-      contentRange:
-        start: {line: 1, character: 15}
-        end: {line: 1, character: 25}
-      isReversed: false
-      hasExplicitRange: false
-returnValue: [helloWorld]
-fullTargets: [{type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: h}, selectionType: token, position: contents, modifier: {type: identity}, insideOutsideType: inside}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/actions/reformatHarpAsSnake2.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/actions/reformatHarpAsSnake2.yml
deleted file mode 100644
index 148ced58f2..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/actions/reformatHarpAsSnake2.yml
+++ /dev/null
@@ -1,36 +0,0 @@
-languageId: typescript
-command:
-  version: 1
-  spokenForm: reformat harp as snake
-  action: replace
-  targets:
-    - type: primitive
-      mark: {type: decoratedSymbol, symbolColor: default, character: h}
-  extraArgs:
-    - [hello_world]
-initialState:
-  documentContents: |
-
-    const value = "helloWorld";
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-  marks:
-    default.h:
-      start: {line: 1, character: 15}
-      end: {line: 1, character: 25}
-finalState:
-  documentContents: |
-
-    const value = "hello_world";
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-  thatMark:
-    - type: UntypedTarget
-      contentRange:
-        start: {line: 1, character: 15}
-        end: {line: 1, character: 26}
-      isReversed: false
-      hasExplicitRange: true
-fullTargets: [{type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: h}, selectionType: token, position: contents, modifier: {type: identity}, insideOutsideType: null}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/actions/replaceAirAndBatAndCapWithCount.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/actions/replaceAirAndBatAndCapWithCount.yml
deleted file mode 100644
index 8119c76271..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/actions/replaceAirAndBatAndCapWithCount.yml
+++ /dev/null
@@ -1,64 +0,0 @@
-languageId: typescript
-command:
-  version: 1
-  spokenForm: replace air and bat and cap with count
-  action: replace
-  targets:
-    - type: list
-      elements:
-        - type: primitive
-          mark: {type: decoratedSymbol, symbolColor: default, character: a}
-        - type: primitive
-          mark: {type: decoratedSymbol, symbolColor: default, character: b}
-        - type: primitive
-          mark: {type: decoratedSymbol, symbolColor: default, character: c}
-  extraArgs:
-    - {start: 0}
-initialState:
-  documentContents: |
-
-    a
-    b
-    c
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-  marks:
-    default.a:
-      start: {line: 1, character: 0}
-      end: {line: 1, character: 1}
-    default.b:
-      start: {line: 2, character: 0}
-      end: {line: 2, character: 1}
-    default.c:
-      start: {line: 3, character: 0}
-      end: {line: 3, character: 1}
-finalState:
-  documentContents: |
-
-    0
-    1
-    2
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-  thatMark:
-    - type: UntypedTarget
-      contentRange:
-        start: {line: 1, character: 0}
-        end: {line: 1, character: 1}
-      isReversed: false
-      hasExplicitRange: true
-    - type: UntypedTarget
-      contentRange:
-        start: {line: 2, character: 0}
-        end: {line: 2, character: 1}
-      isReversed: false
-      hasExplicitRange: true
-    - type: UntypedTarget
-      contentRange:
-        start: {line: 3, character: 0}
-        end: {line: 3, character: 1}
-      isReversed: false
-      hasExplicitRange: true
-fullTargets: [{type: list, elements: [{type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: a}, selectionType: token, position: contents, modifier: {type: identity}, insideOutsideType: null}, {type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: b}, selectionType: token, position: contents, modifier: {type: identity}, insideOutsideType: null}, {type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: c}, selectionType: token, position: contents, modifier: {type: identity}, insideOutsideType: null}]}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/actions/replaceVestWithWhatever.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/actions/replaceVestWithWhatever.yml
deleted file mode 100644
index c2c511ca09..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/actions/replaceVestWithWhatever.yml
+++ /dev/null
@@ -1,36 +0,0 @@
-languageId: typescript
-command:
-  version: 1
-  spokenForm: replace vest with whatever
-  action: replace
-  targets:
-    - type: primitive
-      mark: {type: decoratedSymbol, symbolColor: default, character: v}
-  extraArgs:
-    - [whatever]
-initialState:
-  documentContents: |
-
-    const value = "hello_world";
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-  marks:
-    default.v:
-      start: {line: 1, character: 6}
-      end: {line: 1, character: 11}
-finalState:
-  documentContents: |
-
-    const whatever = "hello_world";
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-  thatMark:
-    - type: UntypedTarget
-      contentRange:
-        start: {line: 1, character: 6}
-        end: {line: 1, character: 14}
-      isReversed: false
-      hasExplicitRange: true
-fullTargets: [{type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: v}, selectionType: token, position: contents, modifier: {type: identity}, insideOutsideType: null}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/actions/reverseAirAndBatAndCap.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/actions/reverseAirAndBatAndCap.yml
deleted file mode 100644
index 50ca5b9c1c..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/actions/reverseAirAndBatAndCap.yml
+++ /dev/null
@@ -1,58 +0,0 @@
-languageId: typescript
-command:
-  version: 1
-  spokenForm: reverse air and bat and cap
-  action: reverseTargets
-  targets:
-    - type: list
-      elements:
-        - type: primitive
-          mark: {type: decoratedSymbol, symbolColor: default, character: a}
-        - type: primitive
-          mark: {type: decoratedSymbol, symbolColor: default, character: b}
-        - type: primitive
-          mark: {type: decoratedSymbol, symbolColor: default, character: c}
-initialState:
-  documentContents: |
-
-    const value = ["a", "b", "c"]
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-  marks:
-    default.a:
-      start: {line: 1, character: 16}
-      end: {line: 1, character: 17}
-    default.b:
-      start: {line: 1, character: 21}
-      end: {line: 1, character: 22}
-    default.c:
-      start: {line: 1, character: 26}
-      end: {line: 1, character: 27}
-finalState:
-  documentContents: |
-
-    const value = ["c", "b", "a"]
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-  thatMark:
-    - type: UntypedTarget
-      contentRange:
-        start: {line: 1, character: 16}
-        end: {line: 1, character: 17}
-      isReversed: false
-      hasExplicitRange: true
-    - type: UntypedTarget
-      contentRange:
-        start: {line: 1, character: 21}
-        end: {line: 1, character: 22}
-      isReversed: false
-      hasExplicitRange: true
-    - type: UntypedTarget
-      contentRange:
-        start: {line: 1, character: 26}
-        end: {line: 1, character: 27}
-      isReversed: false
-      hasExplicitRange: true
-fullTargets: [{type: list, elements: [{type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: a}, selectionType: token, position: contents, modifier: {type: identity}, insideOutsideType: inside}, {type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: b}, selectionType: token, position: contents, modifier: {type: identity}, insideOutsideType: inside}, {type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: c}, selectionType: token, position: contents, modifier: {type: identity}, insideOutsideType: inside}]}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/actions/roundWrapThis.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/actions/roundWrapThis.yml
deleted file mode 100644
index fecb55a77f..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/actions/roundWrapThis.yml
+++ /dev/null
@@ -1,39 +0,0 @@
-languageId: typescript
-command:
-  version: 1
-  spokenForm: round wrap this
-  action: wrapWithPairedDelimiter
-  targets:
-    - type: primitive
-      mark: {type: cursor}
-  extraArgs: [(, )]
-initialState:
-  documentContents: |
-
-    const value = "Hello world";
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-  marks: {}
-finalState:
-  documentContents: |
-    ()
-    const value = "Hello world";
-  selections:
-    - anchor: {line: 0, character: 1}
-      active: {line: 0, character: 1}
-  thatMark:
-    - type: UntypedTarget
-      contentRange:
-        start: {line: 0, character: 0}
-        end: {line: 0, character: 2}
-      isReversed: false
-      hasExplicitRange: true
-  sourceMark:
-    - type: UntypedTarget
-      contentRange:
-        start: {line: 0, character: 1}
-        end: {line: 0, character: 1}
-      isReversed: false
-      hasExplicitRange: false
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, modifier: {type: identity}, insideOutsideType: inside}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/actions/roundWrapVest.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/actions/roundWrapVest.yml
deleted file mode 100644
index d7e88e5f4e..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/actions/roundWrapVest.yml
+++ /dev/null
@@ -1,42 +0,0 @@
-languageId: typescript
-command:
-  version: 1
-  spokenForm: round wrap vest
-  action: wrapWithPairedDelimiter
-  targets:
-    - type: primitive
-      mark: {type: decoratedSymbol, symbolColor: default, character: v}
-  extraArgs: [(, )]
-initialState:
-  documentContents: |
-
-    const value = "Hello world";
-  selections:
-    - anchor: {line: 1, character: 11}
-      active: {line: 1, character: 11}
-  marks:
-    default.v:
-      start: {line: 1, character: 6}
-      end: {line: 1, character: 11}
-finalState:
-  documentContents: |
-
-    const (value) = "Hello world";
-  selections:
-    - anchor: {line: 1, character: 12}
-      active: {line: 1, character: 12}
-  thatMark:
-    - type: UntypedTarget
-      contentRange:
-        start: {line: 1, character: 6}
-        end: {line: 1, character: 13}
-      isReversed: false
-      hasExplicitRange: true
-  sourceMark:
-    - type: UntypedTarget
-      contentRange:
-        start: {line: 1, character: 7}
-        end: {line: 1, character: 12}
-      isReversed: false
-      hasExplicitRange: true
-fullTargets: [{type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: v}, selectionType: token, position: contents, modifier: {type: identity}, insideOutsideType: inside}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/actions/roundWrapVest2.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/actions/roundWrapVest2.yml
deleted file mode 100644
index 8f4b03680a..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/actions/roundWrapVest2.yml
+++ /dev/null
@@ -1,42 +0,0 @@
-languageId: typescript
-command:
-  version: 1
-  spokenForm: round wrap vest
-  action: wrapWithPairedDelimiter
-  targets:
-    - type: primitive
-      mark: {type: decoratedSymbol, symbolColor: default, character: v}
-  extraArgs: [(, )]
-initialState:
-  documentContents: |
-
-    const value = "Hello world";
-  selections:
-    - anchor: {line: 1, character: 12}
-      active: {line: 1, character: 12}
-  marks:
-    default.v:
-      start: {line: 1, character: 6}
-      end: {line: 1, character: 11}
-finalState:
-  documentContents: |
-
-    const (value) = "Hello world";
-  selections:
-    - anchor: {line: 1, character: 14}
-      active: {line: 1, character: 14}
-  thatMark:
-    - type: UntypedTarget
-      contentRange:
-        start: {line: 1, character: 6}
-        end: {line: 1, character: 13}
-      isReversed: false
-      hasExplicitRange: true
-  sourceMark:
-    - type: UntypedTarget
-      contentRange:
-        start: {line: 1, character: 7}
-        end: {line: 1, character: 12}
-      isReversed: false
-      hasExplicitRange: true
-fullTargets: [{type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: v}, selectionType: token, position: contents, modifier: {type: identity}, insideOutsideType: inside}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/actions/shuffleThis.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/actions/shuffleThis.yml
deleted file mode 100644
index 5909a90525..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/actions/shuffleThis.yml
+++ /dev/null
@@ -1,27 +0,0 @@
-languageId: plaintext
-command:
-  version: 1
-  spokenForm: shuffle this
-  action: randomizeTargets
-  targets:
-    - type: primitive
-      mark: {type: cursor}
-initialState:
-  documentContents: hello
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 5}
-  marks: {}
-finalState:
-  documentContents: hello
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 5}
-  thatMark:
-    - type: UntypedTarget
-      contentRange:
-        start: {line: 0, character: 0}
-        end: {line: 0, character: 5}
-      isReversed: false
-      hasExplicitRange: true
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: identity}, isImplicit: false}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/actions/snippets/duplicatedDuplicatedWrapThis.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/actions/snippets/duplicatedDuplicatedWrapThis.yml
deleted file mode 100644
index 923c9bc50b..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/actions/snippets/duplicatedDuplicatedWrapThis.yml
+++ /dev/null
@@ -1,32 +0,0 @@
-languageId: plaintext
-command:
-  spokenForm: duplicated duplicated wrap this
-  version: 2
-  targets:
-    - type: primitive
-      mark: {type: cursor}
-  usePrePhraseSnapshot: true
-  action:
-    name: wrapWithSnippet
-    args: [duplicatedVariableTest.duplicated]
-initialState:
-  documentContents: Hello world
-  selections:
-    - anchor: {line: 0, character: 11}
-      active: {line: 0, character: 0}
-  marks: {}
-finalState:
-  documentContents: >-
-    This variable: 'Hello world' is duplicated here: 'Hello world', but '' is
-    unique!
-  selections:
-    - anchor: {line: 0, character: 69}
-      active: {line: 0, character: 69}
-  thatMark:
-    - type: UntypedTarget
-      contentRange:
-        start: {line: 0, character: 0}
-        end: {line: 0, character: 81}
-      isReversed: true
-      hasExplicitRange: true
-fullTargets: [{type: primitive, mark: {type: cursor}, modifiers: []}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/actions/snippets/duplicatedUniqueWrapThis.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/actions/snippets/duplicatedUniqueWrapThis.yml
deleted file mode 100644
index ee7bdd83db..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/actions/snippets/duplicatedUniqueWrapThis.yml
+++ /dev/null
@@ -1,32 +0,0 @@
-languageId: plaintext
-command:
-  spokenForm: duplicated unique wrap this
-  version: 2
-  targets:
-    - type: primitive
-      mark: {type: cursor}
-  usePrePhraseSnapshot: true
-  action:
-    name: wrapWithSnippet
-    args: [duplicatedVariableTest.unique]
-initialState:
-  documentContents: Hello world
-  selections:
-    - anchor: {line: 0, character: 11}
-      active: {line: 0, character: 0}
-  marks: {}
-finalState:
-  documentContents: "This variable: '' is duplicated here: '', but 'Hello world' is unique!"
-  selections:
-    - anchor: {line: 0, character: 16}
-      active: {line: 0, character: 16}
-    - anchor: {line: 0, character: 39}
-      active: {line: 0, character: 39}
-  thatMark:
-    - type: UntypedTarget
-      contentRange:
-        start: {line: 0, character: 0}
-        end: {line: 0, character: 70}
-      isReversed: true
-      hasExplicitRange: true
-fullTargets: [{type: primitive, mark: {type: cursor}, modifiers: []}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/actions/snippets/snipDuplicatedDuplicated.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/actions/snippets/snipDuplicatedDuplicated.yml
deleted file mode 100644
index 923a1e9222..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/actions/snippets/snipDuplicatedDuplicated.yml
+++ /dev/null
@@ -1,31 +0,0 @@
-languageId: plaintext
-command:
-  spokenForm: snip duplicated duplicated
-  version: 2
-  targets:
-    - {type: primitive, isImplicit: true}
-  usePrePhraseSnapshot: true
-  action:
-    name: insertSnippet
-    args: [duplicatedVariableTest]
-initialState:
-  documentContents: ""
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-  marks: {}
-finalState:
-  documentContents: "This variable: '' is duplicated here: '', but '' is unique!"
-  selections:
-    - anchor: {line: 0, character: 16}
-      active: {line: 0, character: 16}
-    - anchor: {line: 0, character: 39}
-      active: {line: 0, character: 39}
-  thatMark:
-    - type: UntypedTarget
-      contentRange:
-        start: {line: 0, character: 0}
-        end: {line: 0, character: 59}
-      isReversed: false
-      hasExplicitRange: true
-fullTargets: [{type: primitive, mark: {type: cursor}, modifiers: [{type: toRawSelection}]}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/actions/snippets/snipDuplicatedDuplicatedHelloWorld.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/actions/snippets/snipDuplicatedDuplicatedHelloWorld.yml
deleted file mode 100644
index b4ddab7ef7..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/actions/snippets/snipDuplicatedDuplicatedHelloWorld.yml
+++ /dev/null
@@ -1,33 +0,0 @@
-languageId: plaintext
-command:
-  spokenForm: snip duplicated duplicated hello world
-  version: 2
-  targets:
-    - {type: primitive, isImplicit: true}
-  usePrePhraseSnapshot: true
-  action:
-    name: insertSnippet
-    args:
-      - duplicatedVariableTest
-      - {duplicated: hello world}
-initialState:
-  documentContents: ""
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-  marks: {}
-finalState:
-  documentContents: >-
-    This variable: 'hello_world' is duplicated here: 'hello_world', but '' is
-    unique!
-  selections:
-    - anchor: {line: 0, character: 69}
-      active: {line: 0, character: 69}
-  thatMark:
-    - type: UntypedTarget
-      contentRange:
-        start: {line: 0, character: 0}
-        end: {line: 0, character: 81}
-      isReversed: false
-      hasExplicitRange: true
-fullTargets: [{type: primitive, mark: {type: cursor}, modifiers: [{type: toRawSelection}]}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/actions/snippets/snipDuplicatedUniqueHelloWorld.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/actions/snippets/snipDuplicatedUniqueHelloWorld.yml
deleted file mode 100644
index c97ca71098..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/actions/snippets/snipDuplicatedUniqueHelloWorld.yml
+++ /dev/null
@@ -1,33 +0,0 @@
-languageId: plaintext
-command:
-  spokenForm: snip duplicated unique hello world
-  version: 2
-  targets:
-    - {type: primitive, isImplicit: true}
-  usePrePhraseSnapshot: true
-  action:
-    name: insertSnippet
-    args:
-      - duplicatedVariableTest
-      - {unique: hello world}
-initialState:
-  documentContents: ""
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-  marks: {}
-finalState:
-  documentContents: "This variable: '' is duplicated here: '', but 'helloWorld' is unique!"
-  selections:
-    - anchor: {line: 0, character: 16}
-      active: {line: 0, character: 16}
-    - anchor: {line: 0, character: 39}
-      active: {line: 0, character: 39}
-  thatMark:
-    - type: UntypedTarget
-      contentRange:
-        start: {line: 0, character: 0}
-        end: {line: 0, character: 69}
-      isReversed: false
-      hasExplicitRange: true
-fullTargets: [{type: primitive, mark: {type: cursor}, modifiers: [{type: toRawSelection}]}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/actions/snippets/snipFunk.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/actions/snippets/snipFunk.yml
deleted file mode 100644
index 549fdcd04a..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/actions/snippets/snipFunk.yml
+++ /dev/null
@@ -1,29 +0,0 @@
-languageId: typescript
-command:
-  version: 1
-  spokenForm: snip funk
-  action: insertSnippet
-  targets:
-    - {type: primitive, isImplicit: true}
-  extraArgs: [functionDeclaration]
-initialState:
-  documentContents: ""
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-finalState:
-  documentContents: |-
-    function () {
-        
-    }
-  selections:
-    - anchor: {line: 0, character: 9}
-      active: {line: 0, character: 9}
-  thatMark:
-    - type: UntypedTarget
-      contentRange:
-        start: {line: 0, character: 0}
-        end: {line: 2, character: 1}
-      isReversed: false
-      hasExplicitRange: true
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: identity}}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/actions/snippets/snipFunkAfterFineAndZip.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/actions/snippets/snipFunkAfterFineAndZip.yml
deleted file mode 100644
index 1e0ed8385a..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/actions/snippets/snipFunkAfterFineAndZip.yml
+++ /dev/null
@@ -1,60 +0,0 @@
-languageId: typescript
-command:
-  spokenForm: snip funk after fine and zip
-  version: 2
-  targets:
-    - type: list
-      elements:
-        - type: primitive
-          mark: {type: decoratedSymbol, symbolColor: default, character: f}
-          modifiers:
-            - {type: position, position: after}
-        - type: primitive
-          mark: {type: decoratedSymbol, symbolColor: default, character: z}
-  usePrePhraseSnapshot: true
-  action:
-    name: insertSnippet
-    args: [functionDeclaration]
-initialState:
-  documentContents: |-
-    const foo = "bar";
-    const baz = "bongo";
-  selections:
-    - anchor: {line: 1, character: 18}
-      active: {line: 1, character: 18}
-  marks:
-    default.f:
-      start: {line: 0, character: 6}
-      end: {line: 0, character: 9}
-    default.z:
-      start: {line: 1, character: 6}
-      end: {line: 1, character: 9}
-finalState:
-  documentContents: |-
-    const foo = "bar";
-    function () {
-        
-    }
-    const baz = "bongo";
-    function () {
-        
-    }
-  selections:
-    - anchor: {line: 1, character: 9}
-      active: {line: 1, character: 9}
-    - anchor: {line: 5, character: 9}
-      active: {line: 5, character: 9}
-  thatMark:
-    - type: UntypedTarget
-      contentRange:
-        start: {line: 1, character: 0}
-        end: {line: 3, character: 1}
-      isReversed: false
-      hasExplicitRange: true
-    - type: UntypedTarget
-      contentRange:
-        start: {line: 5, character: 0}
-        end: {line: 7, character: 1}
-      isReversed: false
-      hasExplicitRange: true
-fullTargets: [{type: list, elements: [{type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: f}, modifiers: [{type: position, position: after}]}, {type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: z}, modifiers: [{type: position, position: after}]}]}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/actions/snippets/snipFunkAfterMadeAndBeforeFineAndZip.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/actions/snippets/snipFunkAfterMadeAndBeforeFineAndZip.yml
deleted file mode 100644
index 6c6e2c63f1..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/actions/snippets/snipFunkAfterMadeAndBeforeFineAndZip.yml
+++ /dev/null
@@ -1,80 +0,0 @@
-languageId: typescript
-command:
-  spokenForm: snip funk after made and before fine and zip
-  version: 2
-  targets:
-    - type: list
-      elements:
-        - type: primitive
-          mark: {type: decoratedSymbol, symbolColor: default, character: m}
-          modifiers:
-            - {type: position, position: after}
-        - type: primitive
-          modifiers:
-            - {type: position, position: before}
-          mark: {type: decoratedSymbol, symbolColor: default, character: f}
-        - type: primitive
-          mark: {type: decoratedSymbol, symbolColor: default, character: z}
-  usePrePhraseSnapshot: true
-  action:
-    name: insertSnippet
-    args: [functionDeclaration]
-initialState:
-  documentContents: |
-    const foo = "bar";
-    const baz = "bongo";
-    const bazman = "bongo";
-  selections:
-    - anchor: {line: 2, character: 12}
-      active: {line: 2, character: 12}
-  marks:
-    default.m:
-      start: {line: 2, character: 6}
-      end: {line: 2, character: 12}
-    default.f:
-      start: {line: 0, character: 6}
-      end: {line: 0, character: 9}
-    default.z:
-      start: {line: 1, character: 6}
-      end: {line: 1, character: 9}
-finalState:
-  documentContents: |
-    function () {
-        
-    }
-    const foo = "bar";
-    function () {
-        
-    }
-    const baz = "bongo";
-    const bazman = "bongo";
-    function () {
-        
-    }
-  selections:
-    - anchor: {line: 9, character: 9}
-      active: {line: 9, character: 9}
-    - anchor: {line: 0, character: 9}
-      active: {line: 0, character: 9}
-    - anchor: {line: 4, character: 9}
-      active: {line: 4, character: 9}
-  thatMark:
-    - type: UntypedTarget
-      contentRange:
-        start: {line: 9, character: 0}
-        end: {line: 11, character: 1}
-      isReversed: false
-      hasExplicitRange: true
-    - type: UntypedTarget
-      contentRange:
-        start: {line: 0, character: 0}
-        end: {line: 2, character: 1}
-      isReversed: false
-      hasExplicitRange: true
-    - type: UntypedTarget
-      contentRange:
-        start: {line: 4, character: 0}
-        end: {line: 6, character: 1}
-      isReversed: false
-      hasExplicitRange: true
-fullTargets: [{type: list, elements: [{type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: m}, modifiers: [{type: position, position: after}]}, {type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: f}, modifiers: [{type: position, position: before}]}, {type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: z}, modifiers: [{type: position, position: before}]}]}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/actions/snippets/snipFunkAfterThis.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/actions/snippets/snipFunkAfterThis.yml
deleted file mode 100644
index 57a97c8d92..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/actions/snippets/snipFunkAfterThis.yml
+++ /dev/null
@@ -1,36 +0,0 @@
-languageId: typescript
-command:
-  spokenForm: snip funk after this
-  version: 2
-  targets:
-    - type: primitive
-      mark: {type: cursor}
-      modifiers:
-        - {type: position, position: after}
-  usePrePhraseSnapshot: true
-  action:
-    name: insertSnippet
-    args: [functionDeclaration]
-initialState:
-  documentContents: "    const foo = \"bar\";"
-  selections:
-    - anchor: {line: 0, character: 21}
-      active: {line: 0, character: 21}
-  marks: {}
-finalState:
-  documentContents: |2-
-        const foo = "bar";
-        function () {
-            
-        }
-  selections:
-    - anchor: {line: 1, character: 13}
-      active: {line: 1, character: 13}
-  thatMark:
-    - type: UntypedTarget
-      contentRange:
-        start: {line: 1, character: 4}
-        end: {line: 3, character: 5}
-      isReversed: false
-      hasExplicitRange: true
-fullTargets: [{type: primitive, mark: {type: cursor}, modifiers: [{type: position, position: after}]}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/actions/snippets/snipFunkAfterThis2.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/actions/snippets/snipFunkAfterThis2.yml
deleted file mode 100644
index f515de19f7..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/actions/snippets/snipFunkAfterThis2.yml
+++ /dev/null
@@ -1,40 +0,0 @@
-languageId: typescript
-command:
-  spokenForm: snip funk after this
-  version: 2
-  targets:
-    - type: primitive
-      mark: {type: cursor}
-      modifiers:
-        - {type: position, position: after}
-  usePrePhraseSnapshot: true
-  action:
-    name: insertSnippet
-    args: [functionDeclaration]
-initialState:
-  documentContents: const foo = "bar";
-  selections:
-    - anchor: {line: 0, character: 7}
-      active: {line: 0, character: 7}
-    - anchor: {line: 0, character: 13}
-      active: {line: 0, character: 13}
-    - anchor: {line: 0, character: 10}
-      active: {line: 0, character: 10}
-  marks: {}
-finalState:
-  documentContents: |-
-    const foo = "bar";
-    function () {
-        
-    }
-  selections:
-    - anchor: {line: 1, character: 9}
-      active: {line: 1, character: 9}
-  thatMark:
-    - type: UntypedTarget
-      contentRange:
-        start: {line: 1, character: 0}
-        end: {line: 3, character: 1}
-      isReversed: false
-      hasExplicitRange: true
-fullTargets: [{type: primitive, mark: {type: cursor}, modifiers: [{type: position, position: after}]}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/actions/snippets/snipFunkAfterThis3.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/actions/snippets/snipFunkAfterThis3.yml
deleted file mode 100644
index f2a300f951..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/actions/snippets/snipFunkAfterThis3.yml
+++ /dev/null
@@ -1,42 +0,0 @@
-languageId: typescript
-command:
-  spokenForm: snip funk after this
-  version: 2
-  targets:
-    - type: primitive
-      mark: {type: cursor}
-      modifiers:
-        - {type: position, position: after}
-  usePrePhraseSnapshot: true
-  action:
-    name: insertSnippet
-    args: [functionDeclaration]
-initialState:
-  documentContents: |-
-    function helloWorld() {
-        const whatever = "hello";
-    }
-  selections:
-    - anchor: {line: 1, character: 19}
-      active: {line: 1, character: 19}
-  marks: {}
-finalState:
-  documentContents: |-
-    function helloWorld() {
-        const whatever = "hello";
-    }
-
-    function () {
-        
-    }
-  selections:
-    - anchor: {line: 4, character: 9}
-      active: {line: 4, character: 9}
-  thatMark:
-    - type: UntypedTarget
-      contentRange:
-        start: {line: 4, character: 0}
-        end: {line: 6, character: 1}
-      isReversed: false
-      hasExplicitRange: true
-fullTargets: [{type: primitive, mark: {type: cursor}, modifiers: [], positionModifier: {type: position, position: after}}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/actions/snippets/snipFunkAfterThis4.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/actions/snippets/snipFunkAfterThis4.yml
deleted file mode 100644
index 54f64b2823..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/actions/snippets/snipFunkAfterThis4.yml
+++ /dev/null
@@ -1,32 +0,0 @@
-languageId: typescript
-command:
-  version: 1
-  spokenForm: snip funk after this
-  action: insertSnippet
-  targets:
-    - type: primitive
-      position: after
-      mark: {type: cursor}
-  extraArgs: [functionDeclaration]
-initialState:
-  documentContents: const foo = "bar";
-  selections:
-    - anchor: {line: 0, character: 12}
-      active: {line: 0, character: 12}
-finalState:
-  documentContents: |-
-    const foo = "bar";
-    function () {
-        
-    }
-  selections:
-    - anchor: {line: 1, character: 9}
-      active: {line: 1, character: 9}
-  thatMark:
-    - type: UntypedTarget
-      contentRange:
-        start: {line: 1, character: 0}
-        end: {line: 3, character: 1}
-      isReversed: false
-      hasExplicitRange: true
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: after, insideOutsideType: outside, modifier: {type: containingScope, scopeType: statement, includeSiblings: false}}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/actions/snippets/snipFunkAfterZipAndBeforeFine.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/actions/snippets/snipFunkAfterZipAndBeforeFine.yml
deleted file mode 100644
index 13cce5840a..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/actions/snippets/snipFunkAfterZipAndBeforeFine.yml
+++ /dev/null
@@ -1,62 +0,0 @@
-languageId: typescript
-command:
-  spokenForm: snip funk after zip and before fine
-  version: 2
-  targets:
-    - type: list
-      elements:
-        - type: primitive
-          mark: {type: decoratedSymbol, symbolColor: default, character: z}
-          modifiers:
-            - {type: position, position: after}
-        - type: primitive
-          modifiers:
-            - {type: position, position: before}
-          mark: {type: decoratedSymbol, symbolColor: default, character: f}
-  usePrePhraseSnapshot: true
-  action:
-    name: insertSnippet
-    args: [functionDeclaration]
-initialState:
-  documentContents: |-
-    const foo = "bar";
-    const baz = "bongo";
-  selections:
-    - anchor: {line: 1, character: 20}
-      active: {line: 1, character: 20}
-  marks:
-    default.z:
-      start: {line: 1, character: 6}
-      end: {line: 1, character: 9}
-    default.f:
-      start: {line: 0, character: 6}
-      end: {line: 0, character: 9}
-finalState:
-  documentContents: |-
-    function () {
-        
-    }
-    const foo = "bar";
-    const baz = "bongo";
-    function () {
-        
-    }
-  selections:
-    - anchor: {line: 5, character: 9}
-      active: {line: 5, character: 9}
-    - anchor: {line: 0, character: 9}
-      active: {line: 0, character: 9}
-  thatMark:
-    - type: UntypedTarget
-      contentRange:
-        start: {line: 5, character: 0}
-        end: {line: 7, character: 1}
-      isReversed: false
-      hasExplicitRange: true
-    - type: UntypedTarget
-      contentRange:
-        start: {line: 0, character: 0}
-        end: {line: 2, character: 1}
-      isReversed: false
-      hasExplicitRange: true
-fullTargets: [{type: list, elements: [{type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: z}, modifiers: [{type: position, position: after}]}, {type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: f}, modifiers: [{type: position, position: before}]}]}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/actions/snippets/snipFunkBeforeThis.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/actions/snippets/snipFunkBeforeThis.yml
deleted file mode 100644
index 1472150ffe..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/actions/snippets/snipFunkBeforeThis.yml
+++ /dev/null
@@ -1,36 +0,0 @@
-languageId: typescript
-command:
-  spokenForm: snip funk before this
-  version: 2
-  targets:
-    - type: primitive
-      mark: {type: cursor}
-      modifiers:
-        - {type: position, position: before}
-  usePrePhraseSnapshot: true
-  action:
-    name: insertSnippet
-    args: [functionDeclaration]
-initialState:
-  documentContents: const foo = "bar";
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-  marks: {}
-finalState:
-  documentContents: |-
-    function () {
-        
-    }
-    const foo = "bar";
-  selections:
-    - anchor: {line: 0, character: 9}
-      active: {line: 0, character: 9}
-  thatMark:
-    - type: UntypedTarget
-      contentRange:
-        start: {line: 0, character: 0}
-        end: {line: 2, character: 1}
-      isReversed: false
-      hasExplicitRange: true
-fullTargets: [{type: primitive, mark: {type: cursor}, modifiers: [{type: position, position: before}]}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/actions/snippets/snipFunkBeforeThis2.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/actions/snippets/snipFunkBeforeThis2.yml
deleted file mode 100644
index 2a955f0569..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/actions/snippets/snipFunkBeforeThis2.yml
+++ /dev/null
@@ -1,36 +0,0 @@
-languageId: typescript
-command:
-  spokenForm: snip funk before this
-  version: 2
-  targets:
-    - type: primitive
-      mark: {type: cursor}
-      modifiers:
-        - {type: position, position: before}
-  usePrePhraseSnapshot: true
-  action:
-    name: insertSnippet
-    args: [functionDeclaration]
-initialState:
-  documentContents: "    const foo = \"bar\";"
-  selections:
-    - anchor: {line: 0, character: 4}
-      active: {line: 0, character: 4}
-  marks: {}
-finalState:
-  documentContents: |2-
-        function () {
-            
-        }
-        const foo = "bar";
-  selections:
-    - anchor: {line: 0, character: 13}
-      active: {line: 0, character: 13}
-  thatMark:
-    - type: UntypedTarget
-      contentRange:
-        start: {line: 0, character: 4}
-        end: {line: 2, character: 5}
-      isReversed: false
-      hasExplicitRange: true
-fullTargets: [{type: primitive, mark: {type: cursor}, modifiers: [{type: position, position: before}]}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/actions/snippets/snipFunkBeforeThis3.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/actions/snippets/snipFunkBeforeThis3.yml
deleted file mode 100644
index 52d3b704ea..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/actions/snippets/snipFunkBeforeThis3.yml
+++ /dev/null
@@ -1,40 +0,0 @@
-languageId: typescript
-command:
-  spokenForm: snip funk before this
-  version: 2
-  targets:
-    - type: primitive
-      mark: {type: cursor}
-      modifiers:
-        - {type: position, position: before}
-  usePrePhraseSnapshot: true
-  action:
-    name: insertSnippet
-    args: [functionDeclaration]
-initialState:
-  documentContents: const foo = "bar";
-  selections:
-    - anchor: {line: 0, character: 7}
-      active: {line: 0, character: 7}
-    - anchor: {line: 0, character: 13}
-      active: {line: 0, character: 13}
-    - anchor: {line: 0, character: 10}
-      active: {line: 0, character: 10}
-  marks: {}
-finalState:
-  documentContents: |-
-    function () {
-        
-    }
-    const foo = "bar";
-  selections:
-    - anchor: {line: 0, character: 9}
-      active: {line: 0, character: 9}
-  thatMark:
-    - type: UntypedTarget
-      contentRange:
-        start: {line: 0, character: 0}
-        end: {line: 2, character: 1}
-      isReversed: false
-      hasExplicitRange: true
-fullTargets: [{type: primitive, mark: {type: cursor}, modifiers: [{type: position, position: before}]}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/actions/snippets/snipFunkHelloWorld.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/actions/snippets/snipFunkHelloWorld.yml
deleted file mode 100644
index 0981398485..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/actions/snippets/snipFunkHelloWorld.yml
+++ /dev/null
@@ -1,31 +0,0 @@
-languageId: typescript
-command:
-  version: 1
-  spokenForm: snip funk hello world
-  action: insertSnippet
-  targets:
-    - {type: primitive, isImplicit: true}
-  extraArgs:
-    - functionDeclaration
-    - {name: hello world}
-initialState:
-  documentContents: ""
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-finalState:
-  documentContents: |-
-    function helloWorld() {
-        
-    }
-  selections:
-    - anchor: {line: 0, character: 20}
-      active: {line: 0, character: 20}
-  thatMark:
-    - type: UntypedTarget
-      contentRange:
-        start: {line: 0, character: 0}
-        end: {line: 2, character: 1}
-      isReversed: false
-      hasExplicitRange: true
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: identity}}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/actions/snippets/snipFunkHelloWorld2.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/actions/snippets/snipFunkHelloWorld2.yml
deleted file mode 100644
index 3ac513ab19..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/actions/snippets/snipFunkHelloWorld2.yml
+++ /dev/null
@@ -1,30 +0,0 @@
-languageId: python
-command:
-  version: 1
-  spokenForm: snip funk hello world
-  action: insertSnippet
-  targets:
-    - {type: primitive, isImplicit: true}
-  extraArgs:
-    - functionDeclaration
-    - {name: hello world}
-initialState:
-  documentContents: ""
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-finalState:
-  documentContents: |-
-    def hello_world():
-        
-  selections:
-    - anchor: {line: 0, character: 16}
-      active: {line: 0, character: 16}
-  thatMark:
-    - type: UntypedTarget
-      contentRange:
-        start: {line: 0, character: 0}
-        end: {line: 1, character: 4}
-      isReversed: false
-      hasExplicitRange: true
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: identity}}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/actions/snippets/snipIf.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/actions/snippets/snipIf.yml
deleted file mode 100644
index 5442af652a..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/actions/snippets/snipIf.yml
+++ /dev/null
@@ -1,35 +0,0 @@
-languageId: typescript
-command:
-  version: 1
-  spokenForm: snip if
-  action: insertSnippet
-  targets:
-    - {type: primitive, isImplicit: true}
-  extraArgs: [ifStatement]
-initialState:
-  documentContents: |-
-    function whatever() {
-        
-    }
-  selections:
-    - anchor: {line: 1, character: 4}
-      active: {line: 1, character: 4}
-  marks: {}
-finalState:
-  documentContents: |-
-    function whatever() {
-        if () {
-            
-        }
-    }
-  selections:
-    - anchor: {line: 1, character: 8}
-      active: {line: 1, character: 8}
-  thatMark:
-    - type: UntypedTarget
-      contentRange:
-        start: {line: 1, character: 4}
-        end: {line: 3, character: 5}
-      isReversed: false
-      hasExplicitRange: true
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: identity}, isImplicit: true}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/actions/snippets/snipMakeFunk.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/actions/snippets/snipMakeFunk.yml
deleted file mode 100644
index 75919e9974..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/actions/snippets/snipMakeFunk.yml
+++ /dev/null
@@ -1,68 +0,0 @@
-languageId: typescript
-command:
-  spokenForm: snip make funk
-  version: 2
-  targets:
-    - type: primitive
-      modifiers:
-        - type: containingScope
-          scopeType: {type: namedFunction}
-  usePrePhraseSnapshot: true
-  action:
-    name: generateSnippet
-    args: [snippetTest1]
-initialState:
-  documentContents: |2-
-        function helloWorld() {
-            const whatever = "hello";
-
-            if (whatever == null) {
-                console.log("hello")
-            }
-        }
-  selections:
-    - anchor: {line: 0, character: 13}
-      active: {line: 0, character: 23}
-    - anchor: {line: 3, character: 8}
-      active: {line: 5, character: 9}
-  marks: {}
-finalState:
-  documentContents: |-
-    {
-      "snippetTest1": {
-        "definitions": [
-          {
-            "scope": {
-              "langIds": [
-                "typescript"
-              ]
-            },
-            "body": [
-              "function $variable1() {",
-              "\tconst whatever = \"hello\";",
-              "",
-              "\t$variable2",
-              "}"
-            ]
-          }
-        ],
-        "description": "",
-        "variables": {
-          "variable1": {},
-          "variable2": {}
-        }
-      }
-    }
-  selections:
-    - anchor: {line: 10, character: 21}
-      active: {line: 10, character: 30}
-    - anchor: {line: 20, character: 7}
-      active: {line: 20, character: 16}
-  thatMark:
-    - type: UntypedTarget
-      contentRange:
-        start: {line: 0, character: 4}
-        end: {line: 6, character: 5}
-      isReversed: false
-      hasExplicitRange: true
-fullTargets: [{type: primitive, mark: {type: cursor}, modifiers: [{type: containingScope, scopeType: {type: namedFunction}}]}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/actions/snippets/snipMakeState.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/actions/snippets/snipMakeState.yml
deleted file mode 100644
index f181875d04..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/actions/snippets/snipMakeState.yml
+++ /dev/null
@@ -1,59 +0,0 @@
-languageId: typescript
-command:
-  spokenForm: snip make state
-  version: 2
-  targets:
-    - type: primitive
-      modifiers:
-        - type: containingScope
-          scopeType: {type: statement}
-  usePrePhraseSnapshot: true
-  action:
-    name: generateSnippet
-    args: [snippetTest1]
-initialState:
-  documentContents: |-
-    if () {
-        console.log("hello")
-    }
-  selections:
-    - anchor: {line: 0, character: 4}
-      active: {line: 0, character: 4}
-  marks: {}
-finalState:
-  documentContents: |-
-    {
-      "snippetTest1": {
-        "definitions": [
-          {
-            "scope": {
-              "langIds": [
-                "typescript"
-              ]
-            },
-            "body": [
-              "if ($variable1) {",
-              "\tconsole.log(\"hello\")",
-              "}"
-            ]
-          }
-        ],
-        "description": "",
-        "variables": {
-          "variable1": {}
-        }
-      }
-    }
-  selections:
-    - anchor: {line: 10, character: 16}
-      active: {line: 10, character: 25}
-    - anchor: {line: 18, character: 7}
-      active: {line: 18, character: 16}
-  thatMark:
-    - type: UntypedTarget
-      contentRange:
-        start: {line: 0, character: 0}
-        end: {line: 2, character: 1}
-      isReversed: false
-      hasExplicitRange: true
-fullTargets: [{type: primitive, mark: {type: cursor}, modifiers: [{type: containingScope, scopeType: {type: statement}}]}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/actions/snippets/snipSpaghetti.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/actions/snippets/snipSpaghetti.yml
deleted file mode 100644
index 604d98ffd7..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/actions/snippets/snipSpaghetti.yml
+++ /dev/null
@@ -1,27 +0,0 @@
-languageId: plaintext
-command:
-  version: 1
-  spokenForm: snip spaghetti
-  action: insertSnippet
-  targets:
-    - {type: primitive, isImplicit: true}
-  extraArgs: [spaghetti]
-initialState:
-  documentContents: ""
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-  marks: {}
-finalState:
-  documentContents: My friend  likes to eat spaghetti!
-  selections:
-    - anchor: {line: 0, character: 10}
-      active: {line: 0, character: 10}
-  thatMark:
-    - type: UntypedTarget
-      contentRange:
-        start: {line: 0, character: 0}
-        end: {line: 0, character: 34}
-      isReversed: false
-      hasExplicitRange: true
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: identity}}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/actions/snippets/snipSpaghettiGraceHopper.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/actions/snippets/snipSpaghettiGraceHopper.yml
deleted file mode 100644
index 612e76aa0f..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/actions/snippets/snipSpaghettiGraceHopper.yml
+++ /dev/null
@@ -1,29 +0,0 @@
-languageId: plaintext
-command:
-  version: 1
-  spokenForm: snip spaghetti grace hopper
-  action: insertSnippet
-  targets:
-    - {type: primitive, isImplicit: true}
-  extraArgs:
-    - spaghetti
-    - {foo: grace hopper}
-initialState:
-  documentContents: ""
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-  marks: {}
-finalState:
-  documentContents: My friend grace_hopper likes to eat spaghetti!
-  selections:
-    - anchor: {line: 0, character: 46}
-      active: {line: 0, character: 46}
-  thatMark:
-    - type: UntypedTarget
-      contentRange:
-        start: {line: 0, character: 0}
-        end: {line: 0, character: 46}
-      isReversed: false
-      hasExplicitRange: true
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: identity}}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/actions/snippets/spaghettiWrapPastGust.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/actions/snippets/spaghettiWrapPastGust.yml
deleted file mode 100644
index ab66c9245c..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/actions/snippets/spaghettiWrapPastGust.yml
+++ /dev/null
@@ -1,36 +0,0 @@
-languageId: plaintext
-command:
-  version: 1
-  spokenForm: spaghetti wrap past gust
-  action: wrapWithSnippet
-  targets:
-    - type: range
-      start: {type: primitive}
-      end:
-        type: primitive
-        mark: {type: decoratedSymbol, symbolColor: default, character: g}
-      excludeStart: false
-      excludeEnd: false
-  extraArgs: [spaghetti.foo]
-initialState:
-  documentContents: grace hopper
-  selections:
-    - anchor: {line: 0, character: 12}
-      active: {line: 0, character: 12}
-  marks:
-    default.g:
-      start: {line: 0, character: 0}
-      end: {line: 0, character: 5}
-finalState:
-  documentContents: My friend grace hopper likes to eat spaghetti!
-  selections:
-    - anchor: {line: 0, character: 46}
-      active: {line: 0, character: 46}
-  thatMark:
-    - type: UntypedTarget
-      contentRange:
-        start: {line: 0, character: 0}
-        end: {line: 0, character: 46}
-      isReversed: true
-      hasExplicitRange: true
-fullTargets: [{type: range, excludeAnchor: false, excludeActive: false, anchor: {type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: identity}}, active: {type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: g}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: identity}}}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/actions/sortAirAndCapAndBat.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/actions/sortAirAndCapAndBat.yml
deleted file mode 100644
index 35e432d0ab..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/actions/sortAirAndCapAndBat.yml
+++ /dev/null
@@ -1,58 +0,0 @@
-languageId: typescript
-command:
-  version: 1
-  spokenForm: sort air and cap and bat
-  action: sortTargets
-  targets:
-    - type: list
-      elements:
-        - type: primitive
-          mark: {type: decoratedSymbol, symbolColor: default, character: a}
-        - type: primitive
-          mark: {type: decoratedSymbol, symbolColor: default, character: c}
-        - type: primitive
-          mark: {type: decoratedSymbol, symbolColor: default, character: b}
-initialState:
-  documentContents: |
-
-    const value = ["a", "c", "b"]
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-  marks:
-    default.a:
-      start: {line: 1, character: 16}
-      end: {line: 1, character: 17}
-    default.c:
-      start: {line: 1, character: 21}
-      end: {line: 1, character: 22}
-    default.b:
-      start: {line: 1, character: 26}
-      end: {line: 1, character: 27}
-finalState:
-  documentContents: |
-
-    const value = ["a", "b", "c"]
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-  thatMark:
-    - type: UntypedTarget
-      contentRange:
-        start: {line: 1, character: 16}
-        end: {line: 1, character: 17}
-      isReversed: false
-      hasExplicitRange: true
-    - type: UntypedTarget
-      contentRange:
-        start: {line: 1, character: 21}
-        end: {line: 1, character: 22}
-      isReversed: false
-      hasExplicitRange: true
-    - type: UntypedTarget
-      contentRange:
-        start: {line: 1, character: 26}
-        end: {line: 1, character: 27}
-      isReversed: false
-      hasExplicitRange: true
-fullTargets: [{type: list, elements: [{type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: a}, selectionType: token, position: contents, modifier: {type: identity}, insideOutsideType: inside}, {type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: c}, selectionType: token, position: contents, modifier: {type: identity}, insideOutsideType: inside}, {type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: b}, selectionType: token, position: contents, modifier: {type: identity}, insideOutsideType: inside}]}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/actions/sortEveryItem.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/actions/sortEveryItem.yml
deleted file mode 100644
index b2916b183a..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/actions/sortEveryItem.yml
+++ /dev/null
@@ -1,48 +0,0 @@
-languageId: markdown
-command:
-  spokenForm: sort every item
-  version: 3
-  targets:
-    - type: primitive
-      modifiers:
-        - type: everyScope
-          scopeType: {type: collectionItem}
-  usePrePhraseSnapshot: true
-  action: {name: sortTargets}
-initialState:
-  documentContents: 90, 11, 9, 3
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-  marks: {}
-finalState:
-  documentContents: 3, 9, 11, 90
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-  thatMark:
-    - type: UntypedTarget
-      contentRange:
-        start: {line: 0, character: 0}
-        end: {line: 0, character: 1}
-      isReversed: false
-      hasExplicitRange: true
-    - type: UntypedTarget
-      contentRange:
-        start: {line: 0, character: 3}
-        end: {line: 0, character: 4}
-      isReversed: false
-      hasExplicitRange: true
-    - type: UntypedTarget
-      contentRange:
-        start: {line: 0, character: 6}
-        end: {line: 0, character: 8}
-      isReversed: false
-      hasExplicitRange: true
-    - type: UntypedTarget
-      contentRange:
-        start: {line: 0, character: 10}
-        end: {line: 0, character: 12}
-      isReversed: false
-      hasExplicitRange: true
-fullTargets: [{type: primitive, mark: {type: cursor}, modifiers: [{type: everyScope, scopeType: {type: collectionItem}}]}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/actions/sortEveryItem2.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/actions/sortEveryItem2.yml
deleted file mode 100644
index 9d9688308b..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/actions/sortEveryItem2.yml
+++ /dev/null
@@ -1,54 +0,0 @@
-languageId: markdown
-command:
-  spokenForm: sort every item
-  version: 3
-  targets:
-    - type: primitive
-      modifiers:
-        - type: everyScope
-          scopeType: {type: collectionItem}
-  usePrePhraseSnapshot: true
-  action: {name: sortTargets}
-initialState:
-  documentContents: z, a, b, e, E
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-  marks: {}
-finalState:
-  documentContents: a, b, E, e, z
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-  thatMark:
-    - type: UntypedTarget
-      contentRange:
-        start: {line: 0, character: 0}
-        end: {line: 0, character: 1}
-      isReversed: false
-      hasExplicitRange: true
-    - type: UntypedTarget
-      contentRange:
-        start: {line: 0, character: 3}
-        end: {line: 0, character: 4}
-      isReversed: false
-      hasExplicitRange: true
-    - type: UntypedTarget
-      contentRange:
-        start: {line: 0, character: 6}
-        end: {line: 0, character: 7}
-      isReversed: false
-      hasExplicitRange: true
-    - type: UntypedTarget
-      contentRange:
-        start: {line: 0, character: 9}
-        end: {line: 0, character: 10}
-      isReversed: false
-      hasExplicitRange: true
-    - type: UntypedTarget
-      contentRange:
-        start: {line: 0, character: 12}
-        end: {line: 0, character: 13}
-      isReversed: false
-      hasExplicitRange: true
-fullTargets: [{type: primitive, mark: {type: cursor}, modifiers: [{type: everyScope, scopeType: {type: collectionItem}}]}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/actions/sortThis.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/actions/sortThis.yml
deleted file mode 100644
index 5ab89e3213..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/actions/sortThis.yml
+++ /dev/null
@@ -1,54 +0,0 @@
-languageId: plaintext
-command:
-  spokenForm: sort this
-  version: 2
-  targets:
-    - type: primitive
-      mark: {type: cursor}
-  usePrePhraseSnapshot: true
-  action: {name: sortTargets}
-initialState:
-  documentContents: |-
-    2
-    1
-    3
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 1}
-    - anchor: {line: 1, character: 0}
-      active: {line: 1, character: 1}
-    - anchor: {line: 2, character: 0}
-      active: {line: 2, character: 1}
-  marks: {}
-finalState:
-  documentContents: |-
-    1
-    2
-    3
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 1}
-    - anchor: {line: 1, character: 0}
-      active: {line: 1, character: 1}
-    - anchor: {line: 2, character: 0}
-      active: {line: 2, character: 1}
-  thatMark:
-    - type: UntypedTarget
-      contentRange:
-        start: {line: 0, character: 0}
-        end: {line: 0, character: 1}
-      isReversed: false
-      hasExplicitRange: true
-    - type: UntypedTarget
-      contentRange:
-        start: {line: 1, character: 0}
-        end: {line: 1, character: 1}
-      isReversed: false
-      hasExplicitRange: true
-    - type: UntypedTarget
-      contentRange:
-        start: {line: 2, character: 0}
-        end: {line: 2, character: 1}
-      isReversed: false
-      hasExplicitRange: true
-fullTargets: [{type: primitive, mark: {type: cursor}, modifiers: []}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/actions/sortThis2.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/actions/sortThis2.yml
deleted file mode 100644
index 5da5ddc41c..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/actions/sortThis2.yml
+++ /dev/null
@@ -1,54 +0,0 @@
-languageId: plaintext
-command:
-  spokenForm: sort this
-  version: 2
-  targets:
-    - type: primitive
-      mark: {type: cursor}
-  usePrePhraseSnapshot: true
-  action: {name: sortTargets}
-initialState:
-  documentContents: |-
-    2
-    1
-    3
-  selections:
-    - anchor: {line: 2, character: 0}
-      active: {line: 2, character: 1}
-    - anchor: {line: 1, character: 0}
-      active: {line: 1, character: 1}
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 1}
-  marks: {}
-finalState:
-  documentContents: |-
-    1
-    2
-    3
-  selections:
-    - anchor: {line: 2, character: 0}
-      active: {line: 2, character: 1}
-    - anchor: {line: 1, character: 0}
-      active: {line: 1, character: 1}
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 1}
-  thatMark:
-    - type: UntypedTarget
-      contentRange:
-        start: {line: 0, character: 0}
-        end: {line: 0, character: 1}
-      isReversed: false
-      hasExplicitRange: true
-    - type: UntypedTarget
-      contentRange:
-        start: {line: 1, character: 0}
-        end: {line: 1, character: 1}
-      isReversed: false
-      hasExplicitRange: true
-    - type: UntypedTarget
-      contentRange:
-        start: {line: 2, character: 0}
-        end: {line: 2, character: 1}
-      isReversed: false
-      hasExplicitRange: true
-fullTargets: [{type: primitive, mark: {type: cursor}, modifiers: []}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/actions/squareRepackHarp.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/actions/squareRepackHarp.yml
deleted file mode 100644
index 98e7abbf64..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/actions/squareRepackHarp.yml
+++ /dev/null
@@ -1,40 +0,0 @@
-languageId: plaintext
-command:
-  version: 1
-  spokenForm: square repack harp
-  action: rewrapWithPairedDelimiter
-  targets:
-    - type: primitive
-      mark: {type: decoratedSymbol, symbolColor: default, character: h}
-  extraArgs: ['[', ']']
-initialState:
-  documentContents: |
-    (hello)
-  selections:
-    - anchor: {line: 1, character: 0}
-      active: {line: 1, character: 0}
-  marks:
-    default.h:
-      start: {line: 0, character: 1}
-      end: {line: 0, character: 6}
-finalState:
-  documentContents: |
-    [hello]
-  selections:
-    - anchor: {line: 1, character: 0}
-      active: {line: 1, character: 0}
-  thatMark:
-    - type: UntypedTarget
-      contentRange:
-        start: {line: 0, character: 0}
-        end: {line: 0, character: 7}
-      isReversed: false
-      hasExplicitRange: true
-  sourceMark:
-    - type: UntypedTarget
-      contentRange:
-        start: {line: 0, character: 1}
-        end: {line: 0, character: 6}
-      isReversed: false
-      hasExplicitRange: true
-fullTargets: [{type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: h}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: surroundingPair, delimiter: any}}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/actions/squareRepackLeper.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/actions/squareRepackLeper.yml
deleted file mode 100644
index d239a6da73..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/actions/squareRepackLeper.yml
+++ /dev/null
@@ -1,40 +0,0 @@
-languageId: plaintext
-command:
-  version: 1
-  spokenForm: square repack leper
-  action: rewrapWithPairedDelimiter
-  targets:
-    - type: primitive
-      mark: {type: decoratedSymbol, symbolColor: default, character: (}
-  extraArgs: ['[', ']']
-initialState:
-  documentContents: |
-    (hello)
-  selections:
-    - anchor: {line: 1, character: 0}
-      active: {line: 1, character: 0}
-  marks:
-    default.(:
-      start: {line: 0, character: 0}
-      end: {line: 0, character: 1}
-finalState:
-  documentContents: |
-    [hello]
-  selections:
-    - anchor: {line: 1, character: 0}
-      active: {line: 1, character: 0}
-  thatMark:
-    - type: UntypedTarget
-      contentRange:
-        start: {line: 0, character: 0}
-        end: {line: 0, character: 7}
-      isReversed: false
-      hasExplicitRange: true
-  sourceMark:
-    - type: UntypedTarget
-      contentRange:
-        start: {line: 0, character: 0}
-        end: {line: 0, character: 1}
-      isReversed: false
-      hasExplicitRange: true
-fullTargets: [{type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: (}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: surroundingPair, delimiter: any}}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/actions/squareRepackPair.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/actions/squareRepackPair.yml
deleted file mode 100644
index e6dc6c2e61..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/actions/squareRepackPair.yml
+++ /dev/null
@@ -1,37 +0,0 @@
-languageId: plaintext
-command:
-  version: 1
-  spokenForm: square repack pair
-  action: rewrapWithPairedDelimiter
-  targets:
-    - type: primitive
-      modifier: {type: surroundingPair, delimiter: any}
-  extraArgs: ['[', ']']
-initialState:
-  documentContents: |
-    (hello)
-  selections:
-    - anchor: {line: 0, character: 2}
-      active: {line: 0, character: 2}
-  marks: {}
-finalState:
-  documentContents: |
-    [hello]
-  selections:
-    - anchor: {line: 0, character: 2}
-      active: {line: 0, character: 2}
-  thatMark:
-    - type: UntypedTarget
-      contentRange:
-        start: {line: 0, character: 0}
-        end: {line: 0, character: 7}
-      isReversed: false
-      hasExplicitRange: true
-  sourceMark:
-    - type: UntypedTarget
-      contentRange:
-        start: {line: 0, character: 0}
-        end: {line: 0, character: 7}
-      isReversed: false
-      hasExplicitRange: true
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: surroundingPair, delimiter: any}}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/actions/squareRepackThis.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/actions/squareRepackThis.yml
deleted file mode 100644
index 63c74e7612..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/actions/squareRepackThis.yml
+++ /dev/null
@@ -1,35 +0,0 @@
-languageId: plaintext
-command:
-  version: 1
-  spokenForm: square repack this
-  action: rewrapWithPairedDelimiter
-  targets:
-    - type: primitive
-      mark: {type: cursor}
-  extraArgs: ['[', ']']
-initialState:
-  documentContents: (hello)
-  selections:
-    - anchor: {line: 0, character: 4}
-      active: {line: 0, character: 4}
-  marks: {}
-finalState:
-  documentContents: "[hello]"
-  selections:
-    - anchor: {line: 0, character: 4}
-      active: {line: 0, character: 4}
-  thatMark:
-    - type: UntypedTarget
-      contentRange:
-        start: {line: 0, character: 0}
-        end: {line: 0, character: 7}
-      isReversed: false
-      hasExplicitRange: true
-  sourceMark:
-    - type: UntypedTarget
-      contentRange:
-        start: {line: 0, character: 4}
-        end: {line: 0, character: 4}
-      isReversed: false
-      hasExplicitRange: false
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: surroundingPair, delimiter: any}}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/actions/swapVestWithCap.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/actions/swapVestWithCap.yml
deleted file mode 100644
index 4c7c89aebb..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/actions/swapVestWithCap.yml
+++ /dev/null
@@ -1,46 +0,0 @@
-languageId: typescript
-command:
-  version: 1
-  spokenForm: swap vest with cap
-  action: swapTargets
-  targets:
-    - type: primitive
-      mark: {type: decoratedSymbol, symbolColor: default, character: v}
-    - type: primitive
-      mark: {type: decoratedSymbol, symbolColor: default, character: c}
-initialState:
-  documentContents: |
-
-    const value = "Hello world";
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-  marks:
-    default.v:
-      start: {line: 1, character: 6}
-      end: {line: 1, character: 11}
-    default.c:
-      start: {line: 1, character: 0}
-      end: {line: 1, character: 5}
-finalState:
-  documentContents: |
-
-    value const = "Hello world";
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-  thatMark:
-    - type: UntypedTarget
-      contentRange:
-        start: {line: 1, character: 0}
-        end: {line: 1, character: 5}
-      isReversed: false
-      hasExplicitRange: true
-    - type: UntypedTarget
-      contentRange:
-        start: {line: 1, character: 6}
-        end: {line: 1, character: 11}
-      isReversed: false
-      hasExplicitRange: true
-  sourceMark: []
-fullTargets: [{type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: v}, selectionType: token, position: contents, modifier: {type: identity}, insideOutsideType: null}, {type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: c}, selectionType: token, position: contents, modifier: {type: identity}, insideOutsideType: null}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/actions/swapWithVest.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/actions/swapWithVest.yml
deleted file mode 100644
index 738344f055..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/actions/swapWithVest.yml
+++ /dev/null
@@ -1,42 +0,0 @@
-languageId: typescript
-command:
-  version: 1
-  spokenForm: swap with vest
-  action: swapTargets
-  targets:
-    - {type: primitive}
-    - type: primitive
-      mark: {type: decoratedSymbol, symbolColor: default, character: v}
-initialState:
-  documentContents: |
-
-    const value = "Hello world";
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-  marks:
-    default.v:
-      start: {line: 1, character: 6}
-      end: {line: 1, character: 11}
-finalState:
-  documentContents: |
-    value
-    const  = "Hello world";
-  selections:
-    - anchor: {line: 0, character: 5}
-      active: {line: 0, character: 5}
-  thatMark:
-    - type: UntypedTarget
-      contentRange:
-        start: {line: 1, character: 6}
-        end: {line: 1, character: 6}
-      isReversed: false
-      hasExplicitRange: false
-    - type: UntypedTarget
-      contentRange:
-        start: {line: 0, character: 0}
-        end: {line: 0, character: 5}
-      isReversed: false
-      hasExplicitRange: true
-  sourceMark: []
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, modifier: {type: identity}, insideOutsideType: null}, {type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: v}, selectionType: token, position: contents, modifier: {type: identity}, insideOutsideType: null}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/actions/takeVest.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/actions/takeVest.yml
deleted file mode 100644
index 883257b240..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/actions/takeVest.yml
+++ /dev/null
@@ -1,34 +0,0 @@
-languageId: typescript
-command:
-  version: 1
-  spokenForm: take vest
-  action: setSelection
-  targets:
-    - type: primitive
-      mark: {type: decoratedSymbol, symbolColor: default, character: v}
-initialState:
-  documentContents: |
-
-    const value = "Hello world";
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-  marks:
-    default.v:
-      start: {line: 1, character: 6}
-      end: {line: 1, character: 11}
-finalState:
-  documentContents: |
-
-    const value = "Hello world";
-  selections:
-    - anchor: {line: 1, character: 6}
-      active: {line: 1, character: 11}
-  thatMark:
-    - type: UntypedTarget
-      contentRange:
-        start: {line: 1, character: 6}
-        end: {line: 1, character: 11}
-      isReversed: false
-      hasExplicitRange: false
-fullTargets: [{type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: v}, selectionType: token, position: contents, modifier: {type: identity}, insideOutsideType: inside}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/compoundTargets/bringAirToAfterBatVerticalPastFine.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/compoundTargets/bringAirToAfterBatVerticalPastFine.yml
deleted file mode 100644
index fbf038571f..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/compoundTargets/bringAirToAfterBatVerticalPastFine.yml
+++ /dev/null
@@ -1,50 +0,0 @@
-languageId: plaintext
-command:
-  version: 1
-  spokenForm: bring air to after bat vertical past fine
-  action: replaceWithTarget
-  targets:
-    - type: primitive
-      mark: {type: decoratedSymbol, symbolColor: default, character: a}
-    - type: range
-      start:
-        type: primitive
-        position: after
-        mark: {type: decoratedSymbol, symbolColor: default, character: b}
-      end:
-        type: primitive
-        mark: {type: decoratedSymbol, symbolColor: default, character: f}
-      excludeStart: false
-      excludeEnd: false
-      rangeType: vertical
-initialState:
-  documentContents: |
-    a
-
-    b   c
-    d   e
-    f   g
-  selections:
-    - anchor: {line: 5, character: 0}
-      active: {line: 5, character: 0}
-  marks:
-    default.a:
-      start: {line: 0, character: 0}
-      end: {line: 0, character: 1}
-    default.b:
-      start: {line: 2, character: 0}
-      end: {line: 2, character: 1}
-    default.f:
-      start: {line: 4, character: 0}
-      end: {line: 4, character: 1}
-finalState:
-  documentContents: |
-    a
-
-    b a   c
-    d a   e
-    f a   g
-  selections:
-    - anchor: {line: 5, character: 0}
-      active: {line: 5, character: 0}
-fullTargets: [{type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: a}, selectionType: token, position: contents, insideOutsideType: null, modifier: {type: identity}}, {type: range, excludeAnchor: false, excludeActive: false, rangeType: vertical, anchor: {type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: b}, selectionType: token, position: after, insideOutsideType: null, modifier: {type: identity}}, active: {type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: f}, selectionType: token, position: after, insideOutsideType: null, modifier: {type: identity}}}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/compoundTargets/bringAirToBatVerticalPastFine.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/compoundTargets/bringAirToBatVerticalPastFine.yml
deleted file mode 100644
index c14164e8a1..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/compoundTargets/bringAirToBatVerticalPastFine.yml
+++ /dev/null
@@ -1,49 +0,0 @@
-languageId: plaintext
-command:
-  version: 1
-  spokenForm: bring air to bat vertical past fine
-  action: replaceWithTarget
-  targets:
-    - type: primitive
-      mark: {type: decoratedSymbol, symbolColor: default, character: a}
-    - type: range
-      start:
-        type: primitive
-        mark: {type: decoratedSymbol, symbolColor: default, character: b}
-      end:
-        type: primitive
-        mark: {type: decoratedSymbol, symbolColor: default, character: f}
-      excludeStart: false
-      excludeEnd: false
-      rangeType: vertical
-initialState:
-  documentContents: |
-    a
-
-    b   c
-    d   e
-    f   g
-  selections:
-    - anchor: {line: 5, character: 0}
-      active: {line: 5, character: 0}
-  marks:
-    default.a:
-      start: {line: 0, character: 0}
-      end: {line: 0, character: 1}
-    default.b:
-      start: {line: 2, character: 0}
-      end: {line: 2, character: 1}
-    default.f:
-      start: {line: 4, character: 0}
-      end: {line: 4, character: 1}
-finalState:
-  documentContents: |
-    a
-
-    a   c
-    a   e
-    a   g
-  selections:
-    - anchor: {line: 5, character: 0}
-      active: {line: 5, character: 0}
-fullTargets: [{type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: a}, selectionType: token, position: contents, insideOutsideType: null, modifier: {type: identity}}, {type: range, excludeAnchor: false, excludeActive: false, rangeType: vertical, anchor: {type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: b}, selectionType: token, position: contents, insideOutsideType: null, modifier: {type: identity}}, active: {type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: f}, selectionType: token, position: contents, insideOutsideType: null, modifier: {type: identity}}}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/compoundTargets/bringAirToBeforeBatVerticalPastFine.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/compoundTargets/bringAirToBeforeBatVerticalPastFine.yml
deleted file mode 100644
index be40e19e9a..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/compoundTargets/bringAirToBeforeBatVerticalPastFine.yml
+++ /dev/null
@@ -1,50 +0,0 @@
-languageId: plaintext
-command:
-  version: 1
-  spokenForm: bring air to before bat vertical past fine
-  action: replaceWithTarget
-  targets:
-    - type: primitive
-      mark: {type: decoratedSymbol, symbolColor: default, character: a}
-    - type: range
-      start:
-        type: primitive
-        position: before
-        mark: {type: decoratedSymbol, symbolColor: default, character: b}
-      end:
-        type: primitive
-        mark: {type: decoratedSymbol, symbolColor: default, character: f}
-      excludeStart: false
-      excludeEnd: false
-      rangeType: vertical
-initialState:
-  documentContents: |
-    a
-
-    b   c
-    d   e
-    f   g
-  selections:
-    - anchor: {line: 5, character: 0}
-      active: {line: 5, character: 0}
-  marks:
-    default.a:
-      start: {line: 0, character: 0}
-      end: {line: 0, character: 1}
-    default.b:
-      start: {line: 2, character: 0}
-      end: {line: 2, character: 1}
-    default.f:
-      start: {line: 4, character: 0}
-      end: {line: 4, character: 1}
-finalState:
-  documentContents: |
-    a
-
-    a b   c
-    a d   e
-    a f   g
-  selections:
-    - anchor: {line: 5, character: 0}
-      active: {line: 5, character: 0}
-fullTargets: [{type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: a}, selectionType: token, position: contents, insideOutsideType: null, modifier: {type: identity}}, {type: range, excludeAnchor: false, excludeActive: false, rangeType: vertical, anchor: {type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: b}, selectionType: token, position: before, insideOutsideType: null, modifier: {type: identity}}, active: {type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: f}, selectionType: token, position: before, insideOutsideType: null, modifier: {type: identity}}}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/compoundTargets/bringAirToEndOfBatVerticalPastFine.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/compoundTargets/bringAirToEndOfBatVerticalPastFine.yml
deleted file mode 100644
index 1966b6d106..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/compoundTargets/bringAirToEndOfBatVerticalPastFine.yml
+++ /dev/null
@@ -1,51 +0,0 @@
-languageId: plaintext
-command:
-  version: 1
-  spokenForm: bring air to end of bat vertical past fine
-  action: replaceWithTarget
-  targets:
-    - type: primitive
-      mark: {type: decoratedSymbol, symbolColor: default, character: a}
-    - type: range
-      start:
-        type: primitive
-        position: after
-        insideOutsideType: inside
-        mark: {type: decoratedSymbol, symbolColor: default, character: b}
-      end:
-        type: primitive
-        mark: {type: decoratedSymbol, symbolColor: default, character: f}
-      excludeStart: false
-      excludeEnd: false
-      rangeType: vertical
-initialState:
-  documentContents: |
-    a
-
-    b   c
-    d   e
-    f   g
-  selections:
-    - anchor: {line: 5, character: 0}
-      active: {line: 5, character: 0}
-  marks:
-    default.a:
-      start: {line: 0, character: 0}
-      end: {line: 0, character: 1}
-    default.b:
-      start: {line: 2, character: 0}
-      end: {line: 2, character: 1}
-    default.f:
-      start: {line: 4, character: 0}
-      end: {line: 4, character: 1}
-finalState:
-  documentContents: |
-    a
-
-    ba   c
-    da   e
-    fa   g
-  selections:
-    - anchor: {line: 5, character: 0}
-      active: {line: 5, character: 0}
-fullTargets: [{type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: a}, selectionType: token, position: contents, insideOutsideType: null, modifier: {type: identity}}, {type: range, excludeAnchor: false, excludeActive: false, rangeType: vertical, anchor: {type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: b}, selectionType: token, position: after, insideOutsideType: inside, modifier: {type: identity}}, active: {type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: f}, selectionType: token, position: after, insideOutsideType: inside, modifier: {type: identity}}}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/compoundTargets/bringAirToStartOfBatVerticalPastFine.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/compoundTargets/bringAirToStartOfBatVerticalPastFine.yml
deleted file mode 100644
index f880f7b17c..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/compoundTargets/bringAirToStartOfBatVerticalPastFine.yml
+++ /dev/null
@@ -1,51 +0,0 @@
-languageId: plaintext
-command:
-  version: 1
-  spokenForm: bring air to start of bat vertical past fine
-  action: replaceWithTarget
-  targets:
-    - type: primitive
-      mark: {type: decoratedSymbol, symbolColor: default, character: a}
-    - type: range
-      start:
-        type: primitive
-        position: before
-        insideOutsideType: inside
-        mark: {type: decoratedSymbol, symbolColor: default, character: b}
-      end:
-        type: primitive
-        mark: {type: decoratedSymbol, symbolColor: default, character: f}
-      excludeStart: false
-      excludeEnd: false
-      rangeType: vertical
-initialState:
-  documentContents: |
-    a
-
-    b   c
-    d   e
-    f   g
-  selections:
-    - anchor: {line: 5, character: 0}
-      active: {line: 5, character: 0}
-  marks:
-    default.a:
-      start: {line: 0, character: 0}
-      end: {line: 0, character: 1}
-    default.b:
-      start: {line: 2, character: 0}
-      end: {line: 2, character: 1}
-    default.f:
-      start: {line: 4, character: 0}
-      end: {line: 4, character: 1}
-finalState:
-  documentContents: |
-    a
-
-    ab   c
-    ad   e
-    af   g
-  selections:
-    - anchor: {line: 5, character: 0}
-      active: {line: 5, character: 0}
-fullTargets: [{type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: a}, selectionType: token, position: contents, insideOutsideType: null, modifier: {type: identity}}, {type: range, excludeAnchor: false, excludeActive: false, rangeType: vertical, anchor: {type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: b}, selectionType: token, position: before, insideOutsideType: inside, modifier: {type: identity}}, active: {type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: f}, selectionType: token, position: before, insideOutsideType: inside, modifier: {type: identity}}}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/compoundTargets/chuckBlockEachBetweenLook.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/compoundTargets/chuckBlockEachBetweenLook.yml
deleted file mode 100644
index 35b87ff4df..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/compoundTargets/chuckBlockEachBetweenLook.yml
+++ /dev/null
@@ -1,49 +0,0 @@
-languageId: typescript
-command:
-  spokenForm: chuck block each between look
-  version: 2
-  targets:
-    - type: range
-      anchor:
-        type: primitive
-        mark: {type: decoratedSymbol, symbolColor: default, character: e}
-        modifiers:
-          - type: containingScope
-            scopeType: {type: paragraph}
-      active:
-        type: primitive
-        mark: {type: decoratedSymbol, symbolColor: default, character: l}
-      excludeAnchor: true
-      excludeActive: true
-  usePrePhraseSnapshot: true
-  action: {name: remove}
-initialState:
-  documentContents: |-
-    hello there
-    hello there
-
-
-        hello there
-        hello there
-            hello 
-  selections:
-    - anchor: {line: 4, character: 9}
-      active: {line: 4, character: 9}
-  marks:
-    default.e:
-      start: {line: 1, character: 6}
-      end: {line: 1, character: 11}
-    default.l:
-      start: {line: 4, character: 4}
-      end: {line: 4, character: 9}
-finalState:
-  documentContents: |-
-    hello there
-    hello there
-        hello there
-        hello there
-            hello 
-  selections:
-    - anchor: {line: 2, character: 9}
-      active: {line: 2, character: 9}
-fullTargets: [{type: range, excludeAnchor: true, excludeActive: true, rangeType: continuous, anchor: {type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: e}, modifiers: &ref_0 [{type: containingScope, scopeType: {type: paragraph}}]}, active: {type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: l}, modifiers: *ref_0}}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/compoundTargets/chuckBlockEachUntilLook.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/compoundTargets/chuckBlockEachUntilLook.yml
deleted file mode 100644
index bf5863134b..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/compoundTargets/chuckBlockEachUntilLook.yml
+++ /dev/null
@@ -1,47 +0,0 @@
-languageId: typescript
-command:
-  spokenForm: chuck block each until look
-  version: 2
-  targets:
-    - type: range
-      anchor:
-        type: primitive
-        mark: {type: decoratedSymbol, symbolColor: default, character: e}
-        modifiers:
-          - type: containingScope
-            scopeType: {type: paragraph}
-      active:
-        type: primitive
-        mark: {type: decoratedSymbol, symbolColor: default, character: l}
-      excludeAnchor: false
-      excludeActive: true
-  usePrePhraseSnapshot: true
-  action: {name: remove}
-initialState:
-  documentContents: |-
-    hello there
-    hello there
-
-
-        hello there
-        hello there
-            hello 
-  selections:
-    - anchor: {line: 4, character: 9}
-      active: {line: 4, character: 9}
-  marks:
-    default.e:
-      start: {line: 1, character: 6}
-      end: {line: 1, character: 11}
-    default.l:
-      start: {line: 4, character: 4}
-      end: {line: 4, character: 9}
-finalState:
-  documentContents: |2-
-        hello there
-        hello there
-            hello 
-  selections:
-    - anchor: {line: 0, character: 9}
-      active: {line: 0, character: 9}
-fullTargets: [{type: range, excludeAnchor: false, excludeActive: true, rangeType: continuous, anchor: {type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: e}, modifiers: &ref_0 [{type: containingScope, scopeType: {type: paragraph}}]}, active: {type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: l}, modifiers: *ref_0}}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/compoundTargets/chuckLineEachBetweenLook.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/compoundTargets/chuckLineEachBetweenLook.yml
deleted file mode 100644
index ec0f54715c..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/compoundTargets/chuckLineEachBetweenLook.yml
+++ /dev/null
@@ -1,49 +0,0 @@
-languageId: plaintext
-command:
-  spokenForm: chuck line each between look
-  version: 2
-  targets:
-    - type: range
-      anchor:
-        type: primitive
-        mark: {type: decoratedSymbol, symbolColor: default, character: e}
-        modifiers:
-          - type: containingScope
-            scopeType: {type: line}
-      active:
-        type: primitive
-        mark: {type: decoratedSymbol, symbolColor: default, character: l}
-      excludeAnchor: true
-      excludeActive: true
-  usePrePhraseSnapshot: true
-  action: {name: remove}
-initialState:
-  documentContents: |-
-    hello there
-    hello there
-
-
-        hello there
-        hello there
-            hello 
-  selections:
-    - anchor: {line: 4, character: 9}
-      active: {line: 4, character: 9}
-  marks:
-    default.e:
-      start: {line: 1, character: 6}
-      end: {line: 1, character: 11}
-    default.l:
-      start: {line: 4, character: 4}
-      end: {line: 4, character: 9}
-finalState:
-  documentContents: |-
-    hello there
-    hello there
-        hello there
-        hello there
-            hello 
-  selections:
-    - anchor: {line: 2, character: 9}
-      active: {line: 2, character: 9}
-fullTargets: [{type: range, excludeAnchor: true, excludeActive: true, rangeType: continuous, anchor: {type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: e}, modifiers: &ref_0 [{type: containingScope, scopeType: {type: line}}]}, active: {type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: l}, modifiers: *ref_0}}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/compoundTargets/chuckLineEachBetweenLook2.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/compoundTargets/chuckLineEachBetweenLook2.yml
deleted file mode 100644
index 8318c88b57..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/compoundTargets/chuckLineEachBetweenLook2.yml
+++ /dev/null
@@ -1,48 +0,0 @@
-languageId: plaintext
-command:
-  spokenForm: chuck line each between look
-  version: 2
-  targets:
-    - type: range
-      anchor:
-        type: primitive
-        mark: {type: decoratedSymbol, symbolColor: default, character: e}
-        modifiers:
-          - type: containingScope
-            scopeType: {type: line}
-      active:
-        type: primitive
-        mark: {type: decoratedSymbol, symbolColor: default, character: l}
-      excludeAnchor: true
-      excludeActive: true
-  usePrePhraseSnapshot: true
-  action: {name: remove}
-initialState:
-  documentContents: |-
-    hello there
-    hello there
-
-        hello there
-        hello there
-            hello 
-  selections:
-    - anchor: {line: 3, character: 9}
-      active: {line: 3, character: 9}
-  marks:
-    default.e:
-      start: {line: 1, character: 6}
-      end: {line: 1, character: 11}
-    default.l:
-      start: {line: 3, character: 4}
-      end: {line: 3, character: 9}
-finalState:
-  documentContents: |-
-    hello there
-    hello there
-        hello there
-        hello there
-            hello 
-  selections:
-    - anchor: {line: 2, character: 9}
-      active: {line: 2, character: 9}
-fullTargets: [{type: range, excludeAnchor: true, excludeActive: true, rangeType: continuous, anchor: {type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: e}, modifiers: &ref_0 [{type: containingScope, scopeType: {type: line}}]}, active: {type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: l}, modifiers: *ref_0}}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/compoundTargets/chuckLineEachUntilLook.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/compoundTargets/chuckLineEachUntilLook.yml
deleted file mode 100644
index d521a5a9f4..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/compoundTargets/chuckLineEachUntilLook.yml
+++ /dev/null
@@ -1,48 +0,0 @@
-languageId: plaintext
-command:
-  spokenForm: chuck line each until look
-  version: 2
-  targets:
-    - type: range
-      anchor:
-        type: primitive
-        mark: {type: decoratedSymbol, symbolColor: default, character: e}
-        modifiers:
-          - type: containingScope
-            scopeType: {type: line}
-      active:
-        type: primitive
-        mark: {type: decoratedSymbol, symbolColor: default, character: l}
-      excludeAnchor: false
-      excludeActive: true
-  usePrePhraseSnapshot: true
-  action: {name: remove}
-initialState:
-  documentContents: |-
-    hello there
-    hello there
-
-
-        hello there
-        hello there
-            hello 
-  selections:
-    - anchor: {line: 4, character: 9}
-      active: {line: 4, character: 9}
-  marks:
-    default.e:
-      start: {line: 1, character: 6}
-      end: {line: 1, character: 11}
-    default.l:
-      start: {line: 4, character: 4}
-      end: {line: 4, character: 9}
-finalState:
-  documentContents: |-
-    hello there
-        hello there
-        hello there
-            hello 
-  selections:
-    - anchor: {line: 1, character: 9}
-      active: {line: 1, character: 9}
-fullTargets: [{type: range, excludeAnchor: false, excludeActive: true, rangeType: continuous, anchor: {type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: e}, modifiers: &ref_0 [{type: containingScope, scopeType: {type: line}}]}, active: {type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: l}, modifiers: *ref_0}}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/compoundTargets/chuckLineHarpBetweenFine.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/compoundTargets/chuckLineHarpBetweenFine.yml
deleted file mode 100644
index f332eaea78..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/compoundTargets/chuckLineHarpBetweenFine.yml
+++ /dev/null
@@ -1,45 +0,0 @@
-languageId: plaintext
-command:
-  spokenForm: chuck line harp between fine
-  version: 2
-  targets:
-    - type: range
-      anchor:
-        type: primitive
-        mark: {type: decoratedSymbol, symbolColor: default, character: h}
-        modifiers:
-          - type: containingScope
-            scopeType: {type: line}
-      active:
-        type: primitive
-        mark: {type: decoratedSymbol, symbolColor: default, character: f}
-      excludeAnchor: true
-      excludeActive: true
-  usePrePhraseSnapshot: true
-  action: {name: remove}
-initialState:
-  documentContents: |
-
-    hello world
-
-
-    foo bar
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-  marks:
-    default.h:
-      start: {line: 1, character: 0}
-      end: {line: 1, character: 5}
-    default.f:
-      start: {line: 4, character: 0}
-      end: {line: 4, character: 3}
-finalState:
-  documentContents: |
-
-    hello world
-    foo bar
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-fullTargets: [{type: range, excludeAnchor: true, excludeActive: true, rangeType: continuous, anchor: {type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: h}, modifiers: &ref_0 [{type: containingScope, scopeType: {type: line}}]}, active: {type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: f}, modifiers: *ref_0}}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/compoundTargets/chuckLineRiskSliceMade.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/compoundTargets/chuckLineRiskSliceMade.yml
deleted file mode 100644
index 51b74855f8..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/compoundTargets/chuckLineRiskSliceMade.yml
+++ /dev/null
@@ -1,44 +0,0 @@
-languageId: plaintext
-command:
-  spokenForm: chuck line risk slice made
-  version: 2
-  targets:
-    - type: range
-      anchor:
-        type: primitive
-        mark: {type: decoratedSymbol, symbolColor: default, character: r}
-        modifiers:
-          - type: containingScope
-            scopeType: {type: line}
-      active:
-        type: primitive
-        mark: {type: decoratedSymbol, symbolColor: default, character: m}
-      excludeAnchor: false
-      excludeActive: false
-      rangeType: vertical
-  usePrePhraseSnapshot: true
-  action: {name: remove}
-initialState:
-  documentContents: |-
-    short
-    something longer
-    something even longer
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-  marks:
-    default.r:
-      start: {line: 0, character: 0}
-      end: {line: 0, character: 5}
-    default.m:
-      start: {line: 2, character: 0}
-      end: {line: 2, character: 9}
-finalState:
-  documentContents: |-
-
-    hing longer
-    hing even longer
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-fullTargets: [{type: range, excludeAnchor: false, excludeActive: false, rangeType: vertical, anchor: {type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: r}, modifiers: &ref_0 [{type: containingScope, scopeType: {type: line}}]}, active: {type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: m}, modifiers: *ref_0}}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/compoundTargets/clearJustThisPastBatt.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/compoundTargets/clearJustThisPastBatt.yml
deleted file mode 100644
index c7833e8932..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/compoundTargets/clearJustThisPastBatt.yml
+++ /dev/null
@@ -1,35 +0,0 @@
-languageId: plaintext
-command:
-  spokenForm: clear just this past batt
-  version: 3
-  targets:
-    - type: range
-      anchor:
-        type: primitive
-        mark: {type: cursor}
-        modifiers:
-          - {type: toRawSelection}
-      active:
-        type: primitive
-        mark: {type: decoratedSymbol, symbolColor: default, character: b}
-      excludeAnchor: false
-      excludeActive: false
-  usePrePhraseSnapshot: true
-  action: {name: clearAndSetSelection}
-initialState:
-  documentContents: |-
-    aa
-    bb
-  selections:
-    - anchor: {line: 0, character: 1}
-      active: {line: 0, character: 1}
-  marks:
-    default.b:
-      start: {line: 1, character: 0}
-      end: {line: 1, character: 2}
-finalState:
-  documentContents: a
-  selections:
-    - anchor: {line: 0, character: 1}
-      active: {line: 0, character: 1}
-fullTargets: [{type: range, excludeAnchor: false, excludeActive: false, rangeType: continuous, anchor: {type: primitive, mark: {type: cursor}, modifiers: []}, active: {type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: b}, modifiers: []}}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/compoundTargets/clearJustThisPastEndOfToken.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/compoundTargets/clearJustThisPastEndOfToken.yml
deleted file mode 100644
index 2d4657dccc..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/compoundTargets/clearJustThisPastEndOfToken.yml
+++ /dev/null
@@ -1,36 +0,0 @@
-languageId: plaintext
-command:
-  spokenForm: clear just this past end of token
-  version: 3
-  targets:
-    - type: range
-      anchor:
-        type: primitive
-        modifiers:
-          - {type: toRawSelection}
-        mark: {type: cursor}
-      active:
-        type: primitive
-        modifiers:
-          - {type: position, position: end}
-          - type: containingScope
-            scopeType: {type: token}
-      excludeAnchor: false
-      excludeActive: false
-  usePrePhraseSnapshot: true
-  action: {name: clearAndSetSelection}
-initialState:
-  documentContents: hello there
-  selections:
-    - anchor: {line: 0, character: 8}
-      active: {line: 0, character: 8}
-  marks: {}
-finalState:
-  documentContents: hello th
-  selections:
-    - anchor: {line: 0, character: 8}
-      active: {line: 0, character: 8}
-fullTargets: [{type: range, excludeAnchor: false, excludeActive: false, rangeType: continuous, anchor: {type: primitive, mark: {type: cursor}, modifiers: [{type: toRawSelection}]}, active: {type: primitive, mark: {type: cursor}, modifiers: [{type: containingScope, scopeType: {type: token}}], positionModifier: {type: position, position: end}}}]
-ide:
-  messages:
-    - {type: warning, id: deprecatedPositionInference}
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/compoundTargets/clearJustThisPastStartOfToken.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/compoundTargets/clearJustThisPastStartOfToken.yml
deleted file mode 100644
index be7f945bd1..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/compoundTargets/clearJustThisPastStartOfToken.yml
+++ /dev/null
@@ -1,36 +0,0 @@
-languageId: plaintext
-command:
-  spokenForm: clear just this past start of token
-  version: 3
-  targets:
-    - type: range
-      anchor:
-        type: primitive
-        modifiers:
-          - {type: toRawSelection}
-        mark: {type: cursor}
-      active:
-        type: primitive
-        modifiers:
-          - {type: position, position: start}
-          - type: containingScope
-            scopeType: {type: token}
-      excludeAnchor: false
-      excludeActive: false
-  usePrePhraseSnapshot: true
-  action: {name: clearAndSetSelection}
-initialState:
-  documentContents: hello there
-  selections:
-    - anchor: {line: 0, character: 8}
-      active: {line: 0, character: 8}
-  marks: {}
-finalState:
-  documentContents: hello ere
-  selections:
-    - anchor: {line: 0, character: 6}
-      active: {line: 0, character: 6}
-fullTargets: [{type: range, excludeAnchor: false, excludeActive: false, rangeType: continuous, anchor: {type: primitive, mark: {type: cursor}, modifiers: [{type: toRawSelection}]}, active: {type: primitive, mark: {type: cursor}, modifiers: [{type: containingScope, scopeType: {type: token}}], positionModifier: {type: position, position: start}}}]
-ide:
-  messages:
-    - {type: warning, id: deprecatedPositionInference}
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/compoundTargets/clearJustThisPastTrap.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/compoundTargets/clearJustThisPastTrap.yml
deleted file mode 100644
index c741b007bc..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/compoundTargets/clearJustThisPastTrap.yml
+++ /dev/null
@@ -1,33 +0,0 @@
-languageId: plaintext
-command:
-  spokenForm: clear just this past trap
-  version: 3
-  targets:
-    - type: range
-      anchor:
-        type: primitive
-        modifiers:
-          - {type: toRawSelection}
-        mark: {type: cursor}
-      active:
-        type: primitive
-        mark: {type: decoratedSymbol, symbolColor: default, character: t}
-      excludeAnchor: false
-      excludeActive: false
-  usePrePhraseSnapshot: true
-  action: {name: clearAndSetSelection}
-initialState:
-  documentContents: hello there
-  selections:
-    - anchor: {line: 0, character: 3}
-      active: {line: 0, character: 3}
-  marks:
-    default.t:
-      start: {line: 0, character: 6}
-      end: {line: 0, character: 11}
-finalState:
-  documentContents: hel
-  selections:
-    - anchor: {line: 0, character: 3}
-      active: {line: 0, character: 3}
-fullTargets: [{type: range, excludeAnchor: false, excludeActive: false, rangeType: continuous, anchor: {type: primitive, mark: {type: cursor}, modifiers: [{type: toRawSelection}]}, active: {type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: t}, modifiers: [{type: toRawSelection}]}}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/compoundTargets/clearPastBatt.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/compoundTargets/clearPastBatt.yml
deleted file mode 100644
index 106c451c7e..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/compoundTargets/clearPastBatt.yml
+++ /dev/null
@@ -1,31 +0,0 @@
-languageId: plaintext
-command:
-  spokenForm: clear past batt
-  version: 3
-  targets:
-    - type: range
-      anchor: {type: primitive, isImplicit: true}
-      active:
-        type: primitive
-        mark: {type: decoratedSymbol, symbolColor: default, character: b}
-      excludeAnchor: false
-      excludeActive: false
-  usePrePhraseSnapshot: true
-  action: {name: clearAndSetSelection}
-initialState:
-  documentContents: |-
-    aa
-    bb
-  selections:
-    - anchor: {line: 0, character: 1}
-      active: {line: 0, character: 1}
-  marks:
-    default.b:
-      start: {line: 1, character: 0}
-      end: {line: 1, character: 2}
-finalState:
-  documentContents: a
-  selections:
-    - anchor: {line: 0, character: 1}
-      active: {line: 0, character: 1}
-fullTargets: [{type: range, excludeAnchor: false, excludeActive: false, rangeType: continuous, anchor: {type: primitive, mark: {type: cursor}, modifiers: []}, active: {type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: b}, modifiers: []}}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/compoundTargets/clearPastEndOfToken.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/compoundTargets/clearPastEndOfToken.yml
deleted file mode 100644
index 4d44f50520..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/compoundTargets/clearPastEndOfToken.yml
+++ /dev/null
@@ -1,26 +0,0 @@
-languageId: plaintext
-command:
-  version: 1
-  spokenForm: clear past end of token
-  action: clearAndSetSelection
-  targets:
-    - type: range
-      start: {type: primitive, isImplicit: true}
-      end: {type: primitive, position: after, insideOutsideType: inside, selectionType: token}
-      excludeStart: false
-      excludeEnd: false
-initialState:
-  documentContents: hello there
-  selections:
-    - anchor: {line: 0, character: 8}
-      active: {line: 0, character: 8}
-  marks: {}
-finalState:
-  documentContents: hello th
-  selections:
-    - anchor: {line: 0, character: 8}
-      active: {line: 0, character: 8}
-fullTargets: [{type: range, excludeStart: false, excludeEnd: false, start: {type: primitive, mark: {type: cursor}, selectionType: token, position: contents, modifier: {type: identity}, insideOutsideType: inside}, end: {type: primitive, mark: {type: cursorToken}, selectionType: token, position: after, modifier: {type: identity}, insideOutsideType: inside}}]
-ide:
-  messages:
-    - {type: warning, id: deprecatedPositionInference}
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/compoundTargets/clearPastStartOfToken.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/compoundTargets/clearPastStartOfToken.yml
deleted file mode 100644
index 1090f47ea5..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/compoundTargets/clearPastStartOfToken.yml
+++ /dev/null
@@ -1,26 +0,0 @@
-languageId: plaintext
-command:
-  version: 1
-  spokenForm: clear past start of token
-  action: clearAndSetSelection
-  targets:
-    - type: range
-      start: {type: primitive, isImplicit: true}
-      end: {type: primitive, position: before, insideOutsideType: inside, selectionType: token}
-      excludeStart: false
-      excludeEnd: false
-initialState:
-  documentContents: hello there
-  selections:
-    - anchor: {line: 0, character: 8}
-      active: {line: 0, character: 8}
-  marks: {}
-finalState:
-  documentContents: hello ere
-  selections:
-    - anchor: {line: 0, character: 6}
-      active: {line: 0, character: 6}
-fullTargets: [{type: range, excludeStart: false, excludeEnd: false, start: {type: primitive, mark: {type: cursor}, selectionType: token, position: contents, modifier: {type: identity}, insideOutsideType: inside}, end: {type: primitive, mark: {type: cursorToken}, selectionType: token, position: before, modifier: {type: identity}, insideOutsideType: inside}}]
-ide:
-  messages:
-    - {type: warning, id: deprecatedPositionInference}
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/compoundTargets/clearPastTrap.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/compoundTargets/clearPastTrap.yml
deleted file mode 100644
index eeb503e02a..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/compoundTargets/clearPastTrap.yml
+++ /dev/null
@@ -1,28 +0,0 @@
-languageId: plaintext
-command:
-  version: 1
-  spokenForm: clear past trap
-  action: clearAndSetSelection
-  targets:
-    - type: range
-      start: {type: primitive, isImplicit: true}
-      end:
-        type: primitive
-        mark: {type: decoratedSymbol, symbolColor: default, character: t}
-      excludeStart: false
-      excludeEnd: false
-initialState:
-  documentContents: hello there
-  selections:
-    - anchor: {line: 0, character: 3}
-      active: {line: 0, character: 3}
-  marks:
-    default.t:
-      start: {line: 0, character: 6}
-      end: {line: 0, character: 11}
-finalState:
-  documentContents: hel
-  selections:
-    - anchor: {line: 0, character: 3}
-      active: {line: 0, character: 3}
-fullTargets: [{type: range, excludeStart: false, excludeEnd: false, start: {type: primitive, mark: {type: cursor}, selectionType: token, position: contents, modifier: {type: identity}, insideOutsideType: inside}, end: {type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: t}, selectionType: token, position: contents, modifier: {type: identity}, insideOutsideType: inside}}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/compoundTargets/clearThisPastBatt.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/compoundTargets/clearThisPastBatt.yml
deleted file mode 100644
index 07afe6cf87..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/compoundTargets/clearThisPastBatt.yml
+++ /dev/null
@@ -1,33 +0,0 @@
-languageId: plaintext
-command:
-  spokenForm: clear this past batt
-  version: 3
-  targets:
-    - type: range
-      anchor:
-        type: primitive
-        mark: {type: cursor}
-      active:
-        type: primitive
-        mark: {type: decoratedSymbol, symbolColor: default, character: b}
-      excludeAnchor: false
-      excludeActive: false
-  usePrePhraseSnapshot: true
-  action: {name: clearAndSetSelection}
-initialState:
-  documentContents: |-
-    aa
-    bb
-  selections:
-    - anchor: {line: 0, character: 1}
-      active: {line: 0, character: 1}
-  marks:
-    default.b:
-      start: {line: 1, character: 0}
-      end: {line: 1, character: 2}
-finalState:
-  documentContents: ""
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-fullTargets: [{type: range, excludeAnchor: false, excludeActive: false, rangeType: continuous, anchor: {type: primitive, mark: {type: cursor}, modifiers: []}, active: {type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: b}, modifiers: []}}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/compoundTargets/clearThisPastEndOfToken.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/compoundTargets/clearThisPastEndOfToken.yml
deleted file mode 100644
index cf1c0aef79..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/compoundTargets/clearThisPastEndOfToken.yml
+++ /dev/null
@@ -1,34 +0,0 @@
-languageId: plaintext
-command:
-  spokenForm: clear this past end of token
-  version: 3
-  targets:
-    - type: range
-      anchor:
-        type: primitive
-        mark: {type: cursor}
-      active:
-        type: primitive
-        modifiers:
-          - {type: position, position: end}
-          - type: containingScope
-            scopeType: {type: token}
-      excludeAnchor: false
-      excludeActive: false
-  usePrePhraseSnapshot: true
-  action: {name: clearAndSetSelection}
-initialState:
-  documentContents: hello there
-  selections:
-    - anchor: {line: 0, character: 8}
-      active: {line: 0, character: 8}
-  marks: {}
-finalState:
-  documentContents: "hello "
-  selections:
-    - anchor: {line: 0, character: 6}
-      active: {line: 0, character: 6}
-fullTargets: [{type: range, excludeAnchor: false, excludeActive: false, rangeType: continuous, anchor: {type: primitive, mark: {type: cursor}, modifiers: []}, active: {type: primitive, mark: {type: cursor}, modifiers: [{type: containingScope, scopeType: {type: token}}], positionModifier: {type: position, position: end}}}]
-ide:
-  messages:
-    - {type: warning, id: deprecatedPositionInference}
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/compoundTargets/clearThisPastStartOfToken.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/compoundTargets/clearThisPastStartOfToken.yml
deleted file mode 100644
index 953682de65..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/compoundTargets/clearThisPastStartOfToken.yml
+++ /dev/null
@@ -1,34 +0,0 @@
-languageId: plaintext
-command:
-  spokenForm: clear this past start of token
-  version: 3
-  targets:
-    - type: range
-      anchor:
-        type: primitive
-        mark: {type: cursor}
-      active:
-        type: primitive
-        modifiers:
-          - {type: position, position: start}
-          - type: containingScope
-            scopeType: {type: token}
-      excludeAnchor: false
-      excludeActive: false
-  usePrePhraseSnapshot: true
-  action: {name: clearAndSetSelection}
-initialState:
-  documentContents: hello there
-  selections:
-    - anchor: {line: 0, character: 8}
-      active: {line: 0, character: 8}
-  marks: {}
-finalState:
-  documentContents: "hello "
-  selections:
-    - anchor: {line: 0, character: 6}
-      active: {line: 0, character: 6}
-fullTargets: [{type: range, excludeAnchor: false, excludeActive: false, rangeType: continuous, anchor: {type: primitive, mark: {type: cursor}, modifiers: []}, active: {type: primitive, mark: {type: cursor}, modifiers: [{type: containingScope, scopeType: {type: token}}], positionModifier: {type: position, position: start}}}]
-ide:
-  messages:
-    - {type: warning, id: deprecatedPositionInference}
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/compoundTargets/clearThisPastTrap.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/compoundTargets/clearThisPastTrap.yml
deleted file mode 100644
index 54d3db3a8d..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/compoundTargets/clearThisPastTrap.yml
+++ /dev/null
@@ -1,31 +0,0 @@
-languageId: plaintext
-command:
-  spokenForm: clear this past trap
-  version: 3
-  targets:
-    - type: range
-      anchor:
-        type: primitive
-        mark: {type: cursor}
-      active:
-        type: primitive
-        mark: {type: decoratedSymbol, symbolColor: default, character: t}
-      excludeAnchor: false
-      excludeActive: false
-  usePrePhraseSnapshot: true
-  action: {name: clearAndSetSelection}
-initialState:
-  documentContents: hello there
-  selections:
-    - anchor: {line: 0, character: 3}
-      active: {line: 0, character: 3}
-  marks:
-    default.t:
-      start: {line: 0, character: 6}
-      end: {line: 0, character: 11}
-finalState:
-  documentContents: ""
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-fullTargets: [{type: range, excludeAnchor: false, excludeActive: false, rangeType: continuous, anchor: {type: primitive, mark: {type: cursor}, modifiers: []}, active: {type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: t}, modifiers: []}}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/compoundTargets/clearThisSliceBatt.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/compoundTargets/clearThisSliceBatt.yml
deleted file mode 100644
index 3c2d39b019..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/compoundTargets/clearThisSliceBatt.yml
+++ /dev/null
@@ -1,38 +0,0 @@
-languageId: plaintext
-command:
-  spokenForm: clear this slice batt
-  version: 3
-  targets:
-    - type: range
-      anchor:
-        type: primitive
-        mark: {type: cursor}
-      active:
-        type: primitive
-        mark: {type: decoratedSymbol, symbolColor: default, character: b}
-      excludeAnchor: false
-      excludeActive: false
-      rangeType: vertical
-  usePrePhraseSnapshot: true
-  action: {name: clearAndSetSelection}
-initialState:
-  documentContents: |-
-    aa
-    bb
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 1}
-  marks:
-    default.b:
-      start: {line: 1, character: 0}
-      end: {line: 1, character: 2}
-finalState:
-  documentContents: |-
-    a
-    b
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-    - anchor: {line: 1, character: 0}
-      active: {line: 1, character: 0}
-fullTargets: [{type: range, excludeAnchor: false, excludeActive: false, rangeType: vertical, anchor: {type: primitive, mark: {type: cursor}, modifiers: []}, active: {type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: b}, modifiers: []}}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/compoundTargets/postBatVerticalUntilFine.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/compoundTargets/postBatVerticalUntilFine.yml
deleted file mode 100644
index 4a56cc144a..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/compoundTargets/postBatVerticalUntilFine.yml
+++ /dev/null
@@ -1,46 +0,0 @@
-languageId: plaintext
-command:
-  version: 1
-  spokenForm: post bat vertical until fine
-  action: setSelectionAfter
-  targets:
-    - type: range
-      start:
-        type: primitive
-        mark: {type: decoratedSymbol, symbolColor: default, character: b}
-      end:
-        type: primitive
-        mark: {type: decoratedSymbol, symbolColor: default, character: f}
-      excludeStart: false
-      excludeEnd: true
-      rangeType: vertical
-initialState:
-  documentContents: |
-    a
-
-    b   c
-    d   e
-    f   g
-  selections:
-    - anchor: {line: 5, character: 0}
-      active: {line: 5, character: 0}
-  marks:
-    default.b:
-      start: {line: 2, character: 0}
-      end: {line: 2, character: 1}
-    default.f:
-      start: {line: 4, character: 0}
-      end: {line: 4, character: 1}
-finalState:
-  documentContents: |
-    a
-
-    b   c
-    d   e
-    f   g
-  selections:
-    - anchor: {line: 2, character: 1}
-      active: {line: 2, character: 1}
-    - anchor: {line: 3, character: 1}
-      active: {line: 3, character: 1}
-fullTargets: [{type: range, excludeAnchor: false, excludeActive: true, rangeType: vertical, anchor: {type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: b}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: identity}}, active: {type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: f}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: identity}}}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/compoundTargets/preBatVerticalBetweenFine.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/compoundTargets/preBatVerticalBetweenFine.yml
deleted file mode 100644
index 161f726a5e..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/compoundTargets/preBatVerticalBetweenFine.yml
+++ /dev/null
@@ -1,44 +0,0 @@
-languageId: plaintext
-command:
-  version: 1
-  spokenForm: pre bat vertical between fine
-  action: setSelectionBefore
-  targets:
-    - type: range
-      start:
-        type: primitive
-        mark: {type: decoratedSymbol, symbolColor: default, character: b}
-      end:
-        type: primitive
-        mark: {type: decoratedSymbol, symbolColor: default, character: f}
-      excludeStart: true
-      excludeEnd: true
-      rangeType: vertical
-initialState:
-  documentContents: |
-    a
-
-    b   c
-    d   e
-    f   g
-  selections:
-    - anchor: {line: 5, character: 0}
-      active: {line: 5, character: 0}
-  marks:
-    default.b:
-      start: {line: 2, character: 0}
-      end: {line: 2, character: 1}
-    default.f:
-      start: {line: 4, character: 0}
-      end: {line: 4, character: 1}
-finalState:
-  documentContents: |
-    a
-
-    b   c
-    d   e
-    f   g
-  selections:
-    - anchor: {line: 3, character: 0}
-      active: {line: 3, character: 0}
-fullTargets: [{type: range, excludeAnchor: true, excludeActive: true, rangeType: vertical, anchor: {type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: b}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: identity}}, active: {type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: f}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: identity}}}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/compoundTargets/takeBatVerticalPastFine.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/compoundTargets/takeBatVerticalPastFine.yml
deleted file mode 100644
index 14f451522d..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/compoundTargets/takeBatVerticalPastFine.yml
+++ /dev/null
@@ -1,48 +0,0 @@
-languageId: plaintext
-command:
-  version: 1
-  spokenForm: take bat vertical past fine
-  action: setSelection
-  targets:
-    - type: range
-      start:
-        type: primitive
-        mark: {type: decoratedSymbol, symbolColor: default, character: b}
-      end:
-        type: primitive
-        mark: {type: decoratedSymbol, symbolColor: default, character: f}
-      excludeStart: false
-      excludeEnd: false
-      rangeType: vertical
-initialState:
-  documentContents: |
-    a
-
-    b   c
-    d   e
-    f   g
-  selections:
-    - anchor: {line: 5, character: 0}
-      active: {line: 5, character: 0}
-  marks:
-    default.b:
-      start: {line: 2, character: 0}
-      end: {line: 2, character: 1}
-    default.f:
-      start: {line: 4, character: 0}
-      end: {line: 4, character: 1}
-finalState:
-  documentContents: |
-    a
-
-    b   c
-    d   e
-    f   g
-  selections:
-    - anchor: {line: 2, character: 0}
-      active: {line: 2, character: 1}
-    - anchor: {line: 3, character: 0}
-      active: {line: 3, character: 1}
-    - anchor: {line: 4, character: 0}
-      active: {line: 4, character: 1}
-fullTargets: [{type: range, excludeAnchor: false, excludeActive: false, rangeType: vertical, anchor: {type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: b}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: identity}}, active: {type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: f}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: identity}}}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/compoundTargets/takeCapAndVestAndHarp.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/compoundTargets/takeCapAndVestAndHarp.yml
deleted file mode 100644
index fa07846b1c..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/compoundTargets/takeCapAndVestAndHarp.yml
+++ /dev/null
@@ -1,43 +0,0 @@
-languageId: typescript
-command:
-  version: 1
-  spokenForm: take cap and vest and harp
-  action: setSelection
-  targets:
-    - type: list
-      elements:
-        - type: primitive
-          mark: {type: decoratedSymbol, symbolColor: default, character: c}
-        - type: primitive
-          mark: {type: decoratedSymbol, symbolColor: default, character: v}
-        - type: primitive
-          mark: {type: decoratedSymbol, symbolColor: default, character: h}
-initialState:
-  documentContents: |
-
-    const value = "Hello world";
-  selections:
-    - anchor: {line: 1, character: 0}
-      active: {line: 1, character: 20}
-  marks:
-    default.c:
-      start: {line: 1, character: 0}
-      end: {line: 1, character: 5}
-    default.v:
-      start: {line: 1, character: 6}
-      end: {line: 1, character: 11}
-    default.h:
-      start: {line: 1, character: 15}
-      end: {line: 1, character: 20}
-finalState:
-  documentContents: |
-
-    const value = "Hello world";
-  selections:
-    - anchor: {line: 1, character: 0}
-      active: {line: 1, character: 5}
-    - anchor: {line: 1, character: 6}
-      active: {line: 1, character: 11}
-    - anchor: {line: 1, character: 15}
-      active: {line: 1, character: 20}
-fullTargets: [{type: list, elements: [{type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: c}, selectionType: token, position: contents, modifier: {type: identity}, insideOutsideType: inside}, {type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: v}, selectionType: token, position: contents, modifier: {type: identity}, insideOutsideType: inside}, {type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: h}, selectionType: token, position: contents, modifier: {type: identity}, insideOutsideType: inside}]}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/compoundTargets/takeCapPastHarp.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/compoundTargets/takeCapPastHarp.yml
deleted file mode 100644
index 608b010505..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/compoundTargets/takeCapPastHarp.yml
+++ /dev/null
@@ -1,37 +0,0 @@
-languageId: typescript
-command:
-  version: 1
-  spokenForm: take cap past harp
-  action: setSelection
-  targets:
-    - type: range
-      start:
-        type: primitive
-        mark: {type: decoratedSymbol, symbolColor: default, character: c}
-      end:
-        type: primitive
-        mark: {type: decoratedSymbol, symbolColor: default, character: h}
-      excludeStart: false
-      excludeEnd: false
-initialState:
-  documentContents: |
-
-    const value = "Hello world";
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-  marks:
-    default.c:
-      start: {line: 1, character: 0}
-      end: {line: 1, character: 5}
-    default.h:
-      start: {line: 1, character: 15}
-      end: {line: 1, character: 20}
-finalState:
-  documentContents: |
-
-    const value = "Hello world";
-  selections:
-    - anchor: {line: 1, character: 0}
-      active: {line: 1, character: 20}
-fullTargets: [{type: range, excludeStart: false, excludeEnd: false, start: {type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: c}, selectionType: token, position: contents, modifier: {type: identity}, insideOutsideType: inside}, end: {type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: h}, selectionType: token, position: contents, modifier: {type: identity}, insideOutsideType: inside}}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/compoundTargets/takeFineVerticalPastBat.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/compoundTargets/takeFineVerticalPastBat.yml
deleted file mode 100644
index c78bc85990..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/compoundTargets/takeFineVerticalPastBat.yml
+++ /dev/null
@@ -1,48 +0,0 @@
-languageId: typescript
-command:
-  version: 1
-  spokenForm: take fine vertical past bat
-  action: setSelection
-  targets:
-    - type: range
-      start:
-        type: primitive
-        mark: {type: decoratedSymbol, symbolColor: default, character: f}
-      end:
-        type: primitive
-        mark: {type: decoratedSymbol, symbolColor: default, character: b}
-      excludeStart: false
-      excludeEnd: false
-      rangeType: vertical
-initialState:
-  documentContents: |
-    a
-
-    b   c
-    d   e
-    f   g
-  selections:
-    - anchor: {line: 5, character: 0}
-      active: {line: 5, character: 0}
-  marks:
-    default.f:
-      start: {line: 4, character: 0}
-      end: {line: 4, character: 1}
-    default.b:
-      start: {line: 2, character: 0}
-      end: {line: 2, character: 1}
-finalState:
-  documentContents: |
-    a
-
-    b   c
-    d   e
-    f   g
-  selections:
-    - anchor: {line: 4, character: 0}
-      active: {line: 4, character: 1}
-    - anchor: {line: 3, character: 0}
-      active: {line: 3, character: 1}
-    - anchor: {line: 2, character: 0}
-      active: {line: 2, character: 1}
-fullTargets: [{type: range, excludeAnchor: false, excludeActive: false, rangeType: vertical, anchor: {type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: f}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: identity}}, active: {type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: b}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: identity}}}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/compoundTargets/takeHarpAndVestAndCap.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/compoundTargets/takeHarpAndVestAndCap.yml
deleted file mode 100644
index fae6812e71..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/compoundTargets/takeHarpAndVestAndCap.yml
+++ /dev/null
@@ -1,43 +0,0 @@
-languageId: typescript
-command:
-  version: 1
-  spokenForm: take harp and vest and cap
-  action: setSelection
-  targets:
-    - type: list
-      elements:
-        - type: primitive
-          mark: {type: decoratedSymbol, symbolColor: default, character: h}
-        - type: primitive
-          mark: {type: decoratedSymbol, symbolColor: default, character: v}
-        - type: primitive
-          mark: {type: decoratedSymbol, symbolColor: default, character: c}
-initialState:
-  documentContents: |
-
-    const value = "Hello world";
-  selections:
-    - anchor: {line: 1, character: 20}
-      active: {line: 1, character: 0}
-  marks:
-    default.h:
-      start: {line: 1, character: 15}
-      end: {line: 1, character: 20}
-    default.v:
-      start: {line: 1, character: 6}
-      end: {line: 1, character: 11}
-    default.c:
-      start: {line: 1, character: 0}
-      end: {line: 1, character: 5}
-finalState:
-  documentContents: |
-
-    const value = "Hello world";
-  selections:
-    - anchor: {line: 1, character: 15}
-      active: {line: 1, character: 20}
-    - anchor: {line: 1, character: 6}
-      active: {line: 1, character: 11}
-    - anchor: {line: 1, character: 0}
-      active: {line: 1, character: 5}
-fullTargets: [{type: list, elements: [{type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: h}, selectionType: token, position: contents, modifier: {type: identity}, insideOutsideType: inside}, {type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: v}, selectionType: token, position: contents, modifier: {type: identity}, insideOutsideType: inside}, {type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: c}, selectionType: token, position: contents, modifier: {type: identity}, insideOutsideType: inside}]}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/compoundTargets/takeHarpPastCap.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/compoundTargets/takeHarpPastCap.yml
deleted file mode 100644
index 4cc5382083..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/compoundTargets/takeHarpPastCap.yml
+++ /dev/null
@@ -1,37 +0,0 @@
-languageId: typescript
-command:
-  version: 1
-  spokenForm: take harp past cap
-  action: setSelection
-  targets:
-    - type: range
-      start:
-        type: primitive
-        mark: {type: decoratedSymbol, symbolColor: default, character: h}
-      end:
-        type: primitive
-        mark: {type: decoratedSymbol, symbolColor: default, character: c}
-      excludeStart: false
-      excludeEnd: false
-initialState:
-  documentContents: |
-
-    const value = "Hello world";
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-  marks:
-    default.h:
-      start: {line: 1, character: 15}
-      end: {line: 1, character: 20}
-    default.c:
-      start: {line: 1, character: 0}
-      end: {line: 1, character: 5}
-finalState:
-  documentContents: |
-
-    const value = "Hello world";
-  selections:
-    - anchor: {line: 1, character: 20}
-      active: {line: 1, character: 0}
-fullTargets: [{type: range, excludeStart: false, excludeEnd: false, start: {type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: h}, selectionType: token, position: contents, modifier: {type: identity}, insideOutsideType: inside}, end: {type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: c}, selectionType: token, position: contents, modifier: {type: identity}, insideOutsideType: inside}}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/compoundTargets/takeLineVestAndAir.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/compoundTargets/takeLineVestAndAir.yml
deleted file mode 100644
index 6175f0e2c2..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/compoundTargets/takeLineVestAndAir.yml
+++ /dev/null
@@ -1,31 +0,0 @@
-languageId: typescript
-command:
-  version: 1
-  spokenForm: take line vest and air
-  action: setSelection
-  targets:
-    - type: list
-      elements:
-        - type: primitive
-          selectionType: line
-          mark: {type: decoratedSymbol, symbolColor: default, character: v}
-        - type: primitive
-          mark: {type: decoratedSymbol, symbolColor: default, character: a}
-initialState:
-  documentContents: "    value = {a:2}"
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-  marks:
-    default.v:
-      start: {line: 0, character: 4}
-      end: {line: 0, character: 9}
-    default.a:
-      start: {line: 0, character: 13}
-      end: {line: 0, character: 14}
-finalState:
-  documentContents: "    value = {a:2}"
-  selections:
-    - anchor: {line: 0, character: 4}
-      active: {line: 0, character: 17}
-fullTargets: [{type: list, elements: [{type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: v}, selectionType: line, position: contents, insideOutsideType: inside, modifier: {type: identity}}, {type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: a}, selectionType: line, position: contents, insideOutsideType: inside, modifier: {type: identity}}]}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/compoundTargets/takeTokenPastTrap.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/compoundTargets/takeTokenPastTrap.yml
deleted file mode 100644
index 128bd3c336..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/compoundTargets/takeTokenPastTrap.yml
+++ /dev/null
@@ -1,28 +0,0 @@
-languageId: typescript
-command:
-  version: 1
-  spokenForm: take token past trap
-  action: setSelection
-  targets:
-    - type: range
-      start: {type: primitive, selectionType: token}
-      end:
-        type: primitive
-        mark: {type: decoratedSymbol, symbolColor: default, character: t}
-      excludeStart: false
-      excludeEnd: false
-initialState:
-  documentContents: hello there
-  selections:
-    - anchor: {line: 0, character: 3}
-      active: {line: 0, character: 3}
-  marks:
-    default.t:
-      start: {line: 0, character: 6}
-      end: {line: 0, character: 11}
-finalState:
-  documentContents: hello there
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 11}
-fullTargets: [{type: range, excludeStart: false, excludeEnd: false, start: {type: primitive, mark: {type: cursorToken}, selectionType: token, position: contents, modifier: {type: identity}, insideOutsideType: inside}, end: {type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: t}, selectionType: token, position: contents, modifier: {type: identity}, insideOutsideType: inside}}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/compoundTargets/takeVerticalPastFine.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/compoundTargets/takeVerticalPastFine.yml
deleted file mode 100644
index 2d50fbb945..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/compoundTargets/takeVerticalPastFine.yml
+++ /dev/null
@@ -1,43 +0,0 @@
-languageId: typescript
-command:
-  version: 1
-  spokenForm: take vertical past fine
-  action: setSelection
-  targets:
-    - type: range
-      start: {type: primitive}
-      end:
-        type: primitive
-        mark: {type: decoratedSymbol, symbolColor: default, character: f}
-      excludeStart: false
-      excludeEnd: false
-      rangeType: vertical
-initialState:
-  documentContents: |
-    a
-
-    b   c
-    d   e
-    f   g
-  selections:
-    - anchor: {line: 2, character: 1}
-      active: {line: 2, character: 0}
-  marks:
-    default.f:
-      start: {line: 4, character: 0}
-      end: {line: 4, character: 1}
-finalState:
-  documentContents: |
-    a
-
-    b   c
-    d   e
-    f   g
-  selections:
-    - anchor: {line: 2, character: 1}
-      active: {line: 2, character: 0}
-    - anchor: {line: 3, character: 1}
-      active: {line: 3, character: 0}
-    - anchor: {line: 4, character: 1}
-      active: {line: 4, character: 0}
-fullTargets: [{type: range, excludeAnchor: false, excludeActive: false, rangeType: vertical, anchor: {type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: identity}}, active: {type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: f}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: identity}}}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/compoundTargets/takeVestTweenWhale.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/compoundTargets/takeVestTweenWhale.yml
deleted file mode 100644
index d244a2987b..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/compoundTargets/takeVestTweenWhale.yml
+++ /dev/null
@@ -1,37 +0,0 @@
-languageId: typescript
-command:
-  version: 1
-  spokenForm: take vest tween whale
-  action: setSelection
-  targets:
-    - type: range
-      start:
-        type: primitive
-        mark: {type: decoratedSymbol, symbolColor: default, character: v}
-      end:
-        type: primitive
-        mark: {type: decoratedSymbol, symbolColor: default, character: w}
-      excludeStart: true
-      excludeEnd: true
-initialState:
-  documentContents: |
-
-    const value = "Hello world";
-  selections:
-    - anchor: {line: 1, character: 26}
-      active: {line: 1, character: 11}
-  marks:
-    default.v:
-      start: {line: 1, character: 6}
-      end: {line: 1, character: 11}
-    default.w:
-      start: {line: 1, character: 21}
-      end: {line: 1, character: 26}
-finalState:
-  documentContents: |
-
-    const value = "Hello world";
-  selections:
-    - anchor: {line: 1, character: 11}
-      active: {line: 1, character: 21}
-fullTargets: [{type: range, excludeStart: true, excludeEnd: true, start: {type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: v}, selectionType: token, position: contents, modifier: {type: identity}, insideOutsideType: inside}, end: {type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: w}, selectionType: token, position: contents, modifier: {type: identity}, insideOutsideType: inside}}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/compoundTargets/takeVestUntilWhale.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/compoundTargets/takeVestUntilWhale.yml
deleted file mode 100644
index fae5a7aaf8..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/compoundTargets/takeVestUntilWhale.yml
+++ /dev/null
@@ -1,37 +0,0 @@
-languageId: typescript
-command:
-  version: 1
-  spokenForm: take vest until whale
-  action: setSelection
-  targets:
-    - type: range
-      start:
-        type: primitive
-        mark: {type: decoratedSymbol, symbolColor: default, character: v}
-      end:
-        type: primitive
-        mark: {type: decoratedSymbol, symbolColor: default, character: w}
-      excludeStart: false
-      excludeEnd: true
-initialState:
-  documentContents: |
-
-    const value = "Hello world";
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-  marks:
-    default.v:
-      start: {line: 1, character: 6}
-      end: {line: 1, character: 11}
-    default.w:
-      start: {line: 1, character: 21}
-      end: {line: 1, character: 26}
-finalState:
-  documentContents: |
-
-    const value = "Hello world";
-  selections:
-    - anchor: {line: 1, character: 6}
-      active: {line: 1, character: 21}
-fullTargets: [{type: range, excludeStart: false, excludeEnd: true, start: {type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: v}, selectionType: token, position: contents, modifier: {type: identity}, insideOutsideType: inside}, end: {type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: w}, selectionType: token, position: contents, modifier: {type: identity}, insideOutsideType: inside}}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/compoundTargets/takeWhaleTweenVest.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/compoundTargets/takeWhaleTweenVest.yml
deleted file mode 100644
index b97baf5780..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/compoundTargets/takeWhaleTweenVest.yml
+++ /dev/null
@@ -1,37 +0,0 @@
-languageId: typescript
-command:
-  version: 1
-  spokenForm: take whale tween vest
-  action: setSelection
-  targets:
-    - type: range
-      start:
-        type: primitive
-        mark: {type: decoratedSymbol, symbolColor: default, character: w}
-      end:
-        type: primitive
-        mark: {type: decoratedSymbol, symbolColor: default, character: v}
-      excludeStart: true
-      excludeEnd: true
-initialState:
-  documentContents: |
-
-    const value = "Hello world";
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-  marks:
-    default.w:
-      start: {line: 1, character: 21}
-      end: {line: 1, character: 26}
-    default.v:
-      start: {line: 1, character: 6}
-      end: {line: 1, character: 11}
-finalState:
-  documentContents: |
-
-    const value = "Hello world";
-  selections:
-    - anchor: {line: 1, character: 21}
-      active: {line: 1, character: 11}
-fullTargets: [{type: range, excludeStart: true, excludeEnd: true, start: {type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: w}, selectionType: token, position: contents, modifier: {type: identity}, insideOutsideType: inside}, end: {type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: v}, selectionType: token, position: contents, modifier: {type: identity}, insideOutsideType: inside}}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/compoundTargets/takeWhaleUntilVest.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/compoundTargets/takeWhaleUntilVest.yml
deleted file mode 100644
index 7733ea3912..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/compoundTargets/takeWhaleUntilVest.yml
+++ /dev/null
@@ -1,37 +0,0 @@
-languageId: typescript
-command:
-  version: 1
-  spokenForm: take whale until vest
-  action: setSelection
-  targets:
-    - type: range
-      start:
-        type: primitive
-        mark: {type: decoratedSymbol, symbolColor: default, character: w}
-      end:
-        type: primitive
-        mark: {type: decoratedSymbol, symbolColor: default, character: v}
-      excludeStart: false
-      excludeEnd: true
-initialState:
-  documentContents: |
-
-    const value = "Hello world";
-  selections:
-    - anchor: {line: 1, character: 6}
-      active: {line: 1, character: 21}
-  marks:
-    default.w:
-      start: {line: 1, character: 21}
-      end: {line: 1, character: 26}
-    default.v:
-      start: {line: 1, character: 6}
-      end: {line: 1, character: 11}
-finalState:
-  documentContents: |
-
-    const value = "Hello world";
-  selections:
-    - anchor: {line: 1, character: 26}
-      active: {line: 1, character: 11}
-fullTargets: [{type: range, excludeStart: false, excludeEnd: true, start: {type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: w}, selectionType: token, position: contents, modifier: {type: identity}, insideOutsideType: inside}, end: {type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: v}, selectionType: token, position: contents, modifier: {type: identity}, insideOutsideType: inside}}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/containingScope/clearToken.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/containingScope/clearToken.yml
deleted file mode 100644
index 1ffca5f6c1..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/containingScope/clearToken.yml
+++ /dev/null
@@ -1,23 +0,0 @@
-languageId: plaintext
-command:
-  spokenForm: clear token
-  version: 3
-  targets:
-    - type: primitive
-      modifiers:
-        - type: containingScope
-          scopeType: {type: token}
-  usePrePhraseSnapshot: true
-  action: {name: clearAndSetSelection}
-initialState:
-  documentContents: foo.
-  selections:
-    - anchor: {line: 0, character: 3}
-      active: {line: 0, character: 4}
-  marks: {}
-finalState:
-  documentContents: foo
-  selections:
-    - anchor: {line: 0, character: 3}
-      active: {line: 0, character: 3}
-fullTargets: [{type: primitive, mark: {type: cursor}, modifiers: [{type: containingScope, scopeType: {type: token}}]}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/containingScope/clearWord.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/containingScope/clearWord.yml
deleted file mode 100644
index be16534397..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/containingScope/clearWord.yml
+++ /dev/null
@@ -1,23 +0,0 @@
-languageId: plaintext
-command:
-  spokenForm: clear word
-  version: 3
-  targets:
-    - type: primitive
-      modifiers:
-        - type: containingScope
-          scopeType: {type: word}
-  usePrePhraseSnapshot: true
-  action: {name: clearAndSetSelection}
-initialState:
-  documentContents: aaaBbb.
-  selections:
-    - anchor: {line: 0, character: 6}
-      active: {line: 0, character: 6}
-  marks: {}
-finalState:
-  documentContents: aaa.
-  selections:
-    - anchor: {line: 0, character: 3}
-      active: {line: 0, character: 3}
-fullTargets: [{type: primitive, mark: {type: cursor}, modifiers: [{type: containingScope, scopeType: {type: word}}]}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/containingScope/clearWord2.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/containingScope/clearWord2.yml
deleted file mode 100644
index ae540c96bd..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/containingScope/clearWord2.yml
+++ /dev/null
@@ -1,23 +0,0 @@
-languageId: plaintext
-command:
-  spokenForm: clear word
-  version: 3
-  targets:
-    - type: primitive
-      modifiers:
-        - type: containingScope
-          scopeType: {type: word}
-  usePrePhraseSnapshot: true
-  action: {name: clearAndSetSelection}
-initialState:
-  documentContents: .aaaBbb
-  selections:
-    - anchor: {line: 0, character: 1}
-      active: {line: 0, character: 1}
-  marks: {}
-finalState:
-  documentContents: .Bbb
-  selections:
-    - anchor: {line: 0, character: 1}
-      active: {line: 0, character: 1}
-fullTargets: [{type: primitive, mark: {type: cursor}, modifiers: [{type: containingScope, scopeType: {type: word}}]}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/customRegex/clearWhite.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/customRegex/clearWhite.yml
deleted file mode 100644
index 6037cb367d..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/customRegex/clearWhite.yml
+++ /dev/null
@@ -1,23 +0,0 @@
-languageId: plaintext
-command:
-  spokenForm: clear white
-  version: 3
-  targets:
-    - type: primitive
-      modifiers:
-        - type: containingScope
-          scopeType: {type: customRegex, regex: '\p{Zs}+'}
-  usePrePhraseSnapshot: true
-  action: {name: clearAndSetSelection}
-initialState:
-  documentContents: "\"  \""
-  selections:
-    - anchor: {line: 0, character: 2}
-      active: {line: 0, character: 2}
-  marks: {}
-finalState:
-  documentContents: "\"\""
-  selections:
-    - anchor: {line: 0, character: 1}
-      active: {line: 0, character: 1}
-fullTargets: [{type: primitive, mark: {type: cursor}, modifiers: [{type: containingScope, scopeType: {type: customRegex, regex: '\p{Zs}+'}}]}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/decorations/carveLineHarp.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/decorations/carveLineHarp.yml
deleted file mode 100644
index 05820fc7ff..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/decorations/carveLineHarp.yml
+++ /dev/null
@@ -1,38 +0,0 @@
-languageId: plaintext
-command:
-  version: 4
-  spokenForm: carve line harp
-  action: {name: cutToClipboard}
-  targets:
-    - type: primitive
-      modifiers:
-        - type: containingScope
-          scopeType: {type: line}
-      mark: {type: decoratedSymbol, symbolColor: default, character: h}
-  usePrePhraseSnapshot: true
-initialState:
-  documentContents: |2
-        hello world
-  selections:
-    - anchor: {line: 1, character: 0}
-      active: {line: 1, character: 0}
-  marks:
-    default.h:
-      start: {line: 0, character: 4}
-      end: {line: 0, character: 9}
-finalState:
-  documentContents: ""
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-  clipboard: "hello world"
-ide:
-  flashes:
-    - style: referenced
-      range:
-        type: character
-        start: {line: 0, character: 4}
-        end: {line: 0, character: 15}
-    - style: pendingDelete
-      range: {type: line, start: 0, end: 0}
-fullTargets: [{type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: h}, modifiers: [{type: containingScope, scopeType: {type: line}}]}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/decorations/chuckBlockAir.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/decorations/chuckBlockAir.yml
deleted file mode 100644
index 7a5f663073..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/decorations/chuckBlockAir.yml
+++ /dev/null
@@ -1,43 +0,0 @@
-languageId: plaintext
-command:
-  spokenForm: chuck block air
-  version: 2
-  targets:
-    - type: primitive
-      mark: {type: decoratedSymbol, symbolColor: default, character: a}
-      modifiers:
-        - type: containingScope
-          scopeType: {type: paragraph}
-  usePrePhraseSnapshot: true
-  action: {name: remove}
-initialState:
-  documentContents: |
-
-    a
-    a
-
-
-    b   c
-    d   e
-    f   g
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-  marks:
-    default.a:
-      start: {line: 1, character: 0}
-      end: {line: 1, character: 1}
-finalState:
-  documentContents: |
-
-    b   c
-    d   e
-    f   g
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-ide:
-  flashes:
-    - range: {type: line, start: 1, end: 4}
-      style: pendingDelete
-fullTargets: [{type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: a}, modifiers: [{type: containingScope, scopeType: {type: paragraph}}]}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/decorations/chuckBlockAirUntilBatt.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/decorations/chuckBlockAirUntilBatt.yml
deleted file mode 100644
index 0cfd2edb1d..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/decorations/chuckBlockAirUntilBatt.yml
+++ /dev/null
@@ -1,52 +0,0 @@
-languageId: plaintext
-command:
-  spokenForm: chuck block air until batt
-  version: 2
-  targets:
-    - type: range
-      anchor:
-        type: primitive
-        mark: {type: decoratedSymbol, symbolColor: default, character: a}
-        modifiers:
-          - type: containingScope
-            scopeType: {type: paragraph}
-      active:
-        type: primitive
-        mark: {type: decoratedSymbol, symbolColor: default, character: b}
-      excludeAnchor: false
-      excludeActive: true
-  usePrePhraseSnapshot: true
-  action: {name: remove}
-initialState:
-  documentContents: |
-
-    a
-    a
-
-
-    b   c
-    d   e
-    f   g
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-  marks:
-    default.a:
-      start: {line: 1, character: 0}
-      end: {line: 1, character: 1}
-    default.b:
-      start: {line: 5, character: 0}
-      end: {line: 5, character: 1}
-finalState:
-  documentContents: |
-    b   c
-    d   e
-    f   g
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-ide:
-  flashes:
-    - range: {type: line, start: 0, end: 4}
-      style: pendingDelete
-fullTargets: [{type: range, excludeAnchor: false, excludeActive: true, rangeType: continuous, anchor: {type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: a}, modifiers: &ref_0 [{type: containingScope, scopeType: {type: paragraph}}]}, active: {type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: b}, modifiers: *ref_0}}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/decorations/chuckBlockBatt.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/decorations/chuckBlockBatt.yml
deleted file mode 100644
index 15c0a0ba1a..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/decorations/chuckBlockBatt.yml
+++ /dev/null
@@ -1,43 +0,0 @@
-languageId: plaintext
-command:
-  spokenForm: chuck block batt
-  version: 2
-  targets:
-    - type: primitive
-      mark: {type: decoratedSymbol, symbolColor: default, character: b}
-      modifiers:
-        - type: containingScope
-          scopeType: {type: paragraph}
-  usePrePhraseSnapshot: true
-  action: {name: remove}
-initialState:
-  documentContents: |
-
-    a
-    a
-
-
-    b   c
-    d   e
-    f   g
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-  marks:
-    default.b:
-      start: {line: 5, character: 0}
-      end: {line: 5, character: 1}
-finalState:
-  documentContents: |+
-
-    a
-    a
-
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-ide:
-  flashes:
-    - range: {type: line, start: 5, end: 8}
-      style: pendingDelete
-fullTargets: [{type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: b}, modifiers: [{type: containingScope, scopeType: {type: paragraph}}]}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/decorations/chuckBlockBatt2.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/decorations/chuckBlockBatt2.yml
deleted file mode 100644
index 6546f096a3..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/decorations/chuckBlockBatt2.yml
+++ /dev/null
@@ -1,35 +0,0 @@
-languageId: plaintext
-command:
-  spokenForm: chuck block batt
-  version: 2
-  targets:
-    - type: primitive
-      mark: {type: decoratedSymbol, symbolColor: default, character: b}
-      modifiers:
-        - type: containingScope
-          scopeType: {type: paragraph}
-  usePrePhraseSnapshot: true
-  action: {name: remove}
-initialState:
-  documentContents: |-
-
-    b   c
-    d   e
-    f   g
-  selections:
-    - anchor: {line: 3, character: 5}
-      active: {line: 3, character: 5}
-  marks:
-    default.b:
-      start: {line: 1, character: 0}
-      end: {line: 1, character: 1}
-finalState:
-  documentContents: ""
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-ide:
-  flashes:
-    - range: {type: line, start: 0, end: 3}
-      style: pendingDelete
-fullTargets: [{type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: b}, modifiers: [{type: containingScope, scopeType: {type: paragraph}}]}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/decorations/chuckBlockBattUntilAir.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/decorations/chuckBlockBattUntilAir.yml
deleted file mode 100644
index fdd84bd37b..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/decorations/chuckBlockBattUntilAir.yml
+++ /dev/null
@@ -1,52 +0,0 @@
-languageId: plaintext
-command:
-  spokenForm: chuck block batt until air
-  version: 2
-  targets:
-    - type: range
-      anchor:
-        type: primitive
-        mark: {type: decoratedSymbol, symbolColor: default, character: b}
-        modifiers:
-          - type: containingScope
-            scopeType: {type: paragraph}
-      active:
-        type: primitive
-        mark: {type: decoratedSymbol, symbolColor: default, character: a}
-      excludeAnchor: false
-      excludeActive: true
-  usePrePhraseSnapshot: true
-  action: {name: remove}
-initialState:
-  documentContents: |
-
-    a
-    a
-
-
-    b   c
-    d   e
-    f   g
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-  marks:
-    default.b:
-      start: {line: 5, character: 0}
-      end: {line: 5, character: 1}
-    default.a:
-      start: {line: 1, character: 0}
-      end: {line: 1, character: 1}
-finalState:
-  documentContents: |-
-
-    a
-    a
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-ide:
-  flashes:
-    - range: {type: line, start: 3, end: 8}
-      style: pendingDelete
-fullTargets: [{type: range, excludeAnchor: false, excludeActive: true, rangeType: continuous, anchor: {type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: b}, modifiers: &ref_0 [{type: containingScope, scopeType: {type: paragraph}}]}, active: {type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: a}, modifiers: *ref_0}}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/decorations/chuckFine.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/decorations/chuckFine.yml
deleted file mode 100644
index e793bff746..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/decorations/chuckFine.yml
+++ /dev/null
@@ -1,37 +0,0 @@
-languageId: plaintext
-command:
-  spokenForm: chuck fine
-  version: 2
-  targets:
-    - type: primitive
-      mark: {type: decoratedSymbol, symbolColor: default, character: f}
-  usePrePhraseSnapshot: true
-  action: {name: remove}
-initialState:
-  documentContents: |2
-
-        foo ooo    
-        bar    
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-  marks:
-    default.f:
-      start: {line: 1, character: 4}
-      end: {line: 1, character: 7}
-finalState:
-  documentContents: |2
-
-        ooo    
-        bar    
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-ide:
-  flashes:
-    - range:
-        type: character
-        start: {line: 1, character: 4}
-        end: {line: 1, character: 8}
-      style: pendingDelete
-fullTargets: [{type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: f}, modifiers: []}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/decorations/chuckLineFine.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/decorations/chuckLineFine.yml
deleted file mode 100644
index b69ac53055..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/decorations/chuckLineFine.yml
+++ /dev/null
@@ -1,36 +0,0 @@
-languageId: plaintext
-command:
-  spokenForm: chuck line fine
-  version: 2
-  targets:
-    - type: primitive
-      mark: {type: decoratedSymbol, symbolColor: default, character: f}
-      modifiers:
-        - type: containingScope
-          scopeType: {type: line}
-  usePrePhraseSnapshot: true
-  action: {name: remove}
-initialState:
-  documentContents: |2
-
-        foo ooo    
-        bar    
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-  marks:
-    default.f:
-      start: {line: 1, character: 4}
-      end: {line: 1, character: 7}
-finalState:
-  documentContents: |2
-
-        bar    
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-ide:
-  flashes:
-    - range: {type: line, start: 1, end: 1}
-      style: pendingDelete
-fullTargets: [{type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: f}, modifiers: [{type: containingScope, scopeType: {type: line}}]}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/decorations/chuckLineFineBetweenRisk.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/decorations/chuckLineFineBetweenRisk.yml
deleted file mode 100644
index 140f8b1b19..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/decorations/chuckLineFineBetweenRisk.yml
+++ /dev/null
@@ -1,49 +0,0 @@
-languageId: plaintext
-command:
-  spokenForm: chuck line fine between risk
-  version: 2
-  targets:
-    - type: range
-      anchor:
-        type: primitive
-        mark: {type: decoratedSymbol, symbolColor: default, character: f}
-        modifiers:
-          - type: containingScope
-            scopeType: {type: line}
-      active:
-        type: primitive
-        mark: {type: decoratedSymbol, symbolColor: default, character: r}
-      excludeAnchor: true
-      excludeActive: true
-  usePrePhraseSnapshot: true
-  action: {name: remove}
-initialState:
-  documentContents: |2
-
-        foo ooo    
-    aa
-    bb
-        bar    
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-  marks:
-    default.f:
-      start: {line: 1, character: 4}
-      end: {line: 1, character: 7}
-    default.r:
-      start: {line: 4, character: 4}
-      end: {line: 4, character: 7}
-finalState:
-  documentContents: |2
-
-        foo ooo    
-        bar    
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-ide:
-  flashes:
-    - range: {type: line, start: 2, end: 3}
-      style: pendingDelete
-fullTargets: [{type: range, excludeAnchor: true, excludeActive: true, rangeType: continuous, anchor: {type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: f}, modifiers: &ref_0 [{type: containingScope, scopeType: {type: line}}]}, active: {type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: r}, modifiers: *ref_0}}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/decorations/clearBlockFine.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/decorations/clearBlockFine.yml
deleted file mode 100644
index 50885e1ac1..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/decorations/clearBlockFine.yml
+++ /dev/null
@@ -1,39 +0,0 @@
-languageId: plaintext
-command:
-  spokenForm: clear block fine
-  version: 2
-  targets:
-    - type: primitive
-      mark: {type: decoratedSymbol, symbolColor: default, character: f}
-      modifiers:
-        - type: containingScope
-          scopeType: {type: paragraph}
-  usePrePhraseSnapshot: true
-  action: {name: clearAndSetSelection}
-initialState:
-  documentContents: |2
-
-        foo ooo    
-        bar    
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-  marks:
-    default.f:
-      start: {line: 1, character: 4}
-      end: {line: 1, character: 7}
-finalState:
-  documentContents: |2
-
-            
-  selections:
-    - anchor: {line: 1, character: 4}
-      active: {line: 1, character: 4}
-ide:
-  flashes:
-    - range:
-        type: character
-        start: {line: 1, character: 4}
-        end: {line: 2, character: 7}
-      style: pendingDelete
-fullTargets: [{type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: f}, modifiers: [{type: containingScope, scopeType: {type: paragraph}}]}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/decorations/clearFine.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/decorations/clearFine.yml
deleted file mode 100644
index a575accb8f..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/decorations/clearFine.yml
+++ /dev/null
@@ -1,37 +0,0 @@
-languageId: plaintext
-command:
-  spokenForm: clear fine
-  version: 2
-  targets:
-    - type: primitive
-      mark: {type: decoratedSymbol, symbolColor: default, character: f}
-  usePrePhraseSnapshot: true
-  action: {name: clearAndSetSelection}
-initialState:
-  documentContents: |2
-
-        foo ooo    
-        bar    
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-  marks:
-    default.f:
-      start: {line: 1, character: 4}
-      end: {line: 1, character: 7}
-finalState:
-  documentContents: |2
-
-         ooo    
-        bar    
-  selections:
-    - anchor: {line: 1, character: 4}
-      active: {line: 1, character: 4}
-ide:
-  flashes:
-    - range:
-        type: character
-        start: {line: 1, character: 4}
-        end: {line: 1, character: 7}
-      style: pendingDelete
-fullTargets: [{type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: f}, modifiers: []}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/decorations/clearLineFine.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/decorations/clearLineFine.yml
deleted file mode 100644
index 389cbe3cb8..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/decorations/clearLineFine.yml
+++ /dev/null
@@ -1,40 +0,0 @@
-languageId: plaintext
-command:
-  spokenForm: clear line fine
-  version: 2
-  targets:
-    - type: primitive
-      mark: {type: decoratedSymbol, symbolColor: default, character: f}
-      modifiers:
-        - type: containingScope
-          scopeType: {type: line}
-  usePrePhraseSnapshot: true
-  action: {name: clearAndSetSelection}
-initialState:
-  documentContents: |2
-
-        foo ooo    
-        bar    
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-  marks:
-    default.f:
-      start: {line: 1, character: 4}
-      end: {line: 1, character: 7}
-finalState:
-  documentContents: |2
-
-            
-        bar    
-  selections:
-    - anchor: {line: 1, character: 4}
-      active: {line: 1, character: 4}
-ide:
-  flashes:
-    - range:
-        type: character
-        start: {line: 1, character: 4}
-        end: {line: 1, character: 11}
-      style: pendingDelete
-fullTargets: [{type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: f}, modifiers: [{type: containingScope, scopeType: {type: line}}]}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/decorations/cutFine.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/decorations/cutFine.yml
deleted file mode 100644
index d229608351..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/decorations/cutFine.yml
+++ /dev/null
@@ -1,40 +0,0 @@
-languageId: plaintext
-command:
-  spokenForm: cut fine
-  version: 2
-  targets:
-    - type: primitive
-      mark: {type: decoratedSymbol, symbolColor: default, character: f}
-  usePrePhraseSnapshot: true
-  action: {name: cutToClipboard}
-initialState:
-  documentContents: |2
-
-        foo bar
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-  marks:
-    default.f:
-      start: {line: 1, character: 4}
-      end: {line: 1, character: 7}
-finalState:
-  documentContents: |2
-
-        bar
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-ide:
-  flashes:
-    - range:
-        type: character
-        start: {line: 1, character: 4}
-        end: {line: 1, character: 7}
-      style: referenced
-    - range:
-        type: character
-        start: {line: 1, character: 7}
-        end: {line: 1, character: 8}
-      style: pendingDelete
-fullTargets: [{type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: f}, modifiers: []}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/decorations/highlightFine.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/decorations/highlightFine.yml
deleted file mode 100644
index 6fdf22bdd6..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/decorations/highlightFine.yml
+++ /dev/null
@@ -1,43 +0,0 @@
-languageId: plaintext
-command:
-  spokenForm: highlight fine
-  version: 2
-  targets:
-    - type: primitive
-      mark: {type: decoratedSymbol, symbolColor: default, character: f}
-  usePrePhraseSnapshot: true
-  action: {name: highlight}
-initialState:
-  documentContents: |2
-
-        foo    
-        bar    
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-  marks:
-    default.f:
-      start: {line: 1, character: 4}
-      end: {line: 1, character: 7}
-finalState:
-  documentContents: |2
-
-        foo    
-        bar    
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-  thatMark:
-    - type: UntypedTarget
-      contentRange:
-        start: {line: 1, character: 4}
-        end: {line: 1, character: 7}
-      isReversed: false
-      hasExplicitRange: false
-ide:
-  highlights:
-    - ranges:
-        - type: character
-          start: {line: 1, character: 4}
-          end: {line: 1, character: 7}
-fullTargets: [{type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: f}, modifiers: []}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/decorations/highlightLineFine.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/decorations/highlightLineFine.yml
deleted file mode 100644
index df3e934fd3..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/decorations/highlightLineFine.yml
+++ /dev/null
@@ -1,44 +0,0 @@
-languageId: plaintext
-command:
-  spokenForm: highlight line fine
-  version: 2
-  targets:
-    - type: primitive
-      mark: {type: decoratedSymbol, symbolColor: default, character: f}
-      modifiers:
-        - type: containingScope
-          scopeType: {type: line}
-  usePrePhraseSnapshot: true
-  action: {name: highlight}
-initialState:
-  documentContents: |2
-
-        foo    
-        bar    
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-  marks:
-    default.f:
-      start: {line: 1, character: 4}
-      end: {line: 1, character: 7}
-finalState:
-  documentContents: |2
-
-        foo    
-        bar    
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-  thatMark:
-    - type: LineTarget
-      contentRange:
-        start: {line: 1, character: 4}
-        end: {line: 1, character: 7}
-      isReversed: false
-      hasExplicitRange: true
-ide:
-  highlights:
-    - ranges:
-        - {type: line, start: 1, end: 1}
-fullTargets: [{type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: f}, modifiers: [{type: containingScope, scopeType: {type: line}}]}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/decorations/moveLineAir.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/decorations/moveLineAir.yml
deleted file mode 100644
index 2411109fef..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/decorations/moveLineAir.yml
+++ /dev/null
@@ -1,48 +0,0 @@
-languageId: plaintext
-command:
-  spokenForm: move line air
-  version: 2
-  targets:
-    - type: primitive
-      mark: {type: decoratedSymbol, symbolColor: default, character: a}
-      modifiers:
-        - type: containingScope
-          scopeType: {type: line}
-    - {type: primitive, isImplicit: true}
-  usePrePhraseSnapshot: true
-  action: {name: moveToTarget}
-initialState:
-  documentContents: |
-    a a a
-    b b b
-    c c c
-  selections:
-    - anchor: {line: 3, character: 0}
-      active: {line: 3, character: 0}
-  marks:
-    default.a:
-      start: {line: 0, character: 0}
-      end: {line: 0, character: 1}
-finalState:
-  documentContents: |-
-    b b b
-    c c c
-    a a a
-  selections:
-    - anchor: {line: 2, character: 5}
-      active: {line: 2, character: 5}
-ide:
-  flashes:
-    - range: {type: line, start: 0, end: 0}
-      style: pendingDelete
-    - range:
-        type: character
-        start: {line: 3, character: 0}
-        end: {line: 3, character: 0}
-      style: pendingModification0
-    - range:
-        type: character
-        start: {line: 2, character: 0}
-        end: {line: 2, character: 5}
-      style: pendingModification0
-fullTargets: [{type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: a}, modifiers: [{type: containingScope, scopeType: {type: line}}]}, {type: primitive, mark: {type: cursor}, modifiers: [{type: toRawSelection}]}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/hatTokenMap/bringAirToThirdCarWhaleTakeWhale.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/hatTokenMap/bringAirToThirdCarWhaleTakeWhale.yml
deleted file mode 100644
index 803757a8ac..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/hatTokenMap/bringAirToThirdCarWhaleTakeWhale.yml
+++ /dev/null
@@ -1,38 +0,0 @@
-languageId: plaintext
-command:
-  version: 1
-  spokenForm: bring air to third car whale take whale
-  action: replaceWithTarget
-  targets:
-    - type: primitive
-      mark: {type: decoratedSymbol, symbolColor: default, character: a}
-    - type: primitive
-      selectionType: token
-      modifier: {type: subpiece, pieceType: character, anchor: 2, active: 2, excludeAnchor: false, excludeActive: false}
-      mark: {type: decoratedSymbol, symbolColor: default, character: w}
-marksToCheck: [default.w]
-initialState:
-  documentContents: hello. world whatever
-  selections:
-    - anchor: {line: 0, character: 13}
-      active: {line: 0, character: 13}
-  marks:
-    default.a:
-      start: {line: 0, character: 13}
-      end: {line: 0, character: 21}
-    default.w:
-      start: {line: 0, character: 7}
-      end: {line: 0, character: 12}
-finalState:
-  documentContents: hello. wowhateverld whatever
-  selections:
-    - anchor: {line: 0, character: 20}
-      active: {line: 0, character: 20}
-  marks:
-    default.a:
-      start: {line: 0, character: 20}
-      end: {line: 0, character: 28}
-    default.w:
-      start: {line: 0, character: 7}
-      end: {line: 0, character: 19}
-fullTargets: [{type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: a}, selectionType: token, position: contents, insideOutsideType: null, modifier: {type: identity}}, {type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: w}, selectionType: token, position: contents, insideOutsideType: null, modifier: {type: subpiece, pieceType: character, anchor: 2, active: 2, excludeAnchor: false, excludeActive: false}}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/hatTokenMap/bringCommaToEndOfPointTakePoint.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/hatTokenMap/bringCommaToEndOfPointTakePoint.yml
deleted file mode 100644
index 52f02b41f0..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/hatTokenMap/bringCommaToEndOfPointTakePoint.yml
+++ /dev/null
@@ -1,38 +0,0 @@
-languageId: typescript
-command:
-  version: 1
-  spokenForm: bring comma to end of point take point
-  action: replaceWithTarget
-  targets:
-    - type: primitive
-      mark: {type: decoratedSymbol, symbolColor: default, character: ','}
-    - type: primitive
-      position: after
-      insideOutsideType: inside
-      mark: {type: decoratedSymbol, symbolColor: default, character: .}
-marksToCheck: [default..]
-initialState:
-  documentContents: " . , hello"
-  selections:
-    - anchor: {line: 0, character: 10}
-      active: {line: 0, character: 10}
-  marks:
-    default.,:
-      start: {line: 0, character: 3}
-      end: {line: 0, character: 4}
-    default..:
-      start: {line: 0, character: 1}
-      end: {line: 0, character: 2}
-finalState:
-  documentContents: " ., , hello"
-  selections:
-    - anchor: {line: 0, character: 11}
-      active: {line: 0, character: 11}
-  marks:
-    default.,:
-      start: {line: 0, character: 4}
-      end: {line: 0, character: 5}
-    default..:
-      start: {line: 0, character: 1}
-      end: {line: 0, character: 2}
-fullTargets: [{type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: ','}, selectionType: token, position: contents, insideOutsideType: null, modifier: {type: identity}}, {type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: .}, selectionType: token, position: after, insideOutsideType: inside, modifier: {type: identity}}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/hatTokenMap/bringCommaToStartOfPointTakePoint.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/hatTokenMap/bringCommaToStartOfPointTakePoint.yml
deleted file mode 100644
index 3e9f624f7d..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/hatTokenMap/bringCommaToStartOfPointTakePoint.yml
+++ /dev/null
@@ -1,38 +0,0 @@
-languageId: typescript
-command:
-  version: 1
-  spokenForm: bring comma to start of point take point
-  action: replaceWithTarget
-  targets:
-    - type: primitive
-      mark: {type: decoratedSymbol, symbolColor: default, character: ','}
-    - type: primitive
-      position: before
-      insideOutsideType: inside
-      mark: {type: decoratedSymbol, symbolColor: default, character: .}
-marksToCheck: [default..]
-initialState:
-  documentContents: " . , hello"
-  selections:
-    - anchor: {line: 0, character: 10}
-      active: {line: 0, character: 10}
-  marks:
-    default.,:
-      start: {line: 0, character: 3}
-      end: {line: 0, character: 4}
-    default..:
-      start: {line: 0, character: 1}
-      end: {line: 0, character: 2}
-finalState:
-  documentContents: " ,. , hello"
-  selections:
-    - anchor: {line: 0, character: 11}
-      active: {line: 0, character: 11}
-  marks:
-    default.,:
-      start: {line: 0, character: 4}
-      end: {line: 0, character: 5}
-    default..:
-      start: {line: 0, character: 2}
-      end: {line: 0, character: 3}
-fullTargets: [{type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: ','}, selectionType: token, position: contents, insideOutsideType: null, modifier: {type: identity}}, {type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: .}, selectionType: token, position: before, insideOutsideType: inside, modifier: {type: identity}}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/hatTokenMap/bringHarpAfterWhaleTakeWhale.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/hatTokenMap/bringHarpAfterWhaleTakeWhale.yml
deleted file mode 100644
index dfd6716569..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/hatTokenMap/bringHarpAfterWhaleTakeWhale.yml
+++ /dev/null
@@ -1,37 +0,0 @@
-languageId: plaintext
-command:
-  version: 1
-  spokenForm: bring harp after whale take whale
-  action: replaceWithTarget
-  targets:
-    - type: primitive
-      mark: {type: decoratedSymbol, symbolColor: default, character: h}
-    - type: primitive
-      mark: {type: decoratedSymbol, symbolColor: default, character: w}
-      position: after
-marksToCheck: [default.w]
-initialState:
-  documentContents: hello world
-  selections:
-    - anchor: {line: 0, character: 11}
-      active: {line: 0, character: 11}
-  marks:
-    default.h:
-      start: {line: 0, character: 0}
-      end: {line: 0, character: 5}
-    default.w:
-      start: {line: 0, character: 6}
-      end: {line: 0, character: 11}
-finalState:
-  documentContents: hello world hello
-  selections:
-    - anchor: {line: 0, character: 11}
-      active: {line: 0, character: 11}
-  marks:
-    default.h:
-      start: {line: 0, character: 0}
-      end: {line: 0, character: 5}
-    default.w:
-      start: {line: 0, character: 6}
-      end: {line: 0, character: 11}
-fullTargets: [{type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: h}, selectionType: token, position: contents, insideOutsideType: null, modifier: {type: identity}}, {type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: w}, selectionType: token, position: after, insideOutsideType: null, modifier: {type: identity}}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/hatTokenMap/bringHarpAndPointToEndOfThisAndEndOfWhaleTakeWhale.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/hatTokenMap/bringHarpAndPointToEndOfThisAndEndOfWhaleTakeWhale.yml
deleted file mode 100644
index 09dd006c50..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/hatTokenMap/bringHarpAndPointToEndOfThisAndEndOfWhaleTakeWhale.yml
+++ /dev/null
@@ -1,54 +0,0 @@
-languageId: plaintext
-command:
-  version: 1
-  spokenForm: bring harp and point to end of this and end of whale take whale
-  action: replaceWithTarget
-  targets:
-    - type: list
-      elements:
-        - type: primitive
-          mark: {type: decoratedSymbol, symbolColor: default, character: h}
-        - type: primitive
-          mark: {type: decoratedSymbol, symbolColor: default, character: .}
-    - type: list
-      elements:
-        - type: primitive
-          position: after
-          insideOutsideType: inside
-          mark: {type: cursor}
-        - type: primitive
-          position: after
-          insideOutsideType: inside
-          mark: {type: decoratedSymbol, symbolColor: default, character: w}
-marksToCheck: [default.w]
-initialState:
-  documentContents: hello. world
-  selections:
-    - anchor: {line: 0, character: 12}
-      active: {line: 0, character: 12}
-  marks:
-    default.h:
-      start: {line: 0, character: 0}
-      end: {line: 0, character: 5}
-    default..:
-      start: {line: 0, character: 5}
-      end: {line: 0, character: 6}
-    default.w:
-      start: {line: 0, character: 7}
-      end: {line: 0, character: 12}
-finalState:
-  documentContents: hello. worldhello.
-  selections:
-    - anchor: {line: 0, character: 18}
-      active: {line: 0, character: 18}
-  marks:
-    default.h:
-      start: {line: 0, character: 0}
-      end: {line: 0, character: 5}
-    default..:
-      start: {line: 0, character: 5}
-      end: {line: 0, character: 6}
-    default.w:
-      start: {line: 0, character: 7}
-      end: {line: 0, character: 17}
-fullTargets: [{type: list, elements: [{type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: h}, selectionType: token, position: contents, insideOutsideType: null, modifier: {type: identity}}, {type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: .}, selectionType: token, position: contents, insideOutsideType: null, modifier: {type: identity}}]}, {type: list, elements: [{type: primitive, mark: {type: cursor}, selectionType: token, position: after, insideOutsideType: inside, modifier: {type: identity}}, {type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: w}, selectionType: token, position: after, insideOutsideType: inside, modifier: {type: identity}}]}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/hatTokenMap/bringHarpAndPointToJustThisAndStartOfWhaleTakeWhale.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/hatTokenMap/bringHarpAndPointToJustThisAndStartOfWhaleTakeWhale.yml
deleted file mode 100644
index b8e26f1b84..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/hatTokenMap/bringHarpAndPointToJustThisAndStartOfWhaleTakeWhale.yml
+++ /dev/null
@@ -1,54 +0,0 @@
-languageId: plaintext
-command:
-  version: 3
-  spokenForm: bring harp and point to just this and start of whale take whale
-  action: {name: replaceWithTarget}
-  targets:
-    - type: list
-      elements:
-        - type: primitive
-          mark: {type: decoratedSymbol, symbolColor: default, character: h}
-        - type: primitive
-          mark: {type: decoratedSymbol, symbolColor: default, character: .}
-    - type: list
-      elements:
-        - type: primitive
-          modifiers:
-            - {type: toRawSelection}
-          mark: {type: cursor}
-        - type: primitive
-          modifiers:
-            - {type: position, position: start}
-          mark: {type: decoratedSymbol, symbolColor: default, character: w}
-marksToCheck: [default.w]
-initialState:
-  documentContents: hello. world
-  selections:
-    - anchor: {line: 0, character: 7}
-      active: {line: 0, character: 7}
-  marks:
-    default.h:
-      start: {line: 0, character: 0}
-      end: {line: 0, character: 5}
-    default..:
-      start: {line: 0, character: 5}
-      end: {line: 0, character: 6}
-    default.w:
-      start: {line: 0, character: 7}
-      end: {line: 0, character: 12}
-finalState:
-  documentContents: hello. hello.world
-  selections:
-    - anchor: {line: 0, character: 13}
-      active: {line: 0, character: 13}
-  marks:
-    default.h:
-      start: {line: 0, character: 0}
-      end: {line: 0, character: 5}
-    default..:
-      start: {line: 0, character: 5}
-      end: {line: 0, character: 6}
-    default.w:
-      start: {line: 0, character: 8}
-      end: {line: 0, character: 18}
-fullTargets: [{type: list, elements: [{type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: h}, selectionType: token, position: contents, insideOutsideType: null, modifier: {type: identity}}, {type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: .}, selectionType: token, position: contents, insideOutsideType: null, modifier: {type: identity}}]}, {type: list, elements: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: null, modifier: {type: identity}}, {type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: w}, selectionType: token, position: before, insideOutsideType: inside, modifier: {type: identity}}]}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/hatTokenMap/bringHarpBeforeWhaleTakeWhale.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/hatTokenMap/bringHarpBeforeWhaleTakeWhale.yml
deleted file mode 100644
index 82795150be..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/hatTokenMap/bringHarpBeforeWhaleTakeWhale.yml
+++ /dev/null
@@ -1,37 +0,0 @@
-languageId: plaintext
-command:
-  version: 1
-  spokenForm: bring harp before whale take whale
-  action: replaceWithTarget
-  targets:
-    - type: primitive
-      mark: {type: decoratedSymbol, symbolColor: default, character: h}
-    - type: primitive
-      mark: {type: decoratedSymbol, symbolColor: default, character: w}
-      position: before
-marksToCheck: [default.w]
-initialState:
-  documentContents: hello. world whatever
-  selections:
-    - anchor: {line: 0, character: 13}
-      active: {line: 0, character: 13}
-  marks:
-    default.h:
-      start: {line: 0, character: 0}
-      end: {line: 0, character: 5}
-    default.w:
-      start: {line: 0, character: 7}
-      end: {line: 0, character: 12}
-finalState:
-  documentContents: hello. hello world whatever
-  selections:
-    - anchor: {line: 0, character: 19}
-      active: {line: 0, character: 19}
-  marks:
-    default.h:
-      start: {line: 0, character: 0}
-      end: {line: 0, character: 5}
-    default.w:
-      start: {line: 0, character: 13}
-      end: {line: 0, character: 18}
-fullTargets: [{type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: h}, selectionType: token, position: contents, insideOutsideType: null, modifier: {type: identity}}, {type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: w}, selectionType: token, position: before, insideOutsideType: null, modifier: {type: identity}}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/hatTokenMap/bringHarpTakeWhale.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/hatTokenMap/bringHarpTakeWhale.yml
deleted file mode 100644
index 5978ffac29..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/hatTokenMap/bringHarpTakeWhale.yml
+++ /dev/null
@@ -1,35 +0,0 @@
-languageId: plaintext
-command:
-  version: 1
-  spokenForm: bring harp take whale
-  action: replaceWithTarget
-  targets:
-    - type: primitive
-      mark: {type: decoratedSymbol, symbolColor: default, character: h}
-    - {type: primitive, isImplicit: true}
-marksToCheck: [default.w]
-initialState:
-  documentContents: hello world
-  selections:
-    - anchor: {line: 0, character: 11}
-      active: {line: 0, character: 11}
-  marks:
-    default.h:
-      start: {line: 0, character: 0}
-      end: {line: 0, character: 5}
-    default.w:
-      start: {line: 0, character: 6}
-      end: {line: 0, character: 11}
-finalState:
-  documentContents: hello worldhello
-  selections:
-    - anchor: {line: 0, character: 16}
-      active: {line: 0, character: 16}
-  marks:
-    default.h:
-      start: {line: 0, character: 0}
-      end: {line: 0, character: 5}
-    default.w:
-      start: {line: 0, character: 6}
-      end: {line: 0, character: 16}
-fullTargets: [{type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: h}, selectionType: token, position: contents, insideOutsideType: null, modifier: {type: identity}}, {type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: identity}}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/hatTokenMap/bringHarpToEndOfPointTakePoint.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/hatTokenMap/bringHarpToEndOfPointTakePoint.yml
deleted file mode 100644
index a5925f5b8d..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/hatTokenMap/bringHarpToEndOfPointTakePoint.yml
+++ /dev/null
@@ -1,38 +0,0 @@
-languageId: typescript
-command:
-  version: 1
-  spokenForm: bring harp to end of point take point
-  action: replaceWithTarget
-  targets:
-    - type: primitive
-      mark: {type: decoratedSymbol, symbolColor: default, character: h}
-    - type: primitive
-      position: after
-      insideOutsideType: inside
-      mark: {type: decoratedSymbol, symbolColor: default, character: .}
-marksToCheck: [default..]
-initialState:
-  documentContents: " . , hello"
-  selections:
-    - anchor: {line: 0, character: 10}
-      active: {line: 0, character: 10}
-  marks:
-    default.h:
-      start: {line: 0, character: 5}
-      end: {line: 0, character: 10}
-    default..:
-      start: {line: 0, character: 1}
-      end: {line: 0, character: 2}
-finalState:
-  documentContents: " .hello , hello"
-  selections:
-    - anchor: {line: 0, character: 15}
-      active: {line: 0, character: 15}
-  marks:
-    default.h:
-      start: {line: 0, character: 10}
-      end: {line: 0, character: 15}
-    default..:
-      start: {line: 0, character: 1}
-      end: {line: 0, character: 2}
-fullTargets: [{type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: h}, selectionType: token, position: contents, insideOutsideType: null, modifier: {type: identity}}, {type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: .}, selectionType: token, position: after, insideOutsideType: inside, modifier: {type: identity}}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/hatTokenMap/bringHarpToStartOfPointTakePoint.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/hatTokenMap/bringHarpToStartOfPointTakePoint.yml
deleted file mode 100644
index 6183a5b7b0..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/hatTokenMap/bringHarpToStartOfPointTakePoint.yml
+++ /dev/null
@@ -1,38 +0,0 @@
-languageId: typescript
-command:
-  version: 1
-  spokenForm: bring harp to start of point take point
-  action: replaceWithTarget
-  targets:
-    - type: primitive
-      mark: {type: decoratedSymbol, symbolColor: default, character: h}
-    - type: primitive
-      position: before
-      insideOutsideType: inside
-      mark: {type: decoratedSymbol, symbolColor: default, character: .}
-marksToCheck: [default..]
-initialState:
-  documentContents: " . , hello"
-  selections:
-    - anchor: {line: 0, character: 10}
-      active: {line: 0, character: 10}
-  marks:
-    default.h:
-      start: {line: 0, character: 5}
-      end: {line: 0, character: 10}
-    default..:
-      start: {line: 0, character: 1}
-      end: {line: 0, character: 2}
-finalState:
-  documentContents: " hello. , hello"
-  selections:
-    - anchor: {line: 0, character: 15}
-      active: {line: 0, character: 15}
-  marks:
-    default.h:
-      start: {line: 0, character: 10}
-      end: {line: 0, character: 15}
-    default..:
-      start: {line: 0, character: 6}
-      end: {line: 0, character: 7}
-fullTargets: [{type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: h}, selectionType: token, position: contents, insideOutsideType: null, modifier: {type: identity}}, {type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: .}, selectionType: token, position: before, insideOutsideType: inside, modifier: {type: identity}}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/hatTokenMap/bringHarpToStartOfWhaleTakeWhale.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/hatTokenMap/bringHarpToStartOfWhaleTakeWhale.yml
deleted file mode 100644
index 941354af36..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/hatTokenMap/bringHarpToStartOfWhaleTakeWhale.yml
+++ /dev/null
@@ -1,38 +0,0 @@
-languageId: plaintext
-command:
-  version: 1
-  spokenForm: bring harp to start of whale take whale
-  action: replaceWithTarget
-  targets:
-    - type: primitive
-      mark: {type: decoratedSymbol, symbolColor: default, character: h}
-    - type: primitive
-      position: before
-      insideOutsideType: inside
-      mark: {type: decoratedSymbol, symbolColor: default, character: w}
-marksToCheck: [default.w]
-initialState:
-  documentContents: hello. world whatever
-  selections:
-    - anchor: {line: 0, character: 13}
-      active: {line: 0, character: 13}
-  marks:
-    default.h:
-      start: {line: 0, character: 0}
-      end: {line: 0, character: 5}
-    default.w:
-      start: {line: 0, character: 7}
-      end: {line: 0, character: 12}
-finalState:
-  documentContents: hello. helloworld whatever
-  selections:
-    - anchor: {line: 0, character: 18}
-      active: {line: 0, character: 18}
-  marks:
-    default.h:
-      start: {line: 0, character: 0}
-      end: {line: 0, character: 5}
-    default.w:
-      start: {line: 0, character: 7}
-      end: {line: 0, character: 17}
-fullTargets: [{type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: h}, selectionType: token, position: contents, insideOutsideType: null, modifier: {type: identity}}, {type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: w}, selectionType: token, position: before, insideOutsideType: inside, modifier: {type: identity}}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/hatTokenMap/bringPointAfterFirstCarWhaleTakeWhale.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/hatTokenMap/bringPointAfterFirstCarWhaleTakeWhale.yml
deleted file mode 100644
index c52a5af1b3..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/hatTokenMap/bringPointAfterFirstCarWhaleTakeWhale.yml
+++ /dev/null
@@ -1,39 +0,0 @@
-languageId: plaintext
-command:
-  version: 1
-  spokenForm: bring point after first car whale take whale
-  action: replaceWithTarget
-  targets:
-    - type: primitive
-      mark: {type: decoratedSymbol, symbolColor: default, character: .}
-    - type: primitive
-      selectionType: token
-      modifier: {type: subpiece, pieceType: character, anchor: 0, active: 0, excludeAnchor: false, excludeActive: false}
-      mark: {type: decoratedSymbol, symbolColor: default, character: w}
-      position: after
-marksToCheck: [default.w]
-initialState:
-  documentContents: hello. world whatever
-  selections:
-    - anchor: {line: 0, character: 13}
-      active: {line: 0, character: 13}
-  marks:
-    default..:
-      start: {line: 0, character: 5}
-      end: {line: 0, character: 6}
-    default.w:
-      start: {line: 0, character: 7}
-      end: {line: 0, character: 12}
-finalState:
-  documentContents: hello. w.orld whatever
-  selections:
-    - anchor: {line: 0, character: 14}
-      active: {line: 0, character: 14}
-  marks:
-    default..:
-      start: {line: 0, character: 5}
-      end: {line: 0, character: 6}
-    default.w:
-      start: {line: 0, character: 7}
-      end: {line: 0, character: 13}
-fullTargets: [{type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: .}, selectionType: token, position: contents, insideOutsideType: null, modifier: {type: identity}}, {type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: w}, selectionType: token, position: after, insideOutsideType: null, modifier: {type: subpiece, pieceType: character, anchor: 0, active: 0, excludeAnchor: false, excludeActive: false}}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/hatTokenMap/bringPointAndHarpToEndOfSecondCarWhaleAndEndOfJustWhaleTakeWhale.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/hatTokenMap/bringPointAndHarpToEndOfSecondCarWhaleAndEndOfJustWhaleTakeWhale.yml
deleted file mode 100644
index 9871aba9dd..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/hatTokenMap/bringPointAndHarpToEndOfSecondCarWhaleAndEndOfJustWhaleTakeWhale.yml
+++ /dev/null
@@ -1,64 +0,0 @@
-languageId: plaintext
-command:
-  spokenForm: >-
-    bring point and harp to end of second car whale and end of just whale take
-    whale
-  version: 2
-  targets:
-    - type: list
-      elements:
-        - type: primitive
-          mark: {type: decoratedSymbol, symbolColor: default, character: .}
-        - type: primitive
-          mark: {type: decoratedSymbol, symbolColor: default, character: h}
-    - type: list
-      elements:
-        - type: primitive
-          mark: {type: decoratedSymbol, symbolColor: default, character: w}
-          modifiers:
-            - {type: position, position: end}
-            - type: ordinalRange
-              scopeType: {type: character}
-              anchor: 1
-              active: 1
-              excludeAnchor: false
-              excludeActive: false
-        - type: primitive
-          mark: {type: decoratedSymbol, symbolColor: default, character: w}
-          modifiers:
-            - {type: position, position: end}
-            - {type: toRawSelection}
-  usePrePhraseSnapshot: false
-  action: {name: replaceWithTarget}
-marksToCheck: [default.w]
-initialState:
-  documentContents: hello. world
-  selections:
-    - anchor: {line: 0, character: 12}
-      active: {line: 0, character: 12}
-  marks:
-    default..:
-      start: {line: 0, character: 5}
-      end: {line: 0, character: 6}
-    default.h:
-      start: {line: 0, character: 0}
-      end: {line: 0, character: 5}
-    default.w:
-      start: {line: 0, character: 7}
-      end: {line: 0, character: 12}
-finalState:
-  documentContents: hello. wo.rldhello
-  selections:
-    - anchor: {line: 0, character: 18}
-      active: {line: 0, character: 18}
-  marks:
-    default..:
-      start: {line: 0, character: 5}
-      end: {line: 0, character: 6}
-    default.h:
-      start: {line: 0, character: 0}
-      end: {line: 0, character: 5}
-    default.w:
-      start: {line: 0, character: 7}
-      end: {line: 0, character: 18}
-fullTargets: [{type: list, elements: [{type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: .}, selectionType: token, position: contents, insideOutsideType: null, modifier: {type: identity}}, {type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: h}, selectionType: token, position: contents, insideOutsideType: null, modifier: {type: identity}}]}, {type: list, elements: [{type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: w}, selectionType: token, position: after, insideOutsideType: inside, modifier: {type: subpiece, pieceType: character, anchor: 1, active: 1, excludeAnchor: false, excludeActive: false}}, {type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: w}, selectionType: token, position: after, insideOutsideType: inside, modifier: {type: identity}}]}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/hatTokenMap/bringPointAndHarpToEndOfThisAndEndOfWhaleTakeWhale.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/hatTokenMap/bringPointAndHarpToEndOfThisAndEndOfWhaleTakeWhale.yml
deleted file mode 100644
index 0a88a0f36f..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/hatTokenMap/bringPointAndHarpToEndOfThisAndEndOfWhaleTakeWhale.yml
+++ /dev/null
@@ -1,54 +0,0 @@
-languageId: plaintext
-command:
-  version: 1
-  spokenForm: bring point and harp to end of this and end of whale take whale
-  action: replaceWithTarget
-  targets:
-    - type: list
-      elements:
-        - type: primitive
-          mark: {type: decoratedSymbol, symbolColor: default, character: .}
-        - type: primitive
-          mark: {type: decoratedSymbol, symbolColor: default, character: h}
-    - type: list
-      elements:
-        - type: primitive
-          position: after
-          insideOutsideType: inside
-          mark: {type: cursor}
-        - type: primitive
-          position: after
-          insideOutsideType: inside
-          mark: {type: decoratedSymbol, symbolColor: default, character: w}
-marksToCheck: [default.w]
-initialState:
-  documentContents: hello. world
-  selections:
-    - anchor: {line: 0, character: 12}
-      active: {line: 0, character: 12}
-  marks:
-    default..:
-      start: {line: 0, character: 5}
-      end: {line: 0, character: 6}
-    default.h:
-      start: {line: 0, character: 0}
-      end: {line: 0, character: 5}
-    default.w:
-      start: {line: 0, character: 7}
-      end: {line: 0, character: 12}
-finalState:
-  documentContents: hello. world.hello
-  selections:
-    - anchor: {line: 0, character: 18}
-      active: {line: 0, character: 18}
-  marks:
-    default..:
-      start: {line: 0, character: 5}
-      end: {line: 0, character: 6}
-    default.h:
-      start: {line: 0, character: 0}
-      end: {line: 0, character: 5}
-    default.w:
-      start: {line: 0, character: 7}
-      end: {line: 0, character: 12}
-fullTargets: [{type: list, elements: [{type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: .}, selectionType: token, position: contents, insideOutsideType: null, modifier: {type: identity}}, {type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: h}, selectionType: token, position: contents, insideOutsideType: null, modifier: {type: identity}}]}, {type: list, elements: [{type: primitive, mark: {type: cursor}, selectionType: token, position: after, insideOutsideType: inside, modifier: {type: identity}}, {type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: w}, selectionType: token, position: after, insideOutsideType: inside, modifier: {type: identity}}]}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/hatTokenMap/bringPointAndHarpToStartOfSecondCarWhaleAndStartOfJustWhaleTakeWhale.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/hatTokenMap/bringPointAndHarpToStartOfSecondCarWhaleAndStartOfJustWhaleTakeWhale.yml
deleted file mode 100644
index 82f999c080..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/hatTokenMap/bringPointAndHarpToStartOfSecondCarWhaleAndStartOfJustWhaleTakeWhale.yml
+++ /dev/null
@@ -1,64 +0,0 @@
-languageId: plaintext
-command:
-  spokenForm: >-
-    bring point and harp to start of second car whale and start of just whale
-    take whale
-  version: 2
-  targets:
-    - type: list
-      elements:
-        - type: primitive
-          mark: {type: decoratedSymbol, symbolColor: default, character: .}
-        - type: primitive
-          mark: {type: decoratedSymbol, symbolColor: default, character: h}
-    - type: list
-      elements:
-        - type: primitive
-          mark: {type: decoratedSymbol, symbolColor: default, character: w}
-          modifiers:
-            - {type: position, position: start}
-            - type: ordinalRange
-              scopeType: {type: character}
-              anchor: 1
-              active: 1
-              excludeAnchor: false
-              excludeActive: false
-        - type: primitive
-          mark: {type: decoratedSymbol, symbolColor: default, character: w}
-          modifiers:
-            - {type: position, position: start}
-            - {type: toRawSelection}
-  usePrePhraseSnapshot: false
-  action: {name: replaceWithTarget}
-marksToCheck: [default.w]
-initialState:
-  documentContents: hello. world
-  selections:
-    - anchor: {line: 0, character: 12}
-      active: {line: 0, character: 12}
-  marks:
-    default..:
-      start: {line: 0, character: 5}
-      end: {line: 0, character: 6}
-    default.h:
-      start: {line: 0, character: 0}
-      end: {line: 0, character: 5}
-    default.w:
-      start: {line: 0, character: 7}
-      end: {line: 0, character: 12}
-finalState:
-  documentContents: hello. hellow.orld
-  selections:
-    - anchor: {line: 0, character: 18}
-      active: {line: 0, character: 18}
-  marks:
-    default..:
-      start: {line: 0, character: 5}
-      end: {line: 0, character: 6}
-    default.h:
-      start: {line: 0, character: 0}
-      end: {line: 0, character: 5}
-    default.w:
-      start: {line: 0, character: 7}
-      end: {line: 0, character: 18}
-fullTargets: [{type: list, elements: [{type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: .}, selectionType: token, position: contents, insideOutsideType: null, modifier: {type: identity}}, {type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: h}, selectionType: token, position: contents, insideOutsideType: null, modifier: {type: identity}}]}, {type: list, elements: [{type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: w}, selectionType: token, position: before, insideOutsideType: inside, modifier: {type: subpiece, pieceType: character, anchor: 1, active: 1, excludeAnchor: false, excludeActive: false}}, {type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: w}, selectionType: token, position: before, insideOutsideType: inside, modifier: {type: identity}}]}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/hatTokenMap/bringPointAndHarpToThisAndStartOfWhaleTakeWhale.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/hatTokenMap/bringPointAndHarpToThisAndStartOfWhaleTakeWhale.yml
deleted file mode 100644
index 5b93dd774d..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/hatTokenMap/bringPointAndHarpToThisAndStartOfWhaleTakeWhale.yml
+++ /dev/null
@@ -1,54 +0,0 @@
-languageId: plaintext
-command:
-  version: 3
-  spokenForm: bring point and harp to this and start of whale take whale
-  action: {name: replaceWithTarget}
-  targets:
-    - type: list
-      elements:
-        - type: primitive
-          mark: {type: decoratedSymbol, symbolColor: default, character: .}
-        - type: primitive
-          mark: {type: decoratedSymbol, symbolColor: default, character: h}
-    - type: list
-      elements:
-        - type: primitive
-          modifiers:
-            - {type: toRawSelection}
-          mark: {type: cursor}
-        - type: primitive
-          modifiers:
-            - {type: position, position: start}
-          mark: {type: decoratedSymbol, symbolColor: default, character: w}
-marksToCheck: [default.w]
-initialState:
-  documentContents: hello. world
-  selections:
-    - anchor: {line: 0, character: 7}
-      active: {line: 0, character: 7}
-  marks:
-    default..:
-      start: {line: 0, character: 5}
-      end: {line: 0, character: 6}
-    default.h:
-      start: {line: 0, character: 0}
-      end: {line: 0, character: 5}
-    default.w:
-      start: {line: 0, character: 7}
-      end: {line: 0, character: 12}
-finalState:
-  documentContents: hello. .helloworld
-  selections:
-    - anchor: {line: 0, character: 13}
-      active: {line: 0, character: 13}
-  marks:
-    default..:
-      start: {line: 0, character: 5}
-      end: {line: 0, character: 6}
-    default.h:
-      start: {line: 0, character: 0}
-      end: {line: 0, character: 5}
-    default.w:
-      start: {line: 0, character: 8}
-      end: {line: 0, character: 18}
-fullTargets: [{type: list, elements: [{type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: .}, selectionType: token, position: contents, insideOutsideType: null, modifier: {type: identity}}, {type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: h}, selectionType: token, position: contents, insideOutsideType: null, modifier: {type: identity}}]}, {type: list, elements: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: null, modifier: {type: identity}}, {type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: w}, selectionType: token, position: before, insideOutsideType: inside, modifier: {type: identity}}]}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/hatTokenMap/bringPointAndPointToEndOfSecondCarWhaleAndEndOfJustWhaleTakeWhale.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/hatTokenMap/bringPointAndPointToEndOfSecondCarWhaleAndEndOfJustWhaleTakeWhale.yml
deleted file mode 100644
index 407ad73ff0..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/hatTokenMap/bringPointAndPointToEndOfSecondCarWhaleAndEndOfJustWhaleTakeWhale.yml
+++ /dev/null
@@ -1,58 +0,0 @@
-languageId: plaintext
-command:
-  spokenForm: >-
-    bring point and point to end of second car whale and end of just whale take
-    whale
-  version: 2
-  targets:
-    - type: list
-      elements:
-        - type: primitive
-          mark: {type: decoratedSymbol, symbolColor: default, character: .}
-        - type: primitive
-          mark: {type: decoratedSymbol, symbolColor: default, character: .}
-    - type: list
-      elements:
-        - type: primitive
-          mark: {type: decoratedSymbol, symbolColor: default, character: w}
-          modifiers:
-            - {type: position, position: end}
-            - type: ordinalRange
-              scopeType: {type: character}
-              anchor: 1
-              active: 1
-              excludeAnchor: false
-              excludeActive: false
-        - type: primitive
-          mark: {type: decoratedSymbol, symbolColor: default, character: w}
-          modifiers:
-            - {type: position, position: end}
-            - {type: toRawSelection}
-  usePrePhraseSnapshot: false
-  action: {name: replaceWithTarget}
-marksToCheck: [default.w]
-initialState:
-  documentContents: hello. world
-  selections:
-    - anchor: {line: 0, character: 12}
-      active: {line: 0, character: 12}
-  marks:
-    default..:
-      start: {line: 0, character: 5}
-      end: {line: 0, character: 6}
-    default.w:
-      start: {line: 0, character: 7}
-      end: {line: 0, character: 12}
-finalState:
-  documentContents: hello. wo.rld.
-  selections:
-    - anchor: {line: 0, character: 14}
-      active: {line: 0, character: 14}
-  marks:
-    default..:
-      start: {line: 0, character: 5}
-      end: {line: 0, character: 6}
-    default.w:
-      start: {line: 0, character: 7}
-      end: {line: 0, character: 13}
-fullTargets: [{type: list, elements: [{type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: .}, selectionType: token, position: contents, insideOutsideType: null, modifier: {type: identity}}, {type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: .}, selectionType: token, position: contents, insideOutsideType: null, modifier: {type: identity}}]}, {type: list, elements: [{type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: w}, selectionType: token, position: after, insideOutsideType: inside, modifier: {type: subpiece, pieceType: character, anchor: 1, active: 1, excludeAnchor: false, excludeActive: false}}, {type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: w}, selectionType: token, position: after, insideOutsideType: inside, modifier: {type: identity}}]}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/hatTokenMap/bringPointAndPointToStartOfSecondCarWhaleAndStartOfJustWhaleTakeWhale.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/hatTokenMap/bringPointAndPointToStartOfSecondCarWhaleAndStartOfJustWhaleTakeWhale.yml
deleted file mode 100644
index 65abc99be0..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/hatTokenMap/bringPointAndPointToStartOfSecondCarWhaleAndStartOfJustWhaleTakeWhale.yml
+++ /dev/null
@@ -1,58 +0,0 @@
-languageId: plaintext
-command:
-  spokenForm: >-
-    bring point and point to start of second car whale and start of just whale
-    take whale
-  version: 2
-  targets:
-    - type: list
-      elements:
-        - type: primitive
-          mark: {type: decoratedSymbol, symbolColor: default, character: .}
-        - type: primitive
-          mark: {type: decoratedSymbol, symbolColor: default, character: .}
-    - type: list
-      elements:
-        - type: primitive
-          mark: {type: decoratedSymbol, symbolColor: default, character: w}
-          modifiers:
-            - {type: position, position: start}
-            - type: ordinalRange
-              scopeType: {type: character}
-              anchor: 1
-              active: 1
-              excludeAnchor: false
-              excludeActive: false
-        - type: primitive
-          mark: {type: decoratedSymbol, symbolColor: default, character: w}
-          modifiers:
-            - {type: position, position: start}
-            - {type: toRawSelection}
-  usePrePhraseSnapshot: false
-  action: {name: replaceWithTarget}
-marksToCheck: [default.w]
-initialState:
-  documentContents: hello. world
-  selections:
-    - anchor: {line: 0, character: 12}
-      active: {line: 0, character: 12}
-  marks:
-    default..:
-      start: {line: 0, character: 5}
-      end: {line: 0, character: 6}
-    default.w:
-      start: {line: 0, character: 7}
-      end: {line: 0, character: 12}
-finalState:
-  documentContents: hello. .w.orld
-  selections:
-    - anchor: {line: 0, character: 14}
-      active: {line: 0, character: 14}
-  marks:
-    default..:
-      start: {line: 0, character: 5}
-      end: {line: 0, character: 6}
-    default.w:
-      start: {line: 0, character: 8}
-      end: {line: 0, character: 14}
-fullTargets: [{type: list, elements: [{type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: .}, selectionType: token, position: contents, insideOutsideType: null, modifier: {type: identity}}, {type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: .}, selectionType: token, position: contents, insideOutsideType: null, modifier: {type: identity}}]}, {type: list, elements: [{type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: w}, selectionType: token, position: before, insideOutsideType: inside, modifier: {type: subpiece, pieceType: character, anchor: 1, active: 1, excludeAnchor: false, excludeActive: false}}, {type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: w}, selectionType: token, position: before, insideOutsideType: inside, modifier: {type: identity}}]}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/hatTokenMap/bringPointToEndOfWhaleTakeWhale.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/hatTokenMap/bringPointToEndOfWhaleTakeWhale.yml
deleted file mode 100644
index b551fc79f2..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/hatTokenMap/bringPointToEndOfWhaleTakeWhale.yml
+++ /dev/null
@@ -1,38 +0,0 @@
-languageId: plaintext
-command:
-  version: 1
-  spokenForm: bring point to end of whale take whale
-  action: replaceWithTarget
-  targets:
-    - type: primitive
-      mark: {type: decoratedSymbol, symbolColor: default, character: .}
-    - type: primitive
-      position: after
-      insideOutsideType: inside
-      mark: {type: decoratedSymbol, symbolColor: default, character: w}
-marksToCheck: [default.w]
-initialState:
-  documentContents: hello. world whatever
-  selections:
-    - anchor: {line: 0, character: 13}
-      active: {line: 0, character: 13}
-  marks:
-    default..:
-      start: {line: 0, character: 5}
-      end: {line: 0, character: 6}
-    default.w:
-      start: {line: 0, character: 7}
-      end: {line: 0, character: 12}
-finalState:
-  documentContents: hello. world. whatever
-  selections:
-    - anchor: {line: 0, character: 14}
-      active: {line: 0, character: 14}
-  marks:
-    default..:
-      start: {line: 0, character: 5}
-      end: {line: 0, character: 6}
-    default.w:
-      start: {line: 0, character: 7}
-      end: {line: 0, character: 12}
-fullTargets: [{type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: .}, selectionType: token, position: contents, insideOutsideType: null, modifier: {type: identity}}, {type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: w}, selectionType: token, position: after, insideOutsideType: inside, modifier: {type: identity}}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/hatTokenMap/bringPointToStartOfWhaleTakeWhale.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/hatTokenMap/bringPointToStartOfWhaleTakeWhale.yml
deleted file mode 100644
index 81fabf6a7b..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/hatTokenMap/bringPointToStartOfWhaleTakeWhale.yml
+++ /dev/null
@@ -1,38 +0,0 @@
-languageId: plaintext
-command:
-  version: 1
-  spokenForm: bring point to start of whale take whale
-  action: replaceWithTarget
-  targets:
-    - type: primitive
-      mark: {type: decoratedSymbol, symbolColor: default, character: .}
-    - type: primitive
-      position: before
-      insideOutsideType: inside
-      mark: {type: decoratedSymbol, symbolColor: default, character: w}
-marksToCheck: [default.w]
-initialState:
-  documentContents: hello. world whatever
-  selections:
-    - anchor: {line: 0, character: 13}
-      active: {line: 0, character: 13}
-  marks:
-    default..:
-      start: {line: 0, character: 5}
-      end: {line: 0, character: 6}
-    default.w:
-      start: {line: 0, character: 7}
-      end: {line: 0, character: 12}
-finalState:
-  documentContents: hello. .world whatever
-  selections:
-    - anchor: {line: 0, character: 14}
-      active: {line: 0, character: 14}
-  marks:
-    default..:
-      start: {line: 0, character: 5}
-      end: {line: 0, character: 6}
-    default.w:
-      start: {line: 0, character: 8}
-      end: {line: 0, character: 13}
-fullTargets: [{type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: .}, selectionType: token, position: contents, insideOutsideType: null, modifier: {type: identity}}, {type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: w}, selectionType: token, position: before, insideOutsideType: inside, modifier: {type: identity}}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/hatTokenMap/bringPointToThirdCarWhaleTakeWhale.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/hatTokenMap/bringPointToThirdCarWhaleTakeWhale.yml
deleted file mode 100644
index a5ab3d792f..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/hatTokenMap/bringPointToThirdCarWhaleTakeWhale.yml
+++ /dev/null
@@ -1,38 +0,0 @@
-languageId: plaintext
-command:
-  version: 1
-  spokenForm: bring point to third car whale take whale
-  action: replaceWithTarget
-  targets:
-    - type: primitive
-      mark: {type: decoratedSymbol, symbolColor: default, character: .}
-    - type: primitive
-      selectionType: token
-      modifier: {type: subpiece, pieceType: character, anchor: 2, active: 2, excludeAnchor: false, excludeActive: false}
-      mark: {type: decoratedSymbol, symbolColor: default, character: w}
-marksToCheck: [default.w]
-initialState:
-  documentContents: hello. world whatever
-  selections:
-    - anchor: {line: 0, character: 13}
-      active: {line: 0, character: 13}
-  marks:
-    default..:
-      start: {line: 0, character: 5}
-      end: {line: 0, character: 6}
-    default.w:
-      start: {line: 0, character: 7}
-      end: {line: 0, character: 12}
-finalState:
-  documentContents: hello. wo.ld whatever
-  selections:
-    - anchor: {line: 0, character: 13}
-      active: {line: 0, character: 13}
-  marks:
-    default..:
-      start: {line: 0, character: 5}
-      end: {line: 0, character: 6}
-    default.w:
-      start: {line: 0, character: 7}
-      end: {line: 0, character: 12}
-fullTargets: [{type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: .}, selectionType: token, position: contents, insideOutsideType: null, modifier: {type: identity}}, {type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: w}, selectionType: token, position: contents, insideOutsideType: null, modifier: {type: subpiece, pieceType: character, anchor: 2, active: 2, excludeAnchor: false, excludeActive: false}}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/hatTokenMap/chuckFirstTwoCarWhaleTakeWhale.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/hatTokenMap/chuckFirstTwoCarWhaleTakeWhale.yml
deleted file mode 100644
index e5a3b7251b..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/hatTokenMap/chuckFirstTwoCarWhaleTakeWhale.yml
+++ /dev/null
@@ -1,30 +0,0 @@
-languageId: plaintext
-command:
-  version: 1
-  spokenForm: chuck first two car whale take whale
-  action: remove
-  targets:
-    - type: primitive
-      selectionType: token
-      modifier: {type: subpiece, pieceType: character, anchor: 0, active: 1}
-      mark: {type: decoratedSymbol, symbolColor: default, character: w}
-marksToCheck: [default.w]
-initialState:
-  documentContents: hello world
-  selections:
-    - anchor: {line: 0, character: 11}
-      active: {line: 0, character: 11}
-  marks:
-    default.w:
-      start: {line: 0, character: 6}
-      end: {line: 0, character: 11}
-finalState:
-  documentContents: hello rld
-  selections:
-    - anchor: {line: 0, character: 9}
-      active: {line: 0, character: 9}
-  marks:
-    default.w:
-      start: {line: 0, character: 6}
-      end: {line: 0, character: 9}
-fullTargets: [{type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: w}, selectionType: token, position: contents, insideOutsideType: outside, modifier: {type: subpiece, pieceType: character, anchor: 0, active: 1}}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/hatTokenMap/chuckFourthCarWhalePastThirdCarAirTakeWhale.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/hatTokenMap/chuckFourthCarWhalePastThirdCarAirTakeWhale.yml
deleted file mode 100644
index 8d85aacdd2..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/hatTokenMap/chuckFourthCarWhalePastThirdCarAirTakeWhale.yml
+++ /dev/null
@@ -1,45 +0,0 @@
-languageId: plaintext
-command:
-  version: 1
-  spokenForm: chuck fourth car whale past third car air take whale
-  action: remove
-  targets:
-    - type: range
-      start:
-        type: primitive
-        selectionType: token
-        modifier: {type: subpiece, pieceType: character, anchor: 3, active: 3, excludeAnchor: false, excludeActive: false}
-        mark: {type: decoratedSymbol, symbolColor: default, character: w}
-      end:
-        type: primitive
-        selectionType: token
-        modifier: {type: subpiece, pieceType: character, anchor: 2, active: 2, excludeAnchor: false, excludeActive: false}
-        mark: {type: decoratedSymbol, symbolColor: default, character: a}
-      excludeStart: false
-      excludeEnd: false
-marksToCheck: [default.w]
-initialState:
-  documentContents: hello world whatever
-  selections:
-    - anchor: {line: 0, character: 20}
-      active: {line: 0, character: 20}
-  marks:
-    default.w:
-      start: {line: 0, character: 6}
-      end: {line: 0, character: 11}
-    default.a:
-      start: {line: 0, character: 12}
-      end: {line: 0, character: 20}
-finalState:
-  documentContents: hello wortever
-  selections:
-    - anchor: {line: 0, character: 14}
-      active: {line: 0, character: 14}
-  marks:
-    default.w:
-      start: {line: 0, character: 6}
-      end: {line: 0, character: 9}
-    default.a:
-      start: {line: 0, character: 9}
-      end: {line: 0, character: 14}
-fullTargets: [{type: range, excludeAnchor: false, excludeActive: false, anchor: {type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: w}, selectionType: token, position: contents, insideOutsideType: outside, modifier: {type: subpiece, pieceType: character, anchor: 3, active: 3, excludeAnchor: false, excludeActive: false}}, active: {type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: a}, selectionType: token, position: contents, insideOutsideType: outside, modifier: {type: subpiece, pieceType: character, anchor: 2, active: 2, excludeAnchor: false, excludeActive: false}}}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/hatTokenMap/chuckHarpPastAirTakeWhale.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/hatTokenMap/chuckHarpPastAirTakeWhale.yml
deleted file mode 100644
index 5eb385f26a..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/hatTokenMap/chuckHarpPastAirTakeWhale.yml
+++ /dev/null
@@ -1,47 +0,0 @@
-languageId: plaintext
-command:
-  version: 1
-  spokenForm: chuck harp past air take whale
-  action: remove
-  targets:
-    - type: range
-      start:
-        type: primitive
-        mark: {type: decoratedSymbol, symbolColor: default, character: h}
-      end:
-        type: primitive
-        mark: {type: decoratedSymbol, symbolColor: default, character: a}
-      excludeStart: false
-      excludeEnd: false
-marksToCheck: [default.w]
-initialState:
-  documentContents: hello world whatever
-  selections:
-    - anchor: {line: 0, character: 20}
-      active: {line: 0, character: 20}
-  marks:
-    default.h:
-      start: {line: 0, character: 0}
-      end: {line: 0, character: 5}
-    default.a:
-      start: {line: 0, character: 12}
-      end: {line: 0, character: 20}
-    default.w:
-      start: {line: 0, character: 6}
-      end: {line: 0, character: 11}
-finalState:
-  documentContents: ""
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-  marks:
-    default.h:
-      start: {line: 0, character: 0}
-      end: {line: 0, character: 0}
-    default.a:
-      start: {line: 0, character: 0}
-      end: {line: 0, character: 0}
-    default.w:
-      start: {line: 0, character: 0}
-      end: {line: 0, character: 0}
-fullTargets: [{type: range, excludeAnchor: false, excludeActive: false, anchor: {type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: h}, selectionType: token, position: contents, insideOutsideType: outside, modifier: {type: identity}}, active: {type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: a}, selectionType: token, position: contents, insideOutsideType: outside, modifier: {type: identity}}}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/hatTokenMap/chuckLastTwoCarWhaleTakeWhale.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/hatTokenMap/chuckLastTwoCarWhaleTakeWhale.yml
deleted file mode 100644
index 75d1b8db26..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/hatTokenMap/chuckLastTwoCarWhaleTakeWhale.yml
+++ /dev/null
@@ -1,30 +0,0 @@
-languageId: plaintext
-command:
-  version: 1
-  spokenForm: chuck last two car whale take whale
-  action: remove
-  targets:
-    - type: primitive
-      selectionType: token
-      modifier: {type: subpiece, pieceType: character, anchor: -2, active: -1}
-      mark: {type: decoratedSymbol, symbolColor: default, character: w}
-marksToCheck: [default.w]
-initialState:
-  documentContents: hello. world whatever
-  selections:
-    - anchor: {line: 0, character: 13}
-      active: {line: 0, character: 13}
-  marks:
-    default.w:
-      start: {line: 0, character: 7}
-      end: {line: 0, character: 12}
-finalState:
-  documentContents: hello. wor whatever
-  selections:
-    - anchor: {line: 0, character: 11}
-      active: {line: 0, character: 11}
-  marks:
-    default.w:
-      start: {line: 0, character: 7}
-      end: {line: 0, character: 10}
-fullTargets: [{type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: w}, selectionType: token, position: contents, insideOutsideType: outside, modifier: {type: subpiece, pieceType: character, anchor: -2, active: -1}}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/hatTokenMap/chuckSecondPastThirdCarWhaleTakeWhale.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/hatTokenMap/chuckSecondPastThirdCarWhaleTakeWhale.yml
deleted file mode 100644
index d1bdd184d0..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/hatTokenMap/chuckSecondPastThirdCarWhaleTakeWhale.yml
+++ /dev/null
@@ -1,30 +0,0 @@
-languageId: plaintext
-command:
-  version: 1
-  spokenForm: chuck second past third car whale take whale
-  action: remove
-  targets:
-    - type: primitive
-      selectionType: token
-      modifier: {type: subpiece, pieceType: character, anchor: 1, active: 2, excludeAnchor: false, excludeActive: false}
-      mark: {type: decoratedSymbol, symbolColor: default, character: w}
-marksToCheck: [default.w]
-initialState:
-  documentContents: hello. world whatever
-  selections:
-    - anchor: {line: 0, character: 13}
-      active: {line: 0, character: 13}
-  marks:
-    default.w:
-      start: {line: 0, character: 7}
-      end: {line: 0, character: 12}
-finalState:
-  documentContents: hello. wld whatever
-  selections:
-    - anchor: {line: 0, character: 11}
-      active: {line: 0, character: 11}
-  marks:
-    default.w:
-      start: {line: 0, character: 7}
-      end: {line: 0, character: 10}
-fullTargets: [{type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: w}, selectionType: token, position: contents, insideOutsideType: outside, modifier: {type: subpiece, pieceType: character, anchor: 1, active: 2, excludeAnchor: false, excludeActive: false}}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/hatTokenMap/chuckThirdCarHarpPastSecondCarWhaleTakeWhale.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/hatTokenMap/chuckThirdCarHarpPastSecondCarWhaleTakeWhale.yml
deleted file mode 100644
index 9b47101d96..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/hatTokenMap/chuckThirdCarHarpPastSecondCarWhaleTakeWhale.yml
+++ /dev/null
@@ -1,45 +0,0 @@
-languageId: plaintext
-command:
-  version: 1
-  spokenForm: chuck third car harp past second car whale take whale
-  action: remove
-  targets:
-    - type: range
-      start:
-        type: primitive
-        selectionType: token
-        modifier: {type: subpiece, pieceType: character, anchor: 2, active: 2, excludeAnchor: false, excludeActive: false}
-        mark: {type: decoratedSymbol, symbolColor: default, character: h}
-      end:
-        type: primitive
-        selectionType: token
-        modifier: {type: subpiece, pieceType: character, anchor: 1, active: 1, excludeAnchor: false, excludeActive: false}
-        mark: {type: decoratedSymbol, symbolColor: default, character: w}
-      excludeStart: false
-      excludeEnd: false
-marksToCheck: [default.w]
-initialState:
-  documentContents: hello world whatever
-  selections:
-    - anchor: {line: 0, character: 20}
-      active: {line: 0, character: 20}
-  marks:
-    default.h:
-      start: {line: 0, character: 0}
-      end: {line: 0, character: 5}
-    default.w:
-      start: {line: 0, character: 6}
-      end: {line: 0, character: 11}
-finalState:
-  documentContents: herld whatever
-  selections:
-    - anchor: {line: 0, character: 14}
-      active: {line: 0, character: 14}
-  marks:
-    default.h:
-      start: {line: 0, character: 0}
-      end: {line: 0, character: 2}
-    default.w:
-      start: {line: 0, character: 2}
-      end: {line: 0, character: 5}
-fullTargets: [{type: range, excludeAnchor: false, excludeActive: false, anchor: {type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: h}, selectionType: token, position: contents, insideOutsideType: outside, modifier: {type: subpiece, pieceType: character, anchor: 2, active: 2, excludeAnchor: false, excludeActive: false}}, active: {type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: w}, selectionType: token, position: contents, insideOutsideType: outside, modifier: {type: subpiece, pieceType: character, anchor: 1, active: 1, excludeAnchor: false, excludeActive: false}}}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/hatTokenMap/clearBlueSpecial.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/hatTokenMap/clearBlueSpecial.yml
deleted file mode 100644
index 04441c77f1..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/hatTokenMap/clearBlueSpecial.yml
+++ /dev/null
@@ -1,26 +0,0 @@
-languageId: plaintext
-command:
-  spokenForm: clear blue special
-  version: 2
-  targets:
-    - type: primitive
-      mark: {type: decoratedSymbol, symbolColor: blue, character: �}
-  usePrePhraseSnapshot: true
-  action: {name: clearAndSetSelection}
-initialState:
-  documentContents: |
-    😄🙃🙁
-  selections:
-    - anchor: {line: 1, character: 0}
-      active: {line: 1, character: 0}
-  marks:
-    blue.�:
-      start: {line: 0, character: 2}
-      end: {line: 0, character: 4}
-finalState:
-  documentContents: |
-    😄🙁
-  selections:
-    - anchor: {line: 0, character: 2}
-      active: {line: 0, character: 2}
-fullTargets: [{type: primitive, mark: {type: decoratedSymbol, symbolColor: blue, character: �}, modifiers: []}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/hatTokenMap/clearNear.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/hatTokenMap/clearNear.yml
deleted file mode 100644
index b4ce3478e3..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/hatTokenMap/clearNear.yml
+++ /dev/null
@@ -1,26 +0,0 @@
-languageId: plaintext
-command:
-  spokenForm: clear near
-  version: 2
-  targets:
-    - type: primitive
-      mark: {type: decoratedSymbol, symbolColor: default, character: 'n'}
-  usePrePhraseSnapshot: true
-  action: {name: clearAndSetSelection}
-initialState:
-  documentContents: |
-    ñ
-  selections:
-    - anchor: {line: 1, character: 0}
-      active: {line: 1, character: 0}
-  marks:
-    default.n:
-      start: {line: 0, character: 0}
-      end: {line: 0, character: 2}
-finalState:
-  documentContents: |+
-
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-fullTargets: [{type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: 'n'}, modifiers: []}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/hatTokenMap/clearNear2.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/hatTokenMap/clearNear2.yml
deleted file mode 100644
index c73a2202df..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/hatTokenMap/clearNear2.yml
+++ /dev/null
@@ -1,30 +0,0 @@
-languageId: plaintext
-command:
-  spokenForm: clear near
-  version: 2
-  targets:
-    - type: primitive
-      mark: {type: decoratedSymbol, symbolColor: default, character: 'n'}
-  usePrePhraseSnapshot: true
-  action: {name: clearAndSetSelection}
-initialState:
-  documentContents: |
-    ñ
-    ñ
-    n
-  selections:
-    - anchor: {line: 3, character: 0}
-      active: {line: 3, character: 0}
-  marks:
-    default.n:
-      start: {line: 2, character: 0}
-      end: {line: 2, character: 1}
-finalState:
-  documentContents: |+
-    ñ
-    ñ
-
-  selections:
-    - anchor: {line: 2, character: 0}
-      active: {line: 2, character: 0}
-fullTargets: [{type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: 'n'}, modifiers: []}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/hatTokenMap/clearNear3.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/hatTokenMap/clearNear3.yml
deleted file mode 100644
index d8cfec8bf6..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/hatTokenMap/clearNear3.yml
+++ /dev/null
@@ -1,26 +0,0 @@
-languageId: plaintext
-command:
-  spokenForm: clear near
-  version: 2
-  targets:
-    - type: primitive
-      mark: {type: decoratedSymbol, symbolColor: default, character: 'n'}
-  usePrePhraseSnapshot: true
-  action: {name: clearAndSetSelection}
-initialState:
-  documentContents: |
-    ñoñería
-  selections:
-    - anchor: {line: 1, character: 0}
-      active: {line: 1, character: 0}
-  marks:
-    default.n:
-      start: {line: 0, character: 0}
-      end: {line: 0, character: 8}
-finalState:
-  documentContents: |+
-
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-fullTargets: [{type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: 'n'}, modifiers: []}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/hatTokenMap/clearSpecial.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/hatTokenMap/clearSpecial.yml
deleted file mode 100644
index c123c4c1f8..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/hatTokenMap/clearSpecial.yml
+++ /dev/null
@@ -1,26 +0,0 @@
-languageId: plaintext
-command:
-  spokenForm: clear special
-  version: 2
-  targets:
-    - type: primitive
-      mark: {type: decoratedSymbol, symbolColor: default, character: �}
-  usePrePhraseSnapshot: true
-  action: {name: clearAndSetSelection}
-initialState:
-  documentContents: |
-    😄
-  selections:
-    - anchor: {line: 1, character: 0}
-      active: {line: 1, character: 0}
-  marks:
-    default.�:
-      start: {line: 0, character: 0}
-      end: {line: 0, character: 2}
-finalState:
-  documentContents: |+
-
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-fullTargets: [{type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: �}, modifiers: []}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/hatTokenMap/moveFourthCarHarpPastSecondCarWhaleToEndOfJustWhaleTakeWhale.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/hatTokenMap/moveFourthCarHarpPastSecondCarWhaleToEndOfJustWhaleTakeWhale.yml
deleted file mode 100644
index 95c160968d..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/hatTokenMap/moveFourthCarHarpPastSecondCarWhaleToEndOfJustWhaleTakeWhale.yml
+++ /dev/null
@@ -1,61 +0,0 @@
-languageId: plaintext
-command:
-  spokenForm: move fourth car harp past second car whale to end of just whale take whale
-  version: 2
-  targets:
-    - type: range
-      anchor:
-        type: primitive
-        mark: {type: decoratedSymbol, symbolColor: default, character: h}
-        modifiers:
-          - type: ordinalRange
-            scopeType: {type: character}
-            anchor: 3
-            active: 3
-            excludeAnchor: false
-            excludeActive: false
-      active:
-        type: primitive
-        mark: {type: decoratedSymbol, symbolColor: default, character: w}
-        modifiers:
-          - type: ordinalRange
-            scopeType: {type: character}
-            anchor: 1
-            active: 1
-            excludeAnchor: false
-            excludeActive: false
-      excludeAnchor: false
-      excludeActive: false
-    - type: primitive
-      mark: {type: decoratedSymbol, symbolColor: default, character: w}
-      modifiers:
-        - {type: position, position: end}
-        - {type: toRawSelection}
-  usePrePhraseSnapshot: false
-  action: {name: moveToTarget}
-marksToCheck: [default.w]
-initialState:
-  documentContents: hello world whatever
-  selections:
-    - anchor: {line: 0, character: 20}
-      active: {line: 0, character: 20}
-  marks:
-    default.h:
-      start: {line: 0, character: 0}
-      end: {line: 0, character: 5}
-    default.w:
-      start: {line: 0, character: 6}
-      end: {line: 0, character: 11}
-finalState:
-  documentContents: helrldlo wo whatever
-  selections:
-    - anchor: {line: 0, character: 20}
-      active: {line: 0, character: 20}
-  marks:
-    default.h:
-      start: {line: 0, character: 0}
-      end: {line: 0, character: 3}
-    default.w:
-      start: {line: 0, character: 3}
-      end: {line: 0, character: 8}
-fullTargets: [{type: range, excludeAnchor: false, excludeActive: false, anchor: {type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: h}, selectionType: token, position: contents, insideOutsideType: null, modifier: {type: subpiece, pieceType: character, anchor: 3, active: 3, excludeAnchor: false, excludeActive: false}}, active: {type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: w}, selectionType: token, position: contents, insideOutsideType: null, modifier: {type: subpiece, pieceType: character, anchor: 1, active: 1, excludeAnchor: false, excludeActive: false}}}, {type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: w}, selectionType: token, position: after, insideOutsideType: inside, modifier: {type: identity}}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/hatTokenMap/sendEmoji.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/hatTokenMap/sendEmoji.yml
deleted file mode 100644
index d24f33d2d0..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/hatTokenMap/sendEmoji.yml
+++ /dev/null
@@ -1,26 +0,0 @@
-languageId: plaintext
-command:
-  spokenForm: clear special
-  version: 2
-  targets:
-    - type: primitive
-      mark: {type: decoratedSymbol, symbolColor: default, character: 😄}
-  usePrePhraseSnapshot: true
-  action: {name: clearAndSetSelection}
-initialState:
-  documentContents: |
-    😄
-  selections:
-    - anchor: {line: 1, character: 0}
-      active: {line: 1, character: 0}
-  marks:
-    default.�:
-      start: {line: 0, character: 0}
-      end: {line: 0, character: 2}
-finalState:
-  documentContents: |+
-
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-fullTargets: [{type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: �}, modifiers: []}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/hatTokenMap/takeHarp.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/hatTokenMap/takeHarp.yml
deleted file mode 100644
index 69a2dd9168..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/hatTokenMap/takeHarp.yml
+++ /dev/null
@@ -1,23 +0,0 @@
-languageId: plaintext
-command:
-  version: 1
-  spokenForm: take harp
-  action: setSelection
-  targets:
-    - type: primitive
-      mark: {type: decoratedSymbol, symbolColor: default, character: h}
-initialState:
-  documentContents: hello world
-  selections:
-    - anchor: {line: 0, character: 11}
-      active: {line: 0, character: 11}
-  marks:
-    default.h:
-      start: {line: 0, character: 0}
-      end: {line: 0, character: 5}
-finalState:
-  documentContents: hello world
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 5}
-fullTargets: [{type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: h, usePrePhraseSnapshot: true}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: identity}}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/headTail/chuckHeadAir.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/headTail/chuckHeadAir.yml
deleted file mode 100644
index b244b3f47a..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/headTail/chuckHeadAir.yml
+++ /dev/null
@@ -1,26 +0,0 @@
-languageId: plaintext
-command:
-  spokenForm: chuck head air
-  version: 2
-  targets:
-    - type: primitive
-      mark: {type: decoratedSymbol, symbolColor: default, character: a}
-      modifiers:
-        - {type: extendThroughStartOf}
-  usePrePhraseSnapshot: true
-  action: {name: remove}
-initialState:
-  documentContents: "    hello world whatever"
-  selections:
-    - anchor: {line: 0, character: 24}
-      active: {line: 0, character: 24}
-  marks:
-    default.a:
-      start: {line: 0, character: 16}
-      end: {line: 0, character: 24}
-finalState:
-  documentContents: ""
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-fullTargets: [{type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: a}, modifiers: [{type: extendThroughStartOf}]}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/headTail/chuckHeadWhale.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/headTail/chuckHeadWhale.yml
deleted file mode 100644
index df94bec47a..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/headTail/chuckHeadWhale.yml
+++ /dev/null
@@ -1,26 +0,0 @@
-languageId: plaintext
-command:
-  spokenForm: chuck head whale
-  version: 2
-  targets:
-    - type: primitive
-      mark: {type: decoratedSymbol, symbolColor: default, character: w}
-      modifiers:
-        - {type: extendThroughStartOf}
-  usePrePhraseSnapshot: true
-  action: {name: remove}
-initialState:
-  documentContents: "    hello world whatever"
-  selections:
-    - anchor: {line: 0, character: 24}
-      active: {line: 0, character: 24}
-  marks:
-    default.w:
-      start: {line: 0, character: 10}
-      end: {line: 0, character: 15}
-finalState:
-  documentContents: "    whatever"
-  selections:
-    - anchor: {line: 0, character: 12}
-      active: {line: 0, character: 12}
-fullTargets: [{type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: w}, modifiers: [{type: extendThroughStartOf}]}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/headTail/chuckTailHarp.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/headTail/chuckTailHarp.yml
deleted file mode 100644
index 2839e37b18..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/headTail/chuckTailHarp.yml
+++ /dev/null
@@ -1,26 +0,0 @@
-languageId: plaintext
-command:
-  spokenForm: chuck tail harp
-  version: 2
-  targets:
-    - type: primitive
-      mark: {type: decoratedSymbol, symbolColor: default, character: h}
-      modifiers:
-        - {type: extendThroughEndOf}
-  usePrePhraseSnapshot: true
-  action: {name: remove}
-initialState:
-  documentContents: "    hello world whatever"
-  selections:
-    - anchor: {line: 0, character: 24}
-      active: {line: 0, character: 24}
-  marks:
-    default.h:
-      start: {line: 0, character: 4}
-      end: {line: 0, character: 9}
-finalState:
-  documentContents: ""
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-fullTargets: [{type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: h}, modifiers: [{type: extendThroughEndOf}]}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/headTail/chuckTailWhale.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/headTail/chuckTailWhale.yml
deleted file mode 100644
index 3a5dcb5635..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/headTail/chuckTailWhale.yml
+++ /dev/null
@@ -1,26 +0,0 @@
-languageId: plaintext
-command:
-  spokenForm: chuck tail whale
-  version: 2
-  targets:
-    - type: primitive
-      mark: {type: decoratedSymbol, symbolColor: default, character: w}
-      modifiers:
-        - {type: extendThroughEndOf}
-  usePrePhraseSnapshot: true
-  action: {name: remove}
-initialState:
-  documentContents: "    hello world whatever"
-  selections:
-    - anchor: {line: 0, character: 24}
-      active: {line: 0, character: 24}
-  marks:
-    default.w:
-      start: {line: 0, character: 10}
-      end: {line: 0, character: 15}
-finalState:
-  documentContents: "    hello"
-  selections:
-    - anchor: {line: 0, character: 9}
-      active: {line: 0, character: 9}
-fullTargets: [{type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: w}, modifiers: [{type: extendThroughEndOf}]}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/headTail/clearHeadAir.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/headTail/clearHeadAir.yml
deleted file mode 100644
index 6212b8c3cb..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/headTail/clearHeadAir.yml
+++ /dev/null
@@ -1,26 +0,0 @@
-languageId: plaintext
-command:
-  spokenForm: clear head air
-  version: 2
-  targets:
-    - type: primitive
-      mark: {type: decoratedSymbol, symbolColor: default, character: a}
-      modifiers:
-        - {type: extendThroughStartOf}
-  usePrePhraseSnapshot: true
-  action: {name: clearAndSetSelection}
-initialState:
-  documentContents: "    hello world whatever"
-  selections:
-    - anchor: {line: 0, character: 24}
-      active: {line: 0, character: 24}
-  marks:
-    default.a:
-      start: {line: 0, character: 16}
-      end: {line: 0, character: 24}
-finalState:
-  documentContents: "    "
-  selections:
-    - anchor: {line: 0, character: 4}
-      active: {line: 0, character: 4}
-fullTargets: [{type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: a}, modifiers: [{type: extendThroughStartOf}]}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/headTail/clearTailHarp.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/headTail/clearTailHarp.yml
deleted file mode 100644
index a0a659d8a9..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/headTail/clearTailHarp.yml
+++ /dev/null
@@ -1,26 +0,0 @@
-languageId: plaintext
-command:
-  spokenForm: clear tail harp
-  version: 2
-  targets:
-    - type: primitive
-      mark: {type: decoratedSymbol, symbolColor: default, character: h}
-      modifiers:
-        - {type: extendThroughEndOf}
-  usePrePhraseSnapshot: true
-  action: {name: clearAndSetSelection}
-initialState:
-  documentContents: "    hello world whatever"
-  selections:
-    - anchor: {line: 0, character: 24}
-      active: {line: 0, character: 24}
-  marks:
-    default.h:
-      start: {line: 0, character: 4}
-      end: {line: 0, character: 9}
-finalState:
-  documentContents: "    "
-  selections:
-    - anchor: {line: 0, character: 4}
-      active: {line: 0, character: 4}
-fullTargets: [{type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: h}, modifiers: [{type: extendThroughEndOf}]}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/headTail/takeHead.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/headTail/takeHead.yml
deleted file mode 100644
index bb40bf51ce..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/headTail/takeHead.yml
+++ /dev/null
@@ -1,28 +0,0 @@
-languageId: typescript
-command:
-  version: 1
-  spokenForm: take head
-  action: setSelection
-  targets:
-    - type: primitive
-      modifier: {type: head}
-initialState:
-  documentContents: |
-
-    const value = "Hello world";
-
-    const value = "Hello world";
-  selections:
-    - anchor: {line: 1, character: 9}
-      active: {line: 1, character: 9}
-  marks: {}
-finalState:
-  documentContents: |
-
-    const value = "Hello world";
-
-    const value = "Hello world";
-  selections:
-    - anchor: {line: 1, character: 9}
-      active: {line: 1, character: 0}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, modifier: {type: head}, insideOutsideType: inside}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/headTail/takeHeadVest.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/headTail/takeHeadVest.yml
deleted file mode 100644
index 7703fb9027..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/headTail/takeHeadVest.yml
+++ /dev/null
@@ -1,32 +0,0 @@
-languageId: typescript
-command:
-  version: 1
-  spokenForm: take head vest
-  action: setSelection
-  targets:
-    - type: primitive
-      modifier: {type: head}
-      mark: {type: decoratedSymbol, symbolColor: default, character: v}
-initialState:
-  documentContents: |
-
-    const value = "Hello world";
-
-    const value = "Hello world";
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-  marks:
-    default.v:
-      start: {line: 1, character: 6}
-      end: {line: 1, character: 11}
-finalState:
-  documentContents: |
-
-    const value = "Hello world";
-
-    const value = "Hello world";
-  selections:
-    - anchor: {line: 1, character: 11}
-      active: {line: 1, character: 0}
-fullTargets: [{type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: v}, selectionType: token, position: contents, modifier: {type: head}, insideOutsideType: inside}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/headTail/takeTail.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/headTail/takeTail.yml
deleted file mode 100644
index c50c255909..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/headTail/takeTail.yml
+++ /dev/null
@@ -1,28 +0,0 @@
-languageId: typescript
-command:
-  version: 1
-  spokenForm: take tail
-  action: setSelection
-  targets:
-    - type: primitive
-      modifier: {type: tail}
-initialState:
-  documentContents: |
-
-    const value = "Hello world";
-
-    const value = "Hello world";
-  selections:
-    - anchor: {line: 1, character: 6}
-      active: {line: 1, character: 6}
-  marks: {}
-finalState:
-  documentContents: |
-
-    const value = "Hello world";
-
-    const value = "Hello world";
-  selections:
-    - anchor: {line: 1, character: 6}
-      active: {line: 1, character: 28}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, modifier: {type: tail}, insideOutsideType: inside}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/headTail/takeTailVest.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/headTail/takeTailVest.yml
deleted file mode 100644
index 27bb4d80fa..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/headTail/takeTailVest.yml
+++ /dev/null
@@ -1,32 +0,0 @@
-languageId: typescript
-command:
-  version: 1
-  spokenForm: take tail vest
-  action: setSelection
-  targets:
-    - type: primitive
-      modifier: {type: tail}
-      mark: {type: decoratedSymbol, symbolColor: default, character: v}
-initialState:
-  documentContents: |
-
-    const value = "Hello world";
-
-    const value = "Hello world";
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-  marks:
-    default.v:
-      start: {line: 1, character: 6}
-      end: {line: 1, character: 11}
-finalState:
-  documentContents: |
-
-    const value = "Hello world";
-
-    const value = "Hello world";
-  selections:
-    - anchor: {line: 1, character: 6}
-      active: {line: 1, character: 28}
-fullTargets: [{type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: v}, selectionType: token, position: contents, modifier: {type: tail}, insideOutsideType: inside}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/implicitExpansion/bringHarp.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/implicitExpansion/bringHarp.yml
deleted file mode 100644
index 0b9c626646..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/implicitExpansion/bringHarp.yml
+++ /dev/null
@@ -1,28 +0,0 @@
-languageId: plaintext
-command:
-  version: 4
-  spokenForm: bring harp
-  action: {name: replaceWithTarget}
-  targets:
-    - type: primitive
-      mark: {type: decoratedSymbol, symbolColor: default, character: h}
-    - {type: implicit}
-  usePrePhraseSnapshot: true
-initialState:
-  documentContents: |
-    hello
-  selections:
-    - anchor: {line: 1, character: 0}
-      active: {line: 1, character: 0}
-  marks:
-    default.h:
-      start: {line: 0, character: 0}
-      end: {line: 0, character: 5}
-finalState:
-  documentContents: |-
-    hello
-    hello
-  selections:
-    - anchor: {line: 1, character: 5}
-      active: {line: 1, character: 5}
-fullTargets: [{type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: h}, modifiers: []}, {type: primitive, mark: {type: cursor}, modifiers: [{type: toRawSelection}]}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/implicitExpansion/bringHarpToThis.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/implicitExpansion/bringHarpToThis.yml
deleted file mode 100644
index d9034f0b08..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/implicitExpansion/bringHarpToThis.yml
+++ /dev/null
@@ -1,26 +0,0 @@
-languageId: plaintext
-command:
-  version: 4
-  spokenForm: bring harp to this
-  action: {name: replaceWithTarget}
-  targets:
-    - type: primitive
-      mark: {type: decoratedSymbol, symbolColor: default, character: h}
-    - type: primitive
-      mark: {type: cursor}
-  usePrePhraseSnapshot: true
-initialState:
-  documentContents: hello world
-  selections:
-    - anchor: {line: 0, character: 8}
-      active: {line: 0, character: 8}
-  marks:
-    default.h:
-      start: {line: 0, character: 0}
-      end: {line: 0, character: 5}
-finalState:
-  documentContents: hello hello
-  selections:
-    - anchor: {line: 0, character: 8}
-      active: {line: 0, character: 8}
-fullTargets: [{type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: h}, modifiers: []}, {type: primitive, mark: {type: cursor}, modifiers: []}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/implicitExpansion/bringThisToWhale.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/implicitExpansion/bringThisToWhale.yml
deleted file mode 100644
index f1684d44f6..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/implicitExpansion/bringThisToWhale.yml
+++ /dev/null
@@ -1,26 +0,0 @@
-languageId: plaintext
-command:
-  version: 4
-  spokenForm: bring this to whale
-  action: {name: replaceWithTarget}
-  targets:
-    - type: primitive
-      mark: {type: cursor}
-    - type: primitive
-      mark: {type: decoratedSymbol, symbolColor: default, character: w}
-  usePrePhraseSnapshot: true
-initialState:
-  documentContents: hello world
-  selections:
-    - anchor: {line: 0, character: 2}
-      active: {line: 0, character: 2}
-  marks:
-    default.w:
-      start: {line: 0, character: 6}
-      end: {line: 0, character: 11}
-finalState:
-  documentContents: hello hello
-  selections:
-    - anchor: {line: 0, character: 2}
-      active: {line: 0, character: 2}
-fullTargets: [{type: primitive, mark: {type: cursor}, modifiers: []}, {type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: w}, modifiers: []}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/implicitExpansion/chuckBoundingThat.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/implicitExpansion/chuckBoundingThat.yml
deleted file mode 100644
index c02d5fbf1a..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/implicitExpansion/chuckBoundingThat.yml
+++ /dev/null
@@ -1,30 +0,0 @@
-languageId: plaintext
-command:
-  spokenForm: chuck bounding that
-  version: 2
-  targets:
-    - type: primitive
-      modifiers:
-        - {type: excludeInterior}
-      mark: {type: that}
-  usePrePhraseSnapshot: true
-  action: {name: remove}
-initialState:
-  documentContents: (hello )
-  selections:
-    - anchor: {line: 0, character: 8}
-      active: {line: 0, character: 8}
-  marks: {}
-  thatMark:
-    - type: UntypedTarget
-      contentRange:
-        start: {line: 0, character: 7}
-        end: {line: 0, character: 7}
-      isReversed: false
-      hasExplicitRange: false
-finalState:
-  documentContents: hello
-  selections:
-    - anchor: {line: 0, character: 5}
-      active: {line: 0, character: 5}
-fullTargets: [{type: primitive, mark: {type: that}, modifiers: [{type: excludeInterior}]}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/implicitExpansion/chuckCoreThat.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/implicitExpansion/chuckCoreThat.yml
deleted file mode 100644
index 5212551c3f..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/implicitExpansion/chuckCoreThat.yml
+++ /dev/null
@@ -1,30 +0,0 @@
-languageId: plaintext
-command:
-  spokenForm: chuck core that
-  version: 2
-  targets:
-    - type: primitive
-      modifiers:
-        - {type: interiorOnly}
-      mark: {type: that}
-  usePrePhraseSnapshot: true
-  action: {name: remove}
-initialState:
-  documentContents: (hello )
-  selections:
-    - anchor: {line: 0, character: 8}
-      active: {line: 0, character: 8}
-  marks: {}
-  thatMark:
-    - type: UntypedTarget
-      contentRange:
-        start: {line: 0, character: 7}
-        end: {line: 0, character: 7}
-      isReversed: false
-      hasExplicitRange: false
-finalState:
-  documentContents: ()
-  selections:
-    - anchor: {line: 0, character: 2}
-      active: {line: 0, character: 2}
-fullTargets: [{type: primitive, mark: {type: that}, modifiers: [{type: interiorOnly}]}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/implicitExpansion/chuckLeadingThat.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/implicitExpansion/chuckLeadingThat.yml
deleted file mode 100644
index dbe530cdf3..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/implicitExpansion/chuckLeadingThat.yml
+++ /dev/null
@@ -1,30 +0,0 @@
-languageId: plaintext
-command:
-  spokenForm: chuck leading that
-  version: 2
-  targets:
-    - type: primitive
-      modifiers:
-        - {type: leading}
-      mark: {type: that}
-  usePrePhraseSnapshot: true
-  action: {name: remove}
-initialState:
-  documentContents: " hello"
-  selections:
-    - anchor: {line: 0, character: 6}
-      active: {line: 0, character: 6}
-  marks: {}
-  thatMark:
-    - type: UntypedTarget
-      contentRange:
-        start: {line: 0, character: 6}
-        end: {line: 0, character: 6}
-      isReversed: false
-      hasExplicitRange: false
-finalState:
-  documentContents: hello
-  selections:
-    - anchor: {line: 0, character: 5}
-      active: {line: 0, character: 5}
-fullTargets: [{type: primitive, mark: {type: that}, modifiers: [{type: leading}]}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/implicitExpansion/chuckSecondWordThat.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/implicitExpansion/chuckSecondWordThat.yml
deleted file mode 100644
index 3e21b2ba3d..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/implicitExpansion/chuckSecondWordThat.yml
+++ /dev/null
@@ -1,35 +0,0 @@
-languageId: plaintext
-command:
-  spokenForm: chuck second word that
-  version: 2
-  targets:
-    - type: primitive
-      modifiers:
-        - type: ordinalRange
-          scopeType: {type: word}
-          anchor: 1
-          active: 1
-          excludeAnchor: false
-          excludeActive: false
-      mark: {type: that}
-  usePrePhraseSnapshot: true
-  action: {name: remove}
-initialState:
-  documentContents: helloWorld
-  selections:
-    - anchor: {line: 0, character: 10}
-      active: {line: 0, character: 10}
-  marks: {}
-  thatMark:
-    - type: UntypedTarget
-      contentRange:
-        start: {line: 0, character: 10}
-        end: {line: 0, character: 10}
-      isReversed: false
-      hasExplicitRange: false
-finalState:
-  documentContents: hello
-  selections:
-    - anchor: {line: 0, character: 5}
-      active: {line: 0, character: 5}
-fullTargets: [{type: primitive, mark: {type: that}, modifiers: [{type: ordinalRange, scopeType: {type: word}, anchor: 1, active: 1, excludeAnchor: false, excludeActive: false}]}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/implicitExpansion/clearBoundingThat.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/implicitExpansion/clearBoundingThat.yml
deleted file mode 100644
index fabcce9069..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/implicitExpansion/clearBoundingThat.yml
+++ /dev/null
@@ -1,34 +0,0 @@
-languageId: plaintext
-command:
-  spokenForm: clear bounding that
-  version: 2
-  targets:
-    - type: primitive
-      modifiers:
-        - {type: excludeInterior}
-      mark: {type: that}
-  usePrePhraseSnapshot: true
-  action: {name: clearAndSetSelection}
-initialState:
-  documentContents: |
-    (hello now)
-  selections:
-    - anchor: {line: 1, character: 0}
-      active: {line: 1, character: 0}
-  marks: {}
-  thatMark:
-    - type: UntypedTarget
-      contentRange:
-        start: {line: 0, character: 1}
-        end: {line: 0, character: 6}
-      isReversed: false
-      hasExplicitRange: true
-finalState:
-  documentContents: |
-    hello now
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-    - anchor: {line: 0, character: 9}
-      active: {line: 0, character: 9}
-fullTargets: [{type: primitive, mark: {type: that}, modifiers: [{type: excludeInterior}]}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/implicitExpansion/clearBounds.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/implicitExpansion/clearBounds.yml
deleted file mode 100644
index c50d4ac7e3..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/implicitExpansion/clearBounds.yml
+++ /dev/null
@@ -1,24 +0,0 @@
-languageId: plaintext
-command:
-  spokenForm: clear bounds
-  version: 2
-  targets:
-    - type: primitive
-      modifiers:
-        - {type: excludeInterior}
-  usePrePhraseSnapshot: true
-  action: {name: clearAndSetSelection}
-initialState:
-  documentContents: (aaa bbb)
-  selections:
-    - anchor: {line: 0, character: 1}
-      active: {line: 0, character: 1}
-  marks: {}
-finalState:
-  documentContents: aaa bbb
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-    - anchor: {line: 0, character: 7}
-      active: {line: 0, character: 7}
-fullTargets: [{type: primitive, mark: {type: cursor}, modifiers: [{type: excludeInterior}]}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/implicitExpansion/clearBounds2.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/implicitExpansion/clearBounds2.yml
deleted file mode 100644
index 0eff5f5e7e..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/implicitExpansion/clearBounds2.yml
+++ /dev/null
@@ -1,24 +0,0 @@
-languageId: plaintext
-command:
-  spokenForm: clear bounds
-  version: 2
-  targets:
-    - type: primitive
-      modifiers:
-        - {type: excludeInterior}
-  usePrePhraseSnapshot: true
-  action: {name: clearAndSetSelection}
-initialState:
-  documentContents: (aaa bbb)
-  selections:
-    - anchor: {line: 0, character: 1}
-      active: {line: 0, character: 4}
-  marks: {}
-finalState:
-  documentContents: aaa bbb
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-    - anchor: {line: 0, character: 7}
-      active: {line: 0, character: 7}
-fullTargets: [{type: primitive, mark: {type: cursor}, modifiers: [{type: excludeInterior}]}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/implicitExpansion/clearBoundsAir.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/implicitExpansion/clearBoundsAir.yml
deleted file mode 100644
index 6a2021c65e..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/implicitExpansion/clearBoundsAir.yml
+++ /dev/null
@@ -1,28 +0,0 @@
-languageId: plaintext
-command:
-  spokenForm: clear bounds air
-  version: 2
-  targets:
-    - type: primitive
-      mark: {type: decoratedSymbol, symbolColor: default, character: a}
-      modifiers:
-        - {type: excludeInterior}
-  usePrePhraseSnapshot: true
-  action: {name: clearAndSetSelection}
-initialState:
-  documentContents: (aaa bbb)
-  selections:
-    - anchor: {line: 0, character: 1}
-      active: {line: 0, character: 1}
-  marks:
-    default.a:
-      start: {line: 0, character: 1}
-      end: {line: 0, character: 4}
-finalState:
-  documentContents: aaa bbb
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-    - anchor: {line: 0, character: 7}
-      active: {line: 0, character: 7}
-fullTargets: [{type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: a}, modifiers: [{type: excludeInterior}]}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/implicitExpansion/clearBoundsToken.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/implicitExpansion/clearBoundsToken.yml
deleted file mode 100644
index f78fc8e88e..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/implicitExpansion/clearBoundsToken.yml
+++ /dev/null
@@ -1,20 +0,0 @@
-languageId: plaintext
-command:
-  spokenForm: clear bounds token
-  version: 2
-  targets:
-    - type: primitive
-      modifiers:
-        - {type: excludeInterior}
-        - type: containingScope
-          scopeType: {type: token}
-  usePrePhraseSnapshot: true
-  action: {name: clearAndSetSelection}
-initialState:
-  documentContents: (aaa)
-  selections:
-    - anchor: {line: 0, character: 1}
-      active: {line: 0, character: 1}
-  marks: {}
-fullTargets: [{type: primitive, mark: {type: cursor}, modifiers: [{type: excludeInterior}, {type: containingScope, scopeType: {type: token}}]}]
-thrownError: {name: NoContainingScopeError}
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/implicitExpansion/clearCore.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/implicitExpansion/clearCore.yml
deleted file mode 100644
index de31553bf5..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/implicitExpansion/clearCore.yml
+++ /dev/null
@@ -1,22 +0,0 @@
-languageId: plaintext
-command:
-  spokenForm: clear core
-  version: 2
-  targets:
-    - type: primitive
-      modifiers:
-        - {type: interiorOnly}
-  usePrePhraseSnapshot: true
-  action: {name: clearAndSetSelection}
-initialState:
-  documentContents: (aaa bbb)
-  selections:
-    - anchor: {line: 0, character: 1}
-      active: {line: 0, character: 1}
-  marks: {}
-finalState:
-  documentContents: ()
-  selections:
-    - anchor: {line: 0, character: 1}
-      active: {line: 0, character: 1}
-fullTargets: [{type: primitive, mark: {type: cursor}, modifiers: [{type: interiorOnly}]}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/implicitExpansion/clearCore2.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/implicitExpansion/clearCore2.yml
deleted file mode 100644
index 65f9698d8d..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/implicitExpansion/clearCore2.yml
+++ /dev/null
@@ -1,22 +0,0 @@
-languageId: plaintext
-command:
-  spokenForm: clear core
-  version: 2
-  targets:
-    - type: primitive
-      modifiers:
-        - {type: interiorOnly}
-  usePrePhraseSnapshot: true
-  action: {name: clearAndSetSelection}
-initialState:
-  documentContents: (aaa bbb)
-  selections:
-    - anchor: {line: 0, character: 1}
-      active: {line: 0, character: 4}
-  marks: {}
-finalState:
-  documentContents: ()
-  selections:
-    - anchor: {line: 0, character: 1}
-      active: {line: 0, character: 1}
-fullTargets: [{type: primitive, mark: {type: cursor}, modifiers: [{type: interiorOnly}]}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/implicitExpansion/clearCoreAir.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/implicitExpansion/clearCoreAir.yml
deleted file mode 100644
index fbb400da6c..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/implicitExpansion/clearCoreAir.yml
+++ /dev/null
@@ -1,26 +0,0 @@
-languageId: plaintext
-command:
-  spokenForm: clear core air
-  version: 2
-  targets:
-    - type: primitive
-      mark: {type: decoratedSymbol, symbolColor: default, character: a}
-      modifiers:
-        - {type: interiorOnly}
-  usePrePhraseSnapshot: true
-  action: {name: clearAndSetSelection}
-initialState:
-  documentContents: (aaa bbb)
-  selections:
-    - anchor: {line: 0, character: 1}
-      active: {line: 0, character: 1}
-  marks:
-    default.a:
-      start: {line: 0, character: 1}
-      end: {line: 0, character: 4}
-finalState:
-  documentContents: ()
-  selections:
-    - anchor: {line: 0, character: 1}
-      active: {line: 0, character: 1}
-fullTargets: [{type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: a}, modifiers: [{type: interiorOnly}]}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/implicitExpansion/clearCoreThat.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/implicitExpansion/clearCoreThat.yml
deleted file mode 100644
index 4c7ed936e1..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/implicitExpansion/clearCoreThat.yml
+++ /dev/null
@@ -1,32 +0,0 @@
-languageId: plaintext
-command:
-  spokenForm: clear core that
-  version: 2
-  targets:
-    - type: primitive
-      modifiers:
-        - {type: interiorOnly}
-      mark: {type: that}
-  usePrePhraseSnapshot: true
-  action: {name: clearAndSetSelection}
-initialState:
-  documentContents: |
-    (hello now)
-  selections:
-    - anchor: {line: 1, character: 0}
-      active: {line: 1, character: 0}
-  marks: {}
-  thatMark:
-    - type: UntypedTarget
-      contentRange:
-        start: {line: 0, character: 1}
-        end: {line: 0, character: 6}
-      isReversed: false
-      hasExplicitRange: true
-finalState:
-  documentContents: |
-    ()
-  selections:
-    - anchor: {line: 0, character: 1}
-      active: {line: 0, character: 1}
-fullTargets: [{type: primitive, mark: {type: that}, modifiers: [{type: interiorOnly}]}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/implicitExpansion/clearCoreToken.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/implicitExpansion/clearCoreToken.yml
deleted file mode 100644
index 3a4abd07e2..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/implicitExpansion/clearCoreToken.yml
+++ /dev/null
@@ -1,20 +0,0 @@
-languageId: plaintext
-command:
-  spokenForm: clear core token
-  version: 2
-  targets:
-    - type: primitive
-      modifiers:
-        - {type: interiorOnly}
-        - type: containingScope
-          scopeType: {type: token}
-  usePrePhraseSnapshot: true
-  action: {name: clearAndSetSelection}
-initialState:
-  documentContents: (aaa)
-  selections:
-    - anchor: {line: 0, character: 1}
-      active: {line: 0, character: 1}
-  marks: {}
-fullTargets: [{type: primitive, mark: {type: cursor}, modifiers: [{type: interiorOnly}, {type: containingScope, scopeType: {type: token}}]}]
-thrownError: {name: NoContainingScopeError}
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/implicitExpansion/clearEveryItem.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/implicitExpansion/clearEveryItem.yml
deleted file mode 100644
index 78efb2b9ba..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/implicitExpansion/clearEveryItem.yml
+++ /dev/null
@@ -1,29 +0,0 @@
-languageId: plaintext
-command:
-  spokenForm: clear every item
-  version: 2
-  targets:
-    - type: primitive
-      modifiers:
-        - type: everyScope
-          scopeType: {type: collectionItem}
-  usePrePhraseSnapshot: true
-  action: {name: clearAndSetSelection}
-initialState:
-  documentContents: a, b, c, d
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-  marks: {}
-finalState:
-  documentContents: ", , , "
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-    - anchor: {line: 0, character: 2}
-      active: {line: 0, character: 2}
-    - anchor: {line: 0, character: 4}
-      active: {line: 0, character: 4}
-    - anchor: {line: 0, character: 6}
-      active: {line: 0, character: 6}
-fullTargets: [{type: primitive, mark: {type: cursor}, modifiers: [{type: everyScope, scopeType: {type: collectionItem}}]}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/implicitExpansion/clearEveryItem2.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/implicitExpansion/clearEveryItem2.yml
deleted file mode 100644
index 5cffd9bd73..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/implicitExpansion/clearEveryItem2.yml
+++ /dev/null
@@ -1,25 +0,0 @@
-languageId: plaintext
-command:
-  spokenForm: clear every item
-  version: 2
-  targets:
-    - type: primitive
-      modifiers:
-        - type: everyScope
-          scopeType: {type: collectionItem}
-  usePrePhraseSnapshot: true
-  action: {name: clearAndSetSelection}
-initialState:
-  documentContents: a, b, c, d
-  selections:
-    - anchor: {line: 0, character: 3}
-      active: {line: 0, character: 7}
-  marks: {}
-finalState:
-  documentContents: a, , , d
-  selections:
-    - anchor: {line: 0, character: 3}
-      active: {line: 0, character: 3}
-    - anchor: {line: 0, character: 5}
-      active: {line: 0, character: 5}
-fullTargets: [{type: primitive, mark: {type: cursor}, modifiers: [{type: everyScope, scopeType: {type: collectionItem}}]}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/implicitExpansion/clearEveryItemAir.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/implicitExpansion/clearEveryItemAir.yml
deleted file mode 100644
index 2e53735b27..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/implicitExpansion/clearEveryItemAir.yml
+++ /dev/null
@@ -1,33 +0,0 @@
-languageId: plaintext
-command:
-  spokenForm: clear every item air
-  version: 2
-  targets:
-    - type: primitive
-      mark: {type: decoratedSymbol, symbolColor: default, character: a}
-      modifiers:
-        - type: everyScope
-          scopeType: {type: collectionItem}
-  usePrePhraseSnapshot: true
-  action: {name: clearAndSetSelection}
-initialState:
-  documentContents: a, b, c, d
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-  marks:
-    default.a:
-      start: {line: 0, character: 0}
-      end: {line: 0, character: 1}
-finalState:
-  documentContents: ", , , "
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-    - anchor: {line: 0, character: 2}
-      active: {line: 0, character: 2}
-    - anchor: {line: 0, character: 4}
-      active: {line: 0, character: 4}
-    - anchor: {line: 0, character: 6}
-      active: {line: 0, character: 6}
-fullTargets: [{type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: a}, modifiers: [{type: everyScope, scopeType: {type: collectionItem}}]}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/implicitExpansion/clearEveryLine.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/implicitExpansion/clearEveryLine.yml
deleted file mode 100644
index 7b1d1a0294..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/implicitExpansion/clearEveryLine.yml
+++ /dev/null
@@ -1,36 +0,0 @@
-languageId: plaintext
-command:
-  spokenForm: clear every line
-  version: 2
-  targets:
-    - type: primitive
-      modifiers:
-        - type: everyScope
-          scopeType: {type: line}
-  usePrePhraseSnapshot: true
-  action: {name: clearAndSetSelection}
-initialState:
-  documentContents: |-
-    a
-    b
-    c
-    d
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-  marks: {}
-finalState:
-  documentContents: |+
-
-
-
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-    - anchor: {line: 1, character: 0}
-      active: {line: 1, character: 0}
-    - anchor: {line: 2, character: 0}
-      active: {line: 2, character: 0}
-    - anchor: {line: 3, character: 0}
-      active: {line: 3, character: 0}
-fullTargets: [{type: primitive, mark: {type: cursor}, modifiers: [{type: everyScope, scopeType: {type: line}}]}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/implicitExpansion/clearEveryLine2.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/implicitExpansion/clearEveryLine2.yml
deleted file mode 100644
index 6544d2b9a4..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/implicitExpansion/clearEveryLine2.yml
+++ /dev/null
@@ -1,33 +0,0 @@
-languageId: plaintext
-command:
-  spokenForm: clear every line
-  version: 2
-  targets:
-    - type: primitive
-      modifiers:
-        - type: everyScope
-          scopeType: {type: line}
-  usePrePhraseSnapshot: true
-  action: {name: clearAndSetSelection}
-initialState:
-  documentContents: |-
-    a
-    b
-    c
-    d
-  selections:
-    - anchor: {line: 1, character: 0}
-      active: {line: 2, character: 1}
-  marks: {}
-finalState:
-  documentContents: |-
-    a
-
-
-    d
-  selections:
-    - anchor: {line: 1, character: 0}
-      active: {line: 1, character: 0}
-    - anchor: {line: 2, character: 0}
-      active: {line: 2, character: 0}
-fullTargets: [{type: primitive, mark: {type: cursor}, modifiers: [{type: everyScope, scopeType: {type: line}}]}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/implicitExpansion/clearEveryLineAir.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/implicitExpansion/clearEveryLineAir.yml
deleted file mode 100644
index 67a85b373b..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/implicitExpansion/clearEveryLineAir.yml
+++ /dev/null
@@ -1,40 +0,0 @@
-languageId: plaintext
-command:
-  spokenForm: clear every line air
-  version: 2
-  targets:
-    - type: primitive
-      mark: {type: decoratedSymbol, symbolColor: default, character: a}
-      modifiers:
-        - type: everyScope
-          scopeType: {type: line}
-  usePrePhraseSnapshot: true
-  action: {name: clearAndSetSelection}
-initialState:
-  documentContents: |-
-    a
-    b
-    c
-    d
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-  marks:
-    default.a:
-      start: {line: 0, character: 0}
-      end: {line: 0, character: 1}
-finalState:
-  documentContents: |+
-
-
-
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-    - anchor: {line: 1, character: 0}
-      active: {line: 1, character: 0}
-    - anchor: {line: 2, character: 0}
-      active: {line: 2, character: 0}
-    - anchor: {line: 3, character: 0}
-      active: {line: 3, character: 0}
-fullTargets: [{type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: a}, modifiers: [{type: everyScope, scopeType: {type: line}}]}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/implicitExpansion/clearEveryLineFunk.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/implicitExpansion/clearEveryLineFunk.yml
deleted file mode 100644
index 23e4d09873..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/implicitExpansion/clearEveryLineFunk.yml
+++ /dev/null
@@ -1,37 +0,0 @@
-languageId: typescript
-command:
-  spokenForm: clear every line funk
-  version: 2
-  targets:
-    - type: primitive
-      modifiers:
-        - type: everyScope
-          scopeType: {type: line}
-        - type: containingScope
-          scopeType: {type: namedFunction}
-  usePrePhraseSnapshot: true
-  action: {name: clearAndSetSelection}
-initialState:
-  documentContents: |
-
-    function myFunk() {
-      // aaa
-    }
-  selections:
-    - anchor: {line: 2, character: 5}
-      active: {line: 2, character: 5}
-  marks: {}
-finalState:
-  documentContents: |2+
-
-
-      
-
-  selections:
-    - anchor: {line: 1, character: 0}
-      active: {line: 1, character: 0}
-    - anchor: {line: 2, character: 2}
-      active: {line: 2, character: 2}
-    - anchor: {line: 3, character: 0}
-      active: {line: 3, character: 0}
-fullTargets: [{type: primitive, mark: {type: cursor}, modifiers: [{type: everyScope, scopeType: {type: line}}, {type: containingScope, scopeType: {type: namedFunction}}]}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/implicitExpansion/clearEveryLineThat.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/implicitExpansion/clearEveryLineThat.yml
deleted file mode 100644
index 1e87cd57b7..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/implicitExpansion/clearEveryLineThat.yml
+++ /dev/null
@@ -1,36 +0,0 @@
-languageId: plaintext
-command:
-  spokenForm: clear every line that
-  version: 2
-  targets:
-    - type: primitive
-      modifiers:
-        - type: everyScope
-          scopeType: {type: line}
-      mark: {type: that}
-  usePrePhraseSnapshot: true
-  action: {name: clearAndSetSelection}
-initialState:
-  documentContents: |-
-    hello
-    whatever
-  selections:
-    - anchor: {line: 1, character: 8}
-      active: {line: 1, character: 8}
-  marks: {}
-  thatMark:
-    - type: UntypedTarget
-      contentRange:
-        start: {line: 0, character: 5}
-        end: {line: 0, character: 5}
-      isReversed: false
-      hasExplicitRange: false
-finalState:
-  documentContents: |+
-
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-    - anchor: {line: 1, character: 0}
-      active: {line: 1, character: 0}
-fullTargets: [{type: primitive, mark: {type: that}, modifiers: [{type: everyScope, scopeType: {type: line}}]}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/implicitExpansion/clearEveryLineThat2.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/implicitExpansion/clearEveryLineThat2.yml
deleted file mode 100644
index 53847edb74..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/implicitExpansion/clearEveryLineThat2.yml
+++ /dev/null
@@ -1,41 +0,0 @@
-languageId: plaintext
-command:
-  spokenForm: clear every line that
-  version: 2
-  targets:
-    - type: primitive
-      modifiers:
-        - type: everyScope
-          scopeType: {type: line}
-      mark: {type: that}
-  usePrePhraseSnapshot: true
-  action: {name: clearAndSetSelection}
-initialState:
-  documentContents: |-
-    hello
-    world
-    testing
-    again
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-  marks: {}
-  thatMark:
-    - type: UntypedTarget
-      contentRange:
-        start: {line: 1, character: 0}
-        end: {line: 2, character: 7}
-      isReversed: false
-      hasExplicitRange: true
-finalState:
-  documentContents: |-
-    hello
-
-
-    again
-  selections:
-    - anchor: {line: 1, character: 0}
-      active: {line: 1, character: 0}
-    - anchor: {line: 2, character: 0}
-      active: {line: 2, character: 0}
-fullTargets: [{type: primitive, mark: {type: that}, modifiers: [{type: everyScope, scopeType: {type: line}}]}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/implicitExpansion/clearFirstCarSecondWordHarp.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/implicitExpansion/clearFirstCarSecondWordHarp.yml
deleted file mode 100644
index 6a66cf5517..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/implicitExpansion/clearFirstCarSecondWordHarp.yml
+++ /dev/null
@@ -1,37 +0,0 @@
-languageId: plaintext
-command:
-  spokenForm: clear first car second word harp
-  version: 2
-  targets:
-    - type: primitive
-      modifiers:
-        - type: ordinalRange
-          scopeType: {type: character}
-          anchor: 0
-          active: 0
-          excludeAnchor: false
-          excludeActive: false
-        - type: ordinalRange
-          scopeType: {type: word}
-          anchor: 1
-          active: 1
-          excludeAnchor: false
-          excludeActive: false
-      mark: {type: decoratedSymbol, symbolColor: default, character: h}
-  usePrePhraseSnapshot: true
-  action: {name: clearAndSetSelection}
-initialState:
-  documentContents: helloWorld
-  selections:
-    - anchor: {line: 0, character: 10}
-      active: {line: 0, character: 10}
-  marks:
-    default.h:
-      start: {line: 0, character: 0}
-      end: {line: 0, character: 10}
-finalState:
-  documentContents: helloorld
-  selections:
-    - anchor: {line: 0, character: 5}
-      active: {line: 0, character: 5}
-fullTargets: [{type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: h}, modifiers: [{type: ordinalRange, scopeType: {type: character}, anchor: 0, active: 0, excludeAnchor: false, excludeActive: false}, {type: ordinalRange, scopeType: {type: word}, anchor: 1, active: 1, excludeAnchor: false, excludeActive: false}]}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/implicitExpansion/clearFirstWordPastTrap.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/implicitExpansion/clearFirstWordPastTrap.yml
deleted file mode 100644
index ddfe0b123f..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/implicitExpansion/clearFirstWordPastTrap.yml
+++ /dev/null
@@ -1,39 +0,0 @@
-languageId: plaintext
-command:
-  spokenForm: clear first word past trap
-  version: 2
-  targets:
-    - type: range
-      anchor:
-        type: primitive
-        modifiers:
-          - type: ordinalRange
-            scopeType: {type: word}
-            anchor: 0
-            active: 0
-            excludeAnchor: false
-            excludeActive: false
-      active:
-        type: primitive
-        mark: {type: decoratedSymbol, symbolColor: default, character: t}
-      excludeAnchor: false
-      excludeActive: false
-  usePrePhraseSnapshot: true
-  action: {name: clearAndSetSelection}
-initialState:
-  documentContents: |-
-    helloWorld
-    testingThere
-  selections:
-    - anchor: {line: 0, character: 7}
-      active: {line: 0, character: 7}
-  marks:
-    default.t:
-      start: {line: 1, character: 0}
-      end: {line: 1, character: 12}
-finalState:
-  documentContents: There
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-fullTargets: [{type: range, excludeAnchor: false, excludeActive: false, rangeType: continuous, anchor: {type: primitive, mark: {type: cursor}, modifiers: [&ref_0 {type: ordinalRange, scopeType: {type: word}, anchor: 0, active: 0, excludeAnchor: false, excludeActive: false}]}, active: {type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: t}, modifiers: [*ref_0]}}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/implicitExpansion/clearFirstWordThat.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/implicitExpansion/clearFirstWordThat.yml
deleted file mode 100644
index 3267d80082..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/implicitExpansion/clearFirstWordThat.yml
+++ /dev/null
@@ -1,33 +0,0 @@
-languageId: plaintext
-command:
-  spokenForm: clear first word that
-  version: 3
-  targets:
-    - type: primitive
-      modifiers:
-        - type: ordinalScope
-          scopeType: {type: word}
-          start: 0
-          length: 1
-      mark: {type: that}
-  usePrePhraseSnapshot: true
-  action: {name: clearAndSetSelection}
-initialState:
-  documentContents: aaaBbbCcc ddd
-  selections:
-    - anchor: {line: 0, character: 13}
-      active: {line: 0, character: 13}
-  marks: {}
-  thatMark:
-    - type: UntypedTarget
-      contentRange:
-        start: {line: 0, character: 3}
-        end: {line: 0, character: 9}
-      isReversed: false
-      hasExplicitRange: true
-finalState:
-  documentContents: aaaCcc ddd
-  selections:
-    - anchor: {line: 0, character: 3}
-      active: {line: 0, character: 3}
-fullTargets: [{type: primitive, mark: {type: that}, modifiers: [{type: ordinalScope, scopeType: {type: word}, start: 0, length: 1}]}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/implicitExpansion/clearLeadingPastWhale.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/implicitExpansion/clearLeadingPastWhale.yml
deleted file mode 100644
index d967e1cb46..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/implicitExpansion/clearLeadingPastWhale.yml
+++ /dev/null
@@ -1,34 +0,0 @@
-languageId: plaintext
-command:
-  spokenForm: clear leading past whale
-  version: 2
-  targets:
-    - type: range
-      anchor:
-        type: primitive
-        modifiers:
-          - {type: leading}
-      active:
-        type: primitive
-        mark: {type: decoratedSymbol, symbolColor: default, character: w}
-      excludeAnchor: false
-      excludeActive: false
-  usePrePhraseSnapshot: true
-  action: {name: clearAndSetSelection}
-initialState:
-  documentContents: |2-
-     hello
-     world
-  selections:
-    - anchor: {line: 0, character: 3}
-      active: {line: 0, character: 3}
-  marks:
-    default.w:
-      start: {line: 1, character: 1}
-      end: {line: 1, character: 6}
-finalState:
-  documentContents: world
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-fullTargets: [{type: range, excludeAnchor: false, excludeActive: false, rangeType: continuous, anchor: {type: primitive, mark: {type: cursor}, modifiers: [{type: leading}]}, active: {type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: w}, modifiers: [{type: leading}]}}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/implicitExpansion/clearLeadingSecondWord.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/implicitExpansion/clearLeadingSecondWord.yml
deleted file mode 100644
index a8f80b63c2..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/implicitExpansion/clearLeadingSecondWord.yml
+++ /dev/null
@@ -1,24 +0,0 @@
-languageId: plaintext
-command:
-  spokenForm: clear leading second word
-  version: 2
-  targets:
-    - type: primitive
-      modifiers:
-        - {type: leading}
-        - type: ordinalRange
-          scopeType: {type: word}
-          anchor: 1
-          active: 1
-          excludeAnchor: false
-          excludeActive: false
-  usePrePhraseSnapshot: true
-  action: {name: clearAndSetSelection}
-initialState:
-  documentContents: helloWorld
-  selections:
-    - anchor: {line: 0, character: 10}
-      active: {line: 0, character: 10}
-  marks: {}
-fullTargets: [{type: primitive, mark: {type: cursor}, modifiers: [{type: leading}, {type: ordinalRange, scopeType: {type: word}, anchor: 1, active: 1, excludeAnchor: false, excludeActive: false}]}]
-thrownError: {name: NoDelimiterError}
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/implicitExpansion/clearPastTrap.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/implicitExpansion/clearPastTrap.yml
deleted file mode 100644
index 5494364825..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/implicitExpansion/clearPastTrap.yml
+++ /dev/null
@@ -1,29 +0,0 @@
-languageId: plaintext
-command:
-  version: 4
-  spokenForm: clear past trap
-  action: {name: clearAndSetSelection}
-  targets:
-    - type: range
-      anchor: {type: implicit}
-      active:
-        type: primitive
-        mark: {type: decoratedSymbol, symbolColor: default, character: t}
-      excludeAnchor: false
-      excludeActive: false
-  usePrePhraseSnapshot: true
-initialState:
-  documentContents: hello world testing
-  selections:
-    - anchor: {line: 0, character: 8}
-      active: {line: 0, character: 8}
-  marks:
-    default.t:
-      start: {line: 0, character: 12}
-      end: {line: 0, character: 19}
-finalState:
-  documentContents: hello wo
-  selections:
-    - anchor: {line: 0, character: 8}
-      active: {line: 0, character: 8}
-fullTargets: [{type: range, excludeAnchor: false, excludeActive: false, rangeType: continuous, anchor: {type: primitive, mark: {type: cursor}, modifiers: [{type: toRawSelection}]}, active: {type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: t}, modifiers: []}}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/implicitExpansion/clearSecondWord.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/implicitExpansion/clearSecondWord.yml
deleted file mode 100644
index 79576f995b..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/implicitExpansion/clearSecondWord.yml
+++ /dev/null
@@ -1,27 +0,0 @@
-languageId: plaintext
-command:
-  spokenForm: clear second word
-  version: 2
-  targets:
-    - type: primitive
-      modifiers:
-        - type: ordinalRange
-          scopeType: {type: word}
-          anchor: 1
-          active: 1
-          excludeAnchor: false
-          excludeActive: false
-  usePrePhraseSnapshot: true
-  action: {name: clearAndSetSelection}
-initialState:
-  documentContents: aaaBbbCccDdd
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-  marks: {}
-finalState:
-  documentContents: aaaCccDdd
-  selections:
-    - anchor: {line: 0, character: 3}
-      active: {line: 0, character: 3}
-fullTargets: [{type: primitive, mark: {type: cursor}, modifiers: [{type: ordinalRange, scopeType: {type: word}, anchor: 1, active: 1, excludeAnchor: false, excludeActive: false}]}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/implicitExpansion/clearSecondWord2.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/implicitExpansion/clearSecondWord2.yml
deleted file mode 100644
index 560f0f8567..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/implicitExpansion/clearSecondWord2.yml
+++ /dev/null
@@ -1,27 +0,0 @@
-languageId: plaintext
-command:
-  spokenForm: clear second word
-  version: 2
-  targets:
-    - type: primitive
-      modifiers:
-        - type: ordinalRange
-          scopeType: {type: word}
-          anchor: 1
-          active: 1
-          excludeAnchor: false
-          excludeActive: false
-  usePrePhraseSnapshot: true
-  action: {name: clearAndSetSelection}
-initialState:
-  documentContents: aaaBbbCccDdd
-  selections:
-    - anchor: {line: 0, character: 3}
-      active: {line: 0, character: 9}
-  marks: {}
-finalState:
-  documentContents: aaaBbbDdd
-  selections:
-    - anchor: {line: 0, character: 6}
-      active: {line: 0, character: 6}
-fullTargets: [{type: primitive, mark: {type: cursor}, modifiers: [{type: ordinalRange, scopeType: {type: word}, anchor: 1, active: 1, excludeAnchor: false, excludeActive: false}]}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/implicitExpansion/clearSecondWordAir.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/implicitExpansion/clearSecondWordAir.yml
deleted file mode 100644
index fa9f167108..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/implicitExpansion/clearSecondWordAir.yml
+++ /dev/null
@@ -1,31 +0,0 @@
-languageId: plaintext
-command:
-  spokenForm: clear second word air
-  version: 2
-  targets:
-    - type: primitive
-      mark: {type: decoratedSymbol, symbolColor: default, character: a}
-      modifiers:
-        - type: ordinalRange
-          scopeType: {type: word}
-          anchor: 1
-          active: 1
-          excludeAnchor: false
-          excludeActive: false
-  usePrePhraseSnapshot: true
-  action: {name: clearAndSetSelection}
-initialState:
-  documentContents: aaaBbbCccDdd
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-  marks:
-    default.a:
-      start: {line: 0, character: 0}
-      end: {line: 0, character: 12}
-finalState:
-  documentContents: aaaCccDdd
-  selections:
-    - anchor: {line: 0, character: 3}
-      active: {line: 0, character: 3}
-fullTargets: [{type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: a}, modifiers: [{type: ordinalRange, scopeType: {type: word}, anchor: 1, active: 1, excludeAnchor: false, excludeActive: false}]}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/implicitExpansion/clearThisSliceBat.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/implicitExpansion/clearThisSliceBat.yml
deleted file mode 100644
index eb39a3467f..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/implicitExpansion/clearThisSliceBat.yml
+++ /dev/null
@@ -1,37 +0,0 @@
-languageId: plaintext
-command:
-  version: 4
-  spokenForm: clear this slice bat
-  action: {name: clearAndSetSelection}
-  targets:
-    - type: range
-      anchor:
-        type: primitive
-        mark: {type: cursor}
-      active:
-        type: primitive
-        mark: {type: decoratedSymbol, symbolColor: default, character: b}
-      excludeAnchor: false
-      excludeActive: false
-      rangeType: vertical
-  usePrePhraseSnapshot: true
-initialState:
-  documentContents: |-
-    aa
-    bb
-  selections:
-    - anchor: {line: 0, character: 1}
-      active: {line: 0, character: 1}
-  marks:
-    default.b:
-      start: {line: 1, character: 0}
-      end: {line: 1, character: 2}
-finalState:
-  documentContents: |+
-
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-    - anchor: {line: 1, character: 0}
-      active: {line: 1, character: 0}
-fullTargets: [{type: range, excludeAnchor: false, excludeActive: false, rangeType: vertical, anchor: {type: primitive, mark: {type: cursor}, modifiers: []}, active: {type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: b}, modifiers: []}}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/implicitExpansion/clearTrailing.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/implicitExpansion/clearTrailing.yml
deleted file mode 100644
index 3e7bbee826..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/implicitExpansion/clearTrailing.yml
+++ /dev/null
@@ -1,22 +0,0 @@
-languageId: plaintext
-command:
-  spokenForm: clear trailing
-  version: 2
-  targets:
-    - type: primitive
-      modifiers:
-        - {type: trailing}
-  usePrePhraseSnapshot: true
-  action: {name: clearAndSetSelection}
-initialState:
-  documentContents: aaa bbb
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-  marks: {}
-finalState:
-  documentContents: aaabbb
-  selections:
-    - anchor: {line: 0, character: 3}
-      active: {line: 0, character: 3}
-fullTargets: [{type: primitive, mark: {type: cursor}, modifiers: [{type: trailing}]}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/implicitExpansion/clearTrailing2.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/implicitExpansion/clearTrailing2.yml
deleted file mode 100644
index 63b67d73fb..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/implicitExpansion/clearTrailing2.yml
+++ /dev/null
@@ -1,22 +0,0 @@
-languageId: plaintext
-command:
-  spokenForm: clear trailing
-  version: 2
-  targets:
-    - type: primitive
-      modifiers:
-        - {type: trailing}
-  usePrePhraseSnapshot: true
-  action: {name: clearAndSetSelection}
-initialState:
-  documentContents: aaa bbb
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 1}
-  marks: {}
-finalState:
-  documentContents: aaabbb
-  selections:
-    - anchor: {line: 0, character: 3}
-      active: {line: 0, character: 3}
-fullTargets: [{type: primitive, mark: {type: cursor}, modifiers: [{type: trailing}]}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/implicitExpansion/clearTrailingAir.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/implicitExpansion/clearTrailingAir.yml
deleted file mode 100644
index c64395b97a..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/implicitExpansion/clearTrailingAir.yml
+++ /dev/null
@@ -1,26 +0,0 @@
-languageId: plaintext
-command:
-  spokenForm: clear trailing air
-  version: 2
-  targets:
-    - type: primitive
-      mark: {type: decoratedSymbol, symbolColor: default, character: a}
-      modifiers:
-        - {type: trailing}
-  usePrePhraseSnapshot: true
-  action: {name: clearAndSetSelection}
-initialState:
-  documentContents: aaa bbb
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-  marks:
-    default.a:
-      start: {line: 0, character: 0}
-      end: {line: 0, character: 3}
-finalState:
-  documentContents: aaabbb
-  selections:
-    - anchor: {line: 0, character: 3}
-      active: {line: 0, character: 3}
-fullTargets: [{type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: a}, modifiers: [{type: trailing}]}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/implicitExpansion/clearTrailingLine.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/implicitExpansion/clearTrailingLine.yml
deleted file mode 100644
index 8448402a4b..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/implicitExpansion/clearTrailingLine.yml
+++ /dev/null
@@ -1,26 +0,0 @@
-languageId: plaintext
-command:
-  spokenForm: clear trailing line
-  version: 2
-  targets:
-    - type: primitive
-      modifiers:
-        - {type: trailing}
-        - type: containingScope
-          scopeType: {type: line}
-  usePrePhraseSnapshot: true
-  action: {name: clearAndSetSelection}
-initialState:
-  documentContents: |-
-    a b
-    c d
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-  marks: {}
-finalState:
-  documentContents: a bc d
-  selections:
-    - anchor: {line: 0, character: 3}
-      active: {line: 0, character: 3}
-fullTargets: [{type: primitive, mark: {type: cursor}, modifiers: [{type: trailing}, {type: containingScope, scopeType: {type: line}}]}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/implicitExpansion/clearTrailingThat.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/implicitExpansion/clearTrailingThat.yml
deleted file mode 100644
index f9f7b7ee2e..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/implicitExpansion/clearTrailingThat.yml
+++ /dev/null
@@ -1,32 +0,0 @@
-languageId: plaintext
-command:
-  spokenForm: clear trailing that
-  version: 2
-  targets:
-    - type: primitive
-      modifiers:
-        - {type: trailing}
-      mark: {type: that}
-  usePrePhraseSnapshot: true
-  action: {name: clearAndSetSelection}
-initialState:
-  documentContents: |
-    helloWorld now
-  selections:
-    - anchor: {line: 1, character: 0}
-      active: {line: 1, character: 0}
-  marks: {}
-  thatMark:
-    - type: UntypedTarget
-      contentRange:
-        start: {line: 0, character: 10}
-        end: {line: 0, character: 10}
-      isReversed: false
-      hasExplicitRange: false
-finalState:
-  documentContents: |
-    helloWorldnow
-  selections:
-    - anchor: {line: 0, character: 10}
-      active: {line: 0, character: 10}
-fullTargets: [{type: primitive, mark: {type: that}, modifiers: [{type: trailing}]}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/implicitExpansion/cloneAir.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/implicitExpansion/cloneAir.yml
deleted file mode 100644
index 66d507e4a2..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/implicitExpansion/cloneAir.yml
+++ /dev/null
@@ -1,26 +0,0 @@
-languageId: plaintext
-command:
-  spokenForm: clone air
-  version: 2
-  targets:
-    - type: primitive
-      mark: {type: decoratedSymbol, symbolColor: default, character: a}
-  usePrePhraseSnapshot: true
-  action: {name: insertCopyAfter}
-initialState:
-  documentContents: aaa bbb
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-  marks:
-    default.a:
-      start: {line: 0, character: 0}
-      end: {line: 0, character: 3}
-finalState:
-  documentContents: |-
-    aaa bbb
-    aaa bbb
-  selections:
-    - anchor: {line: 1, character: 0}
-      active: {line: 1, character: 0}
-fullTargets: [{type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: a}, modifiers: []}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/implicitExpansion/cloneFunk.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/implicitExpansion/cloneFunk.yml
deleted file mode 100644
index 0ab94dd6db..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/implicitExpansion/cloneFunk.yml
+++ /dev/null
@@ -1,33 +0,0 @@
-languageId: typescript
-command:
-  spokenForm: clone funk
-  version: 2
-  targets:
-    - type: primitive
-      modifiers:
-        - type: containingScope
-          scopeType: {type: namedFunction}
-  usePrePhraseSnapshot: true
-  action: {name: insertCopyAfter}
-initialState:
-  documentContents: |-
-    function myFunk() {
-      // aaa
-    }
-  selections:
-    - anchor: {line: 1, character: 5}
-      active: {line: 1, character: 5}
-  marks: {}
-finalState:
-  documentContents: |-
-    function myFunk() {
-      // aaa
-    }
-
-    function myFunk() {
-      // aaa
-    }
-  selections:
-    - anchor: {line: 5, character: 5}
-      active: {line: 5, character: 5}
-fullTargets: [{type: primitive, mark: {type: cursor}, modifiers: [{type: containingScope, scopeType: {type: namedFunction}}]}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/implicitExpansion/cloneNearPastWhale.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/implicitExpansion/cloneNearPastWhale.yml
deleted file mode 100644
index 248e2de1ef..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/implicitExpansion/cloneNearPastWhale.yml
+++ /dev/null
@@ -1,42 +0,0 @@
-languageId: plaintext
-command:
-  spokenForm: clone near past whale
-  version: 2
-  targets:
-    - type: range
-      anchor:
-        type: primitive
-        mark: {type: decoratedSymbol, symbolColor: default, character: 'n'}
-      active:
-        type: primitive
-        mark: {type: decoratedSymbol, symbolColor: default, character: w}
-      excludeAnchor: false
-      excludeActive: false
-  usePrePhraseSnapshot: true
-  action: {name: insertCopyAfter}
-initialState:
-  documentContents: |+
-    hello now
-    whatever
-
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-  marks:
-    default.n:
-      start: {line: 0, character: 6}
-      end: {line: 0, character: 9}
-    default.w:
-      start: {line: 1, character: 0}
-      end: {line: 1, character: 8}
-finalState:
-  documentContents: |+
-    hello now
-    whatever
-    hello now
-    whatever
-
-  selections:
-    - anchor: {line: 2, character: 0}
-      active: {line: 2, character: 0}
-fullTargets: [{type: range, excludeAnchor: false, excludeActive: false, rangeType: continuous, anchor: {type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: 'n'}, modifiers: []}, active: {type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: w}, modifiers: []}}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/implicitExpansion/clonePastWhale.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/implicitExpansion/clonePastWhale.yml
deleted file mode 100644
index 7bc0e689d3..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/implicitExpansion/clonePastWhale.yml
+++ /dev/null
@@ -1,35 +0,0 @@
-languageId: plaintext
-command:
-  spokenForm: clone past whale
-  version: 2
-  targets:
-    - type: range
-      anchor: {type: primitive}
-      active:
-        type: primitive
-        mark: {type: decoratedSymbol, symbolColor: default, character: w}
-      excludeAnchor: false
-      excludeActive: false
-  usePrePhraseSnapshot: true
-  action: {name: insertCopyAfter}
-initialState:
-  documentContents: |-
-    hello
-    world
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-  marks:
-    default.w:
-      start: {line: 1, character: 0}
-      end: {line: 1, character: 5}
-finalState:
-  documentContents: |-
-    hello
-    world
-    hello
-    world
-  selections:
-    - anchor: {line: 2, character: 0}
-      active: {line: 2, character: 0}
-fullTargets: [{type: range, excludeAnchor: false, excludeActive: false, rangeType: continuous, anchor: {type: primitive, mark: {type: cursor}, modifiers: []}, active: {type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: w}, modifiers: []}}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/implicitExpansion/cloneThat.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/implicitExpansion/cloneThat.yml
deleted file mode 100644
index dd3f6ecc7d..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/implicitExpansion/cloneThat.yml
+++ /dev/null
@@ -1,31 +0,0 @@
-languageId: plaintext
-command:
-  spokenForm: clone that
-  version: 2
-  targets:
-    - type: primitive
-      mark: {type: that}
-  usePrePhraseSnapshot: true
-  action: {name: insertCopyAfter}
-initialState:
-  documentContents: |
-    hello world
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-  marks: {}
-  thatMark:
-    - type: UntypedTarget
-      contentRange:
-        start: {line: 0, character: 6}
-        end: {line: 0, character: 6}
-      isReversed: false
-      hasExplicitRange: false
-finalState:
-  documentContents: |
-    hello world
-    hello world
-  selections:
-    - anchor: {line: 1, character: 0}
-      active: {line: 1, character: 0}
-fullTargets: [{type: primitive, mark: {type: that}, modifiers: []}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/implicitExpansion/cloneThat2.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/implicitExpansion/cloneThat2.yml
deleted file mode 100644
index 586172e9ae..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/implicitExpansion/cloneThat2.yml
+++ /dev/null
@@ -1,33 +0,0 @@
-languageId: plaintext
-command:
-  spokenForm: clone that
-  version: 2
-  targets:
-    - type: primitive
-      mark: {type: that}
-  usePrePhraseSnapshot: true
-  action: {name: insertCopyAfter}
-initialState:
-  documentContents: |+
-    hello world
-
-  selections:
-    - anchor: {line: 2, character: 0}
-      active: {line: 2, character: 0}
-  marks: {}
-  thatMark:
-    - type: UntypedTarget
-      contentRange:
-        start: {line: 0, character: 6}
-        end: {line: 0, character: 11}
-      isReversed: false
-      hasExplicitRange: true
-finalState:
-  documentContents: |+
-    hello world
-    hello world
-
-  selections:
-    - anchor: {line: 3, character: 0}
-      active: {line: 3, character: 0}
-fullTargets: [{type: primitive, mark: {type: that}, modifiers: []}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/implicitExpansion/cloneThis.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/implicitExpansion/cloneThis.yml
deleted file mode 100644
index afe753cf01..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/implicitExpansion/cloneThis.yml
+++ /dev/null
@@ -1,23 +0,0 @@
-languageId: plaintext
-command:
-  spokenForm: clone this
-  version: 2
-  targets:
-    - type: primitive
-      mark: {type: cursor}
-  usePrePhraseSnapshot: true
-  action: {name: insertCopyAfter}
-initialState:
-  documentContents: aaa bbb
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-  marks: {}
-finalState:
-  documentContents: |-
-    aaa bbb
-    aaa bbb
-  selections:
-    - anchor: {line: 1, character: 0}
-      active: {line: 1, character: 0}
-fullTargets: [{type: primitive, mark: {type: cursor}, modifiers: []}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/implicitExpansion/cloneThis2.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/implicitExpansion/cloneThis2.yml
deleted file mode 100644
index d2116cff6a..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/implicitExpansion/cloneThis2.yml
+++ /dev/null
@@ -1,23 +0,0 @@
-languageId: plaintext
-command:
-  spokenForm: clone this
-  version: 2
-  targets:
-    - type: primitive
-      mark: {type: cursor}
-  usePrePhraseSnapshot: true
-  action: {name: insertCopyAfter}
-initialState:
-  documentContents: aaa bbb
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 3}
-  marks: {}
-finalState:
-  documentContents: |-
-    aaa bbb
-    aaa bbb
-  selections:
-    - anchor: {line: 1, character: 0}
-      active: {line: 1, character: 3}
-fullTargets: [{type: primitive, mark: {type: cursor}, modifiers: []}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/implicitExpansion/funkWrapPastInk.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/implicitExpansion/funkWrapPastInk.yml
deleted file mode 100644
index 75a41490be..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/implicitExpansion/funkWrapPastInk.yml
+++ /dev/null
@@ -1,37 +0,0 @@
-languageId: typescript
-command:
-  spokenForm: funk wrap past ink
-  version: 2
-  targets:
-    - type: range
-      anchor: {type: primitive}
-      active:
-        type: primitive
-        mark: {type: decoratedSymbol, symbolColor: default, character: i}
-      excludeAnchor: false
-      excludeActive: false
-  usePrePhraseSnapshot: true
-  action:
-    name: wrapWithSnippet
-    args: [functionDeclaration.body]
-initialState:
-  documentContents: |-
-    const whatever = "hello";
-    const testing = "hello";
-  selections:
-    - anchor: {line: 0, character: 6}
-      active: {line: 0, character: 6}
-  marks:
-    default.i:
-      start: {line: 1, character: 6}
-      end: {line: 1, character: 13}
-finalState:
-  documentContents: |-
-    function () {
-        const whatever = "hello";
-        const testing = "hello";
-    }
-  selections:
-    - anchor: {line: 0, character: 9}
-      active: {line: 0, character: 9}
-fullTargets: [{type: range, excludeAnchor: false, excludeActive: false, rangeType: continuous, anchor: {type: primitive, mark: {type: cursor}, modifiers: []}, active: {type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: i}, modifiers: []}}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/implicitExpansion/funkWrapThat.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/implicitExpansion/funkWrapThat.yml
deleted file mode 100644
index 78dbfa1d87..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/implicitExpansion/funkWrapThat.yml
+++ /dev/null
@@ -1,34 +0,0 @@
-languageId: typescript
-command:
-  spokenForm: funk wrap that
-  version: 2
-  targets:
-    - type: primitive
-      mark: {type: that}
-  usePrePhraseSnapshot: true
-  action:
-    name: wrapWithSnippet
-    args: [functionDeclaration.body]
-initialState:
-  documentContents: |
-    const whatever = "hello";
-  selections:
-    - anchor: {line: 1, character: 0}
-      active: {line: 1, character: 0}
-  marks: {}
-  thatMark:
-    - type: UntypedTarget
-      contentRange:
-        start: {line: 0, character: 23}
-        end: {line: 0, character: 23}
-      isReversed: false
-      hasExplicitRange: false
-finalState:
-  documentContents: |
-    function () {
-        const whatever = "hello";
-    }
-  selections:
-    - anchor: {line: 0, character: 9}
-      active: {line: 0, character: 9}
-fullTargets: [{type: primitive, mark: {type: that}, modifiers: []}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/implicitExpansion/funkWrapThat2.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/implicitExpansion/funkWrapThat2.yml
deleted file mode 100644
index 54866e628c..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/implicitExpansion/funkWrapThat2.yml
+++ /dev/null
@@ -1,34 +0,0 @@
-languageId: typescript
-command:
-  spokenForm: funk wrap that
-  version: 2
-  targets:
-    - type: primitive
-      mark: {type: that}
-  usePrePhraseSnapshot: true
-  action:
-    name: wrapWithSnippet
-    args: [functionDeclaration.body]
-initialState:
-  documentContents: |
-    const whatever = "hello";
-  selections:
-    - anchor: {line: 1, character: 0}
-      active: {line: 1, character: 0}
-  marks: {}
-  thatMark:
-    - type: UntypedTarget
-      contentRange:
-        start: {line: 0, character: 6}
-        end: {line: 0, character: 14}
-      isReversed: false
-      hasExplicitRange: true
-finalState:
-  documentContents: |
-    function () {
-        const whatever = "hello";
-    }
-  selections:
-    - anchor: {line: 0, character: 9}
-      active: {line: 0, character: 9}
-fullTargets: [{type: primitive, mark: {type: that}, modifiers: []}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/implicitExpansion/funkWrapThis.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/implicitExpansion/funkWrapThis.yml
deleted file mode 100644
index 1c9551b5ff..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/implicitExpansion/funkWrapThis.yml
+++ /dev/null
@@ -1,26 +0,0 @@
-languageId: typescript
-command:
-  spokenForm: funk wrap this
-  version: 2
-  targets:
-    - type: primitive
-      mark: {type: cursor}
-  usePrePhraseSnapshot: true
-  action:
-    name: wrapWithSnippet
-    args: [functionDeclaration.body]
-initialState:
-  documentContents: const whatever = "hello";
-  selections:
-    - anchor: {line: 0, character: 24}
-      active: {line: 0, character: 24}
-  marks: {}
-finalState:
-  documentContents: |-
-    function () {
-        const whatever = "hello";
-    }
-  selections:
-    - anchor: {line: 0, character: 9}
-      active: {line: 0, character: 9}
-fullTargets: [{type: primitive, mark: {type: cursor}, modifiers: []}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/implicitExpansion/funkWrapThis2.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/implicitExpansion/funkWrapThis2.yml
deleted file mode 100644
index 6bd7b36882..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/implicitExpansion/funkWrapThis2.yml
+++ /dev/null
@@ -1,26 +0,0 @@
-languageId: typescript
-command:
-  spokenForm: funk wrap this
-  version: 2
-  targets:
-    - type: primitive
-      mark: {type: cursor}
-  usePrePhraseSnapshot: true
-  action:
-    name: wrapWithSnippet
-    args: [functionDeclaration.body]
-initialState:
-  documentContents: const whatever = "hello";
-  selections:
-    - anchor: {line: 0, character: 18}
-      active: {line: 0, character: 23}
-  marks: {}
-finalState:
-  documentContents: |-
-    function () {
-        const whatever = "hello";
-    }
-  selections:
-    - anchor: {line: 0, character: 9}
-      active: {line: 0, character: 9}
-fullTargets: [{type: primitive, mark: {type: cursor}, modifiers: []}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/implicitExpansion/funkWrapToken.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/implicitExpansion/funkWrapToken.yml
deleted file mode 100644
index 565d9b6aa6..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/implicitExpansion/funkWrapToken.yml
+++ /dev/null
@@ -1,28 +0,0 @@
-languageId: typescript
-command:
-  spokenForm: funk wrap token
-  version: 2
-  targets:
-    - type: primitive
-      modifiers:
-        - type: containingScope
-          scopeType: {type: token}
-  usePrePhraseSnapshot: true
-  action:
-    name: wrapWithSnippet
-    args: [functionDeclaration.body]
-initialState:
-  documentContents: const whatever = "hello";
-  selections:
-    - anchor: {line: 0, character: 18}
-      active: {line: 0, character: 18}
-  marks: {}
-finalState:
-  documentContents: |-
-    const whatever = "function () {
-        hello
-    }";
-  selections:
-    - anchor: {line: 0, character: 27}
-      active: {line: 0, character: 27}
-fullTargets: [{type: primitive, mark: {type: cursor}, modifiers: [{type: containingScope, scopeType: {type: token}}]}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/implicitExpansion/funkWrapWhale.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/implicitExpansion/funkWrapWhale.yml
deleted file mode 100644
index a3ea750b40..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/implicitExpansion/funkWrapWhale.yml
+++ /dev/null
@@ -1,30 +0,0 @@
-languageId: typescript
-command:
-  spokenForm: funk wrap whale
-  version: 2
-  targets:
-    - type: primitive
-      mark: {type: decoratedSymbol, symbolColor: default, character: w}
-  usePrePhraseSnapshot: true
-  action:
-    name: wrapWithSnippet
-    args: [functionDeclaration.body]
-initialState:
-  documentContents: |
-    const whatever = "hello";
-  selections:
-    - anchor: {line: 1, character: 0}
-      active: {line: 1, character: 0}
-  marks:
-    default.w:
-      start: {line: 0, character: 6}
-      end: {line: 0, character: 14}
-finalState:
-  documentContents: |
-    function () {
-        const whatever = "hello";
-    }
-  selections:
-    - anchor: {line: 0, character: 9}
-      active: {line: 0, character: 9}
-fullTargets: [{type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: w}, modifiers: []}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/implicitExpansion/funkWrapWhalePastBat.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/implicitExpansion/funkWrapWhalePastBat.yml
deleted file mode 100644
index 08f602164c..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/implicitExpansion/funkWrapWhalePastBat.yml
+++ /dev/null
@@ -1,42 +0,0 @@
-languageId: typescript
-command:
-  spokenForm: funk wrap whale past bat
-  version: 2
-  targets:
-    - type: range
-      anchor:
-        type: primitive
-        mark: {type: decoratedSymbol, symbolColor: default, character: w}
-      active:
-        type: primitive
-        mark: {type: decoratedSymbol, symbolColor: default, character: b}
-      excludeAnchor: false
-      excludeActive: false
-  usePrePhraseSnapshot: true
-  action:
-    name: wrapWithSnippet
-    args: [functionDeclaration.body]
-initialState:
-  documentContents: |
-    const whatever = "hello";
-    const bar = "hello";
-  selections:
-    - anchor: {line: 2, character: 0}
-      active: {line: 2, character: 0}
-  marks:
-    default.w:
-      start: {line: 0, character: 6}
-      end: {line: 0, character: 14}
-    default.b:
-      start: {line: 1, character: 6}
-      end: {line: 1, character: 9}
-finalState:
-  documentContents: |
-    function () {
-        const whatever = "hello";
-        const bar = "hello";
-    }
-  selections:
-    - anchor: {line: 0, character: 9}
-      active: {line: 0, character: 9}
-fullTargets: [{type: range, excludeAnchor: false, excludeActive: false, rangeType: continuous, anchor: {type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: w}, modifiers: []}, active: {type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: b}, modifiers: []}}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/implicitExpansion/pourAir.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/implicitExpansion/pourAir.yml
deleted file mode 100644
index c57ca6a3e3..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/implicitExpansion/pourAir.yml
+++ /dev/null
@@ -1,25 +0,0 @@
-languageId: plaintext
-command:
-  spokenForm: pour air
-  version: 2
-  targets:
-    - type: primitive
-      mark: {type: decoratedSymbol, symbolColor: default, character: a}
-  usePrePhraseSnapshot: true
-  action: {name: editNewLineAfter}
-initialState:
-  documentContents: aaa bbb
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-  marks:
-    default.a:
-      start: {line: 0, character: 0}
-      end: {line: 0, character: 3}
-finalState:
-  documentContents: |
-    aaa bbb
-  selections:
-    - anchor: {line: 1, character: 0}
-      active: {line: 1, character: 0}
-fullTargets: [{type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: a}, modifiers: []}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/implicitExpansion/pourFunk.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/implicitExpansion/pourFunk.yml
deleted file mode 100644
index a2614e4404..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/implicitExpansion/pourFunk.yml
+++ /dev/null
@@ -1,30 +0,0 @@
-languageId: typescript
-command:
-  spokenForm: pour funk
-  version: 2
-  targets:
-    - type: primitive
-      modifiers:
-        - type: containingScope
-          scopeType: {type: namedFunction}
-  usePrePhraseSnapshot: true
-  action: {name: editNewLineAfter}
-initialState:
-  documentContents: |-
-    function myFunk() {
-      // aaa
-    }
-  selections:
-    - anchor: {line: 1, character: 5}
-      active: {line: 1, character: 5}
-  marks: {}
-finalState:
-  documentContents: |+
-    function myFunk() {
-      // aaa
-    }
-
-  selections:
-    - anchor: {line: 4, character: 0}
-      active: {line: 4, character: 0}
-fullTargets: [{type: primitive, mark: {type: cursor}, modifiers: [{type: containingScope, scopeType: {type: namedFunction}}]}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/implicitExpansion/pourNearPastWhale.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/implicitExpansion/pourNearPastWhale.yml
deleted file mode 100644
index 774d384c06..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/implicitExpansion/pourNearPastWhale.yml
+++ /dev/null
@@ -1,39 +0,0 @@
-languageId: plaintext
-command:
-  spokenForm: pour near past whale
-  version: 2
-  targets:
-    - type: range
-      anchor:
-        type: primitive
-        mark: {type: decoratedSymbol, symbolColor: default, character: 'n'}
-      active:
-        type: primitive
-        mark: {type: decoratedSymbol, symbolColor: default, character: w}
-      excludeAnchor: false
-      excludeActive: false
-  usePrePhraseSnapshot: true
-  action: {name: editNewLineAfter}
-initialState:
-  documentContents: |
-    hello now
-    whatever
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-  marks:
-    default.n:
-      start: {line: 0, character: 6}
-      end: {line: 0, character: 9}
-    default.w:
-      start: {line: 1, character: 0}
-      end: {line: 1, character: 8}
-finalState:
-  documentContents: |+
-    hello now
-    whatever
-
-  selections:
-    - anchor: {line: 2, character: 0}
-      active: {line: 2, character: 0}
-fullTargets: [{type: range, excludeAnchor: false, excludeActive: false, rangeType: continuous, anchor: {type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: 'n'}, modifiers: []}, active: {type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: w}, modifiers: []}}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/implicitExpansion/pourPastWhale.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/implicitExpansion/pourPastWhale.yml
deleted file mode 100644
index e063b4d82c..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/implicitExpansion/pourPastWhale.yml
+++ /dev/null
@@ -1,33 +0,0 @@
-languageId: plaintext
-command:
-  spokenForm: pour past whale
-  version: 2
-  targets:
-    - type: range
-      anchor: {type: primitive}
-      active:
-        type: primitive
-        mark: {type: decoratedSymbol, symbolColor: default, character: w}
-      excludeAnchor: false
-      excludeActive: false
-  usePrePhraseSnapshot: true
-  action: {name: editNewLineAfter}
-initialState:
-  documentContents: |-
-    hello
-    world
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-  marks:
-    default.w:
-      start: {line: 1, character: 0}
-      end: {line: 1, character: 5}
-finalState:
-  documentContents: |
-    hello
-    world
-  selections:
-    - anchor: {line: 2, character: 0}
-      active: {line: 2, character: 0}
-fullTargets: [{type: range, excludeAnchor: false, excludeActive: false, rangeType: continuous, anchor: {type: primitive, mark: {type: cursor}, modifiers: []}, active: {type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: w}, modifiers: []}}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/implicitExpansion/pourThat.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/implicitExpansion/pourThat.yml
deleted file mode 100644
index 5398c6f718..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/implicitExpansion/pourThat.yml
+++ /dev/null
@@ -1,33 +0,0 @@
-languageId: plaintext
-command:
-  spokenForm: pour that
-  version: 2
-  targets:
-    - type: primitive
-      mark: {type: that}
-  usePrePhraseSnapshot: true
-  action: {name: editNewLineAfter}
-initialState:
-  documentContents: |+
-    hello world
-
-  selections:
-    - anchor: {line: 2, character: 0}
-      active: {line: 2, character: 0}
-  marks: {}
-  thatMark:
-    - type: UntypedTarget
-      contentRange:
-        start: {line: 0, character: 6}
-        end: {line: 0, character: 6}
-      isReversed: false
-      hasExplicitRange: false
-finalState:
-  documentContents: |+
-    hello world
-
-
-  selections:
-    - anchor: {line: 1, character: 0}
-      active: {line: 1, character: 0}
-fullTargets: [{type: primitive, mark: {type: that}, modifiers: []}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/implicitExpansion/pourThat2.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/implicitExpansion/pourThat2.yml
deleted file mode 100644
index 750e95e035..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/implicitExpansion/pourThat2.yml
+++ /dev/null
@@ -1,33 +0,0 @@
-languageId: plaintext
-command:
-  spokenForm: pour that
-  version: 2
-  targets:
-    - type: primitive
-      mark: {type: that}
-  usePrePhraseSnapshot: true
-  action: {name: editNewLineAfter}
-initialState:
-  documentContents: |+
-    hello world
-
-  selections:
-    - anchor: {line: 2, character: 0}
-      active: {line: 2, character: 0}
-  marks: {}
-  thatMark:
-    - type: UntypedTarget
-      contentRange:
-        start: {line: 0, character: 6}
-        end: {line: 0, character: 11}
-      isReversed: false
-      hasExplicitRange: true
-finalState:
-  documentContents: |+
-    hello world
-
-
-  selections:
-    - anchor: {line: 1, character: 0}
-      active: {line: 1, character: 0}
-fullTargets: [{type: primitive, mark: {type: that}, modifiers: []}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/implicitExpansion/pourThis.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/implicitExpansion/pourThis.yml
deleted file mode 100644
index fba7b15155..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/implicitExpansion/pourThis.yml
+++ /dev/null
@@ -1,22 +0,0 @@
-languageId: plaintext
-command:
-  spokenForm: pour this
-  version: 2
-  targets:
-    - type: primitive
-      mark: {type: cursor}
-  usePrePhraseSnapshot: true
-  action: {name: editNewLineAfter}
-initialState:
-  documentContents: aaa bbb
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-  marks: {}
-finalState:
-  documentContents: |
-    aaa bbb
-  selections:
-    - anchor: {line: 1, character: 0}
-      active: {line: 1, character: 0}
-fullTargets: [{type: primitive, mark: {type: cursor}, modifiers: []}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/implicitExpansion/pourThis2.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/implicitExpansion/pourThis2.yml
deleted file mode 100644
index b6243265d7..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/implicitExpansion/pourThis2.yml
+++ /dev/null
@@ -1,22 +0,0 @@
-languageId: plaintext
-command:
-  spokenForm: pour this
-  version: 2
-  targets:
-    - type: primitive
-      mark: {type: cursor}
-  usePrePhraseSnapshot: true
-  action: {name: editNewLineAfter}
-initialState:
-  documentContents: aaa bbb
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 3}
-  marks: {}
-finalState:
-  documentContents: |
-    aaa bbb
-  selections:
-    - anchor: {line: 1, character: 0}
-      active: {line: 1, character: 0}
-fullTargets: [{type: primitive, mark: {type: cursor}, modifiers: []}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/implicitExpansion/snipFunkAfterThat.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/implicitExpansion/snipFunkAfterThat.yml
deleted file mode 100644
index afdafa47b8..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/implicitExpansion/snipFunkAfterThat.yml
+++ /dev/null
@@ -1,42 +0,0 @@
-languageId: typescript
-command:
-  spokenForm: snip funk after that
-  version: 2
-  targets:
-    - type: primitive
-      mark: {type: that}
-      modifiers:
-        - {type: position, position: after}
-  usePrePhraseSnapshot: true
-  action:
-    name: insertSnippet
-    args: [functionDeclaration]
-initialState:
-  documentContents: |
-    function myFunction() {
-        const whatever = "hello";
-    }
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-  marks: {}
-  thatMark:
-    - type: UntypedTarget
-      contentRange:
-        start: {line: 1, character: 27}
-        end: {line: 1, character: 27}
-      isReversed: false
-      hasExplicitRange: false
-finalState:
-  documentContents: |
-    function myFunction() {
-        const whatever = "hello";
-    }
-
-    function () {
-        
-    }
-  selections:
-    - anchor: {line: 4, character: 9}
-      active: {line: 4, character: 9}
-fullTargets: [{type: primitive, mark: {type: that}, modifiers: [], positionModifier: {type: position, position: after}}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/implicitExpansion/snipFunkAfterThat2.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/implicitExpansion/snipFunkAfterThat2.yml
deleted file mode 100644
index 81b8163e0d..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/implicitExpansion/snipFunkAfterThat2.yml
+++ /dev/null
@@ -1,42 +0,0 @@
-languageId: typescript
-command:
-  spokenForm: snip funk after that
-  version: 2
-  targets:
-    - type: primitive
-      mark: {type: that}
-      modifiers:
-        - {type: position, position: after}
-  usePrePhraseSnapshot: true
-  action:
-    name: insertSnippet
-    args: [functionDeclaration]
-initialState:
-  documentContents: |-
-    function whatever() {
-        const hello = "world";
-    }
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-  marks: {}
-  thatMark:
-    - type: UntypedTarget
-      contentRange:
-        start: {line: 1, character: 10}
-        end: {line: 1, character: 15}
-      isReversed: false
-      hasExplicitRange: true
-finalState:
-  documentContents: |-
-    function whatever() {
-        const hello = "world";
-    }
-
-    function () {
-        
-    }
-  selections:
-    - anchor: {line: 4, character: 9}
-      active: {line: 4, character: 9}
-fullTargets: [{type: primitive, mark: {type: that}, modifiers: [], positionModifier: {type: position, position: after}}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/implicitExpansion/snipFunkAfterThis.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/implicitExpansion/snipFunkAfterThis.yml
deleted file mode 100644
index 529923af9b..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/implicitExpansion/snipFunkAfterThis.yml
+++ /dev/null
@@ -1,39 +0,0 @@
-languageId: typescript
-command:
-  spokenForm: snip funk after this
-  version: 2
-  targets:
-    - type: primitive
-      mark: {type: cursor}
-      modifiers:
-        - {type: position, position: after}
-  usePrePhraseSnapshot: true
-  action:
-    name: insertSnippet
-    args: [functionDeclaration]
-initialState:
-  documentContents: |+
-    function myFunction() {
-        const whatever = "hello";
-    }
-
-
-  selections:
-    - anchor: {line: 1, character: 10}
-      active: {line: 1, character: 10}
-  marks: {}
-finalState:
-  documentContents: |+
-    function myFunction() {
-        const whatever = "hello";
-    }
-
-    function () {
-        
-    }
-
-
-  selections:
-    - anchor: {line: 4, character: 9}
-      active: {line: 4, character: 9}
-fullTargets: [{type: primitive, mark: {type: cursor}, modifiers: [], positionModifier: {type: position, position: after}}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/implicitExpansion/snipFunkAfterThis2.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/implicitExpansion/snipFunkAfterThis2.yml
deleted file mode 100644
index bd9144923a..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/implicitExpansion/snipFunkAfterThis2.yml
+++ /dev/null
@@ -1,39 +0,0 @@
-languageId: typescript
-command:
-  spokenForm: snip funk after this
-  version: 2
-  targets:
-    - type: primitive
-      mark: {type: cursor}
-      modifiers:
-        - {type: position, position: after}
-  usePrePhraseSnapshot: true
-  action:
-    name: insertSnippet
-    args: [functionDeclaration]
-initialState:
-  documentContents: |+
-    function myFunction() {
-        const whatever = "hello";
-    }
-
-
-  selections:
-    - anchor: {line: 1, character: 10}
-      active: {line: 1, character: 18}
-  marks: {}
-finalState:
-  documentContents: |+
-    function myFunction() {
-        const whatever = "hello";
-    }
-
-    function () {
-        
-    }
-
-
-  selections:
-    - anchor: {line: 4, character: 9}
-      active: {line: 4, character: 9}
-fullTargets: [{type: primitive, mark: {type: cursor}, modifiers: [], positionModifier: {type: position, position: after}}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/implicitExpansion/snipFunkAfterToken.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/implicitExpansion/snipFunkAfterToken.yml
deleted file mode 100644
index 8acc75628a..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/implicitExpansion/snipFunkAfterToken.yml
+++ /dev/null
@@ -1,36 +0,0 @@
-languageId: typescript
-command:
-  spokenForm: snip funk after token
-  version: 2
-  targets:
-    - type: primitive
-      modifiers:
-        - {type: position, position: after}
-        - type: containingScope
-          scopeType: {type: token}
-  usePrePhraseSnapshot: true
-  action:
-    name: insertSnippet
-    args: [functionDeclaration]
-initialState:
-  documentContents: |+
-    function myFunction() {
-        const whatever = "hello";
-    }
-
-  selections:
-    - anchor: {line: 1, character: 10}
-      active: {line: 1, character: 18}
-  marks: {}
-finalState:
-  documentContents: |+
-    function myFunction() {
-        const whatever function () {
-            
-        } = "hello";
-    }
-
-  selections:
-    - anchor: {line: 1, character: 28}
-      active: {line: 1, character: 28}
-fullTargets: [{type: primitive, mark: {type: cursor}, modifiers: [{type: containingScope, scopeType: {type: token}}], positionModifier: {type: position, position: after}}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/implicitExpansion/snipFunkAfterWhale.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/implicitExpansion/snipFunkAfterWhale.yml
deleted file mode 100644
index a97a32c1c2..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/implicitExpansion/snipFunkAfterWhale.yml
+++ /dev/null
@@ -1,40 +0,0 @@
-languageId: typescript
-command:
-  spokenForm: snip funk after whale
-  version: 2
-  targets:
-    - type: primitive
-      mark: {type: decoratedSymbol, symbolColor: default, character: w}
-      modifiers:
-        - {type: position, position: after}
-  usePrePhraseSnapshot: true
-  action:
-    name: insertSnippet
-    args: [functionDeclaration]
-initialState:
-  documentContents: |+
-    function myFunction() {
-        const whatever = "hello";
-    }
-
-  selections:
-    - anchor: {line: 4, character: 0}
-      active: {line: 4, character: 0}
-  marks:
-    default.w:
-      start: {line: 1, character: 10}
-      end: {line: 1, character: 18}
-finalState:
-  documentContents: |+
-    function myFunction() {
-        const whatever = "hello";
-    }
-
-    function () {
-        
-    }
-
-  selections:
-    - anchor: {line: 4, character: 9}
-      active: {line: 4, character: 9}
-fullTargets: [{type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: w}, modifiers: [], positionModifier: {type: position, position: after}}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/implicitExpansion/snipFunkToAirPastWhale.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/implicitExpansion/snipFunkToAirPastWhale.yml
deleted file mode 100644
index 8225dc4b98..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/implicitExpansion/snipFunkToAirPastWhale.yml
+++ /dev/null
@@ -1,48 +0,0 @@
-languageId: typescript
-command:
-  spokenForm: snip funk to air past whale
-  version: 2
-  targets:
-    - type: range
-      anchor:
-        type: primitive
-        mark: {type: decoratedSymbol, symbolColor: default, character: a}
-      active:
-        type: primitive
-        mark: {type: decoratedSymbol, symbolColor: default, character: w}
-      excludeAnchor: false
-      excludeActive: false
-  usePrePhraseSnapshot: true
-  action:
-    name: insertSnippet
-    args: [functionDeclaration]
-initialState:
-  documentContents: |+
-    function myFunction() {
-        const whatever = "hello";
-    }
-
-    function testing() {
-        const whatever = "hello";
-    }
-
-  selections:
-    - anchor: {line: 8, character: 0}
-      active: {line: 8, character: 0}
-  marks:
-    default.a:
-      start: {line: 1, character: 10}
-      end: {line: 1, character: 18}
-    default.w:
-      start: {line: 5, character: 10}
-      end: {line: 5, character: 18}
-finalState:
-  documentContents: |+
-    function () {
-        
-    }
-
-  selections:
-    - anchor: {line: 0, character: 9}
-      active: {line: 0, character: 9}
-fullTargets: [{type: range, excludeAnchor: false, excludeActive: false, rangeType: continuous, anchor: {type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: a}, modifiers: []}, active: {type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: w}, modifiers: []}}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/implicitExpansion/snipFunkToThisPastEach.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/implicitExpansion/snipFunkToThisPastEach.yml
deleted file mode 100644
index f6dc51f16d..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/implicitExpansion/snipFunkToThisPastEach.yml
+++ /dev/null
@@ -1,43 +0,0 @@
-languageId: typescript
-command:
-  spokenForm: snip funk to this past each
-  version: 2
-  targets:
-    - type: range
-      anchor:
-        type: primitive
-        mark: {type: cursor}
-      active:
-        type: primitive
-        mark: {type: decoratedSymbol, symbolColor: default, character: e}
-      excludeAnchor: false
-      excludeActive: false
-  usePrePhraseSnapshot: true
-  action:
-    name: insertSnippet
-    args: [functionDeclaration]
-initialState:
-  documentContents: |-
-    function whatever() {
-        const hello = "world";
-    }
-
-    function testing() {
-        const hello = "world";
-    }
-  selections:
-    - anchor: {line: 1, character: 10}
-      active: {line: 1, character: 10}
-  marks:
-    default.e:
-      start: {line: 5, character: 10}
-      end: {line: 5, character: 15}
-finalState:
-  documentContents: |-
-    function () {
-        
-    }
-  selections:
-    - anchor: {line: 0, character: 9}
-      active: {line: 0, character: 9}
-fullTargets: [{type: range, excludeAnchor: false, excludeActive: false, rangeType: continuous, anchor: {type: primitive, mark: {type: cursor}, modifiers: []}, active: {type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: e}, modifiers: []}}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/implicitExpansion/squareSwitchAir.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/implicitExpansion/squareSwitchAir.yml
deleted file mode 100644
index 4ae6f91da2..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/implicitExpansion/squareSwitchAir.yml
+++ /dev/null
@@ -1,26 +0,0 @@
-languageId: plaintext
-command:
-  spokenForm: square switch air
-  version: 2
-  targets:
-    - type: primitive
-      mark: {type: decoratedSymbol, symbolColor: default, character: a}
-  usePrePhraseSnapshot: true
-  action:
-    name: rewrapWithPairedDelimiter
-    args: ['[', ']']
-initialState:
-  documentContents: (aaa bbb)
-  selections:
-    - anchor: {line: 0, character: 1}
-      active: {line: 0, character: 1}
-  marks:
-    default.a:
-      start: {line: 0, character: 1}
-      end: {line: 0, character: 4}
-finalState:
-  documentContents: "[aaa bbb]"
-  selections:
-    - anchor: {line: 0, character: 1}
-      active: {line: 0, character: 1}
-fullTargets: [{type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: a}, modifiers: []}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/implicitExpansion/squareSwitchFunk.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/implicitExpansion/squareSwitchFunk.yml
deleted file mode 100644
index 15be6bc5d9..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/implicitExpansion/squareSwitchFunk.yml
+++ /dev/null
@@ -1,26 +0,0 @@
-languageId: typescript
-command:
-  spokenForm: square switch funk
-  version: 2
-  targets:
-    - type: primitive
-      modifiers:
-        - type: containingScope
-          scopeType: {type: namedFunction}
-  usePrePhraseSnapshot: true
-  action:
-    name: rewrapWithPairedDelimiter
-    args: ['[', ']']
-initialState:
-  documentContents: |-
-    {
-      function myFunk() {
-        // aaa
-      }
-    }
-  selections:
-    - anchor: {line: 2, character: 7}
-      active: {line: 2, character: 7}
-  marks: {}
-fullTargets: [{type: primitive, mark: {type: cursor}, modifiers: [{type: containingScope, scopeType: {type: namedFunction}}]}]
-thrownError: {name: NoContainingScopeError}
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/implicitExpansion/squareSwitchLookPastTrap.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/implicitExpansion/squareSwitchLookPastTrap.yml
deleted file mode 100644
index 368c025e91..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/implicitExpansion/squareSwitchLookPastTrap.yml
+++ /dev/null
@@ -1,38 +0,0 @@
-languageId: plaintext
-command:
-  spokenForm: square switch look past trap
-  version: 2
-  targets:
-    - type: range
-      anchor:
-        type: primitive
-        mark: {type: decoratedSymbol, symbolColor: default, character: l}
-      active:
-        type: primitive
-        mark: {type: decoratedSymbol, symbolColor: default, character: t}
-      excludeAnchor: false
-      excludeActive: false
-  usePrePhraseSnapshot: true
-  action:
-    name: rewrapWithPairedDelimiter
-    args: ['[', ']']
-initialState:
-  documentContents: |
-    (hello there now)
-  selections:
-    - anchor: {line: 1, character: 0}
-      active: {line: 1, character: 0}
-  marks:
-    default.l:
-      start: {line: 0, character: 1}
-      end: {line: 0, character: 6}
-    default.t:
-      start: {line: 0, character: 7}
-      end: {line: 0, character: 12}
-finalState:
-  documentContents: |
-    [hello there now]
-  selections:
-    - anchor: {line: 1, character: 0}
-      active: {line: 1, character: 0}
-fullTargets: [{type: range, excludeAnchor: false, excludeActive: false, rangeType: continuous, anchor: {type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: l}, modifiers: []}, active: {type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: t}, modifiers: []}}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/implicitExpansion/squareSwitchPastWhale.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/implicitExpansion/squareSwitchPastWhale.yml
deleted file mode 100644
index 0fbb2d872d..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/implicitExpansion/squareSwitchPastWhale.yml
+++ /dev/null
@@ -1,31 +0,0 @@
-languageId: plaintext
-command:
-  spokenForm: square switch past whale
-  version: 2
-  targets:
-    - type: range
-      anchor: {type: primitive}
-      active:
-        type: primitive
-        mark: {type: decoratedSymbol, symbolColor: default, character: w}
-      excludeAnchor: false
-      excludeActive: false
-  usePrePhraseSnapshot: true
-  action:
-    name: rewrapWithPairedDelimiter
-    args: ['[', ']']
-initialState:
-  documentContents: (hello world there)
-  selections:
-    - anchor: {line: 0, character: 3}
-      active: {line: 0, character: 3}
-  marks:
-    default.w:
-      start: {line: 0, character: 7}
-      end: {line: 0, character: 12}
-finalState:
-  documentContents: "[hello world there]"
-  selections:
-    - anchor: {line: 0, character: 3}
-      active: {line: 0, character: 3}
-fullTargets: [{type: range, excludeAnchor: false, excludeActive: false, rangeType: continuous, anchor: {type: primitive, mark: {type: cursor}, modifiers: []}, active: {type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: w}, modifiers: []}}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/implicitExpansion/squareSwitchThat.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/implicitExpansion/squareSwitchThat.yml
deleted file mode 100644
index 2a206b3ee8..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/implicitExpansion/squareSwitchThat.yml
+++ /dev/null
@@ -1,32 +0,0 @@
-languageId: plaintext
-command:
-  spokenForm: square switch that
-  version: 2
-  targets:
-    - type: primitive
-      mark: {type: that}
-  usePrePhraseSnapshot: true
-  action:
-    name: rewrapWithPairedDelimiter
-    args: ['[', ']']
-initialState:
-  documentContents: |
-    (hello )
-  selections:
-    - anchor: {line: 1, character: 0}
-      active: {line: 1, character: 0}
-  marks: {}
-  thatMark:
-    - type: UntypedTarget
-      contentRange:
-        start: {line: 0, character: 7}
-        end: {line: 0, character: 7}
-      isReversed: false
-      hasExplicitRange: false
-finalState:
-  documentContents: |
-    [hello ]
-  selections:
-    - anchor: {line: 1, character: 0}
-      active: {line: 1, character: 0}
-fullTargets: [{type: primitive, mark: {type: that}, modifiers: []}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/implicitExpansion/squareSwitchThat2.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/implicitExpansion/squareSwitchThat2.yml
deleted file mode 100644
index ab2226e2be..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/implicitExpansion/squareSwitchThat2.yml
+++ /dev/null
@@ -1,32 +0,0 @@
-languageId: plaintext
-command:
-  spokenForm: square switch that
-  version: 2
-  targets:
-    - type: primitive
-      mark: {type: that}
-  usePrePhraseSnapshot: true
-  action:
-    name: rewrapWithPairedDelimiter
-    args: ['[', ']']
-initialState:
-  documentContents: |
-    (hello world)
-  selections:
-    - anchor: {line: 1, character: 0}
-      active: {line: 1, character: 0}
-  marks: {}
-  thatMark:
-    - type: UntypedTarget
-      contentRange:
-        start: {line: 0, character: 7}
-        end: {line: 0, character: 12}
-      isReversed: false
-      hasExplicitRange: true
-finalState:
-  documentContents: |
-    [hello world]
-  selections:
-    - anchor: {line: 1, character: 0}
-      active: {line: 1, character: 0}
-fullTargets: [{type: primitive, mark: {type: that}, modifiers: []}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/implicitExpansion/squareSwitchThis.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/implicitExpansion/squareSwitchThis.yml
deleted file mode 100644
index eff0122abd..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/implicitExpansion/squareSwitchThis.yml
+++ /dev/null
@@ -1,23 +0,0 @@
-languageId: plaintext
-command:
-  spokenForm: square switch this
-  version: 2
-  targets:
-    - type: primitive
-      mark: {type: cursor}
-  usePrePhraseSnapshot: true
-  action:
-    name: rewrapWithPairedDelimiter
-    args: ['[', ']']
-initialState:
-  documentContents: (aaa bbb)
-  selections:
-    - anchor: {line: 0, character: 1}
-      active: {line: 0, character: 1}
-  marks: {}
-finalState:
-  documentContents: "[aaa bbb]"
-  selections:
-    - anchor: {line: 0, character: 1}
-      active: {line: 0, character: 1}
-fullTargets: [{type: primitive, mark: {type: cursor}, modifiers: []}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/implicitExpansion/squareSwitchThis2.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/implicitExpansion/squareSwitchThis2.yml
deleted file mode 100644
index 36399903f0..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/implicitExpansion/squareSwitchThis2.yml
+++ /dev/null
@@ -1,23 +0,0 @@
-languageId: plaintext
-command:
-  spokenForm: square switch this
-  version: 2
-  targets:
-    - type: primitive
-      mark: {type: cursor}
-  usePrePhraseSnapshot: true
-  action:
-    name: rewrapWithPairedDelimiter
-    args: ['[', ']']
-initialState:
-  documentContents: (aaa bbb)
-  selections:
-    - anchor: {line: 0, character: 1}
-      active: {line: 0, character: 4}
-  marks: {}
-finalState:
-  documentContents: "[aaa bbb]"
-  selections:
-    - anchor: {line: 0, character: 1}
-      active: {line: 0, character: 4}
-fullTargets: [{type: primitive, mark: {type: cursor}, modifiers: []}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/implicitExpansion/takeEveryBlock.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/implicitExpansion/takeEveryBlock.yml
deleted file mode 100644
index d0f5883ef7..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/implicitExpansion/takeEveryBlock.yml
+++ /dev/null
@@ -1,41 +0,0 @@
-languageId: plaintext
-command:
-  spokenForm: take every block
-  version: 2
-  targets:
-    - type: primitive
-      modifiers:
-        - type: everyScope
-          scopeType: {type: paragraph}
-  usePrePhraseSnapshot: true
-  action: {name: setSelection}
-initialState:
-  documentContents: |-
-    first block-test
-    for testing
-
-    second block-test
-    for testing
-
-    third block-test
-    for testing
-  selections:
-    - anchor: {line: 0, character: 6}
-      active: {line: 3, character: 6}
-  marks: {}
-finalState:
-  documentContents: |-
-    first block-test
-    for testing
-
-    second block-test
-    for testing
-
-    third block-test
-    for testing
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 1, character: 11}
-    - anchor: {line: 3, character: 0}
-      active: {line: 4, character: 11}
-fullTargets: [{type: primitive, mark: {type: cursor}, modifiers: [{type: everyScope, scopeType: {type: paragraph}}]}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/implicitExpansion/takeEveryBlock2.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/implicitExpansion/takeEveryBlock2.yml
deleted file mode 100644
index b58bafa530..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/implicitExpansion/takeEveryBlock2.yml
+++ /dev/null
@@ -1,43 +0,0 @@
-languageId: plaintext
-command:
-  spokenForm: take every block
-  version: 2
-  targets:
-    - type: primitive
-      modifiers:
-        - type: everyScope
-          scopeType: {type: paragraph}
-  usePrePhraseSnapshot: true
-  action: {name: setSelection}
-initialState:
-  documentContents: |-
-    first block-test
-    for testing
-
-    second block-test
-    for testing
-
-    third block-test
-    for testing
-  selections:
-    - anchor: {line: 3, character: 6}
-      active: {line: 3, character: 6}
-  marks: {}
-finalState:
-  documentContents: |-
-    first block-test
-    for testing
-
-    second block-test
-    for testing
-
-    third block-test
-    for testing
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 1, character: 11}
-    - anchor: {line: 3, character: 0}
-      active: {line: 4, character: 11}
-    - anchor: {line: 6, character: 0}
-      active: {line: 7, character: 11}
-fullTargets: [{type: primitive, mark: {type: cursor}, modifiers: [{type: everyScope, scopeType: {type: paragraph}}]}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/implicitExpansion/takeEveryBlockFunkWhale.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/implicitExpansion/takeEveryBlockFunkWhale.yml
deleted file mode 100644
index 2e72607fb4..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/implicitExpansion/takeEveryBlockFunkWhale.yml
+++ /dev/null
@@ -1,49 +0,0 @@
-languageId: typescript
-command:
-  spokenForm: take every block funk whale
-  version: 2
-  targets:
-    - type: primitive
-      modifiers:
-        - type: everyScope
-          scopeType: {type: paragraph}
-        - type: containingScope
-          scopeType: {type: namedFunction}
-      mark: {type: decoratedSymbol, symbolColor: default, character: w}
-  usePrePhraseSnapshot: true
-  action: {name: setSelection}
-initialState:
-  documentContents: |-
-    function whatever() {
-        const testing = "hello";
-
-        const again = "hello";
-    }
-
-    function another() {
-        const testing = "hello";
-    }
-  selections:
-    - anchor: {line: 6, character: 16}
-      active: {line: 6, character: 16}
-  marks:
-    default.w:
-      start: {line: 0, character: 9}
-      end: {line: 0, character: 17}
-finalState:
-  documentContents: |-
-    function whatever() {
-        const testing = "hello";
-
-        const again = "hello";
-    }
-
-    function another() {
-        const testing = "hello";
-    }
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 1, character: 28}
-    - anchor: {line: 3, character: 4}
-      active: {line: 4, character: 1}
-fullTargets: [{type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: w}, modifiers: [{type: everyScope, scopeType: {type: paragraph}}, {type: containingScope, scopeType: {type: namedFunction}}]}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/implicitExpansion/takeEveryPaint.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/implicitExpansion/takeEveryPaint.yml
deleted file mode 100644
index ea26a02095..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/implicitExpansion/takeEveryPaint.yml
+++ /dev/null
@@ -1,41 +0,0 @@
-languageId: plaintext
-command:
-  spokenForm: take every paint
-  version: 2
-  targets:
-    - type: primitive
-      modifiers:
-        - type: everyScope
-          scopeType: {type: nonWhitespaceSequence}
-  usePrePhraseSnapshot: true
-  action: {name: setSelection}
-initialState:
-  documentContents: |-
-    first test-block
-    for testing
-
-    second test-block
-    for testing
-  selections:
-    - anchor: {line: 0, character: 6}
-      active: {line: 3, character: 9}
-  marks: {}
-finalState:
-  documentContents: |-
-    first test-block
-    for testing
-
-    second test-block
-    for testing
-  selections:
-    - anchor: {line: 0, character: 6}
-      active: {line: 0, character: 16}
-    - anchor: {line: 1, character: 0}
-      active: {line: 1, character: 3}
-    - anchor: {line: 1, character: 4}
-      active: {line: 1, character: 11}
-    - anchor: {line: 3, character: 0}
-      active: {line: 3, character: 6}
-    - anchor: {line: 3, character: 7}
-      active: {line: 3, character: 17}
-fullTargets: [{type: primitive, mark: {type: cursor}, modifiers: [{type: everyScope, scopeType: {type: boundedNonWhitespaceSequence}}]}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/implicitExpansion/takeEveryPaintBlockRisk.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/implicitExpansion/takeEveryPaintBlockRisk.yml
deleted file mode 100644
index 2d2aff1740..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/implicitExpansion/takeEveryPaintBlockRisk.yml
+++ /dev/null
@@ -1,45 +0,0 @@
-languageId: plaintext
-command:
-  spokenForm: take every paint block risk
-  version: 2
-  targets:
-    - type: primitive
-      modifiers:
-        - type: everyScope
-          scopeType: {type: nonWhitespaceSequence}
-        - type: containingScope
-          scopeType: {type: paragraph}
-      mark: {type: decoratedSymbol, symbolColor: default, character: r}
-  usePrePhraseSnapshot: true
-  action: {name: setSelection}
-initialState:
-  documentContents: |-
-    first test-block
-    for testing
-
-    second test-block
-    for testing
-  selections:
-    - anchor: {line: 4, character: 0}
-      active: {line: 4, character: 0}
-  marks:
-    default.r:
-      start: {line: 0, character: 0}
-      end: {line: 0, character: 5}
-finalState:
-  documentContents: |-
-    first test-block
-    for testing
-
-    second test-block
-    for testing
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 5}
-    - anchor: {line: 0, character: 6}
-      active: {line: 0, character: 16}
-    - anchor: {line: 1, character: 0}
-      active: {line: 1, character: 3}
-    - anchor: {line: 1, character: 4}
-      active: {line: 1, character: 11}
-fullTargets: [{type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: r}, modifiers: [{type: everyScope, scopeType: {type: boundedNonWhitespaceSequence}}, {type: containingScope, scopeType: {type: paragraph}}]}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/implicitExpansion/takeEveryPaintEach.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/implicitExpansion/takeEveryPaintEach.yml
deleted file mode 100644
index e4f471b404..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/implicitExpansion/takeEveryPaintEach.yml
+++ /dev/null
@@ -1,33 +0,0 @@
-languageId: plaintext
-command:
-  spokenForm: take every paint each
-  version: 2
-  targets:
-    - type: primitive
-      modifiers:
-        - type: everyScope
-          scopeType: {type: nonWhitespaceSequence}
-      mark: {type: decoratedSymbol, symbolColor: default, character: e}
-  usePrePhraseSnapshot: true
-  action: {name: setSelection}
-initialState:
-  documentContents: |-
-    first test-block
-    for testing
-  selections:
-    - anchor: {line: 1, character: 11}
-      active: {line: 1, character: 11}
-  marks:
-    default.e:
-      start: {line: 0, character: 6}
-      end: {line: 0, character: 10}
-finalState:
-  documentContents: |-
-    first test-block
-    for testing
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 5}
-    - anchor: {line: 0, character: 6}
-      active: {line: 0, character: 16}
-fullTargets: [{type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: e}, modifiers: [{type: everyScope, scopeType: {type: boundedNonWhitespaceSequence}}]}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/implicitExpansion/takeEverySmallPaint.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/implicitExpansion/takeEverySmallPaint.yml
deleted file mode 100644
index aa78113e55..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/implicitExpansion/takeEverySmallPaint.yml
+++ /dev/null
@@ -1,41 +0,0 @@
-languageId: plaintext
-command:
-  spokenForm: take every paint
-  version: 2
-  targets:
-    - type: primitive
-      modifiers:
-        - type: everyScope
-          scopeType: {type: boundedNonWhitespaceSequence}
-  usePrePhraseSnapshot: true
-  action: {name: setSelection}
-initialState:
-  documentContents: |-
-    first test-block
-    for testing
-
-    second test-block
-    for testing
-  selections:
-    - anchor: {line: 0, character: 6}
-      active: {line: 3, character: 9}
-  marks: {}
-finalState:
-  documentContents: |-
-    first test-block
-    for testing
-
-    second test-block
-    for testing
-  selections:
-    - anchor: {line: 0, character: 6}
-      active: {line: 0, character: 16}
-    - anchor: {line: 1, character: 0}
-      active: {line: 1, character: 3}
-    - anchor: {line: 1, character: 4}
-      active: {line: 1, character: 11}
-    - anchor: {line: 3, character: 0}
-      active: {line: 3, character: 6}
-    - anchor: {line: 3, character: 7}
-      active: {line: 3, character: 17}
-fullTargets: [{type: primitive, mark: {type: cursor}, modifiers: [{type: everyScope, scopeType: {type: boundedNonWhitespaceSequence}}]}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/implicitExpansion/takeEverySmallPaint2.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/implicitExpansion/takeEverySmallPaint2.yml
deleted file mode 100644
index 4dd968427f..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/implicitExpansion/takeEverySmallPaint2.yml
+++ /dev/null
@@ -1,25 +0,0 @@
-languageId: plaintext
-command:
-  spokenForm: take every paint
-  version: 2
-  targets:
-    - type: primitive
-      modifiers:
-        - type: everyScope
-          scopeType: {type: boundedNonWhitespaceSequence}
-  usePrePhraseSnapshot: true
-  action: {name: setSelection}
-initialState:
-  documentContents: (hello world-whatever testing) testing now
-  selections:
-    - anchor: {line: 0, character: 3}
-      active: {line: 0, character: 10}
-  marks: {}
-finalState:
-  documentContents: (hello world-whatever testing) testing now
-  selections:
-    - anchor: {line: 0, character: 1}
-      active: {line: 0, character: 6}
-    - anchor: {line: 0, character: 7}
-      active: {line: 0, character: 21}
-fullTargets: [{type: primitive, mark: {type: cursor}, modifiers: [{type: everyScope, scopeType: {type: boundedNonWhitespaceSequence}}]}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/implicitExpansion/takeEverySmallPaintBlockRisk.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/implicitExpansion/takeEverySmallPaintBlockRisk.yml
deleted file mode 100644
index 82e11cc8bc..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/implicitExpansion/takeEverySmallPaintBlockRisk.yml
+++ /dev/null
@@ -1,45 +0,0 @@
-languageId: plaintext
-command:
-  spokenForm: take every paint block risk
-  version: 2
-  targets:
-    - type: primitive
-      modifiers:
-        - type: everyScope
-          scopeType: {type: boundedNonWhitespaceSequence}
-        - type: containingScope
-          scopeType: {type: paragraph}
-      mark: {type: decoratedSymbol, symbolColor: default, character: r}
-  usePrePhraseSnapshot: true
-  action: {name: setSelection}
-initialState:
-  documentContents: |-
-    first test-block
-    for testing
-
-    second test-block
-    for testing
-  selections:
-    - anchor: {line: 4, character: 0}
-      active: {line: 4, character: 0}
-  marks:
-    default.r:
-      start: {line: 0, character: 0}
-      end: {line: 0, character: 5}
-finalState:
-  documentContents: |-
-    first test-block
-    for testing
-
-    second test-block
-    for testing
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 5}
-    - anchor: {line: 0, character: 6}
-      active: {line: 0, character: 16}
-    - anchor: {line: 1, character: 0}
-      active: {line: 1, character: 3}
-    - anchor: {line: 1, character: 4}
-      active: {line: 1, character: 11}
-fullTargets: [{type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: r}, modifiers: [{type: everyScope, scopeType: {type: boundedNonWhitespaceSequence}}, {type: containingScope, scopeType: {type: paragraph}}]}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/implicitExpansion/takeEverySmallPaintEach.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/implicitExpansion/takeEverySmallPaintEach.yml
deleted file mode 100644
index 2df6d32653..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/implicitExpansion/takeEverySmallPaintEach.yml
+++ /dev/null
@@ -1,33 +0,0 @@
-languageId: plaintext
-command:
-  spokenForm: take every paint each
-  version: 2
-  targets:
-    - type: primitive
-      modifiers:
-        - type: everyScope
-          scopeType: {type: boundedNonWhitespaceSequence}
-      mark: {type: decoratedSymbol, symbolColor: default, character: e}
-  usePrePhraseSnapshot: true
-  action: {name: setSelection}
-initialState:
-  documentContents: |-
-    first test-block
-    for testing
-  selections:
-    - anchor: {line: 1, character: 11}
-      active: {line: 1, character: 11}
-  marks:
-    default.e:
-      start: {line: 0, character: 6}
-      end: {line: 0, character: 10}
-finalState:
-  documentContents: |-
-    first test-block
-    for testing
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 5}
-    - anchor: {line: 0, character: 6}
-      active: {line: 0, character: 16}
-fullTargets: [{type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: e}, modifiers: [{type: everyScope, scopeType: {type: boundedNonWhitespaceSequence}}]}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/implicitExpansion/takeEverySmallPaintToken.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/implicitExpansion/takeEverySmallPaintToken.yml
deleted file mode 100644
index 4db3f07027..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/implicitExpansion/takeEverySmallPaintToken.yml
+++ /dev/null
@@ -1,27 +0,0 @@
-languageId: plaintext
-command:
-  spokenForm: take every paint token
-  version: 2
-  targets:
-    - type: primitive
-      modifiers:
-        - type: everyScope
-          scopeType: {type: boundedNonWhitespaceSequence}
-        - type: containingScope
-          scopeType: {type: token}
-  usePrePhraseSnapshot: true
-  action: {name: setSelection}
-initialState:
-  documentContents: (hello world-whatever testing) testing now
-  selections:
-    - anchor: {line: 0, character: 3}
-      active: {line: 0, character: 10}
-  marks: {}
-finalState:
-  documentContents: (hello world-whatever testing) testing now
-  selections:
-    - anchor: {line: 0, character: 1}
-      active: {line: 0, character: 6}
-    - anchor: {line: 0, character: 7}
-      active: {line: 0, character: 21}
-fullTargets: [{type: primitive, mark: {type: cursor}, modifiers: [{type: everyScope, scopeType: {type: boundedNonWhitespaceSequence}}, {type: containingScope, scopeType: {type: token}}]}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/implicitExpansion/takeEverySmallPaintWhale.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/implicitExpansion/takeEverySmallPaintWhale.yml
deleted file mode 100644
index 0cbc8967d3..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/implicitExpansion/takeEverySmallPaintWhale.yml
+++ /dev/null
@@ -1,29 +0,0 @@
-languageId: plaintext
-command:
-  spokenForm: take every paint whale
-  version: 2
-  targets:
-    - type: primitive
-      modifiers:
-        - type: everyScope
-          scopeType: {type: boundedNonWhitespaceSequence}
-      mark: {type: decoratedSymbol, symbolColor: default, character: w}
-  usePrePhraseSnapshot: true
-  action: {name: setSelection}
-initialState:
-  documentContents: (hello world-whatever) testing now
-  selections:
-    - anchor: {line: 0, character: 34}
-      active: {line: 0, character: 34}
-  marks:
-    default.w:
-      start: {line: 0, character: 7}
-      end: {line: 0, character: 12}
-finalState:
-  documentContents: (hello world-whatever) testing now
-  selections:
-    - anchor: {line: 0, character: 1}
-      active: {line: 0, character: 6}
-    - anchor: {line: 0, character: 7}
-      active: {line: 0, character: 21}
-fullTargets: [{type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: w}, modifiers: [{type: everyScope, scopeType: {type: boundedNonWhitespaceSequence}}]}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/implicitExpansion/takeEveryToken.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/implicitExpansion/takeEveryToken.yml
deleted file mode 100644
index a9b7eb47fe..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/implicitExpansion/takeEveryToken.yml
+++ /dev/null
@@ -1,45 +0,0 @@
-languageId: plaintext
-command:
-  spokenForm: take every token
-  version: 2
-  targets:
-    - type: primitive
-      modifiers:
-        - type: everyScope
-          scopeType: {type: token}
-  usePrePhraseSnapshot: true
-  action: {name: setSelection}
-initialState:
-  documentContents: |-
-    first test-block
-    for testing
-
-    second test-block
-    for testing
-  selections:
-    - anchor: {line: 0, character: 6}
-      active: {line: 3, character: 9}
-  marks: {}
-finalState:
-  documentContents: |-
-    first test-block
-    for testing
-
-    second test-block
-    for testing
-  selections:
-    - anchor: {line: 0, character: 6}
-      active: {line: 0, character: 10}
-    - anchor: {line: 0, character: 10}
-      active: {line: 0, character: 11}
-    - anchor: {line: 0, character: 11}
-      active: {line: 0, character: 16}
-    - anchor: {line: 1, character: 0}
-      active: {line: 1, character: 3}
-    - anchor: {line: 1, character: 4}
-      active: {line: 1, character: 11}
-    - anchor: {line: 3, character: 0}
-      active: {line: 3, character: 6}
-    - anchor: {line: 3, character: 7}
-      active: {line: 3, character: 11}
-fullTargets: [{type: primitive, mark: {type: cursor}, modifiers: [{type: everyScope, scopeType: {type: token}}]}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/implicitExpansion/takeEveryTokenBlockRisk.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/implicitExpansion/takeEveryTokenBlockRisk.yml
deleted file mode 100644
index 6cda146d46..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/implicitExpansion/takeEveryTokenBlockRisk.yml
+++ /dev/null
@@ -1,49 +0,0 @@
-languageId: plaintext
-command:
-  spokenForm: take every token block risk
-  version: 2
-  targets:
-    - type: primitive
-      modifiers:
-        - type: everyScope
-          scopeType: {type: token}
-        - type: containingScope
-          scopeType: {type: paragraph}
-      mark: {type: decoratedSymbol, symbolColor: default, character: r}
-  usePrePhraseSnapshot: true
-  action: {name: setSelection}
-initialState:
-  documentContents: |-
-    first test-block
-    for testing
-
-    second test-block
-    for testing
-  selections:
-    - anchor: {line: 4, character: 0}
-      active: {line: 4, character: 0}
-  marks:
-    default.r:
-      start: {line: 0, character: 0}
-      end: {line: 0, character: 5}
-finalState:
-  documentContents: |-
-    first test-block
-    for testing
-
-    second test-block
-    for testing
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 5}
-    - anchor: {line: 0, character: 6}
-      active: {line: 0, character: 10}
-    - anchor: {line: 0, character: 10}
-      active: {line: 0, character: 11}
-    - anchor: {line: 0, character: 11}
-      active: {line: 0, character: 16}
-    - anchor: {line: 1, character: 0}
-      active: {line: 1, character: 3}
-    - anchor: {line: 1, character: 4}
-      active: {line: 1, character: 11}
-fullTargets: [{type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: r}, modifiers: [{type: everyScope, scopeType: {type: token}}, {type: containingScope, scopeType: {type: paragraph}}]}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/implicitExpansion/takeEveryTokenEach.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/implicitExpansion/takeEveryTokenEach.yml
deleted file mode 100644
index b609d1863a..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/implicitExpansion/takeEveryTokenEach.yml
+++ /dev/null
@@ -1,37 +0,0 @@
-languageId: plaintext
-command:
-  spokenForm: take every token each
-  version: 2
-  targets:
-    - type: primitive
-      modifiers:
-        - type: everyScope
-          scopeType: {type: token}
-      mark: {type: decoratedSymbol, symbolColor: default, character: e}
-  usePrePhraseSnapshot: true
-  action: {name: setSelection}
-initialState:
-  documentContents: |-
-    first test-block
-    for testing
-  selections:
-    - anchor: {line: 1, character: 11}
-      active: {line: 1, character: 11}
-  marks:
-    default.e:
-      start: {line: 0, character: 6}
-      end: {line: 0, character: 10}
-finalState:
-  documentContents: |-
-    first test-block
-    for testing
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 5}
-    - anchor: {line: 0, character: 6}
-      active: {line: 0, character: 10}
-    - anchor: {line: 0, character: 10}
-      active: {line: 0, character: 11}
-    - anchor: {line: 0, character: 11}
-      active: {line: 0, character: 16}
-fullTargets: [{type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: e}, modifiers: [{type: everyScope, scopeType: {type: token}}]}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/inference/bringBattBeforeFunk.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/inference/bringBattBeforeFunk.yml
deleted file mode 100644
index 1cef01e552..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/inference/bringBattBeforeFunk.yml
+++ /dev/null
@@ -1,45 +0,0 @@
-languageId: typescript
-command:
-  spokenForm: bring batt before funk
-  version: 3
-  targets:
-    - type: primitive
-      mark: {type: decoratedSymbol, symbolColor: default, character: b}
-    - type: primitive
-      modifiers:
-        - {type: position, position: before}
-        - type: containingScope
-          scopeType: {type: namedFunction}
-  usePrePhraseSnapshot: true
-  action: {name: replaceWithTarget}
-initialState:
-  documentContents: |-
-    function foo() {
-        return "";
-    }
-
-    function bar() {
-        return "";
-    }
-  selections:
-    - anchor: {line: 1, character: 12}
-      active: {line: 1, character: 12}
-  marks:
-    default.b:
-      start: {line: 4, character: 9}
-      end: {line: 4, character: 12}
-finalState:
-  documentContents: |-
-    bar
-
-    function foo() {
-        return "";
-    }
-
-    function bar() {
-        return "";
-    }
-  selections:
-    - anchor: {line: 3, character: 12}
-      active: {line: 3, character: 12}
-fullTargets: [{type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: b}, modifiers: []}, {type: primitive, mark: {type: cursor}, modifiers: [{type: containingScope, scopeType: {type: namedFunction}}], positionModifier: {type: position, position: before}}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/inference/bringBattBeforeItsFunk.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/inference/bringBattBeforeItsFunk.yml
deleted file mode 100644
index b8ae944b4f..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/inference/bringBattBeforeItsFunk.yml
+++ /dev/null
@@ -1,46 +0,0 @@
-languageId: typescript
-command:
-  spokenForm: bring batt before its funk
-  version: 3
-  targets:
-    - type: primitive
-      mark: {type: decoratedSymbol, symbolColor: default, character: b}
-    - type: primitive
-      modifiers:
-        - {type: position, position: before}
-        - {type: inferPreviousMark}
-        - type: containingScope
-          scopeType: {type: namedFunction}
-  usePrePhraseSnapshot: true
-  action: {name: replaceWithTarget}
-initialState:
-  documentContents: |-
-    function foo() {
-        return "";
-    }
-
-    function bar() {
-        return "";
-    }
-  selections:
-    - anchor: {line: 1, character: 12}
-      active: {line: 1, character: 12}
-  marks:
-    default.b:
-      start: {line: 4, character: 9}
-      end: {line: 4, character: 12}
-finalState:
-  documentContents: |-
-    function foo() {
-        return "";
-    }
-
-    bar
-
-    function bar() {
-        return "";
-    }
-  selections:
-    - anchor: {line: 1, character: 12}
-      active: {line: 1, character: 12}
-fullTargets: [{type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: b}, modifiers: []}, {type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: b}, modifiers: [{type: containingScope, scopeType: {type: namedFunction}}], positionModifier: {type: position, position: before}}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/inference/bringHarpAfterLineTrapAndBlockSpun.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/inference/bringHarpAfterLineTrapAndBlockSpun.yml
deleted file mode 100644
index 6536284d9e..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/inference/bringHarpAfterLineTrapAndBlockSpun.yml
+++ /dev/null
@@ -1,54 +0,0 @@
-languageId: plaintext
-command:
-  spokenForm: bring harp after line trap and block spun
-  version: 2
-  targets:
-    - type: primitive
-      mark: {type: decoratedSymbol, symbolColor: default, character: h}
-    - type: list
-      elements:
-        - type: primitive
-          mark: {type: decoratedSymbol, symbolColor: default, character: t}
-          modifiers:
-            - {type: position, position: after}
-            - type: containingScope
-              scopeType: {type: line}
-        - type: primitive
-          mark: {type: decoratedSymbol, symbolColor: default, character: s}
-          modifiers:
-            - type: containingScope
-              scopeType: {type: paragraph}
-  usePrePhraseSnapshot: true
-  action: {name: replaceWithTarget}
-initialState:
-  documentContents: |-
-    hello
-    there
-
-    testing
-  selections:
-    - anchor: {line: 3, character: 7}
-      active: {line: 3, character: 7}
-  marks:
-    default.h:
-      start: {line: 0, character: 0}
-      end: {line: 0, character: 5}
-    default.t:
-      start: {line: 1, character: 0}
-      end: {line: 1, character: 5}
-    default.s:
-      start: {line: 3, character: 0}
-      end: {line: 3, character: 7}
-finalState:
-  documentContents: |-
-    hello
-    there
-    hello
-
-    testing
-
-    hello
-  selections:
-    - anchor: {line: 4, character: 7}
-      active: {line: 4, character: 7}
-fullTargets: [{type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: h}, modifiers: []}, {type: list, elements: [{type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: t}, modifiers: [{type: position, position: after}, {type: containingScope, scopeType: {type: line}}]}, {type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: s}, modifiers: [{type: position, position: after}, {type: containingScope, scopeType: {type: paragraph}}]}]}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/inference/bringLineBattPastEndOfItsFunkToThis.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/inference/bringLineBattPastEndOfItsFunkToThis.yml
deleted file mode 100644
index a14b2d6593..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/inference/bringLineBattPastEndOfItsFunkToThis.yml
+++ /dev/null
@@ -1,57 +0,0 @@
-languageId: typescript
-command:
-  spokenForm: bring line batt past end of its funk to this
-  version: 3
-  targets:
-    - type: range
-      anchor:
-        type: primitive
-        modifiers:
-          - type: containingScope
-            scopeType: {type: line}
-        mark: {type: decoratedSymbol, symbolColor: default, character: b}
-      active:
-        type: primitive
-        modifiers:
-          - {type: position, position: end}
-          - {type: inferPreviousMark}
-          - type: containingScope
-            scopeType: {type: namedFunction}
-      excludeAnchor: false
-      excludeActive: false
-    - type: primitive
-      mark: {type: cursor}
-  usePrePhraseSnapshot: true
-  action: {name: replaceWithTarget}
-initialState:
-  documentContents: |-
-    function foo() {
-        const bar = "hello";
-
-        const baz = "hi";
-    }
-
-    const bongo = "bazman";
-  selections:
-    - anchor: {line: 6, character: 0}
-      active: {line: 6, character: 0}
-  marks:
-    default.b:
-      start: {line: 1, character: 10}
-      end: {line: 1, character: 13}
-finalState:
-  documentContents: |-
-    function foo() {
-        const bar = "hello";
-
-        const baz = "hi";
-    }
-
-    const bar = "hello";
-
-        const baz = "hi";
-    }
-  selections:
-    - anchor: {line: 6, character: 0}
-      active: {line: 6, character: 0}
-fullTargets: [{type: range, excludeAnchor: false, excludeActive: false, rangeType: continuous, anchor: {type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: b}, modifiers: [&ref_0 {type: containingScope, scopeType: {type: line}}]}, active: {type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: b}, modifiers: [{type: containingScope, scopeType: {type: namedFunction}}], positionModifier: {type: position, position: end}}}, {type: primitive, mark: {type: cursor}, modifiers: [*ref_0]}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/inference/bringLineLookToJustAir.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/inference/bringLineLookToJustAir.yml
deleted file mode 100644
index 658227125f..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/inference/bringLineLookToJustAir.yml
+++ /dev/null
@@ -1,34 +0,0 @@
-languageId: plaintext
-command:
-  version: 1
-  spokenForm: bring line look to just air
-  action: replaceWithTarget
-  targets:
-    - type: primitive
-      selectionType: line
-      mark: {type: decoratedSymbol, symbolColor: default, character: l}
-    - type: primitive
-      modifier: {type: toRawSelection}
-      mark: {type: decoratedSymbol, symbolColor: default, character: a}
-initialState:
-  documentContents: |
-    hello there
-    whatever now
-  selections:
-    - anchor: {line: 2, character: 0}
-      active: {line: 2, character: 0}
-  marks:
-    default.l:
-      start: {line: 0, character: 0}
-      end: {line: 0, character: 5}
-    default.a:
-      start: {line: 1, character: 0}
-      end: {line: 1, character: 8}
-finalState:
-  documentContents: |
-    hello there
-    hello there now
-  selections:
-    - anchor: {line: 2, character: 0}
-      active: {line: 2, character: 0}
-fullTargets: [{type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: l}, selectionType: line, position: contents, insideOutsideType: null, modifier: {type: identity}, isImplicit: false}, {type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: a}, selectionType: token, position: contents, insideOutsideType: null, modifier: {type: toRawSelection}, isImplicit: false}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/inference/bringMapAirToLineHarp.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/inference/bringMapAirToLineHarp.yml
deleted file mode 100644
index 9f125a2028..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/inference/bringMapAirToLineHarp.yml
+++ /dev/null
@@ -1,34 +0,0 @@
-languageId: typescript
-command:
-  version: 1
-  spokenForm: bring map air to line harp
-  action: replaceWithTarget
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: map, includeSiblings: false}
-      mark: {type: decoratedSymbol, symbolColor: default, character: a}
-    - type: primitive
-      selectionType: line
-      mark: {type: decoratedSymbol, symbolColor: default, character: h}
-initialState:
-  documentContents: |2-
-        hello world
-        value = {a:2}
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-  marks:
-    default.a:
-      start: {line: 1, character: 13}
-      end: {line: 1, character: 14}
-    default.h:
-      start: {line: 0, character: 4}
-      end: {line: 0, character: 9}
-finalState:
-  documentContents: |2-
-        {a:2}
-        value = {a:2}
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-fullTargets: [{type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: a}, selectionType: token, position: contents, modifier: {type: containingScope, scopeType: map, includeSiblings: false}, insideOutsideType: null}, {type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: h}, selectionType: line, position: contents, modifier: {type: identity}, insideOutsideType: null}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/inference/bringMapAirToTokenHarp.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/inference/bringMapAirToTokenHarp.yml
deleted file mode 100644
index ec66f17ea6..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/inference/bringMapAirToTokenHarp.yml
+++ /dev/null
@@ -1,34 +0,0 @@
-languageId: typescript
-command:
-  version: 1
-  spokenForm: bring map air to token harp
-  action: replaceWithTarget
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: map, includeSiblings: false}
-      mark: {type: decoratedSymbol, symbolColor: default, character: a}
-    - type: primitive
-      selectionType: token
-      mark: {type: decoratedSymbol, symbolColor: default, character: h}
-initialState:
-  documentContents: |2-
-        hello
-        value = {a:2}
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-  marks:
-    default.a:
-      start: {line: 1, character: 13}
-      end: {line: 1, character: 14}
-    default.h:
-      start: {line: 0, character: 4}
-      end: {line: 0, character: 9}
-finalState:
-  documentContents: |2-
-        {a:2}
-        value = {a:2}
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-fullTargets: [{type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: a}, selectionType: token, position: contents, modifier: {type: containingScope, scopeType: map, includeSiblings: false}, insideOutsideType: null}, {type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: h}, selectionType: token, position: contents, modifier: {type: identity}, insideOutsideType: null}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/inference/bringOddToLine.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/inference/bringOddToLine.yml
deleted file mode 100644
index 88fdcf60a3..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/inference/bringOddToLine.yml
+++ /dev/null
@@ -1,30 +0,0 @@
-languageId: typescript
-command:
-  version: 1
-  spokenForm: bring odd to line
-  action: replaceWithTarget
-  targets:
-    - type: primitive
-      mark: {type: decoratedSymbol, symbolColor: default, character: o}
-    - {type: primitive, selectionType: line}
-initialState:
-  documentContents: |-
-    const foo = "hello";
-
-    const bar = "hello";
-  selections:
-    - anchor: {line: 2, character: 18}
-      active: {line: 2, character: 18}
-  marks:
-    default.o:
-      start: {line: 0, character: 0}
-      end: {line: 0, character: 5}
-finalState:
-  documentContents: |-
-    const foo = "hello";
-
-    const
-  selections:
-    - anchor: {line: 2, character: 5}
-      active: {line: 2, character: 5}
-fullTargets: [{type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: o}, selectionType: token, position: contents, insideOutsideType: null, modifier: {type: identity}}, {type: primitive, mark: {type: cursor}, selectionType: line, position: contents, insideOutsideType: null, modifier: {type: identity}}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/inference/bringOddToState.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/inference/bringOddToState.yml
deleted file mode 100644
index c5828fb622..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/inference/bringOddToState.yml
+++ /dev/null
@@ -1,31 +0,0 @@
-languageId: typescript
-command:
-  version: 1
-  spokenForm: bring odd to state
-  action: replaceWithTarget
-  targets:
-    - type: primitive
-      mark: {type: decoratedSymbol, symbolColor: default, character: o}
-    - type: primitive
-      modifier: {type: containingScope, scopeType: statement, includeSiblings: false}
-initialState:
-  documentContents: |-
-    const foo = "hello";
-
-    const bar = "hello";
-  selections:
-    - anchor: {line: 2, character: 18}
-      active: {line: 2, character: 18}
-  marks:
-    default.o:
-      start: {line: 0, character: 0}
-      end: {line: 0, character: 5}
-finalState:
-  documentContents: |-
-    const foo = "hello";
-
-    const
-  selections:
-    - anchor: {line: 2, character: 5}
-      active: {line: 2, character: 5}
-fullTargets: [{type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: o}, selectionType: token, position: contents, insideOutsideType: null, modifier: {type: identity}}, {type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: null, modifier: {type: containingScope, scopeType: statement, includeSiblings: false}}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/inference/bringOddToToken.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/inference/bringOddToToken.yml
deleted file mode 100644
index ae24220ad5..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/inference/bringOddToToken.yml
+++ /dev/null
@@ -1,30 +0,0 @@
-languageId: typescript
-command:
-  version: 1
-  spokenForm: bring odd to token
-  action: replaceWithTarget
-  targets:
-    - type: primitive
-      mark: {type: decoratedSymbol, symbolColor: default, character: o}
-    - {type: primitive, selectionType: token}
-initialState:
-  documentContents: |-
-    const foo = "hello";
-
-    const bar = "hello";
-  selections:
-    - anchor: {line: 2, character: 18}
-      active: {line: 2, character: 18}
-  marks:
-    default.o:
-      start: {line: 0, character: 0}
-      end: {line: 0, character: 5}
-finalState:
-  documentContents: |-
-    const foo = "hello";
-
-    const bar = "const";
-  selections:
-    - anchor: {line: 2, character: 18}
-      active: {line: 2, character: 18}
-fullTargets: [{type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: o}, selectionType: token, position: contents, insideOutsideType: null, modifier: {type: identity}}, {type: primitive, mark: {type: cursorToken}, selectionType: token, position: contents, insideOutsideType: null, modifier: {type: identity}}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/inference/bringRowOneBeforeBatt.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/inference/bringRowOneBeforeBatt.yml
deleted file mode 100644
index 6448f4f31e..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/inference/bringRowOneBeforeBatt.yml
+++ /dev/null
@@ -1,37 +0,0 @@
-languageId: plaintext
-command:
-  version: 4
-  spokenForm: bring row one before batt
-  action: {name: replaceWithTarget}
-  targets:
-    - type: primitive
-      mark: {type: lineNumber, lineNumberType: modulo100, lineNumber: 0}
-    - type: primitive
-      mark: {type: decoratedSymbol, symbolColor: default, character: b}
-      modifiers:
-        - {type: position, position: before}
-  usePrePhraseSnapshot: true
-initialState:
-  documentContents: |-
-    aaa
-    ccc
-
-    b
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-  marks:
-    default.b:
-      start: {line: 3, character: 0}
-      end: {line: 3, character: 1}
-finalState:
-  documentContents: |-
-    aaa
-    ccc
-
-    aaa
-    b
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-fullTargets: [{type: primitive, mark: {type: lineNumber, lineNumberType: modulo100, lineNumber: 0}, modifiers: [{type: containingScope, scopeType: {type: line}}]}, {type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: b}, modifiers: [{type: containingScope, scopeType: {type: line}}], positionModifier: {type: position, position: before}}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/inference/bringRowOnePastTwoBeforeBatt.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/inference/bringRowOnePastTwoBeforeBatt.yml
deleted file mode 100644
index 7442716ae5..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/inference/bringRowOnePastTwoBeforeBatt.yml
+++ /dev/null
@@ -1,43 +0,0 @@
-languageId: plaintext
-command:
-  version: 4
-  spokenForm: bring row one past two before batt
-  action: {name: replaceWithTarget}
-  targets:
-    - type: primitive
-      mark:
-        type: range
-        anchor: {type: lineNumber, lineNumberType: modulo100, lineNumber: 0}
-        active: {type: lineNumber, lineNumberType: modulo100, lineNumber: 1}
-        excludeAnchor: false
-        excludeActive: false
-    - type: primitive
-      mark: {type: decoratedSymbol, symbolColor: default, character: b}
-      modifiers:
-        - {type: position, position: before}
-  usePrePhraseSnapshot: true
-initialState:
-  documentContents: |-
-    aaa
-    ccc
-
-    b
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-  marks:
-    default.b:
-      start: {line: 3, character: 0}
-      end: {line: 3, character: 1}
-finalState:
-  documentContents: |-
-    aaa
-    ccc
-
-    aaa
-    ccc
-    b
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-fullTargets: [{type: primitive, mark: {type: range, anchor: {type: lineNumber, lineNumberType: modulo100, lineNumber: 0}, active: {type: lineNumber, lineNumberType: modulo100, lineNumber: 1}, excludeAnchor: false, excludeActive: false}, modifiers: [{type: containingScope, scopeType: {type: line}}]}, {type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: b}, modifiers: [{type: containingScope, scopeType: {type: line}}], positionModifier: {type: position, position: before}}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/inference/bringTokenHarpToMapAir.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/inference/bringTokenHarpToMapAir.yml
deleted file mode 100644
index b4cd63903a..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/inference/bringTokenHarpToMapAir.yml
+++ /dev/null
@@ -1,34 +0,0 @@
-languageId: typescript
-command:
-  version: 1
-  spokenForm: bring token harp to map air
-  action: replaceWithTarget
-  targets:
-    - type: primitive
-      selectionType: token
-      mark: {type: decoratedSymbol, symbolColor: default, character: h}
-    - type: primitive
-      modifier: {type: containingScope, scopeType: map, includeSiblings: false}
-      mark: {type: decoratedSymbol, symbolColor: default, character: a}
-initialState:
-  documentContents: |2-
-        hello
-        value = {a:2}
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-  marks:
-    default.h:
-      start: {line: 0, character: 4}
-      end: {line: 0, character: 9}
-    default.a:
-      start: {line: 1, character: 13}
-      end: {line: 1, character: 14}
-finalState:
-  documentContents: |2-
-        hello
-        value = hello
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-fullTargets: [{type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: h}, selectionType: token, position: contents, modifier: {type: identity}, insideOutsideType: null}, {type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: a}, selectionType: token, position: contents, modifier: {type: containingScope, scopeType: map, includeSiblings: false}, insideOutsideType: null}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/inference/clearAirPastEndOfItsLine.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/inference/clearAirPastEndOfItsLine.yml
deleted file mode 100644
index 1e0ea7f640..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/inference/clearAirPastEndOfItsLine.yml
+++ /dev/null
@@ -1,41 +0,0 @@
-languageId: plaintext
-command:
-  spokenForm: clear air past end of its line
-  version: 3
-  targets:
-    - type: range
-      anchor:
-        type: primitive
-        mark: {type: decoratedSymbol, symbolColor: default, character: a}
-      active:
-        type: primitive
-        modifiers:
-          - {type: position, position: end}
-          - {type: inferPreviousMark}
-          - type: containingScope
-            scopeType: {type: line}
-      excludeAnchor: false
-      excludeActive: false
-  usePrePhraseSnapshot: true
-  action: {name: clearAndSetSelection}
-initialState:
-  documentContents: |-
-    const value = "Hello world";
-
-    const value = "Hello world";
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-  marks:
-    default.a:
-      start: {line: 2, character: 6}
-      end: {line: 2, character: 11}
-finalState:
-  documentContents: |-
-    const value = "Hello world";
-
-    const 
-  selections:
-    - anchor: {line: 2, character: 6}
-      active: {line: 2, character: 6}
-fullTargets: [{type: range, excludeAnchor: false, excludeActive: false, rangeType: continuous, anchor: {type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: a}, modifiers: []}, active: {type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: a}, modifiers: [{type: containingScope, scopeType: {type: line}}], positionModifier: {type: position, position: end}}}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/inference/clearEachPastStartOfItsLine.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/inference/clearEachPastStartOfItsLine.yml
deleted file mode 100644
index 733daae668..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/inference/clearEachPastStartOfItsLine.yml
+++ /dev/null
@@ -1,41 +0,0 @@
-languageId: plaintext
-command:
-  spokenForm: clear each past start of its line
-  version: 3
-  targets:
-    - type: range
-      anchor:
-        type: primitive
-        mark: {type: decoratedSymbol, symbolColor: default, character: e}
-      active:
-        type: primitive
-        modifiers:
-          - {type: position, position: start}
-          - {type: inferPreviousMark}
-          - type: containingScope
-            scopeType: {type: line}
-      excludeAnchor: false
-      excludeActive: false
-  usePrePhraseSnapshot: true
-  action: {name: clearAndSetSelection}
-initialState:
-  documentContents: |-
-    const value = "Hello world";
-
-    const value = "Hello world";
-  selections:
-    - anchor: {line: 2, character: 0}
-      active: {line: 2, character: 0}
-  marks:
-    default.e:
-      start: {line: 0, character: 15}
-      end: {line: 0, character: 20}
-finalState:
-  documentContents: |2-
-     world";
-
-    const value = "Hello world";
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-fullTargets: [{type: range, excludeAnchor: false, excludeActive: false, rangeType: continuous, anchor: {type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: e}, modifiers: []}, active: {type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: e}, modifiers: [{type: containingScope, scopeType: {type: line}}], positionModifier: {type: position, position: start}}}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/inference/clearNearPastEndOfItsState.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/inference/clearNearPastEndOfItsState.yml
deleted file mode 100644
index b3e32740ab..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/inference/clearNearPastEndOfItsState.yml
+++ /dev/null
@@ -1,41 +0,0 @@
-languageId: typescript
-command:
-  spokenForm: clear near past end of its state
-  version: 3
-  targets:
-    - type: range
-      anchor:
-        type: primitive
-        mark: {type: decoratedSymbol, symbolColor: default, character: 'n'}
-      active:
-        type: primitive
-        modifiers:
-          - {type: position, position: end}
-          - {type: inferPreviousMark}
-          - type: containingScope
-            scopeType: {type: statement}
-      excludeAnchor: false
-      excludeActive: false
-  usePrePhraseSnapshot: true
-  action: {name: clearAndSetSelection}
-initialState:
-  documentContents: |-
-    const foo = "hello";
-
-    const bar = "hello";
-  selections:
-    - anchor: {line: 2, character: 0}
-      active: {line: 2, character: 0}
-  marks:
-    default.n:
-      start: {line: 0, character: 0}
-      end: {line: 0, character: 5}
-finalState:
-  documentContents: |-
-
-
-    const bar = "hello";
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-fullTargets: [{type: range, excludeAnchor: false, excludeActive: false, rangeType: continuous, anchor: {type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: 'n'}, modifiers: []}, active: {type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: 'n'}, modifiers: [{type: containingScope, scopeType: {type: statement}}], positionModifier: {type: position, position: end}}}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/inference/clearSecondCarLookPastEndOfItsToken.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/inference/clearSecondCarLookPastEndOfItsToken.yml
deleted file mode 100644
index 1395fb2895..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/inference/clearSecondCarLookPastEndOfItsToken.yml
+++ /dev/null
@@ -1,40 +0,0 @@
-languageId: plaintext
-command:
-  spokenForm: clear second car look past end of its token
-  version: 3
-  targets:
-    - type: range
-      anchor:
-        type: primitive
-        modifiers:
-          - type: ordinalScope
-            scopeType: {type: character}
-            start: 1
-            length: 1
-        mark: {type: decoratedSymbol, symbolColor: default, character: l}
-      active:
-        type: primitive
-        modifiers:
-          - {type: position, position: end}
-          - {type: inferPreviousMark}
-          - type: containingScope
-            scopeType: {type: token}
-      excludeAnchor: false
-      excludeActive: false
-  usePrePhraseSnapshot: true
-  action: {name: clearAndSetSelection}
-initialState:
-  documentContents: "    hello there"
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-  marks:
-    default.l:
-      start: {line: 0, character: 4}
-      end: {line: 0, character: 9}
-finalState:
-  documentContents: "    h there"
-  selections:
-    - anchor: {line: 0, character: 5}
-      active: {line: 0, character: 5}
-fullTargets: [{type: range, excludeAnchor: false, excludeActive: false, rangeType: continuous, anchor: {type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: l}, modifiers: [{type: ordinalScope, scopeType: {type: character}, start: 1, length: 1}]}, active: {type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: l}, modifiers: [{type: containingScope, scopeType: {type: token}}], positionModifier: {type: position, position: end}}}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/inference/clearThis.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/inference/clearThis.yml
deleted file mode 100644
index 8fd844fb76..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/inference/clearThis.yml
+++ /dev/null
@@ -1,21 +0,0 @@
-languageId: plaintext
-command:
-  spokenForm: clear this
-  version: 3
-  targets:
-    - type: primitive
-      mark: {type: cursor}
-  usePrePhraseSnapshot: true
-  action: {name: clearAndSetSelection}
-initialState:
-  documentContents: aaa
-  selections:
-    - anchor: {line: 0, character: 1}
-      active: {line: 0, character: 1}
-  marks: {}
-finalState:
-  documentContents: ""
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-fullTargets: [{type: primitive, mark: {type: cursor}, modifiers: []}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/inference/ifWrapTokenFine.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/inference/ifWrapTokenFine.yml
deleted file mode 100644
index 19d7568e56..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/inference/ifWrapTokenFine.yml
+++ /dev/null
@@ -1,29 +0,0 @@
-languageId: typescript
-command:
-  version: 1
-  spokenForm: if wrap token fine
-  action: wrapWithSnippet
-  targets:
-    - type: primitive
-      selectionType: token
-      mark: {type: decoratedSymbol, symbolColor: default, character: f}
-  extraArgs: [ifStatement.consequence]
-initialState:
-  documentContents: |
-    const foo = "hello";
-  selections:
-    - anchor: {line: 1, character: 0}
-      active: {line: 1, character: 0}
-  marks:
-    default.f:
-      start: {line: 0, character: 6}
-      end: {line: 0, character: 9}
-finalState:
-  documentContents: |
-    const if () {
-        foo
-    } = "hello";
-  selections:
-    - anchor: {line: 0, character: 10}
-      active: {line: 0, character: 10}
-fullTargets: [{type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: f}, selectionType: token, position: contents, insideOutsideType: null, modifier: {type: identity}}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/inference/takeAfterVestPastAir.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/inference/takeAfterVestPastAir.yml
deleted file mode 100644
index 3c387c26e7..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/inference/takeAfterVestPastAir.yml
+++ /dev/null
@@ -1,42 +0,0 @@
-languageId: typescript
-command:
-  version: 1
-  spokenForm: take after vest past air
-  action: setSelection
-  targets:
-    - type: range
-      start:
-        type: primitive
-        position: after
-        mark: {type: decoratedSymbol, symbolColor: default, character: v}
-      end:
-        type: primitive
-        mark: {type: decoratedSymbol, symbolColor: default, character: a}
-      excludeStart: false
-      excludeEnd: false
-initialState:
-  documentContents: |
-
-    const value = "Hello world";
-
-    const value = "Hello world";
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-  marks:
-    default.v:
-      start: {line: 1, character: 6}
-      end: {line: 1, character: 11}
-    default.a:
-      start: {line: 3, character: 6}
-      end: {line: 3, character: 11}
-finalState:
-  documentContents: |
-
-    const value = "Hello world";
-
-    const value = "Hello world";
-  selections:
-    - anchor: {line: 1, character: 11}
-      active: {line: 3, character: 11}
-fullTargets: [{type: range, excludeStart: false, excludeEnd: false, start: {type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: v}, selectionType: token, position: after, modifier: {type: identity}, insideOutsideType: inside}, end: {type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: a}, selectionType: token, position: contents, modifier: {type: identity}, insideOutsideType: inside}}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/inference/takeAfterVestPastBeforeAir.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/inference/takeAfterVestPastBeforeAir.yml
deleted file mode 100644
index 392dae5407..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/inference/takeAfterVestPastBeforeAir.yml
+++ /dev/null
@@ -1,43 +0,0 @@
-languageId: typescript
-command:
-  version: 1
-  spokenForm: take after vest past before air
-  action: setSelection
-  targets:
-    - type: range
-      start:
-        type: primitive
-        position: after
-        mark: {type: decoratedSymbol, symbolColor: default, character: v}
-      end:
-        type: primitive
-        position: before
-        mark: {type: decoratedSymbol, symbolColor: default, character: a}
-      excludeStart: false
-      excludeEnd: false
-initialState:
-  documentContents: |
-
-    const value = "Hello world";
-
-    const value = "Hello world";
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-  marks:
-    default.v:
-      start: {line: 1, character: 6}
-      end: {line: 1, character: 11}
-    default.a:
-      start: {line: 3, character: 6}
-      end: {line: 3, character: 11}
-finalState:
-  documentContents: |
-
-    const value = "Hello world";
-
-    const value = "Hello world";
-  selections:
-    - anchor: {line: 1, character: 11}
-      active: {line: 3, character: 6}
-fullTargets: [{type: range, excludeStart: false, excludeEnd: false, start: {type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: v}, selectionType: token, position: after, modifier: {type: identity}, insideOutsideType: inside}, end: {type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: a}, selectionType: token, position: before, modifier: {type: identity}, insideOutsideType: inside}}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/inference/takeFirstWord.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/inference/takeFirstWord.yml
deleted file mode 100644
index de82980f48..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/inference/takeFirstWord.yml
+++ /dev/null
@@ -1,27 +0,0 @@
-languageId: typescript
-command:
-  version: 1
-  spokenForm: take first word
-  action: setSelection
-  targets:
-    - type: primitive
-      selectionType: token
-      modifier: {type: subpiece, pieceType: word, anchor: 0, active: 0}
-initialState:
-  documentContents: |+
-
-    const value = "HelloWorld";
-
-  selections:
-    - anchor: {line: 1, character: 18}
-      active: {line: 1, character: 18}
-  marks: {}
-finalState:
-  documentContents: |+
-
-    const value = "HelloWorld";
-
-  selections:
-    - anchor: {line: 1, character: 15}
-      active: {line: 1, character: 20}
-fullTargets: [{type: primitive, mark: {type: cursorToken}, selectionType: token, position: contents, modifier: {type: subpiece, pieceType: word, anchor: 0, active: 0}, insideOutsideType: inside}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/inference/takeHarpAndStringEach.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/inference/takeHarpAndStringEach.yml
deleted file mode 100644
index 5ba944dcc5..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/inference/takeHarpAndStringEach.yml
+++ /dev/null
@@ -1,41 +0,0 @@
-languageId: typescript
-command:
-  version: 1
-  spokenForm: take harp and string each
-  action: setSelection
-  targets:
-    - type: list
-      elements:
-        - type: primitive
-          mark: {type: decoratedSymbol, symbolColor: default, character: h}
-        - type: primitive
-          modifier: {type: containingScope, scopeType: string}
-          mark: {type: decoratedSymbol, symbolColor: default, character: e}
-initialState:
-  documentContents: |
-
-    const value = "Hello world";
-
-    const value = "Hello world";
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-  marks:
-    default.h:
-      start: {line: 1, character: 15}
-      end: {line: 1, character: 20}
-    default.e:
-      start: {line: 3, character: 15}
-      end: {line: 3, character: 20}
-finalState:
-  documentContents: |
-
-    const value = "Hello world";
-
-    const value = "Hello world";
-  selections:
-    - anchor: {line: 1, character: 15}
-      active: {line: 1, character: 20}
-    - anchor: {line: 3, character: 14}
-      active: {line: 3, character: 27}
-fullTargets: [{type: list, elements: [{type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: h}, selectionType: token, position: contents, modifier: {type: identity}, insideOutsideType: inside}, {type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: e}, selectionType: token, position: contents, modifier: {type: containingScope, scopeType: string}, insideOutsideType: inside}]}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/inference/takeHarpPastStringEach.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/inference/takeHarpPastStringEach.yml
deleted file mode 100644
index 3094cb2ec2..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/inference/takeHarpPastStringEach.yml
+++ /dev/null
@@ -1,42 +0,0 @@
-languageId: typescript
-command:
-  version: 1
-  spokenForm: take harp past string each
-  action: setSelection
-  targets:
-    - type: range
-      start:
-        type: primitive
-        mark: {type: decoratedSymbol, symbolColor: default, character: h}
-      end:
-        type: primitive
-        modifier: {type: containingScope, scopeType: string}
-        mark: {type: decoratedSymbol, symbolColor: default, character: e}
-      excludeStart: false
-      excludeEnd: false
-initialState:
-  documentContents: |
-
-    const value = "Hello world";
-
-    const value = "Hello world";
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-  marks:
-    default.h:
-      start: {line: 1, character: 15}
-      end: {line: 1, character: 20}
-    default.e:
-      start: {line: 3, character: 15}
-      end: {line: 3, character: 20}
-finalState:
-  documentContents: |
-
-    const value = "Hello world";
-
-    const value = "Hello world";
-  selections:
-    - anchor: {line: 1, character: 15}
-      active: {line: 3, character: 27}
-fullTargets: [{type: range, excludeStart: false, excludeEnd: false, start: {type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: h}, selectionType: token, position: contents, modifier: {type: identity}, insideOutsideType: inside}, end: {type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: e}, selectionType: token, position: contents, modifier: {type: containingScope, scopeType: string}, insideOutsideType: inside}}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/inference/takeLastChar.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/inference/takeLastChar.yml
deleted file mode 100644
index 0d4f423a25..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/inference/takeLastChar.yml
+++ /dev/null
@@ -1,27 +0,0 @@
-languageId: typescript
-command:
-  version: 1
-  spokenForm: take last char
-  action: setSelection
-  targets:
-    - type: primitive
-      selectionType: token
-      modifier: {type: subpiece, pieceType: character, anchor: -1, active: -1}
-initialState:
-  documentContents: |+
-
-    const value = "HelloWorld";
-
-  selections:
-    - anchor: {line: 1, character: 16}
-      active: {line: 1, character: 16}
-  marks: {}
-finalState:
-  documentContents: |+
-
-    const value = "HelloWorld";
-
-  selections:
-    - anchor: {line: 1, character: 24}
-      active: {line: 1, character: 25}
-fullTargets: [{type: primitive, mark: {type: cursorToken}, selectionType: token, position: contents, modifier: {type: subpiece, pieceType: character, anchor: -1, active: -1}, insideOutsideType: inside}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/inference/takeLinePastAir.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/inference/takeLinePastAir.yml
deleted file mode 100644
index 48b724c9d3..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/inference/takeLinePastAir.yml
+++ /dev/null
@@ -1,36 +0,0 @@
-languageId: typescript
-command:
-  version: 1
-  spokenForm: take line past air
-  action: setSelection
-  targets:
-    - type: range
-      start: {type: primitive, selectionType: line}
-      end:
-        type: primitive
-        mark: {type: decoratedSymbol, symbolColor: default, character: a}
-      excludeStart: false
-      excludeEnd: false
-initialState:
-  documentContents: |
-
-    const value = "Hello world";
-
-    const value = "Hello world";
-  selections:
-    - anchor: {line: 1, character: 6}
-      active: {line: 1, character: 6}
-  marks:
-    default.a:
-      start: {line: 3, character: 6}
-      end: {line: 3, character: 11}
-finalState:
-  documentContents: |
-
-    const value = "Hello world";
-
-    const value = "Hello world";
-  selections:
-    - anchor: {line: 1, character: 0}
-      active: {line: 3, character: 28}
-fullTargets: [{type: range, excludeStart: false, excludeEnd: false, start: {type: primitive, mark: {type: cursor}, selectionType: line, position: contents, modifier: {type: identity}, insideOutsideType: inside}, end: {type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: a}, selectionType: line, position: contents, modifier: {type: identity}, insideOutsideType: inside}}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/inference/takeLineVestAndAir.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/inference/takeLineVestAndAir.yml
deleted file mode 100644
index 612362b589..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/inference/takeLineVestAndAir.yml
+++ /dev/null
@@ -1,41 +0,0 @@
-languageId: typescript
-command:
-  version: 1
-  spokenForm: take line vest and air
-  action: setSelection
-  targets:
-    - type: list
-      elements:
-        - type: primitive
-          selectionType: line
-          mark: {type: decoratedSymbol, symbolColor: default, character: v}
-        - type: primitive
-          mark: {type: decoratedSymbol, symbolColor: default, character: a}
-initialState:
-  documentContents: |
-
-    const value = "Hello world";
-
-    const value = "Hello world";
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-  marks:
-    default.v:
-      start: {line: 1, character: 6}
-      end: {line: 1, character: 11}
-    default.a:
-      start: {line: 3, character: 6}
-      end: {line: 3, character: 11}
-finalState:
-  documentContents: |
-
-    const value = "Hello world";
-
-    const value = "Hello world";
-  selections:
-    - anchor: {line: 1, character: 0}
-      active: {line: 1, character: 28}
-    - anchor: {line: 3, character: 0}
-      active: {line: 3, character: 28}
-fullTargets: [{type: list, elements: [{type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: v}, selectionType: line, position: contents, modifier: {type: identity}, insideOutsideType: inside}, {type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: a}, selectionType: line, position: contents, modifier: {type: identity}, insideOutsideType: inside}]}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/inference/takeLineVestPastAir.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/inference/takeLineVestPastAir.yml
deleted file mode 100644
index 935105ccbd..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/inference/takeLineVestPastAir.yml
+++ /dev/null
@@ -1,42 +0,0 @@
-languageId: typescript
-command:
-  version: 1
-  spokenForm: take line vest past air
-  action: setSelection
-  targets:
-    - type: range
-      start:
-        type: primitive
-        selectionType: line
-        mark: {type: decoratedSymbol, symbolColor: default, character: v}
-      end:
-        type: primitive
-        mark: {type: decoratedSymbol, symbolColor: default, character: a}
-      excludeStart: false
-      excludeEnd: false
-initialState:
-  documentContents: |
-
-    const value = "Hello world";
-
-    const value = "Hello world";
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-  marks:
-    default.v:
-      start: {line: 1, character: 6}
-      end: {line: 1, character: 11}
-    default.a:
-      start: {line: 3, character: 6}
-      end: {line: 3, character: 11}
-finalState:
-  documentContents: |
-
-    const value = "Hello world";
-
-    const value = "Hello world";
-  selections:
-    - anchor: {line: 1, character: 0}
-      active: {line: 3, character: 28}
-fullTargets: [{type: range, excludeStart: false, excludeEnd: false, start: {type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: v}, selectionType: line, position: contents, modifier: {type: identity}, insideOutsideType: inside}, end: {type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: a}, selectionType: line, position: contents, modifier: {type: identity}, insideOutsideType: inside}}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/inference/takeOddPastLine.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/inference/takeOddPastLine.yml
deleted file mode 100644
index 151f0ca8bc..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/inference/takeOddPastLine.yml
+++ /dev/null
@@ -1,34 +0,0 @@
-languageId: typescript
-command:
-  version: 1
-  spokenForm: take odd past line
-  action: setSelection
-  targets:
-    - type: range
-      start:
-        type: primitive
-        mark: {type: decoratedSymbol, symbolColor: default, character: o}
-      end: {type: primitive, selectionType: line}
-      excludeStart: false
-      excludeEnd: false
-initialState:
-  documentContents: |-
-    const foo = "hello";
-
-    const bar = "hello";
-  selections:
-    - anchor: {line: 2, character: 18}
-      active: {line: 2, character: 18}
-  marks:
-    default.o:
-      start: {line: 0, character: 0}
-      end: {line: 0, character: 5}
-finalState:
-  documentContents: |-
-    const foo = "hello";
-
-    const bar = "hello";
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 2, character: 20}
-fullTargets: [{type: range, excludeAnchor: false, excludeActive: false, anchor: {type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: o}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: identity}}, active: {type: primitive, mark: {type: cursor}, selectionType: line, position: contents, insideOutsideType: inside, modifier: {type: identity}}}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/inference/takeOddPastState.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/inference/takeOddPastState.yml
deleted file mode 100644
index 6dd786930e..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/inference/takeOddPastState.yml
+++ /dev/null
@@ -1,36 +0,0 @@
-languageId: typescript
-command:
-  version: 1
-  spokenForm: take odd past state
-  action: setSelection
-  targets:
-    - type: range
-      start:
-        type: primitive
-        mark: {type: decoratedSymbol, symbolColor: default, character: o}
-      end:
-        type: primitive
-        modifier: {type: containingScope, scopeType: statement, includeSiblings: false}
-      excludeStart: false
-      excludeEnd: false
-initialState:
-  documentContents: |-
-    const foo = "hello";
-
-    const bar = "hello";
-  selections:
-    - anchor: {line: 2, character: 18}
-      active: {line: 2, character: 18}
-  marks:
-    default.o:
-      start: {line: 0, character: 0}
-      end: {line: 0, character: 5}
-finalState:
-  documentContents: |-
-    const foo = "hello";
-
-    const bar = "hello";
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 2, character: 20}
-fullTargets: [{type: range, excludeAnchor: false, excludeActive: false, anchor: {type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: o}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: identity}}, active: {type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: containingScope, scopeType: statement, includeSiblings: false}}}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/inference/takeOddPastToken.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/inference/takeOddPastToken.yml
deleted file mode 100644
index 11ae3d529b..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/inference/takeOddPastToken.yml
+++ /dev/null
@@ -1,34 +0,0 @@
-languageId: typescript
-command:
-  version: 1
-  spokenForm: take odd past token
-  action: setSelection
-  targets:
-    - type: range
-      start:
-        type: primitive
-        mark: {type: decoratedSymbol, symbolColor: default, character: o}
-      end: {type: primitive, selectionType: token}
-      excludeStart: false
-      excludeEnd: false
-initialState:
-  documentContents: |-
-    const foo = "hello";
-
-    const bar = "hello";
-  selections:
-    - anchor: {line: 2, character: 18}
-      active: {line: 2, character: 18}
-  marks:
-    default.o:
-      start: {line: 0, character: 0}
-      end: {line: 0, character: 5}
-finalState:
-  documentContents: |-
-    const foo = "hello";
-
-    const bar = "hello";
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 2, character: 18}
-fullTargets: [{type: range, excludeAnchor: false, excludeActive: false, anchor: {type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: o}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: identity}}, active: {type: primitive, mark: {type: cursorToken}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: identity}}}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/inference/takePastLineAir.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/inference/takePastLineAir.yml
deleted file mode 100644
index b8e1705b7b..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/inference/takePastLineAir.yml
+++ /dev/null
@@ -1,37 +0,0 @@
-languageId: typescript
-command:
-  version: 1
-  spokenForm: take past line air
-  action: setSelection
-  targets:
-    - type: range
-      start: {type: primitive}
-      end:
-        type: primitive
-        selectionType: line
-        mark: {type: decoratedSymbol, symbolColor: default, character: a}
-      excludeStart: false
-      excludeEnd: false
-initialState:
-  documentContents: |
-
-    const value = "Hello world";
-
-    const value = "Hello world";
-  selections:
-    - anchor: {line: 1, character: 6}
-      active: {line: 1, character: 6}
-  marks:
-    default.a:
-      start: {line: 3, character: 6}
-      end: {line: 3, character: 11}
-finalState:
-  documentContents: |
-
-    const value = "Hello world";
-
-    const value = "Hello world";
-  selections:
-    - anchor: {line: 1, character: 6}
-      active: {line: 3, character: 28}
-fullTargets: [{type: range, excludeStart: false, excludeEnd: false, start: {type: primitive, mark: {type: cursor}, selectionType: token, position: contents, modifier: {type: identity}, insideOutsideType: inside}, end: {type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: a}, selectionType: line, position: contents, modifier: {type: identity}, insideOutsideType: inside}}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/inference/takeStringHarpAndEach.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/inference/takeStringHarpAndEach.yml
deleted file mode 100644
index b2bbb3011e..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/inference/takeStringHarpAndEach.yml
+++ /dev/null
@@ -1,41 +0,0 @@
-languageId: typescript
-command:
-  version: 1
-  spokenForm: take string harp and each
-  action: setSelection
-  targets:
-    - type: list
-      elements:
-        - type: primitive
-          modifier: {type: containingScope, scopeType: string}
-          mark: {type: decoratedSymbol, symbolColor: default, character: h}
-        - type: primitive
-          mark: {type: decoratedSymbol, symbolColor: default, character: e}
-initialState:
-  documentContents: |
-
-    const value = "Hello world";
-
-    const value = "Hello world";
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-  marks:
-    default.h:
-      start: {line: 1, character: 15}
-      end: {line: 1, character: 20}
-    default.e:
-      start: {line: 3, character: 15}
-      end: {line: 3, character: 20}
-finalState:
-  documentContents: |
-
-    const value = "Hello world";
-
-    const value = "Hello world";
-  selections:
-    - anchor: {line: 1, character: 14}
-      active: {line: 1, character: 27}
-    - anchor: {line: 3, character: 14}
-      active: {line: 3, character: 27}
-fullTargets: [{type: list, elements: [{type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: h}, selectionType: token, position: contents, modifier: {type: containingScope, scopeType: string}, insideOutsideType: inside}, {type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: e}, selectionType: token, position: contents, modifier: {type: containingScope, scopeType: string}, insideOutsideType: inside}]}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/inference/takeStringHarpPastEach.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/inference/takeStringHarpPastEach.yml
deleted file mode 100644
index bfc58f93c1..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/inference/takeStringHarpPastEach.yml
+++ /dev/null
@@ -1,42 +0,0 @@
-languageId: typescript
-command:
-  version: 1
-  spokenForm: take string harp past each
-  action: setSelection
-  targets:
-    - type: range
-      start:
-        type: primitive
-        modifier: {type: containingScope, scopeType: string}
-        mark: {type: decoratedSymbol, symbolColor: default, character: h}
-      end:
-        type: primitive
-        mark: {type: decoratedSymbol, symbolColor: default, character: e}
-      excludeStart: false
-      excludeEnd: false
-initialState:
-  documentContents: |
-
-    const value = "Hello world";
-
-    const value = "Hello world";
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-  marks:
-    default.h:
-      start: {line: 1, character: 15}
-      end: {line: 1, character: 20}
-    default.e:
-      start: {line: 3, character: 15}
-      end: {line: 3, character: 20}
-finalState:
-  documentContents: |
-
-    const value = "Hello world";
-
-    const value = "Hello world";
-  selections:
-    - anchor: {line: 1, character: 14}
-      active: {line: 3, character: 27}
-fullTargets: [{type: range, excludeStart: false, excludeEnd: false, start: {type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: h}, selectionType: token, position: contents, modifier: {type: containingScope, scopeType: string}, insideOutsideType: inside}, end: {type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: e}, selectionType: token, position: contents, modifier: {type: containingScope, scopeType: string}, insideOutsideType: inside}}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/inference/takeVestAndLineAir.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/inference/takeVestAndLineAir.yml
deleted file mode 100644
index 32de94cfe9..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/inference/takeVestAndLineAir.yml
+++ /dev/null
@@ -1,41 +0,0 @@
-languageId: typescript
-command:
-  version: 1
-  spokenForm: take vest and line air
-  action: setSelection
-  targets:
-    - type: list
-      elements:
-        - type: primitive
-          mark: {type: decoratedSymbol, symbolColor: default, character: v}
-        - type: primitive
-          selectionType: line
-          mark: {type: decoratedSymbol, symbolColor: default, character: a}
-initialState:
-  documentContents: |
-
-    const value = "Hello world";
-
-    const value = "Hello world";
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-  marks:
-    default.v:
-      start: {line: 1, character: 6}
-      end: {line: 1, character: 11}
-    default.a:
-      start: {line: 3, character: 6}
-      end: {line: 3, character: 11}
-finalState:
-  documentContents: |
-
-    const value = "Hello world";
-
-    const value = "Hello world";
-  selections:
-    - anchor: {line: 1, character: 6}
-      active: {line: 1, character: 11}
-    - anchor: {line: 3, character: 0}
-      active: {line: 3, character: 28}
-fullTargets: [{type: list, elements: [{type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: v}, selectionType: token, position: contents, modifier: {type: identity}, insideOutsideType: inside}, {type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: a}, selectionType: line, position: contents, modifier: {type: identity}, insideOutsideType: inside}]}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/inference/takeVestPastAfterAir.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/inference/takeVestPastAfterAir.yml
deleted file mode 100644
index 5b733cec19..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/inference/takeVestPastAfterAir.yml
+++ /dev/null
@@ -1,42 +0,0 @@
-languageId: typescript
-command:
-  version: 1
-  spokenForm: take vest past after air
-  action: setSelection
-  targets:
-    - type: range
-      start:
-        type: primitive
-        mark: {type: decoratedSymbol, symbolColor: default, character: v}
-      end:
-        type: primitive
-        position: after
-        mark: {type: decoratedSymbol, symbolColor: default, character: a}
-      excludeStart: false
-      excludeEnd: false
-initialState:
-  documentContents: |
-
-    const value = "Hello world";
-
-    const value = "Hello world";
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-  marks:
-    default.v:
-      start: {line: 1, character: 6}
-      end: {line: 1, character: 11}
-    default.a:
-      start: {line: 3, character: 6}
-      end: {line: 3, character: 11}
-finalState:
-  documentContents: |
-
-    const value = "Hello world";
-
-    const value = "Hello world";
-  selections:
-    - anchor: {line: 1, character: 6}
-      active: {line: 3, character: 11}
-fullTargets: [{type: range, excludeStart: false, excludeEnd: false, start: {type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: v}, selectionType: token, position: contents, modifier: {type: identity}, insideOutsideType: inside}, end: {type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: a}, selectionType: token, position: after, modifier: {type: identity}, insideOutsideType: inside}}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/inference/takeVestPastBeforeAir.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/inference/takeVestPastBeforeAir.yml
deleted file mode 100644
index c4243a7715..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/inference/takeVestPastBeforeAir.yml
+++ /dev/null
@@ -1,42 +0,0 @@
-languageId: typescript
-command:
-  version: 1
-  spokenForm: take vest past before air
-  action: setSelection
-  targets:
-    - type: range
-      start:
-        type: primitive
-        mark: {type: decoratedSymbol, symbolColor: default, character: v}
-      end:
-        type: primitive
-        position: before
-        mark: {type: decoratedSymbol, symbolColor: default, character: a}
-      excludeStart: false
-      excludeEnd: false
-initialState:
-  documentContents: |
-
-    const value = "Hello world";
-
-    const value = "Hello world";
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-  marks:
-    default.v:
-      start: {line: 1, character: 6}
-      end: {line: 1, character: 11}
-    default.a:
-      start: {line: 3, character: 6}
-      end: {line: 3, character: 11}
-finalState:
-  documentContents: |
-
-    const value = "Hello world";
-
-    const value = "Hello world";
-  selections:
-    - anchor: {line: 1, character: 6}
-      active: {line: 3, character: 6}
-fullTargets: [{type: range, excludeStart: false, excludeEnd: false, start: {type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: v}, selectionType: token, position: contents, modifier: {type: identity}, insideOutsideType: inside}, end: {type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: a}, selectionType: token, position: before, modifier: {type: identity}, insideOutsideType: inside}}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/inference/takeVestPastLineAir.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/inference/takeVestPastLineAir.yml
deleted file mode 100644
index bff6bb520b..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/inference/takeVestPastLineAir.yml
+++ /dev/null
@@ -1,42 +0,0 @@
-languageId: typescript
-command:
-  version: 1
-  spokenForm: take vest past line air
-  action: setSelection
-  targets:
-    - type: range
-      start:
-        type: primitive
-        mark: {type: decoratedSymbol, symbolColor: default, character: v}
-      end:
-        type: primitive
-        selectionType: line
-        mark: {type: decoratedSymbol, symbolColor: default, character: a}
-      excludeStart: false
-      excludeEnd: false
-initialState:
-  documentContents: |
-
-    const value = "Hello world";
-
-    const value = "Hello world";
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-  marks:
-    default.v:
-      start: {line: 1, character: 6}
-      end: {line: 1, character: 11}
-    default.a:
-      start: {line: 3, character: 6}
-      end: {line: 3, character: 11}
-finalState:
-  documentContents: |
-
-    const value = "Hello world";
-
-    const value = "Hello world";
-  selections:
-    - anchor: {line: 1, character: 6}
-      active: {line: 3, character: 28}
-fullTargets: [{type: range, excludeStart: false, excludeEnd: false, start: {type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: v}, selectionType: token, position: contents, modifier: {type: identity}, insideOutsideType: inside}, end: {type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: a}, selectionType: line, position: contents, modifier: {type: identity}, insideOutsideType: inside}}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/itemTextual/chuckEveryItem.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/itemTextual/chuckEveryItem.yml
deleted file mode 100644
index c984703a14..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/itemTextual/chuckEveryItem.yml
+++ /dev/null
@@ -1,30 +0,0 @@
-languageId: plaintext
-command:
-  spokenForm: chuck every item
-  version: 2
-  targets:
-    - type: primitive
-      modifiers:
-        - type: everyScope
-          scopeType: {type: collectionItem}
-  usePrePhraseSnapshot: true
-  action: {name: remove}
-initialState:
-  documentContents: |-
-    {
-        "hello": "there",
-        "testing": "whatever",
-    }
-  selections:
-    - anchor: {line: 0, character: 1}
-      active: {line: 0, character: 1}
-  marks: {}
-finalState:
-  documentContents: |-
-    {
-        
-    }
-  selections:
-    - anchor: {line: 0, character: 1}
-      active: {line: 0, character: 1}
-fullTargets: [{type: primitive, mark: {type: cursor}, modifiers: [{type: everyScope, scopeType: {type: collectionItem}}]}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/itemTextual/chuckItem.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/itemTextual/chuckItem.yml
deleted file mode 100644
index 5312cd0c34..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/itemTextual/chuckItem.yml
+++ /dev/null
@@ -1,29 +0,0 @@
-languageId: plaintext
-command:
-  spokenForm: chuck item
-  version: 2
-  targets:
-    - type: primitive
-      modifiers:
-        - type: containingScope
-          scopeType: {type: collectionItem}
-  usePrePhraseSnapshot: true
-  action: {name: remove}
-initialState:
-  documentContents: |-
-    [
-        aaa,
-    ]
-  selections:
-    - anchor: {line: 1, character: 4}
-      active: {line: 1, character: 4}
-  marks: {}
-finalState:
-  documentContents: |-
-    [
-        
-    ]
-  selections:
-    - anchor: {line: 1, character: 4}
-      active: {line: 1, character: 4}
-fullTargets: [{type: primitive, mark: {type: cursor}, modifiers: [{type: containingScope, scopeType: {type: collectionItem}}]}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/itemTextual/chuckItem2.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/itemTextual/chuckItem2.yml
deleted file mode 100644
index c321a2d893..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/itemTextual/chuckItem2.yml
+++ /dev/null
@@ -1,29 +0,0 @@
-languageId: plaintext
-command:
-  spokenForm: chuck item
-  version: 2
-  targets:
-    - type: primitive
-      modifiers:
-        - type: containingScope
-          scopeType: {type: collectionItem}
-  usePrePhraseSnapshot: true
-  action: {name: remove}
-initialState:
-  documentContents: |-
-    [
-        aaa
-    ]
-  selections:
-    - anchor: {line: 1, character: 4}
-      active: {line: 1, character: 4}
-  marks: {}
-finalState:
-  documentContents: |-
-    [
-
-    ]
-  selections:
-    - anchor: {line: 1, character: 0}
-      active: {line: 1, character: 0}
-fullTargets: [{type: primitive, mark: {type: cursor}, modifiers: [{type: containingScope, scopeType: {type: collectionItem}}]}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/itemTextual/chuckItem3.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/itemTextual/chuckItem3.yml
deleted file mode 100644
index ee339a6e0d..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/itemTextual/chuckItem3.yml
+++ /dev/null
@@ -1,30 +0,0 @@
-languageId: plaintext
-command:
-  spokenForm: chuck item
-  version: 2
-  targets:
-    - type: primitive
-      modifiers:
-        - type: containingScope
-          scopeType: {type: collectionItem}
-  usePrePhraseSnapshot: true
-  action: {name: remove}
-initialState:
-  documentContents: |-
-    [
-        foo,
-        bar,
-    ]
-  selections:
-    - anchor: {line: 2, character: 4}
-      active: {line: 2, character: 4}
-  marks: {}
-finalState:
-  documentContents: |-
-    [
-        foo,
-    ]
-  selections:
-    - anchor: {line: 1, character: 7}
-      active: {line: 1, character: 7}
-fullTargets: [{type: primitive, mark: {type: cursor}, modifiers: [{type: containingScope, scopeType: {type: collectionItem}}]}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/itemTextual/chuckItem4.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/itemTextual/chuckItem4.yml
deleted file mode 100644
index 6e94b48b16..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/itemTextual/chuckItem4.yml
+++ /dev/null
@@ -1,31 +0,0 @@
-languageId: plaintext
-command:
-  spokenForm: chuck item
-  version: 2
-  targets:
-    - type: primitive
-      modifiers:
-        - type: containingScope
-          scopeType: {type: collectionItem}
-  usePrePhraseSnapshot: true
-  action: {name: remove}
-initialState:
-  documentContents: |-
-    [
-        foo,
-        bar,
-        baz,
-    ]
-  selections:
-    - anchor: {line: 2, character: 8}
-      active: {line: 2, character: 7}
-  marks: {}
-finalState:
-  documentContents: |-
-    [
-        foo,
-    ]
-  selections:
-    - anchor: {line: 1, character: 7}
-      active: {line: 1, character: 7}
-fullTargets: [{type: primitive, mark: {type: cursor}, modifiers: [{type: containingScope, scopeType: {type: collectionItem}}]}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/itemTextual/clearEveryItem.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/itemTextual/clearEveryItem.yml
deleted file mode 100644
index e8ff5a1fc2..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/itemTextual/clearEveryItem.yml
+++ /dev/null
@@ -1,37 +0,0 @@
-languageId: plaintext
-command:
-  spokenForm: clear every item
-  version: 2
-  targets:
-    - type: primitive
-      modifiers:
-        - type: everyScope
-          scopeType: {type: collectionItem}
-  usePrePhraseSnapshot: true
-  action: {name: clearAndSetSelection}
-initialState:
-  documentContents: |-
-    [
-        111,
-        "a\"b\"c",
-        222,
-    ]
-  selections:
-    - anchor: {line: 1, character: 4}
-      active: {line: 1, character: 4}
-  marks: {}
-finalState:
-  documentContents: |-
-    [
-        ,
-        ,
-        ,
-    ]
-  selections:
-    - anchor: {line: 1, character: 4}
-      active: {line: 1, character: 4}
-    - anchor: {line: 2, character: 4}
-      active: {line: 2, character: 4}
-    - anchor: {line: 3, character: 4}
-      active: {line: 3, character: 4}
-fullTargets: [{type: primitive, mark: {type: cursor}, modifiers: [{type: everyScope, scopeType: {type: collectionItem}}]}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/itemTextual/clearEveryItem2.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/itemTextual/clearEveryItem2.yml
deleted file mode 100644
index 803df45b8e..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/itemTextual/clearEveryItem2.yml
+++ /dev/null
@@ -1,27 +0,0 @@
-languageId: plaintext
-command:
-  spokenForm: clear every item
-  version: 2
-  targets:
-    - type: primitive
-      modifiers:
-        - type: everyScope
-          scopeType: {type: collectionItem}
-  usePrePhraseSnapshot: true
-  action: {name: clearAndSetSelection}
-initialState:
-  documentContents: aaa, bbb, ccc
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-  marks: {}
-finalState:
-  documentContents: ", , "
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-    - anchor: {line: 0, character: 2}
-      active: {line: 0, character: 2}
-    - anchor: {line: 0, character: 4}
-      active: {line: 0, character: 4}
-fullTargets: [{type: primitive, mark: {type: cursor}, modifiers: [{type: everyScope, scopeType: {type: collectionItem}}]}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/itemTextual/clearEveryItem3.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/itemTextual/clearEveryItem3.yml
deleted file mode 100644
index 48ba5f440c..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/itemTextual/clearEveryItem3.yml
+++ /dev/null
@@ -1,25 +0,0 @@
-languageId: plaintext
-command:
-  spokenForm: clear every item
-  version: 2
-  targets:
-    - type: primitive
-      modifiers:
-        - type: everyScope
-          scopeType: {type: collectionItem}
-  usePrePhraseSnapshot: true
-  action: {name: clearAndSetSelection}
-initialState:
-  documentContents: aaa, """bbb"""
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-  marks: {}
-finalState:
-  documentContents: ", "
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-    - anchor: {line: 0, character: 2}
-      active: {line: 0, character: 2}
-fullTargets: [{type: primitive, mark: {type: cursor}, modifiers: [{type: everyScope, scopeType: {type: collectionItem}}]}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/itemTextual/clearEveryItem4.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/itemTextual/clearEveryItem4.yml
deleted file mode 100644
index 1d1959202f..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/itemTextual/clearEveryItem4.yml
+++ /dev/null
@@ -1,29 +0,0 @@
-languageId: plaintext
-command:
-  spokenForm: clear every item
-  version: 2
-  targets:
-    - type: primitive
-      modifiers:
-        - type: everyScope
-          scopeType: {type: collectionItem}
-  usePrePhraseSnapshot: true
-  action: {name: clearAndSetSelection}
-initialState:
-  documentContents: a, "b\",b\"b", 'c\',c\'c', `d\`,d\`d`
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-  marks: {}
-finalState:
-  documentContents: ", , , "
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-    - anchor: {line: 0, character: 2}
-      active: {line: 0, character: 2}
-    - anchor: {line: 0, character: 4}
-      active: {line: 0, character: 4}
-    - anchor: {line: 0, character: 6}
-      active: {line: 0, character: 6}
-fullTargets: [{type: primitive, mark: {type: cursor}, modifiers: [{type: everyScope, scopeType: {type: collectionItem}}]}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/itemTextual/clearEveryItem5.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/itemTextual/clearEveryItem5.yml
deleted file mode 100644
index 562176522c..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/itemTextual/clearEveryItem5.yml
+++ /dev/null
@@ -1,39 +0,0 @@
-languageId: plaintext
-command:
-  spokenForm: clear every item
-  version: 2
-  targets:
-    - type: primitive
-      modifiers:
-        - type: everyScope
-          scopeType: {type: collectionItem}
-  usePrePhraseSnapshot: true
-  action: {name: clearAndSetSelection}
-initialState:
-  documentContents: |-
-    [
-        a,
-        [
-            b
-        ],
-        c
-    ]
-  selections:
-    - anchor: {line: 1, character: 4}
-      active: {line: 1, character: 4}
-  marks: {}
-finalState:
-  documentContents: |-
-    [
-        ,
-        ,
-        
-    ]
-  selections:
-    - anchor: {line: 1, character: 4}
-      active: {line: 1, character: 4}
-    - anchor: {line: 2, character: 4}
-      active: {line: 2, character: 4}
-    - anchor: {line: 3, character: 4}
-      active: {line: 3, character: 4}
-fullTargets: [{type: primitive, mark: {type: cursor}, modifiers: [{type: everyScope, scopeType: {type: collectionItem}}]}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/itemTextual/clearEveryItem6.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/itemTextual/clearEveryItem6.yml
deleted file mode 100644
index be55d9535b..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/itemTextual/clearEveryItem6.yml
+++ /dev/null
@@ -1,29 +0,0 @@
-languageId: plaintext
-command:
-  spokenForm: clear every item
-  version: 2
-  targets:
-    - type: primitive
-      modifiers:
-        - type: everyScope
-          scopeType: {type: collectionItem}
-  usePrePhraseSnapshot: true
-  action: {name: clearAndSetSelection}
-initialState:
-  documentContents: |-
-    a, b,
-    c, d
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-  marks: {}
-finalState:
-  documentContents: |-
-    , ,
-    c, d
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-    - anchor: {line: 0, character: 2}
-      active: {line: 0, character: 2}
-fullTargets: [{type: primitive, mark: {type: cursor}, modifiers: [{type: everyScope, scopeType: {type: collectionItem}}]}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/itemTextual/clearEveryItem7.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/itemTextual/clearEveryItem7.yml
deleted file mode 100644
index f223f997cf..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/itemTextual/clearEveryItem7.yml
+++ /dev/null
@@ -1,29 +0,0 @@
-languageId: typescript
-command:
-  spokenForm: clear every item
-  version: 2
-  targets:
-    - type: primitive
-      modifiers:
-        - type: everyScope
-          scopeType: {type: collectionItem}
-  usePrePhraseSnapshot: true
-  action: {name: clearAndSetSelection}
-initialState:
-  documentContents: seq('(', ",", $._import_list, ')')
-  selections:
-    - anchor: {line: 0, character: 6}
-      active: {line: 0, character: 6}
-  marks: {}
-finalState:
-  documentContents: seq(, , , )
-  selections:
-    - anchor: {line: 0, character: 4}
-      active: {line: 0, character: 4}
-    - anchor: {line: 0, character: 6}
-      active: {line: 0, character: 6}
-    - anchor: {line: 0, character: 8}
-      active: {line: 0, character: 8}
-    - anchor: {line: 0, character: 10}
-      active: {line: 0, character: 10}
-fullTargets: [{type: primitive, mark: {type: cursor}, modifiers: [{type: everyScope, scopeType: {type: collectionItem}}]}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/itemTextual/clearEveryItemBlock.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/itemTextual/clearEveryItemBlock.yml
deleted file mode 100644
index 19d16a90e8..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/itemTextual/clearEveryItemBlock.yml
+++ /dev/null
@@ -1,35 +0,0 @@
-languageId: plaintext
-command:
-  spokenForm: clear every item block
-  version: 2
-  targets:
-    - type: primitive
-      modifiers:
-        - type: everyScope
-          scopeType: {type: collectionItem}
-        - type: containingScope
-          scopeType: {type: paragraph}
-  usePrePhraseSnapshot: true
-  action: {name: clearAndSetSelection}
-initialState:
-  documentContents: |-
-    a, b,
-    c, d
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-  marks: {}
-finalState:
-  documentContents: |-
-    , ,
-    , 
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-    - anchor: {line: 0, character: 2}
-      active: {line: 0, character: 2}
-    - anchor: {line: 1, character: 0}
-      active: {line: 1, character: 0}
-    - anchor: {line: 1, character: 2}
-      active: {line: 1, character: 2}
-fullTargets: [{type: primitive, mark: {type: cursor}, modifiers: [{type: everyScope, scopeType: {type: collectionItem}}, {type: containingScope, scopeType: {type: paragraph}}]}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/itemTextual/clearEveryItemToken.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/itemTextual/clearEveryItemToken.yml
deleted file mode 100644
index fb9e26442d..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/itemTextual/clearEveryItemToken.yml
+++ /dev/null
@@ -1,25 +0,0 @@
-languageId: plaintext
-command:
-  spokenForm: clear every item token
-  version: 2
-  targets:
-    - type: primitive
-      modifiers:
-        - type: everyScope
-          scopeType: {type: collectionItem}
-        - type: containingScope
-          scopeType: {type: token}
-  usePrePhraseSnapshot: true
-  action: {name: clearAndSetSelection}
-initialState:
-  documentContents: aaa bbb, ccc
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-  marks: {}
-finalState:
-  documentContents: ", ccc"
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-fullTargets: [{type: primitive, mark: {type: cursor}, modifiers: [{type: everyScope, scopeType: {type: collectionItem}}, {type: containingScope, scopeType: {type: token}}]}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/itemTextual/clearItem.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/itemTextual/clearItem.yml
deleted file mode 100644
index 1f8f88897f..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/itemTextual/clearItem.yml
+++ /dev/null
@@ -1,33 +0,0 @@
-languageId: plaintext
-command:
-  spokenForm: clear item
-  version: 2
-  targets:
-    - type: primitive
-      modifiers:
-        - type: containingScope
-          scopeType: {type: collectionItem}
-  usePrePhraseSnapshot: true
-  action: {name: clearAndSetSelection}
-initialState:
-  documentContents: |-
-    [
-        111,
-        "a\"b\"c",
-        222,
-    ]
-  selections:
-    - anchor: {line: 2, character: 5}
-      active: {line: 2, character: 5}
-  marks: {}
-finalState:
-  documentContents: |-
-    [
-        111,
-        ,
-        222,
-    ]
-  selections:
-    - anchor: {line: 2, character: 4}
-      active: {line: 2, character: 4}
-fullTargets: [{type: primitive, mark: {type: cursor}, modifiers: [{type: containingScope, scopeType: {type: collectionItem}}]}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/itemTextual/clearItem10.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/itemTextual/clearItem10.yml
deleted file mode 100644
index 5994fe4922..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/itemTextual/clearItem10.yml
+++ /dev/null
@@ -1,23 +0,0 @@
-languageId: typescript
-command:
-  spokenForm: clear item
-  version: 2
-  targets:
-    - type: primitive
-      modifiers:
-        - type: containingScope
-          scopeType: {type: collectionItem}
-  usePrePhraseSnapshot: false
-  action: {name: clearAndSetSelection}
-initialState:
-  documentContents: foo(hello, world)
-  selections:
-    - anchor: {line: 0, character: 10}
-      active: {line: 0, character: 10}
-  marks: {}
-finalState:
-  documentContents: foo(hello, )
-  selections:
-    - anchor: {line: 0, character: 11}
-      active: {line: 0, character: 11}
-fullTargets: [{type: primitive, mark: {type: cursor}, modifiers: [{type: containingScope, scopeType: {type: collectionItem}}]}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/itemTextual/clearItem11.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/itemTextual/clearItem11.yml
deleted file mode 100644
index 67c46eb208..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/itemTextual/clearItem11.yml
+++ /dev/null
@@ -1,23 +0,0 @@
-languageId: typescript
-command:
-  spokenForm: clear item
-  version: 2
-  targets:
-    - type: primitive
-      modifiers:
-        - type: containingScope
-          scopeType: {type: collectionItem}
-  usePrePhraseSnapshot: false
-  action: {name: clearAndSetSelection}
-initialState:
-  documentContents: foo(hello, world)
-  selections:
-    - anchor: {line: 0, character: 7}
-      active: {line: 0, character: 13}
-  marks: {}
-finalState:
-  documentContents: foo()
-  selections:
-    - anchor: {line: 0, character: 4}
-      active: {line: 0, character: 4}
-fullTargets: [{type: primitive, mark: {type: cursor}, modifiers: [{type: containingScope, scopeType: {type: collectionItem}}]}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/itemTextual/clearItem2.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/itemTextual/clearItem2.yml
deleted file mode 100644
index ae39bac501..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/itemTextual/clearItem2.yml
+++ /dev/null
@@ -1,33 +0,0 @@
-languageId: plaintext
-command:
-  spokenForm: clear item
-  version: 2
-  targets:
-    - type: primitive
-      modifiers:
-        - type: containingScope
-          scopeType: {type: collectionItem}
-  usePrePhraseSnapshot: true
-  action: {name: clearAndSetSelection}
-initialState:
-  documentContents: |-
-    [
-        111,
-        "a\"b\"c",
-        222,
-    ]
-  selections:
-    - anchor: {line: 2, character: 9}
-      active: {line: 2, character: 9}
-  marks: {}
-finalState:
-  documentContents: |-
-    [
-        111,
-        ,
-        222,
-    ]
-  selections:
-    - anchor: {line: 2, character: 4}
-      active: {line: 2, character: 4}
-fullTargets: [{type: primitive, mark: {type: cursor}, modifiers: [{type: containingScope, scopeType: {type: collectionItem}}]}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/itemTextual/clearItem3.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/itemTextual/clearItem3.yml
deleted file mode 100644
index bd587548cf..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/itemTextual/clearItem3.yml
+++ /dev/null
@@ -1,33 +0,0 @@
-languageId: plaintext
-command:
-  spokenForm: clear item
-  version: 2
-  targets:
-    - type: primitive
-      modifiers:
-        - type: containingScope
-          scopeType: {type: collectionItem}
-  usePrePhraseSnapshot: true
-  action: {name: clearAndSetSelection}
-initialState:
-  documentContents: |-
-    [
-        111,
-        "a\"b\"c",
-        222,
-    ]
-  selections:
-    - anchor: {line: 2, character: 12}
-      active: {line: 2, character: 12}
-  marks: {}
-finalState:
-  documentContents: |-
-    [
-        111,
-        ,
-        222,
-    ]
-  selections:
-    - anchor: {line: 2, character: 4}
-      active: {line: 2, character: 4}
-fullTargets: [{type: primitive, mark: {type: cursor}, modifiers: [{type: containingScope, scopeType: {type: collectionItem}}]}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/itemTextual/clearItem4.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/itemTextual/clearItem4.yml
deleted file mode 100644
index adee7428a2..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/itemTextual/clearItem4.yml
+++ /dev/null
@@ -1,23 +0,0 @@
-languageId: plaintext
-command:
-  spokenForm: clear item
-  version: 2
-  targets:
-    - type: primitive
-      modifiers:
-        - type: containingScope
-          scopeType: {type: collectionItem}
-  usePrePhraseSnapshot: true
-  action: {name: clearAndSetSelection}
-initialState:
-  documentContents: (aaa)
-  selections:
-    - anchor: {line: 0, character: 2}
-      active: {line: 0, character: 2}
-  marks: {}
-finalState:
-  documentContents: ()
-  selections:
-    - anchor: {line: 0, character: 1}
-      active: {line: 0, character: 1}
-fullTargets: [{type: primitive, mark: {type: cursor}, modifiers: [{type: containingScope, scopeType: {type: collectionItem}}]}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/itemTextual/clearItem5.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/itemTextual/clearItem5.yml
deleted file mode 100644
index 024e60f97c..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/itemTextual/clearItem5.yml
+++ /dev/null
@@ -1,23 +0,0 @@
-languageId: plaintext
-command:
-  spokenForm: clear item
-  version: 2
-  targets:
-    - type: primitive
-      modifiers:
-        - type: containingScope
-          scopeType: {type: collectionItem}
-  usePrePhraseSnapshot: true
-  action: {name: clearAndSetSelection}
-initialState:
-  documentContents: aaa aaa, bbb bbb
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-  marks: {}
-finalState:
-  documentContents: ", bbb bbb"
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-fullTargets: [{type: primitive, mark: {type: cursor}, modifiers: [{type: containingScope, scopeType: {type: collectionItem}}]}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/itemTextual/clearItem6.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/itemTextual/clearItem6.yml
deleted file mode 100644
index 329ed2c049..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/itemTextual/clearItem6.yml
+++ /dev/null
@@ -1,23 +0,0 @@
-languageId: plaintext
-command:
-  spokenForm: clear item
-  version: 2
-  targets:
-    - type: primitive
-      modifiers:
-        - type: containingScope
-          scopeType: {type: collectionItem}
-  usePrePhraseSnapshot: true
-  action: {name: clearAndSetSelection}
-initialState:
-  documentContents: aaa aaa
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-  marks: {}
-finalState:
-  documentContents: ""
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-fullTargets: [{type: primitive, mark: {type: cursor}, modifiers: [{type: containingScope, scopeType: {type: collectionItem}}]}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/itemTextual/clearItem7.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/itemTextual/clearItem7.yml
deleted file mode 100644
index c7c501ca1f..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/itemTextual/clearItem7.yml
+++ /dev/null
@@ -1,23 +0,0 @@
-languageId: plaintext
-command:
-  spokenForm: clear item
-  version: 2
-  targets:
-    - type: primitive
-      modifiers:
-        - type: containingScope
-          scopeType: {type: collectionItem}
-  usePrePhraseSnapshot: true
-  action: {name: clearAndSetSelection}
-initialState:
-  documentContents: a, "foo(bar)baz", b
-  selections:
-    - anchor: {line: 0, character: 8}
-      active: {line: 0, character: 8}
-  marks: {}
-finalState:
-  documentContents: a, "foo()baz", b
-  selections:
-    - anchor: {line: 0, character: 8}
-      active: {line: 0, character: 8}
-fullTargets: [{type: primitive, mark: {type: cursor}, modifiers: [{type: containingScope, scopeType: {type: collectionItem}}]}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/itemTextual/clearItem8.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/itemTextual/clearItem8.yml
deleted file mode 100644
index 537422e970..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/itemTextual/clearItem8.yml
+++ /dev/null
@@ -1,23 +0,0 @@
-languageId: plaintext
-command:
-  spokenForm: clear item
-  version: 2
-  targets:
-    - type: primitive
-      modifiers:
-        - type: containingScope
-          scopeType: {type: collectionItem}
-  usePrePhraseSnapshot: true
-  action: {name: clearAndSetSelection}
-initialState:
-  documentContents: a, "foo(bar)baz", b
-  selections:
-    - anchor: {line: 0, character: 4}
-      active: {line: 0, character: 4}
-  marks: {}
-finalState:
-  documentContents: a, , b
-  selections:
-    - anchor: {line: 0, character: 3}
-      active: {line: 0, character: 3}
-fullTargets: [{type: primitive, mark: {type: cursor}, modifiers: [{type: containingScope, scopeType: {type: collectionItem}}]}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/itemTextual/clearItem9.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/itemTextual/clearItem9.yml
deleted file mode 100644
index cb97a6dde2..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/itemTextual/clearItem9.yml
+++ /dev/null
@@ -1,23 +0,0 @@
-languageId: typescript
-command:
-  spokenForm: clear item
-  version: 2
-  targets:
-    - type: primitive
-      modifiers:
-        - type: containingScope
-          scopeType: {type: collectionItem}
-  usePrePhraseSnapshot: true
-  action: {name: clearAndSetSelection}
-initialState:
-  documentContents: foo(hello, world)
-  selections:
-    - anchor: {line: 0, character: 9}
-      active: {line: 0, character: 9}
-  marks: {}
-finalState:
-  documentContents: foo(, world)
-  selections:
-    - anchor: {line: 0, character: 4}
-      active: {line: 0, character: 4}
-fullTargets: [{type: primitive, mark: {type: cursor}, modifiers: [{type: containingScope, scopeType: {type: collectionItem}}]}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/itemTextual/clearItemDrip.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/itemTextual/clearItemDrip.yml
deleted file mode 100644
index f1d9f278bd..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/itemTextual/clearItemDrip.yml
+++ /dev/null
@@ -1,27 +0,0 @@
-languageId: typescript
-command:
-  spokenForm: clear item drip
-  version: 2
-  targets:
-    - type: primitive
-      modifiers:
-        - type: containingScope
-          scopeType: {type: collectionItem}
-      mark: {type: decoratedSymbol, symbolColor: default, character: ','}
-  usePrePhraseSnapshot: true
-  action: {name: clearAndSetSelection}
-initialState:
-  documentContents: foo(hello, world)
-  selections:
-    - anchor: {line: 0, character: 13}
-      active: {line: 0, character: 13}
-  marks:
-    default.,:
-      start: {line: 0, character: 9}
-      end: {line: 0, character: 10}
-finalState:
-  documentContents: foo()
-  selections:
-    - anchor: {line: 0, character: 4}
-      active: {line: 0, character: 4}
-fullTargets: [{type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: ','}, modifiers: [{type: containingScope, scopeType: {type: collectionItem}}]}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/itemTextual/drinkItem.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/itemTextual/drinkItem.yml
deleted file mode 100644
index a44f9cdfd1..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/itemTextual/drinkItem.yml
+++ /dev/null
@@ -1,34 +0,0 @@
-languageId: plaintext
-command:
-  spokenForm: drink item
-  version: 2
-  targets:
-    - type: primitive
-      modifiers:
-        - type: containingScope
-          scopeType: {type: collectionItem}
-  usePrePhraseSnapshot: true
-  action: {name: editNewLineBefore}
-initialState:
-  documentContents: |-
-    [
-        aaa,
-        bbb,
-        ccc
-    ]
-  selections:
-    - anchor: {line: 3, character: 7}
-      active: {line: 3, character: 7}
-  marks: {}
-finalState:
-  documentContents: |-
-    [
-        aaa,
-        bbb,
-        ,
-        ccc
-    ]
-  selections:
-    - anchor: {line: 3, character: 4}
-      active: {line: 3, character: 4}
-fullTargets: [{type: primitive, mark: {type: cursor}, modifiers: [{type: containingScope, scopeType: {type: collectionItem}}]}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/itemTextual/drinkItem2.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/itemTextual/drinkItem2.yml
deleted file mode 100644
index d88ce5ae46..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/itemTextual/drinkItem2.yml
+++ /dev/null
@@ -1,34 +0,0 @@
-languageId: plaintext
-command:
-  spokenForm: drink item
-  version: 2
-  targets:
-    - type: primitive
-      modifiers:
-        - type: containingScope
-          scopeType: {type: collectionItem}
-  usePrePhraseSnapshot: true
-  action: {name: editNewLineBefore}
-initialState:
-  documentContents: |-
-    [
-        aaa,
-        bbb,
-        ccc,
-    ]
-  selections:
-    - anchor: {line: 3, character: 7}
-      active: {line: 3, character: 7}
-  marks: {}
-finalState:
-  documentContents: |-
-    [
-        aaa,
-        bbb,
-        ,
-        ccc,
-    ]
-  selections:
-    - anchor: {line: 3, character: 4}
-      active: {line: 3, character: 4}
-fullTargets: [{type: primitive, mark: {type: cursor}, modifiers: [{type: containingScope, scopeType: {type: collectionItem}}]}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/itemTextual/takeEveryItem.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/itemTextual/takeEveryItem.yml
deleted file mode 100644
index 21e4577566..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/itemTextual/takeEveryItem.yml
+++ /dev/null
@@ -1,55 +0,0 @@
-languageId: plaintext
-command:
-  spokenForm: take every item
-  version: 2
-  targets:
-    - type: primitive
-      modifiers:
-        - type: everyScope
-          scopeType: {type: collectionItem}
-  usePrePhraseSnapshot: true
-  action: {name: setSelection}
-initialState:
-  documentContents: |-
-    [
-        a b, (c, d),
-        e f, {g, h},
-        i j, [k, l],
-        m n, <o, p>,
-    ]
-  selections:
-    - anchor: {line: 1, character: 10}
-      active: {line: 1, character: 10}
-    - anchor: {line: 2, character: 10}
-      active: {line: 2, character: 10}
-    - anchor: {line: 3, character: 10}
-      active: {line: 3, character: 10}
-    - anchor: {line: 4, character: 10}
-      active: {line: 4, character: 10}
-  marks: {}
-finalState:
-  documentContents: |-
-    [
-        a b, (c, d),
-        e f, {g, h},
-        i j, [k, l],
-        m n, <o, p>,
-    ]
-  selections:
-    - anchor: {line: 1, character: 10}
-      active: {line: 1, character: 11}
-    - anchor: {line: 1, character: 13}
-      active: {line: 1, character: 14}
-    - anchor: {line: 2, character: 10}
-      active: {line: 2, character: 11}
-    - anchor: {line: 2, character: 13}
-      active: {line: 2, character: 14}
-    - anchor: {line: 3, character: 10}
-      active: {line: 3, character: 11}
-    - anchor: {line: 3, character: 13}
-      active: {line: 3, character: 14}
-    - anchor: {line: 4, character: 10}
-      active: {line: 4, character: 11}
-    - anchor: {line: 4, character: 13}
-      active: {line: 4, character: 14}
-fullTargets: [{type: primitive, mark: {type: cursor}, modifiers: [{type: everyScope, scopeType: {type: collectionItem}}]}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/itemTextual/takeEveryItemAir.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/itemTextual/takeEveryItemAir.yml
deleted file mode 100644
index 8df306b041..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/itemTextual/takeEveryItemAir.yml
+++ /dev/null
@@ -1,65 +0,0 @@
-languageId: plaintext
-command:
-  spokenForm: take every item air
-  version: 2
-  targets:
-    - type: primitive
-      mark: {type: decoratedSymbol, symbolColor: default, character: a}
-      modifiers:
-        - type: everyScope
-          scopeType: {type: collectionItem}
-  usePrePhraseSnapshot: true
-  action: {name: setSelection}
-initialState:
-  documentContents: |-
-    [
-        a b, (c, d),
-        e f, {g, h},
-        i j, [k, l],
-        m n, <o, p>,
-        q r, "s, t",
-        u v, "foo(bar)baz",
-    ]
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-  marks:
-    default.a:
-      start: {line: 1, character: 4}
-      end: {line: 1, character: 5}
-finalState:
-  documentContents: |-
-    [
-        a b, (c, d),
-        e f, {g, h},
-        i j, [k, l],
-        m n, <o, p>,
-        q r, "s, t",
-        u v, "foo(bar)baz",
-    ]
-  selections:
-    - anchor: {line: 1, character: 4}
-      active: {line: 1, character: 7}
-    - anchor: {line: 1, character: 9}
-      active: {line: 1, character: 15}
-    - anchor: {line: 2, character: 4}
-      active: {line: 2, character: 7}
-    - anchor: {line: 2, character: 9}
-      active: {line: 2, character: 15}
-    - anchor: {line: 3, character: 4}
-      active: {line: 3, character: 7}
-    - anchor: {line: 3, character: 9}
-      active: {line: 3, character: 15}
-    - anchor: {line: 4, character: 4}
-      active: {line: 4, character: 7}
-    - anchor: {line: 4, character: 9}
-      active: {line: 4, character: 15}
-    - anchor: {line: 5, character: 4}
-      active: {line: 5, character: 7}
-    - anchor: {line: 5, character: 9}
-      active: {line: 5, character: 15}
-    - anchor: {line: 6, character: 4}
-      active: {line: 6, character: 7}
-    - anchor: {line: 6, character: 9}
-      active: {line: 6, character: 22}
-fullTargets: [{type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: a}, modifiers: [{type: everyScope, scopeType: {type: collectionItem}}]}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/itemTextual/takeItemAir.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/itemTextual/takeItemAir.yml
deleted file mode 100644
index 9ce41faa20..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/itemTextual/takeItemAir.yml
+++ /dev/null
@@ -1,43 +0,0 @@
-languageId: plaintext
-command:
-  spokenForm: take item air
-  version: 2
-  targets:
-    - type: primitive
-      mark: {type: decoratedSymbol, symbolColor: default, character: a}
-      modifiers:
-        - type: containingScope
-          scopeType: {type: collectionItem}
-  usePrePhraseSnapshot: true
-  action: {name: setSelection}
-initialState:
-  documentContents: |-
-    [
-        a b, (c, d),
-        e f, {g, h},
-        i j, [k, l],
-        m n, <o, p>,
-        q r, "s, t",
-        u v, "foo(bar)baz",
-    ]
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-  marks:
-    default.a:
-      start: {line: 1, character: 4}
-      end: {line: 1, character: 5}
-finalState:
-  documentContents: |-
-    [
-        a b, (c, d),
-        e f, {g, h},
-        i j, [k, l],
-        m n, <o, p>,
-        q r, "s, t",
-        u v, "foo(bar)baz",
-    ]
-  selections:
-    - anchor: {line: 1, character: 4}
-      active: {line: 1, character: 7}
-fullTargets: [{type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: a}, modifiers: [{type: containingScope, scopeType: {type: collectionItem}}]}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/itemTextual/takeItemBlueRisk.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/itemTextual/takeItemBlueRisk.yml
deleted file mode 100644
index 9aab850864..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/itemTextual/takeItemBlueRisk.yml
+++ /dev/null
@@ -1,43 +0,0 @@
-languageId: plaintext
-command:
-  spokenForm: take item blue risk
-  version: 2
-  targets:
-    - type: primitive
-      mark: {type: decoratedSymbol, symbolColor: blue, character: r}
-      modifiers:
-        - type: containingScope
-          scopeType: {type: collectionItem}
-  usePrePhraseSnapshot: true
-  action: {name: setSelection}
-initialState:
-  documentContents: |-
-    [
-        a b, (c, d),
-        e f, {g, h},
-        i j, [k, l],
-        m n, <o, p>,
-        q r, "s, t",
-        u v, "foo(bar)baz",
-    ]
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-  marks:
-    blue.r:
-      start: {line: 6, character: 14}
-      end: {line: 6, character: 17}
-finalState:
-  documentContents: |-
-    [
-        a b, (c, d),
-        e f, {g, h},
-        i j, [k, l],
-        m n, <o, p>,
-        q r, "s, t",
-        u v, "foo(bar)baz",
-    ]
-  selections:
-    - anchor: {line: 6, character: 14}
-      active: {line: 6, character: 17}
-fullTargets: [{type: primitive, mark: {type: decoratedSymbol, symbolColor: blue, character: r}, modifiers: [{type: containingScope, scopeType: {type: collectionItem}}]}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/c/clearFunk.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/c/clearFunk.yml
deleted file mode 100644
index ac42597371..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/c/clearFunk.yml
+++ /dev/null
@@ -1,23 +0,0 @@
-languageId: c
-command:
-  version: 1
-  spokenForm: clear funk
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: namedFunction}
-initialState:
-  documentContents: |-
-    int f(int a, int b) {
-        
-    }
-  selections:
-    - anchor: {line: 1, character: 4}
-      active: {line: 1, character: 4}
-  marks: {}
-finalState:
-  documentContents: ""
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, modifier: {type: containingScope, scopeType: namedFunction}, insideOutsideType: inside}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/clojure/changeCallee.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/clojure/changeCallee.yml
deleted file mode 100644
index 5d5c45bdcf..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/clojure/changeCallee.yml
+++ /dev/null
@@ -1,20 +0,0 @@
-languageId: clojure
-command:
-  version: 1
-  spokenForm: change callee
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: functionCallee, includeSiblings: false}
-initialState:
-  documentContents: (foo bar)
-  selections:
-    - anchor: {line: 0, character: 6}
-      active: {line: 0, character: 6}
-  marks: {}
-finalState:
-  documentContents: ( bar)
-  selections:
-    - anchor: {line: 0, character: 1}
-      active: {line: 0, character: 1}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: containingScope, scopeType: functionCallee, includeSiblings: false}, isImplicit: false}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/clojure/changeCallee2.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/clojure/changeCallee2.yml
deleted file mode 100644
index 224a6abe33..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/clojure/changeCallee2.yml
+++ /dev/null
@@ -1,20 +0,0 @@
-languageId: clojure
-command:
-  version: 1
-  spokenForm: change callee
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: functionCallee, includeSiblings: false}
-initialState:
-  documentContents: (defn messenger ([]     (messenger "Hello world!")))
-  selections:
-    - anchor: {line: 0, character: 43}
-      active: {line: 0, character: 43}
-  marks: {}
-finalState:
-  documentContents: (defn messenger ([]     ( "Hello world!")))
-  selections:
-    - anchor: {line: 0, character: 25}
-      active: {line: 0, character: 25}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: containingScope, scopeType: functionCallee, includeSiblings: false}, isImplicit: false}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/clojure/changeCallee3.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/clojure/changeCallee3.yml
deleted file mode 100644
index 3c3425b534..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/clojure/changeCallee3.yml
+++ /dev/null
@@ -1,20 +0,0 @@
-languageId: clojure
-command:
-  version: 1
-  spokenForm: change callee
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: functionCallee, includeSiblings: false}
-initialState:
-  documentContents: (  (fn [message] (println message))  "Hello world!" )
-  selections:
-    - anchor: {line: 0, character: 45}
-      active: {line: 0, character: 45}
-  marks: {}
-finalState:
-  documentContents: (    "Hello world!" )
-  selections:
-    - anchor: {line: 0, character: 3}
-      active: {line: 0, character: 3}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: containingScope, scopeType: functionCallee, includeSiblings: false}, isImplicit: false}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/clojure/changeCallee4.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/clojure/changeCallee4.yml
deleted file mode 100644
index e931c61017..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/clojure/changeCallee4.yml
+++ /dev/null
@@ -1,20 +0,0 @@
-languageId: clojure
-command:
-  version: 1
-  spokenForm: change callee
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: functionCallee, includeSiblings: false}
-initialState:
-  documentContents: (apply f '(1 2 3 4))
-  selections:
-    - anchor: {line: 0, character: 15}
-      active: {line: 0, character: 16}
-  marks: {}
-finalState:
-  documentContents: ( f '(1 2 3 4))
-  selections:
-    - anchor: {line: 0, character: 1}
-      active: {line: 0, character: 1}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: containingScope, scopeType: functionCallee, includeSiblings: false}, isImplicit: false}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/clojure/chuckItemFine.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/clojure/chuckItemFine.yml
deleted file mode 100644
index ccca655e2c..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/clojure/chuckItemFine.yml
+++ /dev/null
@@ -1,33 +0,0 @@
-languageId: clojure
-command:
-  version: 1
-  spokenForm: chuck item fine
-  action: remove
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: collectionItem, includeSiblings: false}
-      mark: {type: decoratedSymbol, symbolColor: default, character: f}
-initialState:
-  documentContents: |-
-    {
-        :foo "bar",
-        ;; hello
-        :baz "whatever",
-    }
-  selections:
-    - anchor: {line: 4, character: 1}
-      active: {line: 4, character: 1}
-  marks:
-    default.f:
-      start: {line: 1, character: 5}
-      end: {line: 1, character: 8}
-finalState:
-  documentContents: |-
-    {
-        ;; hello
-        :baz "whatever",
-    }
-  selections:
-    - anchor: {line: 3, character: 1}
-      active: {line: 3, character: 1}
-fullTargets: [{type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: f, usePrePhraseSnapshot: true}, selectionType: token, position: contents, insideOutsideType: outside, modifier: {type: containingScope, scopeType: collectionItem, includeSiblings: false}}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/clojure/chuckItemFine2.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/clojure/chuckItemFine2.yml
deleted file mode 100644
index 54bf669a37..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/clojure/chuckItemFine2.yml
+++ /dev/null
@@ -1,31 +0,0 @@
-languageId: clojure
-command:
-  version: 1
-  spokenForm: chuck item fine
-  action: remove
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: collectionItem, includeSiblings: false}
-      mark: {type: decoratedSymbol, symbolColor: default, character: f}
-initialState:
-  documentContents: |-
-    {
-        :foo "bar",
-        :baz "whatever",
-    }
-  selections:
-    - anchor: {line: 3, character: 1}
-      active: {line: 3, character: 1}
-  marks:
-    default.f:
-      start: {line: 1, character: 5}
-      end: {line: 1, character: 8}
-finalState:
-  documentContents: |-
-    {
-        :baz "whatever",
-    }
-  selections:
-    - anchor: {line: 2, character: 1}
-      active: {line: 2, character: 1}
-fullTargets: [{type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: f, usePrePhraseSnapshot: true}, selectionType: token, position: contents, insideOutsideType: outside, modifier: {type: containingScope, scopeType: collectionItem, includeSiblings: false}}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/clojure/chuckItemZip.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/clojure/chuckItemZip.yml
deleted file mode 100644
index 72a6b85871..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/clojure/chuckItemZip.yml
+++ /dev/null
@@ -1,34 +0,0 @@
-languageId: clojure
-command:
-  version: 1
-  spokenForm: chuck item zip
-  action: remove
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: collectionItem, includeSiblings: false}
-      mark: {type: decoratedSymbol, symbolColor: default, character: z}
-initialState:
-  documentContents: |-
-    {
-        :foo "bar",
-        ;; hello
-        :baz "whatever",
-    }
-  selections:
-    - anchor: {line: 4, character: 1}
-      active: {line: 4, character: 1}
-  marks:
-    default.z:
-      start: {line: 3, character: 5}
-      end: {line: 3, character: 8}
-finalState:
-  documentContents: |-
-    {
-        :foo "bar",
-        ;; hello
-    ,
-    }
-  selections:
-    - anchor: {line: 4, character: 1}
-      active: {line: 4, character: 1}
-fullTargets: [{type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: z, usePrePhraseSnapshot: true}, selectionType: token, position: contents, insideOutsideType: outside, modifier: {type: containingScope, scopeType: collectionItem, includeSiblings: false}}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/clojure/chuckItemZip2.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/clojure/chuckItemZip2.yml
deleted file mode 100644
index 904462c36e..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/clojure/chuckItemZip2.yml
+++ /dev/null
@@ -1,31 +0,0 @@
-languageId: clojure
-command:
-  version: 1
-  spokenForm: chuck item zip
-  action: remove
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: collectionItem, includeSiblings: false}
-      mark: {type: decoratedSymbol, symbolColor: default, character: z}
-initialState:
-  documentContents: |-
-    {
-        :foo "bar",
-        :baz "whatever",
-    }
-  selections:
-    - anchor: {line: 3, character: 1}
-      active: {line: 3, character: 1}
-  marks:
-    default.z:
-      start: {line: 2, character: 5}
-      end: {line: 2, character: 8}
-finalState:
-  documentContents: |-
-    {
-        :foo "bar",
-    }
-  selections:
-    - anchor: {line: 2, character: 1}
-      active: {line: 2, character: 1}
-fullTargets: [{type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: z, usePrePhraseSnapshot: true}, selectionType: token, position: contents, insideOutsideType: outside, modifier: {type: containingScope, scopeType: collectionItem, includeSiblings: false}}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/clojure/clearArgue.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/clojure/clearArgue.yml
deleted file mode 100644
index 84ce74414b..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/clojure/clearArgue.yml
+++ /dev/null
@@ -1,20 +0,0 @@
-languageId: clojure
-command:
-  version: 1
-  spokenForm: clear argue
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: argumentOrParameter, includeSiblings: false}
-initialState:
-  documentContents: (foo :bar)
-  selections:
-    - anchor: {line: 0, character: 6}
-      active: {line: 0, character: 6}
-  marks: {}
-finalState:
-  documentContents: (foo )
-  selections:
-    - anchor: {line: 0, character: 5}
-      active: {line: 0, character: 5}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: containingScope, scopeType: argumentOrParameter, includeSiblings: false}}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/clojure/clearArgue2.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/clojure/clearArgue2.yml
deleted file mode 100644
index 8825107105..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/clojure/clearArgue2.yml
+++ /dev/null
@@ -1,20 +0,0 @@
-languageId: clojure
-command:
-  version: 1
-  spokenForm: clear argue
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: argumentOrParameter, includeSiblings: false}
-initialState:
-  documentContents: (hello (foo :bar))
-  selections:
-    - anchor: {line: 0, character: 10}
-      active: {line: 0, character: 10}
-  marks: {}
-finalState:
-  documentContents: (hello )
-  selections:
-    - anchor: {line: 0, character: 7}
-      active: {line: 0, character: 7}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: containingScope, scopeType: argumentOrParameter, includeSiblings: false}}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/clojure/clearArgue3.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/clojure/clearArgue3.yml
deleted file mode 100644
index 85507da90a..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/clojure/clearArgue3.yml
+++ /dev/null
@@ -1,20 +0,0 @@
-languageId: clojure
-command:
-  version: 1
-  spokenForm: clear argue
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: argumentOrParameter, includeSiblings: false}
-initialState:
-  documentContents: (foo '(hello there))
-  selections:
-    - anchor: {line: 0, character: 17}
-      active: {line: 0, character: 17}
-  marks: {}
-finalState:
-  documentContents: (foo )
-  selections:
-    - anchor: {line: 0, character: 5}
-      active: {line: 0, character: 5}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: containingScope, scopeType: argumentOrParameter, includeSiblings: false}}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/clojure/clearCall.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/clojure/clearCall.yml
deleted file mode 100644
index 6700b6dbb5..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/clojure/clearCall.yml
+++ /dev/null
@@ -1,20 +0,0 @@
-languageId: clojure
-command:
-  version: 1
-  spokenForm: clear call
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: functionCall, includeSiblings: false}
-initialState:
-  documentContents: (hello)
-  selections:
-    - anchor: {line: 0, character: 2}
-      active: {line: 0, character: 2}
-  marks: {}
-finalState:
-  documentContents: ""
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: containingScope, scopeType: functionCall, includeSiblings: false}}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/clojure/clearCall2.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/clojure/clearCall2.yml
deleted file mode 100644
index 9c5e71a144..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/clojure/clearCall2.yml
+++ /dev/null
@@ -1,20 +0,0 @@
-languageId: clojure
-command:
-  version: 1
-  spokenForm: clear call
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: functionCall, includeSiblings: false}
-initialState:
-  documentContents: (foo '(bar))
-  selections:
-    - anchor: {line: 0, character: 9}
-      active: {line: 0, character: 9}
-  marks: {}
-finalState:
-  documentContents: ""
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: containingScope, scopeType: functionCall, includeSiblings: false}}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/clojure/clearComment.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/clojure/clearComment.yml
deleted file mode 100644
index 7cac84caf7..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/clojure/clearComment.yml
+++ /dev/null
@@ -1,20 +0,0 @@
-languageId: clojure
-command:
-  version: 1
-  spokenForm: clear comment
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: comment, includeSiblings: false}
-initialState:
-  documentContents: ;; hello
-  selections:
-    - anchor: {line: 0, character: 6}
-      active: {line: 0, character: 6}
-  marks: {}
-finalState:
-  documentContents: ""
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: containingScope, scopeType: comment, includeSiblings: false}}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/clojure/clearCondition.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/clojure/clearCondition.yml
deleted file mode 100644
index 40cd37228c..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/clojure/clearCondition.yml
+++ /dev/null
@@ -1,20 +0,0 @@
-languageId: clojure
-command:
-  version: 1
-  spokenForm: clear condition
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: condition, includeSiblings: false}
-initialState:
-  documentContents: (if true "hello")
-  selections:
-    - anchor: {line: 0, character: 14}
-      active: {line: 0, character: 14}
-  marks: {}
-finalState:
-  documentContents: (if  "hello")
-  selections:
-    - anchor: {line: 0, character: 4}
-      active: {line: 0, character: 4}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: containingScope, scopeType: condition, includeSiblings: false}}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/clojure/clearEveryItem.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/clojure/clearEveryItem.yml
deleted file mode 100644
index 03be08ead6..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/clojure/clearEveryItem.yml
+++ /dev/null
@@ -1,34 +0,0 @@
-languageId: clojure
-command:
-  version: 1
-  spokenForm: clear every item
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: collectionItem, includeSiblings: true}
-initialState:
-  documentContents: |-
-
-    {
-        :foo "bar",
-        ;; hello
-        :baz "whatever",
-    }
-  selections:
-    - anchor: {line: 4, character: 13}
-      active: {line: 4, character: 13}
-  marks: {}
-finalState:
-  documentContents: |-
-
-    {
-        ,
-        ;; hello
-        ,
-    }
-  selections:
-    - anchor: {line: 2, character: 4}
-      active: {line: 2, character: 4}
-    - anchor: {line: 4, character: 4}
-      active: {line: 4, character: 4}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: containingScope, scopeType: collectionItem, includeSiblings: true}}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/clojure/clearEveryKey.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/clojure/clearEveryKey.yml
deleted file mode 100644
index d5cbaa0d91..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/clojure/clearEveryKey.yml
+++ /dev/null
@@ -1,34 +0,0 @@
-languageId: clojure
-command:
-  version: 1
-  spokenForm: clear every key
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: collectionKey, includeSiblings: true}
-initialState:
-  documentContents: |-
-
-    {
-        :foo "bar",
-        ;; hello
-        :baz "whatever",
-    }
-  selections:
-    - anchor: {line: 4, character: 13}
-      active: {line: 4, character: 13}
-  marks: {}
-finalState:
-  documentContents: |-
-
-    {
-         "bar",
-        ;; hello
-         "whatever",
-    }
-  selections:
-    - anchor: {line: 2, character: 4}
-      active: {line: 2, character: 4}
-    - anchor: {line: 4, character: 4}
-      active: {line: 4, character: 4}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: containingScope, scopeType: collectionKey, includeSiblings: true}}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/clojure/clearEveryValue.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/clojure/clearEveryValue.yml
deleted file mode 100644
index c52beb4e59..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/clojure/clearEveryValue.yml
+++ /dev/null
@@ -1,34 +0,0 @@
-languageId: clojure
-command:
-  version: 1
-  spokenForm: clear every value
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: value, includeSiblings: true}
-initialState:
-  documentContents: |-
-
-    {
-        :foo "bar",
-        ;; hello
-        :baz "whatever",
-    }
-  selections:
-    - anchor: {line: 4, character: 13}
-      active: {line: 4, character: 13}
-  marks: {}
-finalState:
-  documentContents: |-
-
-    {
-        :foo ,
-        ;; hello
-        :baz ,
-    }
-  selections:
-    - anchor: {line: 2, character: 9}
-      active: {line: 2, character: 9}
-    - anchor: {line: 4, character: 9}
-      active: {line: 4, character: 9}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: containingScope, scopeType: value, includeSiblings: true}}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/clojure/clearFunk.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/clojure/clearFunk.yml
deleted file mode 100644
index 6623ed1277..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/clojure/clearFunk.yml
+++ /dev/null
@@ -1,23 +0,0 @@
-languageId: clojure
-command:
-  version: 1
-  spokenForm: clear funk
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: namedFunction, includeSiblings: false}
-initialState:
-  documentContents: |-
-    (defn say-hello
-      [name]
-      (println (str "Hello, " name)))
-  selections:
-    - anchor: {line: 2, character: 4}
-      active: {line: 2, character: 4}
-  marks: {}
-finalState:
-  documentContents: ""
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: containingScope, scopeType: namedFunction, includeSiblings: false}}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/clojure/clearFunk2.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/clojure/clearFunk2.yml
deleted file mode 100644
index 7dccce497f..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/clojure/clearFunk2.yml
+++ /dev/null
@@ -1,20 +0,0 @@
-languageId: clojure
-command:
-  version: 1
-  spokenForm: clear funk
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: namedFunction, includeSiblings: false}
-initialState:
-  documentContents: (defmacro foo [bar] "baz" (bongo))
-  selections:
-    - anchor: {line: 0, character: 30}
-      active: {line: 0, character: 30}
-  marks: {}
-finalState:
-  documentContents: ""
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: containingScope, scopeType: namedFunction, includeSiblings: false}}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/clojure/clearIfState.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/clojure/clearIfState.yml
deleted file mode 100644
index 38e49f47dd..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/clojure/clearIfState.yml
+++ /dev/null
@@ -1,20 +0,0 @@
-languageId: clojure
-command:
-  version: 1
-  spokenForm: clear if state
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: ifStatement, includeSiblings: false}
-initialState:
-  documentContents: (if true "hello")
-  selections:
-    - anchor: {line: 0, character: 14}
-      active: {line: 0, character: 14}
-  marks: {}
-finalState:
-  documentContents: ""
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: containingScope, scopeType: ifStatement, includeSiblings: false}}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/clojure/clearItem.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/clojure/clearItem.yml
deleted file mode 100644
index 5850dd27f2..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/clojure/clearItem.yml
+++ /dev/null
@@ -1,30 +0,0 @@
-languageId: clojure
-command:
-  version: 1
-  spokenForm: clear item
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: collectionItem, includeSiblings: false}
-initialState:
-  documentContents: |-
-    {
-        :bongo {
-            :foo "bar",
-            ;; hello
-            :baz "whatever",
-        }
-    }
-  selections:
-    - anchor: {line: 3, character: 13}
-      active: {line: 3, character: 13}
-  marks: {}
-finalState:
-  documentContents: |-
-    {
-        
-    }
-  selections:
-    - anchor: {line: 1, character: 4}
-      active: {line: 1, character: 4}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: containingScope, scopeType: collectionItem, includeSiblings: false}}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/clojure/clearItem2.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/clojure/clearItem2.yml
deleted file mode 100644
index 2645b9e7c8..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/clojure/clearItem2.yml
+++ /dev/null
@@ -1,20 +0,0 @@
-languageId: clojure
-command:
-  version: 1
-  spokenForm: clear item
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: collectionItem, includeSiblings: false}
-initialState:
-  documentContents: (foo :bar)
-  selections:
-    - anchor: {line: 0, character: 6}
-      active: {line: 0, character: 6}
-  marks: {}
-finalState:
-  documentContents: (foo )
-  selections:
-    - anchor: {line: 0, character: 5}
-      active: {line: 0, character: 5}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: containingScope, scopeType: collectionItem, includeSiblings: false}}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/clojure/clearItem3.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/clojure/clearItem3.yml
deleted file mode 100644
index 9b6112ecdb..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/clojure/clearItem3.yml
+++ /dev/null
@@ -1,20 +0,0 @@
-languageId: clojure
-command:
-  version: 1
-  spokenForm: clear item
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: collectionItem, includeSiblings: false}
-initialState:
-  documentContents: (foo)
-  selections:
-    - anchor: {line: 0, character: 3}
-      active: {line: 0, character: 3}
-  marks: {}
-finalState:
-  documentContents: ()
-  selections:
-    - anchor: {line: 0, character: 1}
-      active: {line: 0, character: 1}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: containingScope, scopeType: collectionItem, includeSiblings: false}}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/clojure/clearItem4.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/clojure/clearItem4.yml
deleted file mode 100644
index dca5c06fe9..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/clojure/clearItem4.yml
+++ /dev/null
@@ -1,20 +0,0 @@
-languageId: clojure
-command:
-  version: 1
-  spokenForm: clear item
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: collectionItem, includeSiblings: false}
-initialState:
-  documentContents: (foo (hello there))
-  selections:
-    - anchor: {line: 0, character: 5}
-      active: {line: 0, character: 5}
-  marks: {}
-finalState:
-  documentContents: (foo )
-  selections:
-    - anchor: {line: 0, character: 5}
-      active: {line: 0, character: 5}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: containingScope, scopeType: collectionItem, includeSiblings: false}}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/clojure/clearItem5.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/clojure/clearItem5.yml
deleted file mode 100644
index 81e977942b..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/clojure/clearItem5.yml
+++ /dev/null
@@ -1,20 +0,0 @@
-languageId: clojure
-command:
-  version: 1
-  spokenForm: clear item
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: collectionItem, includeSiblings: false}
-initialState:
-  documentContents: "'(foo bar)"
-  selections:
-    - anchor: {line: 0, character: 3}
-      active: {line: 0, character: 3}
-  marks: {}
-finalState:
-  documentContents: "'( bar)"
-  selections:
-    - anchor: {line: 0, character: 2}
-      active: {line: 0, character: 2}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: containingScope, scopeType: collectionItem, includeSiblings: false}}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/clojure/clearItem6.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/clojure/clearItem6.yml
deleted file mode 100644
index b4edecbdd2..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/clojure/clearItem6.yml
+++ /dev/null
@@ -1,20 +0,0 @@
-languageId: clojure
-command:
-  version: 1
-  spokenForm: clear item
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: collectionItem, includeSiblings: false}
-initialState:
-  documentContents: "[foo :bar]"
-  selections:
-    - anchor: {line: 0, character: 7}
-      active: {line: 0, character: 7}
-  marks: {}
-finalState:
-  documentContents: "[foo ]"
-  selections:
-    - anchor: {line: 0, character: 5}
-      active: {line: 0, character: 5}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: containingScope, scopeType: collectionItem, includeSiblings: false}}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/clojure/clearItemBat.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/clojure/clearItemBat.yml
deleted file mode 100644
index 7a5ed0f012..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/clojure/clearItemBat.yml
+++ /dev/null
@@ -1,32 +0,0 @@
-languageId: clojure
-command:
-  version: 1
-  spokenForm: clear item bat
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: collectionItem, includeSiblings: false}
-      mark: {type: decoratedSymbol, symbolColor: default, character: b}
-initialState:
-  documentContents: |-
-    {
-        :baz
-        ;; hello
-        "whatever",
-    }
-  selections:
-    - anchor: {line: 4, character: 1}
-      active: {line: 4, character: 1}
-  marks:
-    default.b:
-      start: {line: 1, character: 5}
-      end: {line: 1, character: 8}
-finalState:
-  documentContents: |-
-    {
-        ,
-    }
-  selections:
-    - anchor: {line: 1, character: 4}
-      active: {line: 1, character: 4}
-fullTargets: [{type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: b, usePrePhraseSnapshot: true}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: containingScope, scopeType: collectionItem, includeSiblings: false}}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/clojure/clearItemBatClearItemBat.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/clojure/clearItemBatClearItemBat.yml
deleted file mode 100644
index 8516c61ad3..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/clojure/clearItemBatClearItemBat.yml
+++ /dev/null
@@ -1,24 +0,0 @@
-languageId: clojure
-command:
-  version: 1
-  spokenForm: clear item bat clear item bat
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: collectionItem, includeSiblings: false}
-      mark: {type: decoratedSymbol, symbolColor: default, character: b}
-initialState:
-  documentContents: "{:foo \"bar\"}"
-  selections:
-    - anchor: {line: 0, character: 12}
-      active: {line: 0, character: 12}
-  marks:
-    default.b:
-      start: {line: 0, character: 7}
-      end: {line: 0, character: 10}
-finalState:
-  documentContents: "{}"
-  selections:
-    - anchor: {line: 0, character: 1}
-      active: {line: 0, character: 1}
-fullTargets: [{type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: b, usePrePhraseSnapshot: true}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: containingScope, scopeType: collectionItem, includeSiblings: false}}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/clojure/clearItemFine.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/clojure/clearItemFine.yml
deleted file mode 100644
index 9bc115df0c..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/clojure/clearItemFine.yml
+++ /dev/null
@@ -1,24 +0,0 @@
-languageId: clojure
-command:
-  version: 1
-  spokenForm: clear item fine
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: collectionItem, includeSiblings: false}
-      mark: {type: decoratedSymbol, symbolColor: default, character: f}
-initialState:
-  documentContents: "{:foo \"bar\" :baz \"whatever\"}"
-  selections:
-    - anchor: {line: 0, character: 28}
-      active: {line: 0, character: 28}
-  marks:
-    default.f:
-      start: {line: 0, character: 2}
-      end: {line: 0, character: 5}
-finalState:
-  documentContents: "{ :baz \"whatever\"}"
-  selections:
-    - anchor: {line: 0, character: 1}
-      active: {line: 0, character: 1}
-fullTargets: [{type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: f, usePrePhraseSnapshot: true}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: containingScope, scopeType: collectionItem, includeSiblings: false}}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/clojure/clearItemWhale.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/clojure/clearItemWhale.yml
deleted file mode 100644
index bc3bb32b8d..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/clojure/clearItemWhale.yml
+++ /dev/null
@@ -1,24 +0,0 @@
-languageId: clojure
-command:
-  version: 1
-  spokenForm: clear item whale
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: collectionItem, includeSiblings: false}
-      mark: {type: decoratedSymbol, symbolColor: default, character: w}
-initialState:
-  documentContents: "{:foo \"bar\", :baz \"whatever\"}"
-  selections:
-    - anchor: {line: 0, character: 29}
-      active: {line: 0, character: 29}
-  marks:
-    default.w:
-      start: {line: 0, character: 19}
-      end: {line: 0, character: 27}
-finalState:
-  documentContents: "{:foo \"bar\", }"
-  selections:
-    - anchor: {line: 0, character: 13}
-      active: {line: 0, character: 13}
-fullTargets: [{type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: w, usePrePhraseSnapshot: true}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: containingScope, scopeType: collectionItem, includeSiblings: false}}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/clojure/clearItemZip.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/clojure/clearItemZip.yml
deleted file mode 100644
index 69c31c4616..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/clojure/clearItemZip.yml
+++ /dev/null
@@ -1,24 +0,0 @@
-languageId: clojure
-command:
-  version: 1
-  spokenForm: clear item zip
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: collectionItem, includeSiblings: false}
-      mark: {type: decoratedSymbol, symbolColor: default, character: z}
-initialState:
-  documentContents: "{:foo \"bar\", :baz \"whatever\"}"
-  selections:
-    - anchor: {line: 0, character: 29}
-      active: {line: 0, character: 29}
-  marks:
-    default.z:
-      start: {line: 0, character: 14}
-      end: {line: 0, character: 17}
-finalState:
-  documentContents: "{:foo \"bar\", }"
-  selections:
-    - anchor: {line: 0, character: 13}
-      active: {line: 0, character: 13}
-fullTargets: [{type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: z, usePrePhraseSnapshot: true}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: containingScope, scopeType: collectionItem, includeSiblings: false}}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/clojure/clearKey.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/clojure/clearKey.yml
deleted file mode 100644
index 2731e7e8d2..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/clojure/clearKey.yml
+++ /dev/null
@@ -1,20 +0,0 @@
-languageId: clojure
-command:
-  version: 1
-  spokenForm: clear key
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: collectionKey, includeSiblings: false}
-initialState:
-  documentContents: "{:baz {:foo \"bar\"}}"
-  selections:
-    - anchor: {line: 0, character: 6}
-      active: {line: 0, character: 6}
-  marks: {}
-finalState:
-  documentContents: "{ {:foo \"bar\"}}"
-  selections:
-    - anchor: {line: 0, character: 1}
-      active: {line: 0, character: 1}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: containingScope, scopeType: collectionKey, includeSiblings: false}}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/clojure/clearKeyWhale.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/clojure/clearKeyWhale.yml
deleted file mode 100644
index cdd4de6fbd..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/clojure/clearKeyWhale.yml
+++ /dev/null
@@ -1,24 +0,0 @@
-languageId: clojure
-command:
-  version: 1
-  spokenForm: clear key whale
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: collectionKey, includeSiblings: false}
-      mark: {type: decoratedSymbol, symbolColor: default, character: w}
-initialState:
-  documentContents: "{:foo \"bar\", :baz \"whatever\"}"
-  selections:
-    - anchor: {line: 0, character: 29}
-      active: {line: 0, character: 29}
-  marks:
-    default.w:
-      start: {line: 0, character: 19}
-      end: {line: 0, character: 27}
-finalState:
-  documentContents: "{:foo \"bar\",  \"whatever\"}"
-  selections:
-    - anchor: {line: 0, character: 13}
-      active: {line: 0, character: 13}
-fullTargets: [{type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: w, usePrePhraseSnapshot: true}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: containingScope, scopeType: collectionKey, includeSiblings: false}}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/clojure/clearKeyWhale2.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/clojure/clearKeyWhale2.yml
deleted file mode 100644
index 1ddf16f3bb..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/clojure/clearKeyWhale2.yml
+++ /dev/null
@@ -1,34 +0,0 @@
-languageId: clojure
-command:
-  version: 1
-  spokenForm: clear key whale
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: collectionKey, includeSiblings: false}
-      mark: {type: decoratedSymbol, symbolColor: default, character: w}
-initialState:
-  documentContents: |-
-    {
-        :baz
-        ;; hello
-        "whatever",
-    }
-  selections:
-    - anchor: {line: 4, character: 1}
-      active: {line: 4, character: 1}
-  marks:
-    default.w:
-      start: {line: 3, character: 5}
-      end: {line: 3, character: 13}
-finalState:
-  documentContents: |-
-    {
-        
-        ;; hello
-        "whatever",
-    }
-  selections:
-    - anchor: {line: 1, character: 4}
-      active: {line: 1, character: 4}
-fullTargets: [{type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: w, usePrePhraseSnapshot: true}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: containingScope, scopeType: collectionKey, includeSiblings: false}}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/clojure/clearKeyZip.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/clojure/clearKeyZip.yml
deleted file mode 100644
index 91bf608ee6..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/clojure/clearKeyZip.yml
+++ /dev/null
@@ -1,24 +0,0 @@
-languageId: clojure
-command:
-  version: 1
-  spokenForm: clear key zip
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: collectionKey, includeSiblings: false}
-      mark: {type: decoratedSymbol, symbolColor: default, character: z}
-initialState:
-  documentContents: "{:foo \"bar\", :baz \"whatever\"}"
-  selections:
-    - anchor: {line: 0, character: 29}
-      active: {line: 0, character: 29}
-  marks:
-    default.z:
-      start: {line: 0, character: 14}
-      end: {line: 0, character: 17}
-finalState:
-  documentContents: "{:foo \"bar\",  \"whatever\"}"
-  selections:
-    - anchor: {line: 0, character: 13}
-      active: {line: 0, character: 13}
-fullTargets: [{type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: z, usePrePhraseSnapshot: true}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: containingScope, scopeType: collectionKey, includeSiblings: false}}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/clojure/clearKeyZip2.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/clojure/clearKeyZip2.yml
deleted file mode 100644
index 8a92b70363..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/clojure/clearKeyZip2.yml
+++ /dev/null
@@ -1,34 +0,0 @@
-languageId: clojure
-command:
-  version: 1
-  spokenForm: clear key zip
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: collectionKey, includeSiblings: false}
-      mark: {type: decoratedSymbol, symbolColor: default, character: z}
-initialState:
-  documentContents: |-
-    {
-        :foo "bar",
-        ;; hello
-        :baz "whatever",
-    }
-  selections:
-    - anchor: {line: 4, character: 1}
-      active: {line: 4, character: 1}
-  marks:
-    default.z:
-      start: {line: 3, character: 5}
-      end: {line: 3, character: 8}
-finalState:
-  documentContents: |-
-    {
-        :foo "bar",
-        ;; hello
-         "whatever",
-    }
-  selections:
-    - anchor: {line: 3, character: 4}
-      active: {line: 3, character: 4}
-fullTargets: [{type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: z, usePrePhraseSnapshot: true}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: containingScope, scopeType: collectionKey, includeSiblings: false}}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/clojure/clearLambda.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/clojure/clearLambda.yml
deleted file mode 100644
index 2ca540848b..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/clojure/clearLambda.yml
+++ /dev/null
@@ -1,20 +0,0 @@
-languageId: clojure
-command:
-  version: 1
-  spokenForm: clear lambda
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: anonymousFunction, includeSiblings: false}
-initialState:
-  documentContents: (fn [] (println "Hello world"))
-  selections:
-    - anchor: {line: 0, character: 12}
-      active: {line: 0, character: 12}
-  marks: {}
-finalState:
-  documentContents: ""
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: containingScope, scopeType: anonymousFunction, includeSiblings: false}}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/clojure/clearLambda2.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/clojure/clearLambda2.yml
deleted file mode 100644
index 10138c83f2..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/clojure/clearLambda2.yml
+++ /dev/null
@@ -1,20 +0,0 @@
-languageId: clojure
-command:
-  version: 1
-  spokenForm: clear lambda
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: anonymousFunction, includeSiblings: false}
-initialState:
-  documentContents: "#(+ 1 1)"
-  selections:
-    - anchor: {line: 0, character: 6}
-      active: {line: 0, character: 6}
-  marks: {}
-finalState:
-  documentContents: ""
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: containingScope, scopeType: anonymousFunction, includeSiblings: false}}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/clojure/clearList.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/clojure/clearList.yml
deleted file mode 100644
index cf02e836c4..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/clojure/clearList.yml
+++ /dev/null
@@ -1,20 +0,0 @@
-languageId: clojure
-command:
-  version: 1
-  spokenForm: clear list
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: list, includeSiblings: false}
-initialState:
-  documentContents: "'(hello)"
-  selections:
-    - anchor: {line: 0, character: 3}
-      active: {line: 0, character: 3}
-  marks: {}
-finalState:
-  documentContents: ""
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: containingScope, scopeType: list, includeSiblings: false}}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/clojure/clearList2.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/clojure/clearList2.yml
deleted file mode 100644
index a2088f932b..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/clojure/clearList2.yml
+++ /dev/null
@@ -1,20 +0,0 @@
-languageId: clojure
-command:
-  version: 1
-  spokenForm: clear list
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: list, includeSiblings: false}
-initialState:
-  documentContents: "[hello]"
-  selections:
-    - anchor: {line: 0, character: 5}
-      active: {line: 0, character: 5}
-  marks: {}
-finalState:
-  documentContents: ""
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: containingScope, scopeType: list, includeSiblings: false}}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/clojure/clearMap.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/clojure/clearMap.yml
deleted file mode 100644
index 0324ce9c38..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/clojure/clearMap.yml
+++ /dev/null
@@ -1,20 +0,0 @@
-languageId: clojure
-command:
-  version: 1
-  spokenForm: clear map
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: map, includeSiblings: false}
-initialState:
-  documentContents: "{:foo \"bar\"}"
-  selections:
-    - anchor: {line: 0, character: 9}
-      active: {line: 0, character: 9}
-  marks: {}
-finalState:
-  documentContents: ""
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: containingScope, scopeType: map, includeSiblings: false}}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/clojure/clearName.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/clojure/clearName.yml
deleted file mode 100644
index fd923a739a..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/clojure/clearName.yml
+++ /dev/null
@@ -1,26 +0,0 @@
-languageId: clojure
-command:
-  version: 1
-  spokenForm: clear name
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: name, includeSiblings: false}
-initialState:
-  documentContents: |-
-    (defn say-hello
-      [name]
-      (println (str "Hello, " name)))
-  selections:
-    - anchor: {line: 2, character: 4}
-      active: {line: 2, character: 4}
-  marks: {}
-finalState:
-  documentContents: |-
-    (defn 
-      [name]
-      (println (str "Hello, " name)))
-  selections:
-    - anchor: {line: 0, character: 6}
-      active: {line: 0, character: 6}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: containingScope, scopeType: name, includeSiblings: false}}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/clojure/clearName2.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/clojure/clearName2.yml
deleted file mode 100644
index b4d6ee7856..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/clojure/clearName2.yml
+++ /dev/null
@@ -1,20 +0,0 @@
-languageId: clojure
-command:
-  version: 1
-  spokenForm: clear name
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: name, includeSiblings: false}
-initialState:
-  documentContents: (defmacro foo [bar] "baz" (bongo))
-  selections:
-    - anchor: {line: 0, character: 30}
-      active: {line: 0, character: 30}
-  marks: {}
-finalState:
-  documentContents: (defmacro  [bar] "baz" (bongo))
-  selections:
-    - anchor: {line: 0, character: 10}
-      active: {line: 0, character: 10}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: containingScope, scopeType: name, includeSiblings: false}}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/clojure/clearValueBat.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/clojure/clearValueBat.yml
deleted file mode 100644
index 5ba790d675..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/clojure/clearValueBat.yml
+++ /dev/null
@@ -1,34 +0,0 @@
-languageId: clojure
-command:
-  version: 1
-  spokenForm: clear value bat
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: value, includeSiblings: false}
-      mark: {type: decoratedSymbol, symbolColor: default, character: b}
-initialState:
-  documentContents: |-
-    {
-        :baz
-        ;; hello
-        "whatever",
-    }
-  selections:
-    - anchor: {line: 4, character: 1}
-      active: {line: 4, character: 1}
-  marks:
-    default.b:
-      start: {line: 1, character: 5}
-      end: {line: 1, character: 8}
-finalState:
-  documentContents: |-
-    {
-        :baz
-        ;; hello
-        ,
-    }
-  selections:
-    - anchor: {line: 3, character: 4}
-      active: {line: 3, character: 4}
-fullTargets: [{type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: b, usePrePhraseSnapshot: true}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: containingScope, scopeType: value, includeSiblings: false}}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/clojure/clearValueZip.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/clojure/clearValueZip.yml
deleted file mode 100644
index 6d3be369f3..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/clojure/clearValueZip.yml
+++ /dev/null
@@ -1,34 +0,0 @@
-languageId: clojure
-command:
-  version: 1
-  spokenForm: clear value zip
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: value, includeSiblings: false}
-      mark: {type: decoratedSymbol, symbolColor: default, character: z}
-initialState:
-  documentContents: |-
-    {
-        :foo "bar",
-        ;; hello
-        :baz "whatever",
-    }
-  selections:
-    - anchor: {line: 4, character: 1}
-      active: {line: 4, character: 1}
-  marks:
-    default.z:
-      start: {line: 3, character: 5}
-      end: {line: 3, character: 8}
-finalState:
-  documentContents: |-
-    {
-        :foo "bar",
-        ;; hello
-        :baz ,
-    }
-  selections:
-    - anchor: {line: 3, character: 9}
-      active: {line: 3, character: 9}
-fullTargets: [{type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: z, usePrePhraseSnapshot: true}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: containingScope, scopeType: value, includeSiblings: false}}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/clojure/takeValue.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/clojure/takeValue.yml
deleted file mode 100644
index 4e1507e73a..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/clojure/takeValue.yml
+++ /dev/null
@@ -1,20 +0,0 @@
-languageId: clojure
-command:
-  version: 1
-  spokenForm: take value
-  action: setSelection
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: value, includeSiblings: false}
-initialState:
-  documentContents: "{:bar {:foo \"bar\"}}"
-  selections:
-    - anchor: {line: 0, character: 6}
-      active: {line: 0, character: 6}
-  marks: {}
-finalState:
-  documentContents: "{:bar {:foo \"bar\"}}"
-  selections:
-    - anchor: {line: 0, character: 6}
-      active: {line: 0, character: 18}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: containingScope, scopeType: value, includeSiblings: false}}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/clojure/takeValueBat.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/clojure/takeValueBat.yml
deleted file mode 100644
index f2bceb261e..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/clojure/takeValueBat.yml
+++ /dev/null
@@ -1,24 +0,0 @@
-languageId: clojure
-command:
-  version: 1
-  spokenForm: take value bat
-  action: setSelection
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: value, includeSiblings: false}
-      mark: {type: decoratedSymbol, symbolColor: default, character: b}
-initialState:
-  documentContents: "{:foo \"bar\", :baz \"whatever\"}"
-  selections:
-    - anchor: {line: 0, character: 29}
-      active: {line: 0, character: 29}
-  marks:
-    default.b:
-      start: {line: 0, character: 7}
-      end: {line: 0, character: 10}
-finalState:
-  documentContents: "{:foo \"bar\", :baz \"whatever\"}"
-  selections:
-    - anchor: {line: 0, character: 6}
-      active: {line: 0, character: 11}
-fullTargets: [{type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: b, usePrePhraseSnapshot: true}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: containingScope, scopeType: value, includeSiblings: false}}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/clojure/takeValueBat2.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/clojure/takeValueBat2.yml
deleted file mode 100644
index ebfa6941b6..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/clojure/takeValueBat2.yml
+++ /dev/null
@@ -1,24 +0,0 @@
-languageId: clojure
-command:
-  version: 1
-  spokenForm: take value bat
-  action: setSelection
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: value, includeSiblings: false}
-      mark: {type: decoratedSymbol, symbolColor: default, character: b}
-initialState:
-  documentContents: "{:foo \"bar\"}"
-  selections:
-    - anchor: {line: 0, character: 12}
-      active: {line: 0, character: 12}
-  marks:
-    default.b:
-      start: {line: 0, character: 7}
-      end: {line: 0, character: 10}
-finalState:
-  documentContents: "{:foo \"bar\"}"
-  selections:
-    - anchor: {line: 0, character: 6}
-      active: {line: 0, character: 11}
-fullTargets: [{type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: b, usePrePhraseSnapshot: true}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: containingScope, scopeType: value, includeSiblings: false}}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/clojure/takeValueFine.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/clojure/takeValueFine.yml
deleted file mode 100644
index 7773870a30..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/clojure/takeValueFine.yml
+++ /dev/null
@@ -1,24 +0,0 @@
-languageId: clojure
-command:
-  version: 1
-  spokenForm: take value fine
-  action: setSelection
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: value, includeSiblings: false}
-      mark: {type: decoratedSymbol, symbolColor: default, character: f}
-initialState:
-  documentContents: "{:foo \"bar\", :baz \"whatever\"}"
-  selections:
-    - anchor: {line: 0, character: 29}
-      active: {line: 0, character: 29}
-  marks:
-    default.f:
-      start: {line: 0, character: 2}
-      end: {line: 0, character: 5}
-finalState:
-  documentContents: "{:foo \"bar\", :baz \"whatever\"}"
-  selections:
-    - anchor: {line: 0, character: 6}
-      active: {line: 0, character: 11}
-fullTargets: [{type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: f, usePrePhraseSnapshot: true}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: containingScope, scopeType: value, includeSiblings: false}}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/clojure/takeValueFine2.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/clojure/takeValueFine2.yml
deleted file mode 100644
index c200f8858d..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/clojure/takeValueFine2.yml
+++ /dev/null
@@ -1,24 +0,0 @@
-languageId: clojure
-command:
-  version: 1
-  spokenForm: take value fine
-  action: setSelection
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: value, includeSiblings: false}
-      mark: {type: decoratedSymbol, symbolColor: default, character: f}
-initialState:
-  documentContents: "{:foo \"bar\"}"
-  selections:
-    - anchor: {line: 0, character: 12}
-      active: {line: 0, character: 12}
-  marks:
-    default.f:
-      start: {line: 0, character: 2}
-      end: {line: 0, character: 5}
-finalState:
-  documentContents: "{:foo \"bar\"}"
-  selections:
-    - anchor: {line: 0, character: 6}
-      active: {line: 0, character: 11}
-fullTargets: [{type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: f, usePrePhraseSnapshot: true}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: containingScope, scopeType: value, includeSiblings: false}}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/clojure/takeValueWhale.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/clojure/takeValueWhale.yml
deleted file mode 100644
index af7c516bea..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/clojure/takeValueWhale.yml
+++ /dev/null
@@ -1,24 +0,0 @@
-languageId: clojure
-command:
-  version: 1
-  spokenForm: take value whale
-  action: setSelection
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: value, includeSiblings: false}
-      mark: {type: decoratedSymbol, symbolColor: default, character: w}
-initialState:
-  documentContents: "{:foo \"bar\", :baz \"whatever\"}"
-  selections:
-    - anchor: {line: 0, character: 29}
-      active: {line: 0, character: 29}
-  marks:
-    default.w:
-      start: {line: 0, character: 19}
-      end: {line: 0, character: 27}
-finalState:
-  documentContents: "{:foo \"bar\", :baz \"whatever\"}"
-  selections:
-    - anchor: {line: 0, character: 18}
-      active: {line: 0, character: 28}
-fullTargets: [{type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: w, usePrePhraseSnapshot: true}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: containingScope, scopeType: value, includeSiblings: false}}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/clojure/takeValueZip.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/clojure/takeValueZip.yml
deleted file mode 100644
index ae989ee88f..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/clojure/takeValueZip.yml
+++ /dev/null
@@ -1,24 +0,0 @@
-languageId: clojure
-command:
-  version: 1
-  spokenForm: take value zip
-  action: setSelection
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: value, includeSiblings: false}
-      mark: {type: decoratedSymbol, symbolColor: default, character: z}
-initialState:
-  documentContents: "{:foo \"bar\", :baz \"whatever\"}"
-  selections:
-    - anchor: {line: 0, character: 29}
-      active: {line: 0, character: 29}
-  marks:
-    default.z:
-      start: {line: 0, character: 14}
-      end: {line: 0, character: 17}
-finalState:
-  documentContents: "{:foo \"bar\", :baz \"whatever\"}"
-  selections:
-    - anchor: {line: 0, character: 18}
-      active: {line: 0, character: 28}
-fullTargets: [{type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: z, usePrePhraseSnapshot: true}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: containingScope, scopeType: value, includeSiblings: false}}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/clojure/takeValueZip2.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/clojure/takeValueZip2.yml
deleted file mode 100644
index 3befacf48d..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/clojure/takeValueZip2.yml
+++ /dev/null
@@ -1,24 +0,0 @@
-languageId: clojure
-command:
-  version: 1
-  spokenForm: take value zip
-  action: setSelection
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: value, includeSiblings: false}
-      mark: {type: decoratedSymbol, symbolColor: default, character: z}
-initialState:
-  documentContents: "{:baz {:foo \"bar\"}}"
-  selections:
-    - anchor: {line: 0, character: 6}
-      active: {line: 0, character: 6}
-  marks:
-    default.z:
-      start: {line: 0, character: 2}
-      end: {line: 0, character: 5}
-finalState:
-  documentContents: "{:baz {:foo \"bar\"}}"
-  selections:
-    - anchor: {line: 0, character: 6}
-      active: {line: 0, character: 18}
-fullTargets: [{type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: z, usePrePhraseSnapshot: true}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: containingScope, scopeType: value, includeSiblings: false}}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/cpp/changeCall.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/cpp/changeCall.yml
deleted file mode 100644
index ce5e1434a0..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/cpp/changeCall.yml
+++ /dev/null
@@ -1,20 +0,0 @@
-languageId: cpp
-command:
-  version: 1
-  spokenForm: change call
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: functionCall, includeSiblings: false}
-initialState:
-  documentContents: Car carObj1("BMW", "X5", 1999);
-  selections:
-    - anchor: {line: 0, character: 19}
-      active: {line: 0, character: 19}
-  marks: {}
-finalState:
-  documentContents: Car ;
-  selections:
-    - anchor: {line: 0, character: 4}
-      active: {line: 0, character: 4}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: containingScope, scopeType: functionCall, includeSiblings: false}, isImplicit: false}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/cpp/changeCallee.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/cpp/changeCallee.yml
deleted file mode 100644
index 5ef7d7e87f..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/cpp/changeCallee.yml
+++ /dev/null
@@ -1,20 +0,0 @@
-languageId: cpp
-command:
-  version: 1
-  spokenForm: change callee
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: functionCallee, includeSiblings: false}
-initialState:
-  documentContents: obj.method[0]();
-  selections:
-    - anchor: {line: 0, character: 14}
-      active: {line: 0, character: 14}
-  marks: {}
-finalState:
-  documentContents: ();
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: containingScope, scopeType: functionCallee, includeSiblings: false}, isImplicit: false}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/cpp/changeCallee2.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/cpp/changeCallee2.yml
deleted file mode 100644
index f928b64081..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/cpp/changeCallee2.yml
+++ /dev/null
@@ -1,20 +0,0 @@
-languageId: cpp
-command:
-  version: 1
-  spokenForm: change callee
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: functionCallee, includeSiblings: false}
-initialState:
-  documentContents: obj.method[0]().otherMethod();
-  selections:
-    - anchor: {line: 0, character: 28}
-      active: {line: 0, character: 28}
-  marks: {}
-finalState:
-  documentContents: ();
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: containingScope, scopeType: functionCallee, includeSiblings: false}, isImplicit: false}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/cpp/changeCallee3.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/cpp/changeCallee3.yml
deleted file mode 100644
index 778744792a..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/cpp/changeCallee3.yml
+++ /dev/null
@@ -1,20 +0,0 @@
-languageId: cpp
-command:
-  version: 1
-  spokenForm: change callee
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: functionCallee, includeSiblings: false}
-initialState:
-  documentContents: Car carObj1("X5", 1999);
-  selections:
-    - anchor: {line: 0, character: 17}
-      active: {line: 0, character: 17}
-  marks: {}
-finalState:
-  documentContents: Car ("X5", 1999);
-  selections:
-    - anchor: {line: 0, character: 4}
-      active: {line: 0, character: 4}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: containingScope, scopeType: functionCallee, includeSiblings: false}, isImplicit: false}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/cpp/changeCallee4.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/cpp/changeCallee4.yml
deleted file mode 100644
index 9dbb9681d8..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/cpp/changeCallee4.yml
+++ /dev/null
@@ -1,20 +0,0 @@
-languageId: cpp
-command:
-  version: 1
-  spokenForm: change callee
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: functionCallee, includeSiblings: false}
-initialState:
-  documentContents: method();
-  selections:
-    - anchor: {line: 0, character: 7}
-      active: {line: 0, character: 7}
-  marks: {}
-finalState:
-  documentContents: ();
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: containingScope, scopeType: functionCallee, includeSiblings: false}, isImplicit: false}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/cpp/chuckTypeAir.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/cpp/chuckTypeAir.yml
deleted file mode 100644
index e5d5487a02..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/cpp/chuckTypeAir.yml
+++ /dev/null
@@ -1,24 +0,0 @@
-languageId: cpp
-command:
-  version: 1
-  spokenForm: chuck type air
-  action: remove
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: type, includeSiblings: false}
-      mark: {type: decoratedSymbol, symbolColor: default, character: a}
-initialState:
-  documentContents: string name = "hello";
-  selections:
-    - anchor: {line: 0, character: 22}
-      active: {line: 0, character: 22}
-  marks:
-    default.a:
-      start: {line: 0, character: 7}
-      end: {line: 0, character: 11}
-finalState:
-  documentContents: name = "hello";
-  selections:
-    - anchor: {line: 0, character: 15}
-      active: {line: 0, character: 15}
-fullTargets: [{type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: a}, selectionType: token, position: contents, insideOutsideType: outside, modifier: {type: containingScope, scopeType: type, includeSiblings: false}}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/cpp/chuckTypeSoon.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/cpp/chuckTypeSoon.yml
deleted file mode 100644
index e9d6953443..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/cpp/chuckTypeSoon.yml
+++ /dev/null
@@ -1,30 +0,0 @@
-languageId: cpp
-command:
-  version: 1
-  spokenForm: chuck type soon
-  action: remove
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: type, includeSiblings: false}
-      mark: {type: decoratedSymbol, symbolColor: default, character: s}
-initialState:
-  documentContents: |-
-    void myFunk(string value) {
-        
-    }
-  selections:
-    - anchor: {line: 1, character: 4}
-      active: {line: 1, character: 4}
-  marks:
-    default.s:
-      start: {line: 0, character: 12}
-      end: {line: 0, character: 18}
-finalState:
-  documentContents: |-
-    void myFunk(value) {
-        
-    }
-  selections:
-    - anchor: {line: 1, character: 4}
-      active: {line: 1, character: 4}
-fullTargets: [{type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: s}, selectionType: token, position: contents, insideOutsideType: outside, modifier: {type: containingScope, scopeType: type, includeSiblings: false}}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/cpp/chuckValue.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/cpp/chuckValue.yml
deleted file mode 100644
index 029cc951f0..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/cpp/chuckValue.yml
+++ /dev/null
@@ -1,82 +0,0 @@
-languageId: cpp
-command:
-  version: 1
-  spokenForm: chuck value
-  action: remove
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: value, includeSiblings: false}
-initialState:
-  documentContents: |-
-    a = 1;
-    a += 1;
-    a -= 1;
-    a *= 1;
-    a /= 1;
-    a %= 1;
-    a &= 1;
-    a |= 1;
-    a ^= 1;
-    a <<= 1;
-    a >>= 1;
-  selections:
-    - anchor: {line: 0, character: 4}
-      active: {line: 0, character: 5}
-    - anchor: {line: 1, character: 5}
-      active: {line: 1, character: 6}
-    - anchor: {line: 2, character: 5}
-      active: {line: 2, character: 6}
-    - anchor: {line: 3, character: 5}
-      active: {line: 3, character: 6}
-    - anchor: {line: 4, character: 5}
-      active: {line: 4, character: 6}
-    - anchor: {line: 5, character: 5}
-      active: {line: 5, character: 6}
-    - anchor: {line: 6, character: 5}
-      active: {line: 6, character: 6}
-    - anchor: {line: 7, character: 5}
-      active: {line: 7, character: 6}
-    - anchor: {line: 8, character: 5}
-      active: {line: 8, character: 6}
-    - anchor: {line: 9, character: 6}
-      active: {line: 9, character: 7}
-    - anchor: {line: 10, character: 6}
-      active: {line: 10, character: 7}
-  marks: {}
-finalState:
-  documentContents: |-
-    a;
-    a;
-    a;
-    a;
-    a;
-    a;
-    a;
-    a;
-    a;
-    a;
-    a;
-  selections:
-    - anchor: {line: 0, character: 1}
-      active: {line: 0, character: 1}
-    - anchor: {line: 1, character: 1}
-      active: {line: 1, character: 1}
-    - anchor: {line: 2, character: 1}
-      active: {line: 2, character: 1}
-    - anchor: {line: 3, character: 1}
-      active: {line: 3, character: 1}
-    - anchor: {line: 4, character: 1}
-      active: {line: 4, character: 1}
-    - anchor: {line: 5, character: 1}
-      active: {line: 5, character: 1}
-    - anchor: {line: 6, character: 1}
-      active: {line: 6, character: 1}
-    - anchor: {line: 7, character: 1}
-      active: {line: 7, character: 1}
-    - anchor: {line: 8, character: 1}
-      active: {line: 8, character: 1}
-    - anchor: {line: 9, character: 1}
-      active: {line: 9, character: 1}
-    - anchor: {line: 10, character: 1}
-      active: {line: 10, character: 1}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: outside, modifier: {type: containingScope, scopeType: value, includeSiblings: false}, isImplicit: false}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/cpp/clearName.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/cpp/clearName.yml
deleted file mode 100644
index 50d51904de..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/cpp/clearName.yml
+++ /dev/null
@@ -1,20 +0,0 @@
-languageId: cpp
-command:
-  version: 1
-  spokenForm: clear name
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: name, includeSiblings: false}
-initialState:
-  documentContents: a += "world"
-  selections:
-    - anchor: {line: 0, character: 6}
-      active: {line: 0, character: 6}
-  marks: {}
-finalState:
-  documentContents: " += \"world\""
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: containingScope, scopeType: name, includeSiblings: false}, isImplicit: false}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/cpp/clearSubject.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/cpp/clearSubject.yml
deleted file mode 100644
index 166fb1c15d..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/cpp/clearSubject.yml
+++ /dev/null
@@ -1,35 +0,0 @@
-languageId: cpp
-command:
-  version: 3
-  spokenForm: clear subject
-  action: {name: clearAndSetSelection}
-  targets:
-    - type: primitive
-      modifiers:
-        - type: containingScope
-          scopeType: {type: switchStatementSubject}
-  usePrePhraseSnapshot: true
-initialState:
-  documentContents: |
-    int main() {
-      switch (i) {
-        default:
-          break;
-      }
-    }
-  selections:
-    - anchor: {line: 3, character: 4}
-      active: {line: 3, character: 4}
-  marks: {}
-finalState:
-  documentContents: |
-    int main() {
-      switch () {
-        default:
-          break;
-      }
-    }
-  selections:
-    - anchor: {line: 1, character: 10}
-      active: {line: 1, character: 10}
-fullTargets: [{type: primitive, mark: {type: cursor}, modifiers: [{type: containingScope, scopeType: {type: switchStatementSubject}}]}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/cpp/clearSubject2.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/cpp/clearSubject2.yml
deleted file mode 100644
index 2e730188fc..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/cpp/clearSubject2.yml
+++ /dev/null
@@ -1,35 +0,0 @@
-languageId: cpp
-command:
-  version: 3
-  spokenForm: clear subject
-  action: {name: clearAndSetSelection}
-  targets:
-    - type: primitive
-      modifiers:
-        - type: containingScope
-          scopeType: {type: switchStatementSubject}
-  usePrePhraseSnapshot: false
-initialState:
-  documentContents: |
-    int main() {
-      switch (int i = rand() % 100; i) {
-        default:
-        break;
-      }
-    }
-  selections:
-    - anchor: {line: 3, character: 4}
-      active: {line: 3, character: 4}
-  marks: {}
-finalState:
-  documentContents: |
-    int main() {
-      switch (int i = rand() % 100; ) {
-        default:
-        break;
-      }
-    }
-  selections:
-    - anchor: {line: 1, character: 32}
-      active: {line: 1, character: 32}
-fullTargets: [{type: primitive, mark: {type: cursor}, modifiers: [{type: containingScope, scopeType: {type: switchStatementSubject}}]}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/cpp/clearValue.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/cpp/clearValue.yml
deleted file mode 100644
index 3a7ca192b5..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/cpp/clearValue.yml
+++ /dev/null
@@ -1,20 +0,0 @@
-languageId: cpp
-command:
-  version: 1
-  spokenForm: clear value
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: value, includeSiblings: false}
-initialState:
-  documentContents: a += "world"
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-  marks: {}
-finalState:
-  documentContents: "a += "
-  selections:
-    - anchor: {line: 0, character: 5}
-      active: {line: 0, character: 5}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: containingScope, scopeType: value, includeSiblings: false}, isImplicit: false}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/cpp/elseStateWrapThis.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/cpp/elseStateWrapThis.yml
deleted file mode 100644
index ff8bb079b0..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/cpp/elseStateWrapThis.yml
+++ /dev/null
@@ -1,26 +0,0 @@
-languageId: cpp
-command:
-  version: 1
-  spokenForm: else state wrap this
-  action: wrapWithSnippet
-  targets:
-    - type: primitive
-      mark: {type: cursor}
-  extraArgs: [ifElseStatement.alternative]
-initialState:
-  documentContents: int foo = 0;
-  selections:
-    - anchor: {line: 0, character: 6}
-      active: {line: 0, character: 6}
-  marks: {}
-finalState:
-  documentContents: |-
-    if () {
-        
-    } else {
-        int foo = 0;
-    }
-  selections:
-    - anchor: {line: 0, character: 4}
-      active: {line: 0, character: 4}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: containingScope, scopeType: statement, includeSiblings: false}}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/cpp/ifElseWrapThis.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/cpp/ifElseWrapThis.yml
deleted file mode 100644
index 3d0ad86e68..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/cpp/ifElseWrapThis.yml
+++ /dev/null
@@ -1,26 +0,0 @@
-languageId: cpp
-command:
-  version: 1
-  spokenForm: if else wrap this
-  action: wrapWithSnippet
-  targets:
-    - type: primitive
-      mark: {type: cursor}
-  extraArgs: [ifElseStatement.consequence]
-initialState:
-  documentContents: int foo = 0;
-  selections:
-    - anchor: {line: 0, character: 6}
-      active: {line: 0, character: 6}
-  marks: {}
-finalState:
-  documentContents: |-
-    if () {
-        int foo = 0;
-    } else {
-        
-    }
-  selections:
-    - anchor: {line: 0, character: 4}
-      active: {line: 0, character: 4}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: containingScope, scopeType: statement, includeSiblings: false}}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/cpp/ifStateWrapThis.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/cpp/ifStateWrapThis.yml
deleted file mode 100644
index 885039ed32..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/cpp/ifStateWrapThis.yml
+++ /dev/null
@@ -1,24 +0,0 @@
-languageId: cpp
-command:
-  version: 1
-  spokenForm: if state wrap this
-  action: wrapWithSnippet
-  targets:
-    - type: primitive
-      mark: {type: cursor}
-  extraArgs: [ifStatement.consequence]
-initialState:
-  documentContents: int foo = 0;
-  selections:
-    - anchor: {line: 0, character: 6}
-      active: {line: 0, character: 6}
-  marks: {}
-finalState:
-  documentContents: |-
-    if () {
-        int foo = 0;
-    }
-  selections:
-    - anchor: {line: 0, character: 4}
-      active: {line: 0, character: 4}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: containingScope, scopeType: statement, includeSiblings: false}}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/cpp/takeArg.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/cpp/takeArg.yml
deleted file mode 100644
index f2723c5c02..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/cpp/takeArg.yml
+++ /dev/null
@@ -1,26 +0,0 @@
-languageId: cpp
-command:
-  version: 1
-  spokenForm: take arg
-  action: setSelection
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: argumentOrParameter}
-initialState:
-  documentContents: |-
-    int main() {
-        f(1 + 2, 3 + 4);
-    }
-  selections:
-    - anchor: {line: 1, character: 7}
-      active: {line: 1, character: 7}
-  marks: {}
-finalState:
-  documentContents: |-
-    int main() {
-        f(1 + 2, 3 + 4);
-    }
-  selections:
-    - anchor: {line: 1, character: 6}
-      active: {line: 1, character: 11}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, modifier: {type: containingScope, scopeType: argumentOrParameter}, insideOutsideType: inside}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/cpp/takeArg2.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/cpp/takeArg2.yml
deleted file mode 100644
index ce89e48131..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/cpp/takeArg2.yml
+++ /dev/null
@@ -1,24 +0,0 @@
-languageId: cpp
-command:
-  version: 1
-  spokenForm: take arg
-  action: setSelection
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: argumentOrParameter}
-initialState:
-  documentContents: |-
-    int f(int a, int b) {
-    }
-  selections:
-    - anchor: {line: 0, character: 16}
-      active: {line: 0, character: 16}
-  marks: {}
-finalState:
-  documentContents: |-
-    int f(int a, int b) {
-    }
-  selections:
-    - anchor: {line: 0, character: 13}
-      active: {line: 0, character: 18}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, modifier: {type: containingScope, scopeType: argumentOrParameter}, insideOutsideType: inside}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/cpp/takeAttribute.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/cpp/takeAttribute.yml
deleted file mode 100644
index 391ebccb0f..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/cpp/takeAttribute.yml
+++ /dev/null
@@ -1,26 +0,0 @@
-languageId: cpp
-command:
-  version: 1
-  spokenForm: take attribute
-  action: setSelection
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: attribute}
-initialState:
-  documentContents: |
-    [[nodiscard]]
-    int f(int a = 1) {
-    }
-  selections:
-    - anchor: {line: 0, character: 9}
-      active: {line: 0, character: 9}
-  marks: {}
-finalState:
-  documentContents: |
-    [[nodiscard]]
-    int f(int a = 1) {
-    }
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 13}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, modifier: {type: containingScope, scopeType: attribute}, insideOutsideType: inside}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/cpp/takeCall.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/cpp/takeCall.yml
deleted file mode 100644
index ac18b7f002..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/cpp/takeCall.yml
+++ /dev/null
@@ -1,26 +0,0 @@
-languageId: cpp
-command:
-  version: 1
-  spokenForm: take call
-  action: setSelection
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: functionCall}
-initialState:
-  documentContents: |-
-    int f(int a, int b) {
-        return f(a, b);
-    }
-  selections:
-    - anchor: {line: 1, character: 14}
-      active: {line: 1, character: 14}
-  marks: {}
-finalState:
-  documentContents: |-
-    int f(int a, int b) {
-        return f(a, b);
-    }
-  selections:
-    - anchor: {line: 1, character: 11}
-      active: {line: 1, character: 18}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, modifier: {type: containingScope, scopeType: functionCall}, insideOutsideType: inside}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/cpp/takeClass.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/cpp/takeClass.yml
deleted file mode 100644
index b50fd3286e..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/cpp/takeClass.yml
+++ /dev/null
@@ -1,20 +0,0 @@
-languageId: cpp
-command:
-  version: 1
-  spokenForm: take class
-  action: setSelection
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: class}
-initialState:
-  documentContents: class A { int a; };
-  selections:
-    - anchor: {line: 0, character: 14}
-      active: {line: 0, character: 14}
-  marks: {}
-finalState:
-  documentContents: class A { int a; };
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 18}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, modifier: {type: containingScope, scopeType: class}, insideOutsideType: inside}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/cpp/takeClass2.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/cpp/takeClass2.yml
deleted file mode 100644
index 57e0a0d569..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/cpp/takeClass2.yml
+++ /dev/null
@@ -1,20 +0,0 @@
-languageId: cpp
-command:
-  version: 1
-  spokenForm: take class
-  action: setSelection
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: class}
-initialState:
-  documentContents: enum class A { B };
-  selections:
-    - anchor: {line: 0, character: 16}
-      active: {line: 0, character: 16}
-  marks: {}
-finalState:
-  documentContents: enum class A { B };
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 18}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, modifier: {type: containingScope, scopeType: class}, insideOutsideType: inside}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/cpp/takeClassName.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/cpp/takeClassName.yml
deleted file mode 100644
index 84d42df17a..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/cpp/takeClassName.yml
+++ /dev/null
@@ -1,20 +0,0 @@
-languageId: cpp
-command:
-  version: 1
-  spokenForm: take class name
-  action: setSelection
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: className}
-initialState:
-  documentContents: class A { int a; };
-  selections:
-    - anchor: {line: 0, character: 15}
-      active: {line: 0, character: 15}
-  marks: {}
-finalState:
-  documentContents: class A { int a; };
-  selections:
-    - anchor: {line: 0, character: 6}
-      active: {line: 0, character: 7}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, modifier: {type: containingScope, scopeType: className}, insideOutsideType: inside}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/cpp/takeClassName2.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/cpp/takeClassName2.yml
deleted file mode 100644
index ffaff1e9a0..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/cpp/takeClassName2.yml
+++ /dev/null
@@ -1,20 +0,0 @@
-languageId: cpp
-command:
-  version: 1
-  spokenForm: take class name
-  action: setSelection
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: className}
-initialState:
-  documentContents: enum class A { B };
-  selections:
-    - anchor: {line: 0, character: 16}
-      active: {line: 0, character: 16}
-  marks: {}
-finalState:
-  documentContents: enum class A { B };
-  selections:
-    - anchor: {line: 0, character: 11}
-      active: {line: 0, character: 12}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, modifier: {type: containingScope, scopeType: className}, insideOutsideType: inside}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/cpp/takeClassName3.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/cpp/takeClassName3.yml
deleted file mode 100644
index 8abf393804..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/cpp/takeClassName3.yml
+++ /dev/null
@@ -1,20 +0,0 @@
-languageId: cpp
-command:
-  version: 1
-  spokenForm: take class name
-  action: setSelection
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: className}
-initialState:
-  documentContents: void ClassName::method() {}
-  selections:
-    - anchor: {line: 0, character: 26}
-      active: {line: 0, character: 26}
-  marks: {}
-finalState:
-  documentContents: void ClassName::method() {}
-  selections:
-    - anchor: {line: 0, character: 5}
-      active: {line: 0, character: 14}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, modifier: {type: containingScope, scopeType: className}, insideOutsideType: inside}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/cpp/takeComment.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/cpp/takeComment.yml
deleted file mode 100644
index a556690627..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/cpp/takeComment.yml
+++ /dev/null
@@ -1,20 +0,0 @@
-languageId: cpp
-command:
-  version: 1
-  spokenForm: take comment
-  action: setSelection
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: comment}
-initialState:
-  documentContents: int a; // the comment
-  selections:
-    - anchor: {line: 0, character: 20}
-      active: {line: 0, character: 20}
-  marks: {}
-finalState:
-  documentContents: int a; // the comment
-  selections:
-    - anchor: {line: 0, character: 7}
-      active: {line: 0, character: 21}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, modifier: {type: containingScope, scopeType: comment}, insideOutsideType: inside}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/cpp/takeEveryArg.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/cpp/takeEveryArg.yml
deleted file mode 100644
index 51fd63b1e7..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/cpp/takeEveryArg.yml
+++ /dev/null
@@ -1,28 +0,0 @@
-languageId: cpp
-command:
-  version: 1
-  spokenForm: take every arg
-  action: setSelection
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: argumentOrParameter, includeSiblings: true}
-initialState:
-  documentContents: |-
-    int f(int a, int b) {
-        return f(a, b);
-    }
-  selections:
-    - anchor: {line: 1, character: 16}
-      active: {line: 1, character: 16}
-  marks: {}
-finalState:
-  documentContents: |-
-    int f(int a, int b) {
-        return f(a, b);
-    }
-  selections:
-    - anchor: {line: 1, character: 13}
-      active: {line: 1, character: 14}
-    - anchor: {line: 1, character: 16}
-      active: {line: 1, character: 17}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, modifier: {type: containingScope, scopeType: argumentOrParameter, includeSiblings: true}, insideOutsideType: inside}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/cpp/takeEveryItem.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/cpp/takeEveryItem.yml
deleted file mode 100644
index f120fe7b17..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/cpp/takeEveryItem.yml
+++ /dev/null
@@ -1,28 +0,0 @@
-languageId: cpp
-command:
-  version: 1
-  spokenForm: take every item
-  action: setSelection
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: collectionItem, includeSiblings: true}
-initialState:
-  documentContents: |-
-    int f(int a, int b) {
-        std::vector<int> v { a, b };
-    }
-  selections:
-    - anchor: {line: 1, character: 29}
-      active: {line: 1, character: 29}
-  marks: {}
-finalState:
-  documentContents: |-
-    int f(int a, int b) {
-        std::vector<int> v { a, b };
-    }
-  selections:
-    - anchor: {line: 1, character: 25}
-      active: {line: 1, character: 26}
-    - anchor: {line: 1, character: 28}
-      active: {line: 1, character: 29}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, modifier: {type: containingScope, scopeType: collectionItem, includeSiblings: true}, insideOutsideType: inside}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/cpp/takeFunk.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/cpp/takeFunk.yml
deleted file mode 100644
index 7343948b79..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/cpp/takeFunk.yml
+++ /dev/null
@@ -1,26 +0,0 @@
-languageId: cpp
-command:
-  version: 1
-  spokenForm: take funk
-  action: setSelection
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: namedFunction}
-initialState:
-  documentContents: |-
-    int f(int a, int b) {
-        
-    }
-  selections:
-    - anchor: {line: 1, character: 4}
-      active: {line: 1, character: 4}
-  marks: {}
-finalState:
-  documentContents: |-
-    int f(int a, int b) {
-        
-    }
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 2, character: 1}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, modifier: {type: containingScope, scopeType: namedFunction}, insideOutsideType: inside}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/cpp/takeFunk2.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/cpp/takeFunk2.yml
deleted file mode 100644
index 31e3dd13dd..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/cpp/takeFunk2.yml
+++ /dev/null
@@ -1,20 +0,0 @@
-languageId: cpp
-command:
-  version: 1
-  spokenForm: take funk
-  action: setSelection
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: namedFunction}
-initialState:
-  documentContents: int f(int a, int b);
-  selections:
-    - anchor: {line: 0, character: 7}
-      active: {line: 0, character: 7}
-  marks: {}
-finalState:
-  documentContents: int f(int a, int b);
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 20}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, modifier: {type: containingScope, scopeType: namedFunction}, insideOutsideType: inside}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/cpp/takeFunkName.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/cpp/takeFunkName.yml
deleted file mode 100644
index e2cefac08b..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/cpp/takeFunkName.yml
+++ /dev/null
@@ -1,26 +0,0 @@
-languageId: cpp
-command:
-  version: 1
-  spokenForm: take funk name
-  action: setSelection
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: functionName}
-initialState:
-  documentContents: |-
-    int f(int a, int b) {
-        
-    }
-  selections:
-    - anchor: {line: 1, character: 4}
-      active: {line: 1, character: 4}
-  marks: {}
-finalState:
-  documentContents: |-
-    int f(int a, int b) {
-        
-    }
-  selections:
-    - anchor: {line: 0, character: 4}
-      active: {line: 0, character: 5}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, modifier: {type: containingScope, scopeType: functionName}, insideOutsideType: inside}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/cpp/takeFunkName2.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/cpp/takeFunkName2.yml
deleted file mode 100644
index bd94da14b2..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/cpp/takeFunkName2.yml
+++ /dev/null
@@ -1,26 +0,0 @@
-languageId: cpp
-command:
-  version: 1
-  spokenForm: take funk name
-  action: setSelection
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: functionName}
-initialState:
-  documentContents: |-
-    int C::f(int a, int b) {
-        
-    }
-  selections:
-    - anchor: {line: 1, character: 4}
-      active: {line: 1, character: 4}
-  marks: {}
-finalState:
-  documentContents: |-
-    int C::f(int a, int b) {
-        
-    }
-  selections:
-    - anchor: {line: 0, character: 7}
-      active: {line: 0, character: 8}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, modifier: {type: containingScope, scopeType: functionName}, insideOutsideType: inside}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/cpp/takeFunkName3.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/cpp/takeFunkName3.yml
deleted file mode 100644
index ae94e2a5ec..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/cpp/takeFunkName3.yml
+++ /dev/null
@@ -1,20 +0,0 @@
-languageId: cpp
-command:
-  version: 1
-  spokenForm: take funk name
-  action: setSelection
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: functionName}
-initialState:
-  documentContents: int f(int a, int b);
-  selections:
-    - anchor: {line: 0, character: 1}
-      active: {line: 0, character: 1}
-  marks: {}
-finalState:
-  documentContents: int f(int a, int b);
-  selections:
-    - anchor: {line: 0, character: 4}
-      active: {line: 0, character: 5}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, modifier: {type: containingScope, scopeType: functionName}, insideOutsideType: inside}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/cpp/takeIf.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/cpp/takeIf.yml
deleted file mode 100644
index 61d5539c4b..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/cpp/takeIf.yml
+++ /dev/null
@@ -1,30 +0,0 @@
-languageId: cpp
-command:
-  version: 1
-  spokenForm: take if
-  action: setSelection
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: ifStatement}
-initialState:
-  documentContents: |-
-    void f() {
-        if (true) {
-            
-        }
-    }
-  selections:
-    - anchor: {line: 2, character: 8}
-      active: {line: 2, character: 8}
-  marks: {}
-finalState:
-  documentContents: |-
-    void f() {
-        if (true) {
-            
-        }
-    }
-  selections:
-    - anchor: {line: 1, character: 4}
-      active: {line: 3, character: 5}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, modifier: {type: containingScope, scopeType: ifStatement}, insideOutsideType: inside}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/cpp/takeIf2.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/cpp/takeIf2.yml
deleted file mode 100644
index ce08fa4b67..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/cpp/takeIf2.yml
+++ /dev/null
@@ -1,30 +0,0 @@
-languageId: cpp
-command:
-  version: 1
-  spokenForm: take if
-  action: setSelection
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: ifStatement}
-initialState:
-  documentContents: |-
-    void f() {
-        if constexpr (true) {
-            
-        }
-    }
-  selections:
-    - anchor: {line: 2, character: 8}
-      active: {line: 2, character: 8}
-  marks: {}
-finalState:
-  documentContents: |-
-    void f() {
-        if constexpr (true) {
-            
-        }
-    }
-  selections:
-    - anchor: {line: 1, character: 4}
-      active: {line: 3, character: 5}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, modifier: {type: containingScope, scopeType: ifStatement}, insideOutsideType: inside}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/cpp/takeItem.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/cpp/takeItem.yml
deleted file mode 100644
index 3512149c3a..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/cpp/takeItem.yml
+++ /dev/null
@@ -1,32 +0,0 @@
-languageId: cpp
-command:
-  version: 1
-  spokenForm: take item
-  action: setSelection
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: collectionItem}
-initialState:
-  documentContents: |-
-    void f() {
-        std::vector<int> v {
-            1 + 2,
-            3
-        };
-    }
-  selections:
-    - anchor: {line: 2, character: 10}
-      active: {line: 2, character: 10}
-  marks: {}
-finalState:
-  documentContents: |-
-    void f() {
-        std::vector<int> v {
-            1 + 2,
-            3
-        };
-    }
-  selections:
-    - anchor: {line: 2, character: 8}
-      active: {line: 2, character: 13}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, modifier: {type: containingScope, scopeType: collectionItem}, insideOutsideType: inside}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/cpp/takeItem2.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/cpp/takeItem2.yml
deleted file mode 100644
index b91b1bcb0e..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/cpp/takeItem2.yml
+++ /dev/null
@@ -1,32 +0,0 @@
-languageId: cpp
-command:
-  version: 1
-  spokenForm: take item
-  action: setSelection
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: collectionItem}
-initialState:
-  documentContents: |-
-    void f() {
-        int arr[] = {
-            1 + 2,
-            3
-        };
-    }
-  selections:
-    - anchor: {line: 2, character: 11}
-      active: {line: 2, character: 11}
-  marks: {}
-finalState:
-  documentContents: |-
-    void f() {
-        int arr[] = {
-            1 + 2,
-            3
-        };
-    }
-  selections:
-    - anchor: {line: 2, character: 8}
-      active: {line: 2, character: 13}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, modifier: {type: containingScope, scopeType: collectionItem}, insideOutsideType: inside}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/cpp/takeLambda.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/cpp/takeLambda.yml
deleted file mode 100644
index a7328eb70e..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/cpp/takeLambda.yml
+++ /dev/null
@@ -1,26 +0,0 @@
-languageId: cpp
-command:
-  version: 1
-  spokenForm: take lambda
-  action: setSelection
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: anonymousFunction}
-initialState:
-  documentContents: |
-    void f() {
-        [](){}();
-    }
-  selections:
-    - anchor: {line: 1, character: 7}
-      active: {line: 1, character: 7}
-  marks: {}
-finalState:
-  documentContents: |
-    void f() {
-        [](){}();
-    }
-  selections:
-    - anchor: {line: 1, character: 4}
-      active: {line: 1, character: 10}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, modifier: {type: containingScope, scopeType: anonymousFunction}, insideOutsideType: inside}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/cpp/takeList.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/cpp/takeList.yml
deleted file mode 100644
index abf4be77e7..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/cpp/takeList.yml
+++ /dev/null
@@ -1,32 +0,0 @@
-languageId: cpp
-command:
-  version: 1
-  spokenForm: take list
-  action: setSelection
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: list}
-initialState:
-  documentContents: |-
-    void f() {
-        std::vector<int> v {
-            1 + 2,
-            3
-        };
-    }
-  selections:
-    - anchor: {line: 2, character: 11}
-      active: {line: 2, character: 11}
-  marks: {}
-finalState:
-  documentContents: |-
-    void f() {
-        std::vector<int> v {
-            1 + 2,
-            3
-        };
-    }
-  selections:
-    - anchor: {line: 1, character: 23}
-      active: {line: 4, character: 5}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, modifier: {type: containingScope, scopeType: list}, insideOutsideType: inside}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/cpp/takeList2.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/cpp/takeList2.yml
deleted file mode 100644
index 46887a1708..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/cpp/takeList2.yml
+++ /dev/null
@@ -1,32 +0,0 @@
-languageId: cpp
-command:
-  version: 1
-  spokenForm: take list
-  action: setSelection
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: list}
-initialState:
-  documentContents: |-
-    void f() {
-        int arr[] = {
-            1 + 2,
-            3
-        };
-    }
-  selections:
-    - anchor: {line: 2, character: 12}
-      active: {line: 2, character: 12}
-  marks: {}
-finalState:
-  documentContents: |-
-    void f() {
-        int arr[] = {
-            1 + 2,
-            3
-        };
-    }
-  selections:
-    - anchor: {line: 1, character: 16}
-      active: {line: 4, character: 5}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, modifier: {type: containingScope, scopeType: list}, insideOutsideType: inside}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/cpp/takeName.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/cpp/takeName.yml
deleted file mode 100644
index 16dbf4344a..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/cpp/takeName.yml
+++ /dev/null
@@ -1,26 +0,0 @@
-languageId: cpp
-command:
-  version: 1
-  spokenForm: take name
-  action: setSelection
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: name}
-initialState:
-  documentContents: |-
-    void f() {
-        int i = 1;
-    }
-  selections:
-    - anchor: {line: 1, character: 13}
-      active: {line: 1, character: 13}
-  marks: {}
-finalState:
-  documentContents: |-
-    void f() {
-        int i = 1;
-    }
-  selections:
-    - anchor: {line: 1, character: 8}
-      active: {line: 1, character: 9}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, modifier: {type: containingScope, scopeType: name}, insideOutsideType: inside}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/cpp/takeName2.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/cpp/takeName2.yml
deleted file mode 100644
index 13ed4fdcd0..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/cpp/takeName2.yml
+++ /dev/null
@@ -1,26 +0,0 @@
-languageId: cpp
-command:
-  version: 1
-  spokenForm: take name
-  action: setSelection
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: name}
-initialState:
-  documentContents: |-
-    void f(int i = 1) {
-        
-    }
-  selections:
-    - anchor: {line: 0, character: 15}
-      active: {line: 0, character: 15}
-  marks: {}
-finalState:
-  documentContents: |-
-    void f(int i = 1) {
-        
-    }
-  selections:
-    - anchor: {line: 0, character: 11}
-      active: {line: 0, character: 12}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, modifier: {type: containingScope, scopeType: name}, insideOutsideType: inside}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/cpp/takeName3.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/cpp/takeName3.yml
deleted file mode 100644
index b5e1d3d697..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/cpp/takeName3.yml
+++ /dev/null
@@ -1,26 +0,0 @@
-languageId: cpp
-command:
-  version: 1
-  spokenForm: take name
-  action: setSelection
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: name}
-initialState:
-  documentContents: |-
-    void f(int i = 1) {
-        
-    }
-  selections:
-    - anchor: {line: 1, character: 4}
-      active: {line: 1, character: 4}
-  marks: {}
-finalState:
-  documentContents: |-
-    void f(int i = 1) {
-        
-    }
-  selections:
-    - anchor: {line: 0, character: 5}
-      active: {line: 0, character: 6}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, modifier: {type: containingScope, scopeType: name}, insideOutsideType: inside}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/cpp/takeState.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/cpp/takeState.yml
deleted file mode 100644
index 57b62dfcf9..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/cpp/takeState.yml
+++ /dev/null
@@ -1,30 +0,0 @@
-languageId: cpp
-command:
-  version: 1
-  spokenForm: take state
-  action: setSelection
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: statement}
-initialState:
-  documentContents: |-
-    void f() {
-        while (true) {
-            ;
-        }
-    }
-  selections:
-    - anchor: {line: 1, character: 7}
-      active: {line: 1, character: 7}
-  marks: {}
-finalState:
-  documentContents: |-
-    void f() {
-        while (true) {
-            ;
-        }
-    }
-  selections:
-    - anchor: {line: 1, character: 4}
-      active: {line: 3, character: 5}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, modifier: {type: containingScope, scopeType: statement}, insideOutsideType: inside}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/cpp/takeState2.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/cpp/takeState2.yml
deleted file mode 100644
index 0b35b77a7b..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/cpp/takeState2.yml
+++ /dev/null
@@ -1,26 +0,0 @@
-languageId: cpp
-command:
-  version: 1
-  spokenForm: take state
-  action: setSelection
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: statement}
-initialState:
-  documentContents: |-
-    void f() {
-        a = 1;
-    }
-  selections:
-    - anchor: {line: 1, character: 7}
-      active: {line: 1, character: 7}
-  marks: {}
-finalState:
-  documentContents: |-
-    void f() {
-        a = 1;
-    }
-  selections:
-    - anchor: {line: 1, character: 4}
-      active: {line: 1, character: 10}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, modifier: {type: containingScope, scopeType: statement}, insideOutsideType: inside}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/cpp/takeState3.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/cpp/takeState3.yml
deleted file mode 100644
index 7dd2e5c184..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/cpp/takeState3.yml
+++ /dev/null
@@ -1,26 +0,0 @@
-languageId: cpp
-command:
-  version: 1
-  spokenForm: take state
-  action: setSelection
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: statement}
-initialState:
-  documentContents: |-
-    void f() {
-        int a = 1;
-    }
-  selections:
-    - anchor: {line: 1, character: 10}
-      active: {line: 1, character: 10}
-  marks: {}
-finalState:
-  documentContents: |-
-    void f() {
-        int a = 1;
-    }
-  selections:
-    - anchor: {line: 1, character: 4}
-      active: {line: 1, character: 14}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, modifier: {type: containingScope, scopeType: statement}, insideOutsideType: inside}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/cpp/takeString.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/cpp/takeString.yml
deleted file mode 100644
index 2a69ee87b7..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/cpp/takeString.yml
+++ /dev/null
@@ -1,22 +0,0 @@
-languageId: cpp
-command:
-  version: 1
-  spokenForm: take string
-  action: setSelection
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: string}
-initialState:
-  documentContents: |
-    char* a = "hello world";
-  selections:
-    - anchor: {line: 0, character: 21}
-      active: {line: 0, character: 21}
-  marks: {}
-finalState:
-  documentContents: |
-    char* a = "hello world";
-  selections:
-    - anchor: {line: 0, character: 10}
-      active: {line: 0, character: 23}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, modifier: {type: containingScope, scopeType: string}, insideOutsideType: inside}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/cpp/takeType.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/cpp/takeType.yml
deleted file mode 100644
index 89cd6b2b01..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/cpp/takeType.yml
+++ /dev/null
@@ -1,22 +0,0 @@
-languageId: cpp
-command:
-  version: 1
-  spokenForm: take type
-  action: setSelection
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: type}
-initialState:
-  documentContents: |
-    int f(int a) {}
-  selections:
-    - anchor: {line: 0, character: 10}
-      active: {line: 0, character: 10}
-  marks: {}
-finalState:
-  documentContents: |
-    int f(int a) {}
-  selections:
-    - anchor: {line: 0, character: 6}
-      active: {line: 0, character: 9}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, modifier: {type: containingScope, scopeType: type}, insideOutsideType: inside}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/cpp/takeType2.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/cpp/takeType2.yml
deleted file mode 100644
index 5743b9605e..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/cpp/takeType2.yml
+++ /dev/null
@@ -1,22 +0,0 @@
-languageId: cpp
-command:
-  version: 1
-  spokenForm: take type
-  action: setSelection
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: type}
-initialState:
-  documentContents: |
-    int f(int a) {}
-  selections:
-    - anchor: {line: 0, character: 14}
-      active: {line: 0, character: 14}
-  marks: {}
-finalState:
-  documentContents: |
-    int f(int a) {}
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 3}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, modifier: {type: containingScope, scopeType: type}, insideOutsideType: inside}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/cpp/takeType3.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/cpp/takeType3.yml
deleted file mode 100644
index 655f024b52..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/cpp/takeType3.yml
+++ /dev/null
@@ -1,26 +0,0 @@
-languageId: cpp
-command:
-  version: 1
-  spokenForm: take type
-  action: setSelection
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: type}
-initialState:
-  documentContents: |
-    int f(int a) {
-        int j = a;
-    }
-  selections:
-    - anchor: {line: 1, character: 13}
-      active: {line: 1, character: 13}
-  marks: {}
-finalState:
-  documentContents: |
-    int f(int a) {
-        int j = a;
-    }
-  selections:
-    - anchor: {line: 1, character: 4}
-      active: {line: 1, character: 7}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, modifier: {type: containingScope, scopeType: type}, insideOutsideType: inside}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/cpp/takeValue.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/cpp/takeValue.yml
deleted file mode 100644
index 152f9edf3e..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/cpp/takeValue.yml
+++ /dev/null
@@ -1,26 +0,0 @@
-languageId: cpp
-command:
-  version: 1
-  spokenForm: take value
-  action: setSelection
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: value}
-initialState:
-  documentContents: |
-    int f(int a) {
-        int j = a;
-    }
-  selections:
-    - anchor: {line: 1, character: 5}
-      active: {line: 1, character: 5}
-  marks: {}
-finalState:
-  documentContents: |
-    int f(int a) {
-        int j = a;
-    }
-  selections:
-    - anchor: {line: 1, character: 12}
-      active: {line: 1, character: 13}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, modifier: {type: containingScope, scopeType: value}, insideOutsideType: inside}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/cpp/takeValue2.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/cpp/takeValue2.yml
deleted file mode 100644
index b5e3da96be..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/cpp/takeValue2.yml
+++ /dev/null
@@ -1,26 +0,0 @@
-languageId: cpp
-command:
-  version: 1
-  spokenForm: take value
-  action: setSelection
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: value}
-initialState:
-  documentContents: |
-    int f(int a) {
-        a = 2;
-    }
-  selections:
-    - anchor: {line: 1, character: 5}
-      active: {line: 1, character: 5}
-  marks: {}
-finalState:
-  documentContents: |
-    int f(int a) {
-        a = 2;
-    }
-  selections:
-    - anchor: {line: 1, character: 8}
-      active: {line: 1, character: 9}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, modifier: {type: containingScope, scopeType: value}, insideOutsideType: inside}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/cpp/takeValue3.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/cpp/takeValue3.yml
deleted file mode 100644
index aefeb752d0..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/cpp/takeValue3.yml
+++ /dev/null
@@ -1,24 +0,0 @@
-languageId: cpp
-command:
-  version: 1
-  spokenForm: take value
-  action: setSelection
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: value}
-initialState:
-  documentContents: |
-    int f(int a = 1) {
-    }
-  selections:
-    - anchor: {line: 0, character: 11}
-      active: {line: 0, character: 11}
-  marks: {}
-finalState:
-  documentContents: |
-    int f(int a = 1) {
-    }
-  selections:
-    - anchor: {line: 0, character: 14}
-      active: {line: 0, character: 15}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, modifier: {type: containingScope, scopeType: value}, insideOutsideType: inside}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/cpp/tryCatchWrapThis.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/cpp/tryCatchWrapThis.yml
deleted file mode 100644
index 22952b77f6..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/cpp/tryCatchWrapThis.yml
+++ /dev/null
@@ -1,26 +0,0 @@
-languageId: cpp
-command:
-  version: 1
-  spokenForm: try catch wrap this
-  action: wrapWithSnippet
-  targets:
-    - type: primitive
-      mark: {type: cursor}
-  extraArgs: [tryCatchStatement.body]
-initialState:
-  documentContents: int foo = 0;
-  selections:
-    - anchor: {line: 0, character: 6}
-      active: {line: 0, character: 6}
-  marks: {}
-finalState:
-  documentContents: |-
-    try {
-        int foo = 0;
-    } catch () {
-        
-    }
-  selections:
-    - anchor: {line: 2, character: 9}
-      active: {line: 2, character: 9}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: containingScope, scopeType: statement, includeSiblings: false}}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/cpp/tryCatchWrapThis2.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/cpp/tryCatchWrapThis2.yml
deleted file mode 100644
index af41b82d05..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/cpp/tryCatchWrapThis2.yml
+++ /dev/null
@@ -1,43 +0,0 @@
-languageId: cpp
-command:
-  version: 1
-  spokenForm: try catch wrap this
-  action: wrapWithSnippet
-  targets:
-    - type: primitive
-      mark: {type: cursor}
-  extraArgs: [tryCatchStatement.body]
-initialState:
-  documentContents: |-
-    if (true) {
-        int foo = 0;
-    }
-
-    int bar = 1;
-  selections:
-    - anchor: {line: 4, character: 0}
-      active: {line: 4, character: 0}
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-  marks: {}
-finalState:
-  documentContents: |-
-    try {
-        if (true) {
-            int foo = 0;
-        }
-    } catch () {
-        
-    }
-
-    try {
-        int bar = 1;
-    } catch () {
-        
-    }
-  selections:
-    - anchor: {line: 10, character: 9}
-      active: {line: 10, character: 9}
-    - anchor: {line: 4, character: 9}
-      active: {line: 4, character: 9}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: containingScope, scopeType: statement, includeSiblings: false}}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/csharp/changeCall.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/csharp/changeCall.yml
deleted file mode 100644
index 578f4b8c5f..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/csharp/changeCall.yml
+++ /dev/null
@@ -1,20 +0,0 @@
-languageId: csharp
-command:
-  version: 1
-  spokenForm: change call
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: functionCall, includeSiblings: false}
-initialState:
-  documentContents: Taxi t = new Taxi();
-  selections:
-    - anchor: {line: 0, character: 18}
-      active: {line: 0, character: 18}
-  marks: {}
-finalState:
-  documentContents: Taxi t = ;
-  selections:
-    - anchor: {line: 0, character: 9}
-      active: {line: 0, character: 9}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: containingScope, scopeType: functionCall, includeSiblings: false}, isImplicit: false}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/csharp/changeCall2.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/csharp/changeCall2.yml
deleted file mode 100644
index e0256248d7..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/csharp/changeCall2.yml
+++ /dev/null
@@ -1,20 +0,0 @@
-languageId: csharp
-command:
-  version: 1
-  spokenForm: change call
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: functionCall, includeSiblings: false}
-initialState:
-  documentContents: Taxi t = new c.Taxi(a, b);
-  selections:
-    - anchor: {line: 0, character: 23}
-      active: {line: 0, character: 23}
-  marks: {}
-finalState:
-  documentContents: Taxi t = ;
-  selections:
-    - anchor: {line: 0, character: 9}
-      active: {line: 0, character: 9}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: containingScope, scopeType: functionCall, includeSiblings: false}, isImplicit: false}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/csharp/changeCall3.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/csharp/changeCall3.yml
deleted file mode 100644
index 2c1e158cfa..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/csharp/changeCall3.yml
+++ /dev/null
@@ -1,20 +0,0 @@
-languageId: csharp
-command:
-  version: 1
-  spokenForm: change call
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: functionCall, includeSiblings: false}
-initialState:
-  documentContents: Taxi t = new c[0].Taxi(a, b);
-  selections:
-    - anchor: {line: 0, character: 25}
-      active: {line: 0, character: 25}
-  marks: {}
-finalState:
-  documentContents: Taxi t = ;
-  selections:
-    - anchor: {line: 0, character: 9}
-      active: {line: 0, character: 9}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: containingScope, scopeType: functionCall, includeSiblings: false}, isImplicit: false}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/csharp/changeCallee.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/csharp/changeCallee.yml
deleted file mode 100644
index 15316cc595..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/csharp/changeCallee.yml
+++ /dev/null
@@ -1,20 +0,0 @@
-languageId: csharp
-command:
-  version: 1
-  spokenForm: change callee
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: functionCallee, includeSiblings: false}
-initialState:
-  documentContents: TestMotorcycle moto = new TestMotorcycle();
-  selections:
-    - anchor: {line: 0, character: 41}
-      active: {line: 0, character: 41}
-  marks: {}
-finalState:
-  documentContents: TestMotorcycle moto = new ();
-  selections:
-    - anchor: {line: 0, character: 26}
-      active: {line: 0, character: 26}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: containingScope, scopeType: functionCallee, includeSiblings: false}, isImplicit: false}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/csharp/changeCallee2.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/csharp/changeCallee2.yml
deleted file mode 100644
index ebefee1389..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/csharp/changeCallee2.yml
+++ /dev/null
@@ -1,20 +0,0 @@
-languageId: csharp
-command:
-  version: 1
-  spokenForm: change callee
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: functionCallee, includeSiblings: false}
-initialState:
-  documentContents: TestMotorcycle moto = new TestMotorcycle[0]();
-  selections:
-    - anchor: {line: 0, character: 44}
-      active: {line: 0, character: 44}
-  marks: {}
-finalState:
-  documentContents: TestMotorcycle moto = ();
-  selections:
-    - anchor: {line: 0, character: 22}
-      active: {line: 0, character: 22}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: containingScope, scopeType: functionCallee, includeSiblings: false}, isImplicit: false}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/csharp/changeCallee3.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/csharp/changeCallee3.yml
deleted file mode 100644
index 433fdad638..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/csharp/changeCallee3.yml
+++ /dev/null
@@ -1,20 +0,0 @@
-languageId: csharp
-command:
-  version: 1
-  spokenForm: change callee
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: functionCallee, includeSiblings: false}
-initialState:
-  documentContents: moto.StartEngine();
-  selections:
-    - anchor: {line: 0, character: 17}
-      active: {line: 0, character: 17}
-  marks: {}
-finalState:
-  documentContents: ();
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: containingScope, scopeType: functionCallee, includeSiblings: false}, isImplicit: false}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/csharp/changeCallee4.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/csharp/changeCallee4.yml
deleted file mode 100644
index 1f16a40a57..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/csharp/changeCallee4.yml
+++ /dev/null
@@ -1,20 +0,0 @@
-languageId: csharp
-command:
-  version: 1
-  spokenForm: change callee
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: functionCallee, includeSiblings: false}
-initialState:
-  documentContents: moto.StartEngine[0](5, true);
-  selections:
-    - anchor: {line: 0, character: 24}
-      active: {line: 0, character: 24}
-  marks: {}
-finalState:
-  documentContents: (5, true);
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: containingScope, scopeType: functionCallee, includeSiblings: false}, isImplicit: false}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/csharp/changeCallee5.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/csharp/changeCallee5.yml
deleted file mode 100644
index c488f8e6bc..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/csharp/changeCallee5.yml
+++ /dev/null
@@ -1,20 +0,0 @@
-languageId: csharp
-command:
-  version: 1
-  spokenForm: change callee
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: functionCallee, includeSiblings: false}
-initialState:
-  documentContents: startEngine[0](5, true)();
-  selections:
-    - anchor: {line: 0, character: 24}
-      active: {line: 0, character: 24}
-  marks: {}
-finalState:
-  documentContents: ();
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: containingScope, scopeType: functionCallee, includeSiblings: false}, isImplicit: false}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/csharp/changeCallee6.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/csharp/changeCallee6.yml
deleted file mode 100644
index f69de247ea..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/csharp/changeCallee6.yml
+++ /dev/null
@@ -1,20 +0,0 @@
-languageId: csharp
-command:
-  version: 1
-  spokenForm: change callee
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: functionCallee, includeSiblings: false}
-initialState:
-  documentContents: startEngine[0](5, true).test();
-  selections:
-    - anchor: {line: 0, character: 29}
-      active: {line: 0, character: 29}
-  marks: {}
-finalState:
-  documentContents: ();
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: containingScope, scopeType: functionCallee, includeSiblings: false}, isImplicit: false}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/csharp/changeCondition.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/csharp/changeCondition.yml
deleted file mode 100644
index ce74ce31ca..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/csharp/changeCondition.yml
+++ /dev/null
@@ -1,26 +0,0 @@
-languageId: csharp
-command:
-  version: 1
-  spokenForm: change condition
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: condition, includeSiblings: false}
-initialState:
-  documentContents: |-
-    if (columnname != a && columnname != b && columnname != c)
-    {
-    }
-  selections:
-    - anchor: {line: 0, character: 28}
-      active: {line: 0, character: 28}
-  marks: {}
-finalState:
-  documentContents: |-
-    if ()
-    {
-    }
-  selections:
-    - anchor: {line: 0, character: 4}
-      active: {line: 0, character: 4}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: containingScope, scopeType: condition, includeSiblings: false}, isImplicit: false}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/csharp/changeCondition2.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/csharp/changeCondition2.yml
deleted file mode 100644
index 56dc4be67f..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/csharp/changeCondition2.yml
+++ /dev/null
@@ -1,20 +0,0 @@
-languageId: csharp
-command:
-  version: 1
-  spokenForm: change condition
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: condition, includeSiblings: false}
-initialState:
-  documentContents: for (int i = 0; i < 5; i++) {}
-  selections:
-    - anchor: {line: 0, character: 19}
-      active: {line: 0, character: 19}
-  marks: {}
-finalState:
-  documentContents: for (int i = 0; ; i++) {}
-  selections:
-    - anchor: {line: 0, character: 16}
-      active: {line: 0, character: 16}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: containingScope, scopeType: condition, includeSiblings: false}, isImplicit: false}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/csharp/changeCondition3.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/csharp/changeCondition3.yml
deleted file mode 100644
index 6a047d95f5..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/csharp/changeCondition3.yml
+++ /dev/null
@@ -1,20 +0,0 @@
-languageId: csharp
-command:
-  version: 1
-  spokenForm: change condition
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: condition, includeSiblings: false}
-initialState:
-  documentContents: while (a != true) {}
-  selections:
-    - anchor: {line: 0, character: 11}
-      active: {line: 0, character: 11}
-  marks: {}
-finalState:
-  documentContents: while () {}
-  selections:
-    - anchor: {line: 0, character: 7}
-      active: {line: 0, character: 7}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: containingScope, scopeType: condition, includeSiblings: false}, isImplicit: false}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/csharp/changeCondition4.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/csharp/changeCondition4.yml
deleted file mode 100644
index 09e83d5206..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/csharp/changeCondition4.yml
+++ /dev/null
@@ -1,20 +0,0 @@
-languageId: csharp
-command:
-  version: 1
-  spokenForm: change condition
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: condition, includeSiblings: false}
-initialState:
-  documentContents: if (false) {}
-  selections:
-    - anchor: {line: 0, character: 12}
-      active: {line: 0, character: 12}
-  marks: {}
-finalState:
-  documentContents: if () {}
-  selections:
-    - anchor: {line: 0, character: 4}
-      active: {line: 0, character: 4}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: containingScope, scopeType: condition, includeSiblings: false}, isImplicit: false}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/csharp/changeCondition5.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/csharp/changeCondition5.yml
deleted file mode 100644
index 1a6292eb4e..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/csharp/changeCondition5.yml
+++ /dev/null
@@ -1,20 +0,0 @@
-languageId: csharp
-command:
-  version: 1
-  spokenForm: change condition
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: condition, includeSiblings: false}
-initialState:
-  documentContents: if (!true) {}
-  selections:
-    - anchor: {line: 0, character: 12}
-      active: {line: 0, character: 12}
-  marks: {}
-finalState:
-  documentContents: if () {}
-  selections:
-    - anchor: {line: 0, character: 4}
-      active: {line: 0, character: 4}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: containingScope, scopeType: condition, includeSiblings: false}, isImplicit: false}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/csharp/changeCondition6.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/csharp/changeCondition6.yml
deleted file mode 100644
index ea6c288631..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/csharp/changeCondition6.yml
+++ /dev/null
@@ -1,20 +0,0 @@
-languageId: csharp
-command:
-  version: 1
-  spokenForm: change condition
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: condition, includeSiblings: false}
-initialState:
-  documentContents: if (foo(bar)) {    }
-  selections:
-    - anchor: {line: 0, character: 11}
-      active: {line: 0, character: 11}
-  marks: {}
-finalState:
-  documentContents: if () {    }
-  selections:
-    - anchor: {line: 0, character: 4}
-      active: {line: 0, character: 4}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: containingScope, scopeType: condition, includeSiblings: false}, isImplicit: false}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/csharp/changeCondition7.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/csharp/changeCondition7.yml
deleted file mode 100644
index 4e00cba951..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/csharp/changeCondition7.yml
+++ /dev/null
@@ -1,20 +0,0 @@
-languageId: csharp
-command:
-  version: 1
-  spokenForm: change condition
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: condition, includeSiblings: false}
-initialState:
-  documentContents: while (true) {}
-  selections:
-    - anchor: {line: 0, character: 10}
-      active: {line: 0, character: 10}
-  marks: {}
-finalState:
-  documentContents: while () {}
-  selections:
-    - anchor: {line: 0, character: 7}
-      active: {line: 0, character: 7}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: containingScope, scopeType: condition, includeSiblings: false}, isImplicit: false}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/csharp/changeCondition8.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/csharp/changeCondition8.yml
deleted file mode 100644
index e02f269d24..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/csharp/changeCondition8.yml
+++ /dev/null
@@ -1,20 +0,0 @@
-languageId: csharp
-command:
-  version: 1
-  spokenForm: change condition
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: condition, includeSiblings: false}
-initialState:
-  documentContents: for (int i = 0; i < 5; i++) { while(false == true) {} }
-  selections:
-    - anchor: {line: 0, character: 43}
-      active: {line: 0, character: 43}
-  marks: {}
-finalState:
-  documentContents: for (int i = 0; i < 5; i++) { while() {} }
-  selections:
-    - anchor: {line: 0, character: 36}
-      active: {line: 0, character: 36}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: containingScope, scopeType: condition, includeSiblings: false}, isImplicit: false}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/csharp/changeCondition9.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/csharp/changeCondition9.yml
deleted file mode 100644
index 1d0d9823fb..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/csharp/changeCondition9.yml
+++ /dev/null
@@ -1,20 +0,0 @@
-languageId: csharp
-command:
-  version: 1
-  spokenForm: change condition
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: condition, includeSiblings: false}
-initialState:
-  documentContents: for (int i = 0; i < 5; i++) { for (int i = 0; i < 5; i++) {} }
-  selections:
-    - anchor: {line: 0, character: 59}
-      active: {line: 0, character: 59}
-  marks: {}
-finalState:
-  documentContents: for (int i = 0; i < 5; i++) { for (int i = 0; ; i++) {} }
-  selections:
-    - anchor: {line: 0, character: 46}
-      active: {line: 0, character: 46}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: containingScope, scopeType: condition, includeSiblings: false}, isImplicit: false}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/csharp/chuckTypeSoon.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/csharp/chuckTypeSoon.yml
deleted file mode 100644
index 34c96abfb7..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/csharp/chuckTypeSoon.yml
+++ /dev/null
@@ -1,24 +0,0 @@
-languageId: csharp
-command:
-  version: 1
-  spokenForm: chuck type soon
-  action: remove
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: type, includeSiblings: false}
-      mark: {type: decoratedSymbol, symbolColor: default, character: s}
-initialState:
-  documentContents: String name = "hello";
-  selections:
-    - anchor: {line: 0, character: 22}
-      active: {line: 0, character: 22}
-  marks:
-    default.s:
-      start: {line: 0, character: 0}
-      end: {line: 0, character: 6}
-finalState:
-  documentContents: name = "hello";
-  selections:
-    - anchor: {line: 0, character: 15}
-      active: {line: 0, character: 15}
-fullTargets: [{type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: s}, selectionType: token, position: contents, insideOutsideType: outside, modifier: {type: containingScope, scopeType: type, includeSiblings: false}}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/csharp/chuckTypeSoon2.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/csharp/chuckTypeSoon2.yml
deleted file mode 100644
index a08559d126..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/csharp/chuckTypeSoon2.yml
+++ /dev/null
@@ -1,30 +0,0 @@
-languageId: csharp
-command:
-  version: 1
-  spokenForm: chuck type soon
-  action: remove
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: type, includeSiblings: false}
-      mark: {type: decoratedSymbol, symbolColor: default, character: s}
-initialState:
-  documentContents: |-
-    void myFunk(String value) {
-        
-    }
-  selections:
-    - anchor: {line: 1, character: 4}
-      active: {line: 1, character: 4}
-  marks:
-    default.s:
-      start: {line: 0, character: 12}
-      end: {line: 0, character: 18}
-finalState:
-  documentContents: |-
-    void myFunk(value) {
-        
-    }
-  selections:
-    - anchor: {line: 1, character: 4}
-      active: {line: 1, character: 4}
-fullTargets: [{type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: s}, selectionType: token, position: contents, insideOutsideType: outside, modifier: {type: containingScope, scopeType: type, includeSiblings: false}}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/csharp/chuckValue.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/csharp/chuckValue.yml
deleted file mode 100644
index 9f79b71ba3..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/csharp/chuckValue.yml
+++ /dev/null
@@ -1,82 +0,0 @@
-languageId: csharp
-command:
-  version: 1
-  spokenForm: chuck value
-  action: remove
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: value, includeSiblings: false}
-initialState:
-  documentContents: |-
-    a = 1;
-    a += 1;
-    a -= 1;
-    a *= 1;
-    a /= 1;
-    a %= 1;
-    a &= 1;
-    a |= 1;
-    a ^= 1;
-    a <<= 1;
-    a >>= 1;
-  selections:
-    - anchor: {line: 0, character: 4}
-      active: {line: 0, character: 5}
-    - anchor: {line: 1, character: 5}
-      active: {line: 1, character: 6}
-    - anchor: {line: 2, character: 5}
-      active: {line: 2, character: 6}
-    - anchor: {line: 3, character: 5}
-      active: {line: 3, character: 6}
-    - anchor: {line: 4, character: 5}
-      active: {line: 4, character: 6}
-    - anchor: {line: 5, character: 5}
-      active: {line: 5, character: 6}
-    - anchor: {line: 6, character: 5}
-      active: {line: 6, character: 6}
-    - anchor: {line: 7, character: 5}
-      active: {line: 7, character: 6}
-    - anchor: {line: 8, character: 5}
-      active: {line: 8, character: 6}
-    - anchor: {line: 9, character: 6}
-      active: {line: 9, character: 7}
-    - anchor: {line: 10, character: 6}
-      active: {line: 10, character: 7}
-  marks: {}
-finalState:
-  documentContents: |-
-    a;
-    a;
-    a;
-    a;
-    a;
-    a;
-    a;
-    a;
-    a;
-    a;
-    a;
-  selections:
-    - anchor: {line: 0, character: 1}
-      active: {line: 0, character: 1}
-    - anchor: {line: 1, character: 1}
-      active: {line: 1, character: 1}
-    - anchor: {line: 2, character: 1}
-      active: {line: 2, character: 1}
-    - anchor: {line: 3, character: 1}
-      active: {line: 3, character: 1}
-    - anchor: {line: 4, character: 1}
-      active: {line: 4, character: 1}
-    - anchor: {line: 5, character: 1}
-      active: {line: 5, character: 1}
-    - anchor: {line: 6, character: 1}
-      active: {line: 6, character: 1}
-    - anchor: {line: 7, character: 1}
-      active: {line: 7, character: 1}
-    - anchor: {line: 8, character: 1}
-      active: {line: 8, character: 1}
-    - anchor: {line: 9, character: 1}
-      active: {line: 9, character: 1}
-    - anchor: {line: 10, character: 1}
-      active: {line: 10, character: 1}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: outside, modifier: {type: containingScope, scopeType: value, includeSiblings: false}, isImplicit: false}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/csharp/clearName.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/csharp/clearName.yml
deleted file mode 100644
index 2dad5569b1..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/csharp/clearName.yml
+++ /dev/null
@@ -1,20 +0,0 @@
-languageId: csharp
-command:
-  version: 1
-  spokenForm: clear name
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: name, includeSiblings: false}
-initialState:
-  documentContents: a += "world";
-  selections:
-    - anchor: {line: 0, character: 6}
-      active: {line: 0, character: 6}
-  marks: {}
-finalState:
-  documentContents: " += \"world\";"
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: containingScope, scopeType: name, includeSiblings: false}, isImplicit: false}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/csharp/clearName2.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/csharp/clearName2.yml
deleted file mode 100644
index 5c1d5d3d65..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/csharp/clearName2.yml
+++ /dev/null
@@ -1,20 +0,0 @@
-languageId: csharp
-command:
-  version: 1
-  spokenForm: clear name
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: name, includeSiblings: false}
-initialState:
-  documentContents: String a = "hello";
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-  marks: {}
-finalState:
-  documentContents: String  = "hello";
-  selections:
-    - anchor: {line: 0, character: 7}
-      active: {line: 0, character: 7}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: containingScope, scopeType: name, includeSiblings: false}, isImplicit: false}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/csharp/clearName3.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/csharp/clearName3.yml
deleted file mode 100644
index 79d5cb40f2..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/csharp/clearName3.yml
+++ /dev/null
@@ -1,20 +0,0 @@
-languageId: csharp
-command:
-  version: 1
-  spokenForm: clear name
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: name, includeSiblings: false}
-initialState:
-  documentContents: String a = "hello";
-  selections:
-    - anchor: {line: 0, character: 12}
-      active: {line: 0, character: 12}
-  marks: {}
-finalState:
-  documentContents: String  = "hello";
-  selections:
-    - anchor: {line: 0, character: 7}
-      active: {line: 0, character: 7}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: containingScope, scopeType: name, includeSiblings: false}, isImplicit: false}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/csharp/clearSubject.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/csharp/clearSubject.yml
deleted file mode 100644
index 83b4153635..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/csharp/clearSubject.yml
+++ /dev/null
@@ -1,31 +0,0 @@
-languageId: csharp
-command:
-  version: 3
-  spokenForm: clear subject
-  action: {name: clearAndSetSelection}
-  targets:
-    - type: primitive
-      modifiers:
-        - type: containingScope
-          scopeType: {type: switchStatementSubject}
-  usePrePhraseSnapshot: true
-initialState:
-  documentContents: |-
-    switch (aaa) {
-      default:
-        break;
-    }
-  selections:
-    - anchor: {line: 2, character: 4}
-      active: {line: 2, character: 4}
-  marks: {}
-finalState:
-  documentContents: |-
-    switch () {
-      default:
-        break;
-    }
-  selections:
-    - anchor: {line: 0, character: 8}
-      active: {line: 0, character: 8}
-fullTargets: [{type: primitive, mark: {type: cursor}, modifiers: [{type: containingScope, scopeType: {type: switchStatementSubject}}]}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/csharp/clearSubject2.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/csharp/clearSubject2.yml
deleted file mode 100644
index 1dbc686844..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/csharp/clearSubject2.yml
+++ /dev/null
@@ -1,31 +0,0 @@
-languageId: csharp
-command:
-  version: 3
-  spokenForm: clear subject
-  action: {name: clearAndSetSelection}
-  targets:
-    - type: primitive
-      modifiers:
-        - type: containingScope
-          scopeType: {type: switchStatementSubject}
-  usePrePhraseSnapshot: false
-initialState:
-  documentContents: |-
-    switch (aaa + 1) {
-      default:
-        break;
-    }
-  selections:
-    - anchor: {line: 2, character: 4}
-      active: {line: 2, character: 4}
-  marks: {}
-finalState:
-  documentContents: |-
-    switch () {
-      default:
-        break;
-    }
-  selections:
-    - anchor: {line: 0, character: 8}
-      active: {line: 0, character: 8}
-fullTargets: [{type: primitive, mark: {type: cursor}, modifiers: [{type: containingScope, scopeType: {type: switchStatementSubject}}]}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/csharp/clearValue.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/csharp/clearValue.yml
deleted file mode 100644
index 84032402e0..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/csharp/clearValue.yml
+++ /dev/null
@@ -1,20 +0,0 @@
-languageId: csharp
-command:
-  version: 1
-  spokenForm: clear value
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: value, includeSiblings: false}
-initialState:
-  documentContents: a += "world";
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-  marks: {}
-finalState:
-  documentContents: a += ;
-  selections:
-    - anchor: {line: 0, character: 5}
-      active: {line: 0, character: 5}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: containingScope, scopeType: value, includeSiblings: false}, isImplicit: false}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/csharp/clearValue2.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/csharp/clearValue2.yml
deleted file mode 100644
index 296e559715..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/csharp/clearValue2.yml
+++ /dev/null
@@ -1,20 +0,0 @@
-languageId: csharp
-command:
-  version: 1
-  spokenForm: clear value
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: value, includeSiblings: false}
-initialState:
-  documentContents: String a = "hello";
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-  marks: {}
-finalState:
-  documentContents: String a = ;
-  selections:
-    - anchor: {line: 0, character: 11}
-      active: {line: 0, character: 11}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: containingScope, scopeType: value, includeSiblings: false}, isImplicit: false}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/csharp/clearValue3.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/csharp/clearValue3.yml
deleted file mode 100644
index 942609d1a8..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/csharp/clearValue3.yml
+++ /dev/null
@@ -1,20 +0,0 @@
-languageId: csharp
-command:
-  version: 1
-  spokenForm: clear value
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: value, includeSiblings: false}
-initialState:
-  documentContents: String a = "hello";
-  selections:
-    - anchor: {line: 0, character: 7}
-      active: {line: 0, character: 7}
-  marks: {}
-finalState:
-  documentContents: String a = ;
-  selections:
-    - anchor: {line: 0, character: 11}
-      active: {line: 0, character: 11}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: containingScope, scopeType: value, includeSiblings: false}, isImplicit: false}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/csharp/elseStateWrapThis.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/csharp/elseStateWrapThis.yml
deleted file mode 100644
index d3003f4186..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/csharp/elseStateWrapThis.yml
+++ /dev/null
@@ -1,26 +0,0 @@
-languageId: csharp
-command:
-  version: 1
-  spokenForm: else state wrap this
-  action: wrapWithSnippet
-  targets:
-    - type: primitive
-      mark: {type: cursor}
-  extraArgs: [ifElseStatement.alternative]
-initialState:
-  documentContents: int foo = 0;
-  selections:
-    - anchor: {line: 0, character: 6}
-      active: {line: 0, character: 6}
-  marks: {}
-finalState:
-  documentContents: |-
-    if () {
-        
-    } else {
-        int foo = 0;
-    }
-  selections:
-    - anchor: {line: 0, character: 4}
-      active: {line: 0, character: 4}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: containingScope, scopeType: statement, includeSiblings: false}}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/csharp/ifElseWrapThis.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/csharp/ifElseWrapThis.yml
deleted file mode 100644
index f8f219cd6b..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/csharp/ifElseWrapThis.yml
+++ /dev/null
@@ -1,26 +0,0 @@
-languageId: csharp
-command:
-  version: 1
-  spokenForm: if else wrap this
-  action: wrapWithSnippet
-  targets:
-    - type: primitive
-      mark: {type: cursor}
-  extraArgs: [ifElseStatement.consequence]
-initialState:
-  documentContents: int foo = 0;
-  selections:
-    - anchor: {line: 0, character: 6}
-      active: {line: 0, character: 6}
-  marks: {}
-finalState:
-  documentContents: |-
-    if () {
-        int foo = 0;
-    } else {
-        
-    }
-  selections:
-    - anchor: {line: 0, character: 4}
-      active: {line: 0, character: 4}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: containingScope, scopeType: statement, includeSiblings: false}}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/csharp/ifStateWrapThis.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/csharp/ifStateWrapThis.yml
deleted file mode 100644
index 12ad960724..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/csharp/ifStateWrapThis.yml
+++ /dev/null
@@ -1,24 +0,0 @@
-languageId: csharp
-command:
-  version: 1
-  spokenForm: if state wrap this
-  action: wrapWithSnippet
-  targets:
-    - type: primitive
-      mark: {type: cursor}
-  extraArgs: [ifStatement.consequence]
-initialState:
-  documentContents: int foo = 0;
-  selections:
-    - anchor: {line: 0, character: 6}
-      active: {line: 0, character: 6}
-  marks: {}
-finalState:
-  documentContents: |-
-    if () {
-        int foo = 0;
-    }
-  selections:
-    - anchor: {line: 0, character: 4}
-      active: {line: 0, character: 4}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: containingScope, scopeType: statement, includeSiblings: false}}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/csharp/tryCatchWrapThis.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/csharp/tryCatchWrapThis.yml
deleted file mode 100644
index ab1007a89b..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/csharp/tryCatchWrapThis.yml
+++ /dev/null
@@ -1,26 +0,0 @@
-languageId: csharp
-command:
-  version: 1
-  spokenForm: try catch wrap this
-  action: wrapWithSnippet
-  targets:
-    - type: primitive
-      mark: {type: cursor}
-  extraArgs: [tryCatchStatement.body]
-initialState:
-  documentContents: int foo = 0;
-  selections:
-    - anchor: {line: 0, character: 6}
-      active: {line: 0, character: 6}
-  marks: {}
-finalState:
-  documentContents: |-
-    try {
-        int foo = 0;
-    } catch () {
-        
-    }
-  selections:
-    - anchor: {line: 2, character: 9}
-      active: {line: 2, character: 9}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: containingScope, scopeType: statement, includeSiblings: false}}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/csharp/tryCatchWrapThis2.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/csharp/tryCatchWrapThis2.yml
deleted file mode 100644
index 0c2fe173b1..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/csharp/tryCatchWrapThis2.yml
+++ /dev/null
@@ -1,43 +0,0 @@
-languageId: csharp
-command:
-  version: 1
-  spokenForm: try catch wrap this
-  action: wrapWithSnippet
-  targets:
-    - type: primitive
-      mark: {type: cursor}
-  extraArgs: [tryCatchStatement.body]
-initialState:
-  documentContents: |-
-    if (true) {
-        int foo = 0;
-    }
-
-    int bar = 1;
-  selections:
-    - anchor: {line: 4, character: 0}
-      active: {line: 4, character: 0}
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-  marks: {}
-finalState:
-  documentContents: |-
-    try {
-        if (true) {
-            int foo = 0;
-        }
-    } catch () {
-        
-    }
-
-    try {
-        int bar = 1;
-    } catch () {
-        
-    }
-  selections:
-    - anchor: {line: 10, character: 9}
-      active: {line: 10, character: 9}
-    - anchor: {line: 4, character: 9}
-      active: {line: 4, character: 9}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: containingScope, scopeType: statement, includeSiblings: false}}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/css/changeArgue.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/css/changeArgue.yml
deleted file mode 100644
index 41a01ef885..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/css/changeArgue.yml
+++ /dev/null
@@ -1,28 +0,0 @@
-languageId: css
-command:
-  version: 1
-  spokenForm: change argue
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: argumentOrParameter, includeSiblings: false}
-initialState:
-  documentContents: |-
-
-    .double {
-      transform: translate(-50%, -50%);
-    }
-  selections:
-    - anchor: {line: 2, character: 25}
-      active: {line: 2, character: 25}
-  marks: {}
-finalState:
-  documentContents: |-
-
-    .double {
-      transform: translate(, -50%);
-    }
-  selections:
-    - anchor: {line: 2, character: 23}
-      active: {line: 2, character: 23}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: containingScope, scopeType: argumentOrParameter, includeSiblings: false}, isImplicit: false}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/css/changeArgue2.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/css/changeArgue2.yml
deleted file mode 100644
index f266a9018f..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/css/changeArgue2.yml
+++ /dev/null
@@ -1,26 +0,0 @@
-languageId: css
-command:
-  version: 1
-  spokenForm: change argue
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: argumentOrParameter, includeSiblings: false}
-initialState:
-  documentContents: |-
-    div {
-      background: repeating-linear-gradient(red, orange 50px);
-    }
-  selections:
-    - anchor: {line: 1, character: 47}
-      active: {line: 1, character: 47}
-  marks: {}
-finalState:
-  documentContents: |-
-    div {
-      background: repeating-linear-gradient(red, );
-    }
-  selections:
-    - anchor: {line: 1, character: 45}
-      active: {line: 1, character: 45}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: containingScope, scopeType: argumentOrParameter, includeSiblings: false}, isImplicit: false}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/css/changeArgue3.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/css/changeArgue3.yml
deleted file mode 100644
index 8173e8b19e..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/css/changeArgue3.yml
+++ /dev/null
@@ -1,28 +0,0 @@
-languageId: css
-command:
-  version: 1
-  spokenForm: change argue
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: argumentOrParameter, includeSiblings: false}
-initialState:
-  documentContents: |-
-    a {
-      clip-path: polygon(50% 0%, 60% 40%, 100% 50%, 60% 60%, 50% 100%, 40% 60%, 0% 50%, 40% 40%);
-    }
-     
-  selections:
-    - anchor: {line: 1, character: 27}
-      active: {line: 1, character: 27}
-  marks: {}
-finalState:
-  documentContents: |-
-    a {
-      clip-path: polygon(, 60% 40%, 100% 50%, 60% 60%, 50% 100%, 40% 60%, 0% 50%, 40% 40%);
-    }
-     
-  selections:
-    - anchor: {line: 1, character: 21}
-      active: {line: 1, character: 21}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: containingScope, scopeType: argumentOrParameter, includeSiblings: false}, isImplicit: false}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/css/changeArgue4.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/css/changeArgue4.yml
deleted file mode 100644
index a5faf319cf..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/css/changeArgue4.yml
+++ /dev/null
@@ -1,26 +0,0 @@
-languageId: css
-command:
-  version: 1
-  spokenForm: change argue
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: argumentOrParameter, includeSiblings: false}
-initialState:
-  documentContents: |-
-    a {
-      clip-path: ellipse(115px 55px at 50% 40%);
-    }
-  selections:
-    - anchor: {line: 1, character: 39}
-      active: {line: 1, character: 39}
-  marks: {}
-finalState:
-  documentContents: |-
-    a {
-      clip-path: ellipse(115px 55px at );
-    }
-  selections:
-    - anchor: {line: 1, character: 35}
-      active: {line: 1, character: 35}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: containingScope, scopeType: argumentOrParameter, includeSiblings: false}, isImplicit: false}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/css/changeArgue5.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/css/changeArgue5.yml
deleted file mode 100644
index 19a9935fc5..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/css/changeArgue5.yml
+++ /dev/null
@@ -1,26 +0,0 @@
-languageId: css
-command:
-  version: 1
-  spokenForm: change argue
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: argumentOrParameter, includeSiblings: false}
-initialState:
-  documentContents: |-
-    a {
-      clip-path: ellipse(115px 55px at 50% 40%);
-    }
-  selections:
-    - anchor: {line: 1, character: 25}
-      active: {line: 1, character: 25}
-  marks: {}
-finalState:
-  documentContents: |-
-    a {
-      clip-path: ellipse( at 50% 40%);
-    }
-  selections:
-    - anchor: {line: 1, character: 21}
-      active: {line: 1, character: 21}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: containingScope, scopeType: argumentOrParameter, includeSiblings: false}, isImplicit: false}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/css/changeComment.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/css/changeComment.yml
deleted file mode 100644
index c4d6d98adb..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/css/changeComment.yml
+++ /dev/null
@@ -1,23 +0,0 @@
-languageId: css
-command:
-  version: 1
-  spokenForm: change comment
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: comment, includeSiblings: false}
-initialState:
-  documentContents: |-
-    /*
-      hello
-    */
-  selections:
-    - anchor: {line: 1, character: 7}
-      active: {line: 1, character: 7}
-  marks: {}
-finalState:
-  documentContents: ""
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: containingScope, scopeType: comment, includeSiblings: false}, isImplicit: false}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/css/changeEveryArgue.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/css/changeEveryArgue.yml
deleted file mode 100644
index 0fbc843e28..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/css/changeEveryArgue.yml
+++ /dev/null
@@ -1,30 +0,0 @@
-languageId: css
-command:
-  version: 1
-  spokenForm: change every argue
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: argumentOrParameter, includeSiblings: true}
-initialState:
-  documentContents: |-
-
-    .double {
-      transform: translate(-50%, -50%);
-    }
-  selections:
-    - anchor: {line: 2, character: 25}
-      active: {line: 2, character: 25}
-  marks: {}
-finalState:
-  documentContents: |-
-
-    .double {
-      transform: translate(, );
-    }
-  selections:
-    - anchor: {line: 2, character: 23}
-      active: {line: 2, character: 23}
-    - anchor: {line: 2, character: 25}
-      active: {line: 2, character: 25}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: containingScope, scopeType: argumentOrParameter, includeSiblings: true}, isImplicit: false}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/css/changeEveryArgue2.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/css/changeEveryArgue2.yml
deleted file mode 100644
index feb40e8565..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/css/changeEveryArgue2.yml
+++ /dev/null
@@ -1,30 +0,0 @@
-languageId: css
-command:
-  version: 1
-  spokenForm: change every argue
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: argumentOrParameter, includeSiblings: true}
-initialState:
-  documentContents: |-
-    div {
-      background: repeating-linear-gradient(red, orange 50px);
-      clip-path: polygon(50% 0%, 60% 40%, 100% 50%, 60% 60%, 50% 100%, 40% 60%, 0% 50%, 40% 40%);
-    }
-  selections:
-    - anchor: {line: 1, character: 50}
-      active: {line: 1, character: 50}
-  marks: {}
-finalState:
-  documentContents: |-
-    div {
-      background: repeating-linear-gradient(, );
-      clip-path: polygon(50% 0%, 60% 40%, 100% 50%, 60% 60%, 50% 100%, 40% 60%, 0% 50%, 40% 40%);
-    }
-  selections:
-    - anchor: {line: 1, character: 40}
-      active: {line: 1, character: 40}
-    - anchor: {line: 1, character: 42}
-      active: {line: 1, character: 42}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: containingScope, scopeType: argumentOrParameter, includeSiblings: true}, isImplicit: false}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/css/changeEveryArgue3.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/css/changeEveryArgue3.yml
deleted file mode 100644
index f228a48edc..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/css/changeEveryArgue3.yml
+++ /dev/null
@@ -1,32 +0,0 @@
-languageId: css
-command:
-  version: 1
-  spokenForm: change every argue
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: argumentOrParameter, includeSiblings: true}
-initialState:
-  documentContents: |-
-    a {
-      width: calc(100% - 80px);
-      clip-path: ellipse(115px 55px at 50% 40%);
-    }
-     
-  selections:
-    - anchor: {line: 2, character: 25}
-      active: {line: 2, character: 25}
-  marks: {}
-finalState:
-  documentContents: |-
-    a {
-      width: calc(100% - 80px);
-      clip-path: ellipse( at );
-    }
-     
-  selections:
-    - anchor: {line: 2, character: 21}
-      active: {line: 2, character: 21}
-    - anchor: {line: 2, character: 25}
-      active: {line: 2, character: 25}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: containingScope, scopeType: argumentOrParameter, includeSiblings: true}, isImplicit: false}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/css/changeItem.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/css/changeItem.yml
deleted file mode 100644
index fe71464f19..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/css/changeItem.yml
+++ /dev/null
@@ -1,26 +0,0 @@
-languageId: css
-command:
-  version: 1
-  spokenForm: change item
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: collectionItem, includeSiblings: false}
-initialState:
-  documentContents: |-
-    a {
-      width: calc(100% - 80px);
-    }
-  selections:
-    - anchor: {line: 1, character: 12}
-      active: {line: 1, character: 12}
-  marks: {}
-finalState:
-  documentContents: |-
-    a {
-      
-    }
-  selections:
-    - anchor: {line: 1, character: 2}
-      active: {line: 1, character: 2}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: containingScope, scopeType: collectionItem, includeSiblings: false}, isImplicit: false}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/css/changeKey.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/css/changeKey.yml
deleted file mode 100644
index 356be8a93f..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/css/changeKey.yml
+++ /dev/null
@@ -1,26 +0,0 @@
-languageId: css
-command:
-  version: 1
-  spokenForm: change key
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: collectionKey, includeSiblings: false}
-initialState:
-  documentContents: |
-    span[hello="Cleveland"][goodbye="Columbus"] { 
-      color: blue; 
-    }
-  selections:
-    - anchor: {line: 1, character: 4}
-      active: {line: 1, character: 4}
-  marks: {}
-finalState:
-  documentContents: |
-    span[hello="Cleveland"][goodbye="Columbus"] { 
-      : blue; 
-    }
-  selections:
-    - anchor: {line: 1, character: 2}
-      active: {line: 1, character: 2}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: containingScope, scopeType: collectionKey, includeSiblings: false}, isImplicit: false}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/css/changeKey2.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/css/changeKey2.yml
deleted file mode 100644
index 6fd4e94fdf..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/css/changeKey2.yml
+++ /dev/null
@@ -1,26 +0,0 @@
-languageId: css
-command:
-  version: 1
-  spokenForm: change key
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: collectionKey, includeSiblings: false}
-initialState:
-  documentContents: |-
-    span[hello="Cleveland"][goodbye="Columbus"] { 
-      color: blue; 
-    }
-  selections:
-    - anchor: {line: 1, character: 12}
-      active: {line: 1, character: 12}
-  marks: {}
-finalState:
-  documentContents: |-
-    span[hello="Cleveland"][goodbye="Columbus"] { 
-      : blue; 
-    }
-  selections:
-    - anchor: {line: 1, character: 2}
-      active: {line: 1, character: 2}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: containingScope, scopeType: collectionKey, includeSiblings: false}, isImplicit: false}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/css/changeName.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/css/changeName.yml
deleted file mode 100644
index 05f08e5732..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/css/changeName.yml
+++ /dev/null
@@ -1,28 +0,0 @@
-languageId: css
-command:
-  version: 1
-  spokenForm: change name
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: name, includeSiblings: false}
-initialState:
-  documentContents: |-
-    a {
-      height: 10px;
-      color: red;
-    }
-  selections:
-    - anchor: {line: 1, character: 12}
-      active: {line: 1, character: 12}
-  marks: {}
-finalState:
-  documentContents: |-
-    a {
-      : 10px;
-      color: red;
-    }
-  selections:
-    - anchor: {line: 1, character: 2}
-      active: {line: 1, character: 2}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: containingScope, scopeType: name, includeSiblings: false}, isImplicit: false}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/css/changeName2.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/css/changeName2.yml
deleted file mode 100644
index 81c9693791..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/css/changeName2.yml
+++ /dev/null
@@ -1,26 +0,0 @@
-languageId: css
-command:
-  version: 1
-  spokenForm: change name
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: name, includeSiblings: false}
-initialState:
-  documentContents: |-
-    a {
-      height: 10px;
-    }
-  selections:
-    - anchor: {line: 1, character: 4}
-      active: {line: 1, character: 4}
-  marks: {}
-finalState:
-  documentContents: |-
-    a {
-      : 10px;
-    }
-  selections:
-    - anchor: {line: 1, character: 2}
-      active: {line: 1, character: 2}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: containingScope, scopeType: name, includeSiblings: false}, isImplicit: false}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/css/changeName3.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/css/changeName3.yml
deleted file mode 100644
index 0bc8616f8c..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/css/changeName3.yml
+++ /dev/null
@@ -1,26 +0,0 @@
-languageId: css
-command:
-  version: 1
-  spokenForm: change name
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: name, includeSiblings: false}
-initialState:
-  documentContents: |
-    a {
-      margin: 10px 10px 10px 10px;
-    }
-  selections:
-    - anchor: {line: 1, character: 14}
-      active: {line: 1, character: 14}
-  marks: {}
-finalState:
-  documentContents: |
-    a {
-      : 10px 10px 10px 10px;
-    }
-  selections:
-    - anchor: {line: 1, character: 2}
-      active: {line: 1, character: 2}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: containingScope, scopeType: name, includeSiblings: false}, isImplicit: false}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/css/changeName6.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/css/changeName6.yml
deleted file mode 100644
index 480322f50e..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/css/changeName6.yml
+++ /dev/null
@@ -1,26 +0,0 @@
-languageId: css
-command:
-  version: 1
-  spokenForm: change name
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: name, includeSiblings: false}
-initialState:
-  documentContents: |-
-    a[data-lang^="tel"] {
-      color: rgba(0, 255, 0, 0.5);
-    }
-  selections:
-    - anchor: {line: 0, character: 15}
-      active: {line: 0, character: 15}
-  marks: {}
-finalState:
-  documentContents: |-
-    a[^="tel"] {
-      color: rgba(0, 255, 0, 0.5);
-    }
-  selections:
-    - anchor: {line: 0, character: 2}
-      active: {line: 0, character: 2}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: containingScope, scopeType: name, includeSiblings: false}, isImplicit: false}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/css/changeRound.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/css/changeRound.yml
deleted file mode 100644
index 8d748c7239..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/css/changeRound.yml
+++ /dev/null
@@ -1,26 +0,0 @@
-languageId: css
-command:
-  version: 1
-  spokenForm: change round
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: surroundingPair, delimiter: parentheses}
-initialState:
-  documentContents: |-
-    a {
-      font-family: "hello (world)";
-    }
-  selections:
-    - anchor: {line: 1, character: 25}
-      active: {line: 1, character: 25}
-  marks: {}
-finalState:
-  documentContents: |-
-    a {
-      font-family: "hello ";
-    }
-  selections:
-    - anchor: {line: 1, character: 22}
-      active: {line: 1, character: 22}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: surroundingPair, delimiter: parentheses}, isImplicit: false}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/css/changeSelector.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/css/changeSelector.yml
deleted file mode 100644
index 912c76d72f..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/css/changeSelector.yml
+++ /dev/null
@@ -1,26 +0,0 @@
-languageId: css
-command:
-  version: 1
-  spokenForm: change selector
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: selector, includeSiblings: false}
-initialState:
-  documentContents: |
-    span[hello="Cleveland"][goodbye="Columbus"] { 
-      color: blue; 
-    }
-  selections:
-    - anchor: {line: 1, character: 4}
-      active: {line: 1, character: 4}
-  marks: {}
-finalState:
-  documentContents: |2
-     { 
-      color: blue; 
-    }
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: containingScope, scopeType: selector, includeSiblings: false}, isImplicit: false}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/css/changeSelector2.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/css/changeSelector2.yml
deleted file mode 100644
index 0a5bc1da78..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/css/changeSelector2.yml
+++ /dev/null
@@ -1,26 +0,0 @@
-languageId: css
-command:
-  version: 1
-  spokenForm: change selector
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: selector, includeSiblings: false}
-initialState:
-  documentContents: |-
-    a.b ~ c.d {
-      
-    }
-  selections:
-    - anchor: {line: 1, character: 2}
-      active: {line: 1, character: 2}
-  marks: {}
-finalState:
-  documentContents: |2-
-     {
-      
-    }
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: containingScope, scopeType: selector, includeSiblings: false}, isImplicit: false}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/css/changeSelector3.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/css/changeSelector3.yml
deleted file mode 100644
index abd39153ec..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/css/changeSelector3.yml
+++ /dev/null
@@ -1,26 +0,0 @@
-languageId: css
-command:
-  version: 1
-  spokenForm: change selector
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: selector, includeSiblings: false}
-initialState:
-  documentContents: |
-    #header.callout {
-      
-    }
-  selections:
-    - anchor: {line: 1, character: 2}
-      active: {line: 1, character: 2}
-  marks: {}
-finalState:
-  documentContents: |2
-     {
-      
-    }
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: containingScope, scopeType: selector, includeSiblings: false}, isImplicit: false}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/css/changeSelector4.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/css/changeSelector4.yml
deleted file mode 100644
index 7583797f9f..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/css/changeSelector4.yml
+++ /dev/null
@@ -1,26 +0,0 @@
-languageId: css
-command:
-  version: 1
-  spokenForm: change selector
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: selector, includeSiblings: false}
-initialState:
-  documentContents: |-
-    #header .callout {
-
-    }
-  selections:
-    - anchor: {line: 1, character: 0}
-      active: {line: 1, character: 0}
-  marks: {}
-finalState:
-  documentContents: |2-
-     {
-
-    }
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: containingScope, scopeType: selector, includeSiblings: false}, isImplicit: false}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/css/changeSelector5.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/css/changeSelector5.yml
deleted file mode 100644
index 94d24a6bd1..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/css/changeSelector5.yml
+++ /dev/null
@@ -1,26 +0,0 @@
-languageId: css
-command:
-  version: 1
-  spokenForm: change selector
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: selector, includeSiblings: false}
-initialState:
-  documentContents: |-
-    span[hello="Cleveland"][goodbye="Columbus"] {
-      color: blue;
-    }
-  selections:
-    - anchor: {line: 1, character: 12}
-      active: {line: 1, character: 12}
-  marks: {}
-finalState:
-  documentContents: |2-
-     {
-      color: blue;
-    }
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: containingScope, scopeType: selector, includeSiblings: false}, isImplicit: false}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/css/changeState.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/css/changeState.yml
deleted file mode 100644
index 422ee93e80..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/css/changeState.yml
+++ /dev/null
@@ -1,22 +0,0 @@
-languageId: css
-command:
-  version: 1
-  spokenForm: change state
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: statement, includeSiblings: false}
-initialState:
-  documentContents: |
-    @import "subs.css";
-  selections:
-    - anchor: {line: 0, character: 11}
-      active: {line: 0, character: 11}
-  marks: {}
-finalState:
-  documentContents: |+
-
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: containingScope, scopeType: statement, includeSiblings: false}, isImplicit: false}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/css/changeState5.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/css/changeState5.yml
deleted file mode 100644
index 749aca381a..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/css/changeState5.yml
+++ /dev/null
@@ -1,23 +0,0 @@
-languageId: css
-command:
-  version: 1
-  spokenForm: change state
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: statement, includeSiblings: false}
-initialState:
-  documentContents: |-
-    a {
-      width: calc(100% - 80px);
-    }
-  selections:
-    - anchor: {line: 1, character: 12}
-      active: {line: 1, character: 12}
-  marks: {}
-finalState:
-  documentContents: ""
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: containingScope, scopeType: statement, includeSiblings: false}, isImplicit: false}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/css/changeStateAir.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/css/changeStateAir.yml
deleted file mode 100644
index f33a622949..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/css/changeStateAir.yml
+++ /dev/null
@@ -1,28 +0,0 @@
-languageId: css
-command:
-  version: 1
-  spokenForm: change state air
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: statement, includeSiblings: false}
-      mark: {type: decoratedSymbol, symbolColor: default, character: a}
-initialState:
-  documentContents: |-
-    a {
-      height: 10px;
-      color: red;
-    }
-  selections:
-    - anchor: {line: 0, character: 3}
-      active: {line: 0, character: 3}
-  marks:
-    default.a:
-      start: {line: 0, character: 0}
-      end: {line: 0, character: 1}
-finalState:
-  documentContents: ""
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-fullTargets: [{type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: a}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: containingScope, scopeType: statement, includeSiblings: false}, isImplicit: false}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/css/changeStateHarp.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/css/changeStateHarp.yml
deleted file mode 100644
index 87fc04416c..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/css/changeStateHarp.yml
+++ /dev/null
@@ -1,28 +0,0 @@
-languageId: css
-command:
-  version: 1
-  spokenForm: change state harp
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: statement, includeSiblings: false}
-      mark: {type: decoratedSymbol, symbolColor: default, character: h}
-initialState:
-  documentContents: |-
-    a .child-selector {
-      height: 10px;
-      color: red;
-    }
-  selections:
-    - anchor: {line: 2, character: 13}
-      active: {line: 2, character: 13}
-  marks:
-    default.h:
-      start: {line: 0, character: 3}
-      end: {line: 0, character: 17}
-finalState:
-  documentContents: ""
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-fullTargets: [{type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: h}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: containingScope, scopeType: statement, includeSiblings: false}, isImplicit: false}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/css/changeValue.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/css/changeValue.yml
deleted file mode 100644
index e17f2fc265..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/css/changeValue.yml
+++ /dev/null
@@ -1,22 +0,0 @@
-languageId: css
-command:
-  version: 1
-  spokenForm: change value
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: value, includeSiblings: false}
-initialState:
-  documentContents: |
-    @import "subs.css";
-  selections:
-    - anchor: {line: 0, character: 10}
-      active: {line: 0, character: 10}
-  marks: {}
-finalState:
-  documentContents: |
-    @import ;
-  selections:
-    - anchor: {line: 0, character: 8}
-      active: {line: 0, character: 8}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: containingScope, scopeType: value, includeSiblings: false}, isImplicit: false}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/css/changeValue2.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/css/changeValue2.yml
deleted file mode 100644
index 440f2e1bb3..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/css/changeValue2.yml
+++ /dev/null
@@ -1,28 +0,0 @@
-languageId: css
-command:
-  version: 1
-  spokenForm: change value
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: value, includeSiblings: false}
-initialState:
-  documentContents: |-
-    a {
-      height: 10px;
-      color: red;
-    }
-  selections:
-    - anchor: {line: 1, character: 12}
-      active: {line: 1, character: 12}
-  marks: {}
-finalState:
-  documentContents: |-
-    a {
-      height: ;
-      color: red;
-    }
-  selections:
-    - anchor: {line: 1, character: 10}
-      active: {line: 1, character: 10}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: containingScope, scopeType: value, includeSiblings: false}, isImplicit: false}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/css/changeValue4.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/css/changeValue4.yml
deleted file mode 100644
index bcee58215d..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/css/changeValue4.yml
+++ /dev/null
@@ -1,26 +0,0 @@
-languageId: css
-command:
-  version: 1
-  spokenForm: change value
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: value, includeSiblings: false}
-initialState:
-  documentContents: |
-    a {
-      margin: 10px 10px 10px 10px;
-    }
-  selections:
-    - anchor: {line: 1, character: 4}
-      active: {line: 1, character: 4}
-  marks: {}
-finalState:
-  documentContents: |
-    a {
-      margin: ;
-    }
-  selections:
-    - anchor: {line: 1, character: 10}
-      active: {line: 1, character: 10}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: containingScope, scopeType: value, includeSiblings: false}, isImplicit: false}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/css/changeValue6.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/css/changeValue6.yml
deleted file mode 100644
index 8f6d9626f6..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/css/changeValue6.yml
+++ /dev/null
@@ -1,26 +0,0 @@
-languageId: css
-command:
-  version: 1
-  spokenForm: change value
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: value, includeSiblings: false}
-initialState:
-  documentContents: |
-    a {
-      background-image: url("/icons/mail.svg");
-    }
-  selections:
-    - anchor: {line: 1, character: 35}
-      active: {line: 1, character: 35}
-  marks: {}
-finalState:
-  documentContents: |
-    a {
-      background-image: ;
-    }
-  selections:
-    - anchor: {line: 1, character: 20}
-      active: {line: 1, character: 20}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: containingScope, scopeType: value, includeSiblings: false}, isImplicit: false}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/css/changeValue9.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/css/changeValue9.yml
deleted file mode 100644
index 1e0a1f8f57..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/css/changeValue9.yml
+++ /dev/null
@@ -1,26 +0,0 @@
-languageId: css
-command:
-  version: 1
-  spokenForm: change value
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: value, includeSiblings: false}
-initialState:
-  documentContents: |-
-    a[data-lang^="tel"] {
-      color: rgba(0, 255, 0, 0.5);
-    }
-  selections:
-    - anchor: {line: 0, character: 16}
-      active: {line: 0, character: 16}
-  marks: {}
-finalState:
-  documentContents: |-
-    a[data-lang^=] {
-      color: rgba(0, 255, 0, 0.5);
-    }
-  selections:
-    - anchor: {line: 0, character: 13}
-      active: {line: 0, character: 13}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: containingScope, scopeType: value, includeSiblings: false}, isImplicit: false}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/css/chuckArgue.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/css/chuckArgue.yml
deleted file mode 100644
index 144d4ad67c..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/css/chuckArgue.yml
+++ /dev/null
@@ -1,26 +0,0 @@
-languageId: css
-command:
-  version: 1
-  spokenForm: chuck argue
-  action: remove
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: argumentOrParameter, includeSiblings: false}
-initialState:
-  documentContents: |-
-    div {
-      background: repeating-linear-gradient(red, orange 50px);
-    }
-  selections:
-    - anchor: {line: 1, character: 46}
-      active: {line: 1, character: 46}
-  marks: {}
-finalState:
-  documentContents: |-
-    div {
-      background: repeating-linear-gradient(red);
-    }
-  selections:
-    - anchor: {line: 1, character: 43}
-      active: {line: 1, character: 43}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: outside, modifier: {type: containingScope, scopeType: argumentOrParameter, includeSiblings: false}, isImplicit: false}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/css/chuckArgue2.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/css/chuckArgue2.yml
deleted file mode 100644
index ab9547be97..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/css/chuckArgue2.yml
+++ /dev/null
@@ -1,26 +0,0 @@
-languageId: css
-command:
-  version: 1
-  spokenForm: chuck argue
-  action: remove
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: argumentOrParameter, includeSiblings: false}
-initialState:
-  documentContents: |-
-    div {
-      clip-path: polygon(50% 0%, 60% 40%, 100% 50%, 60% 60%, 50% 100%, 40% 60%, 0% 50%, 40% 40%);
-    }
-  selections:
-    - anchor: {line: 1, character: 22}
-      active: {line: 1, character: 22}
-  marks: {}
-finalState:
-  documentContents: |-
-    div {
-      clip-path: polygon(60% 40%, 100% 50%, 60% 60%, 50% 100%, 40% 60%, 0% 50%, 40% 40%);
-    }
-  selections:
-    - anchor: {line: 1, character: 21}
-      active: {line: 1, character: 21}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: outside, modifier: {type: containingScope, scopeType: argumentOrParameter, includeSiblings: false}, isImplicit: false}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/css/chuckArgue3.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/css/chuckArgue3.yml
deleted file mode 100644
index ef21e16453..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/css/chuckArgue3.yml
+++ /dev/null
@@ -1,26 +0,0 @@
-languageId: css
-command:
-  version: 1
-  spokenForm: chuck argue
-  action: remove
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: argumentOrParameter, includeSiblings: false}
-initialState:
-  documentContents: |-
-    a {
-      width: calc(100% - 80px);
-    }
-  selections:
-    - anchor: {line: 1, character: 23}
-      active: {line: 1, character: 23}
-  marks: {}
-finalState:
-  documentContents: |-
-    a {
-      width: calc();
-    }
-  selections:
-    - anchor: {line: 1, character: 14}
-      active: {line: 1, character: 14}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: outside, modifier: {type: containingScope, scopeType: argumentOrParameter, includeSiblings: false}, isImplicit: false}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/css/chuckArgue4.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/css/chuckArgue4.yml
deleted file mode 100644
index d46f4b687b..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/css/chuckArgue4.yml
+++ /dev/null
@@ -1,26 +0,0 @@
-languageId: css
-command:
-  version: 1
-  spokenForm: chuck argue
-  action: remove
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: argumentOrParameter, includeSiblings: false}
-initialState:
-  documentContents: |-
-    a {
-      clip-path: ellipse(115px 55px at 50% 40%);
-    }
-  selections:
-    - anchor: {line: 1, character: 24}
-      active: {line: 1, character: 24}
-  marks: {}
-finalState:
-  documentContents: |-
-    a {
-      clip-path: ellipse(50% 40%);
-    }
-  selections:
-    - anchor: {line: 1, character: 21}
-      active: {line: 1, character: 21}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: outside, modifier: {type: containingScope, scopeType: argumentOrParameter, includeSiblings: false}, isImplicit: false}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/css/chuckArgue5.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/css/chuckArgue5.yml
deleted file mode 100644
index 11f8800dd4..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/css/chuckArgue5.yml
+++ /dev/null
@@ -1,26 +0,0 @@
-languageId: css
-command:
-  version: 1
-  spokenForm: chuck argue
-  action: remove
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: argumentOrParameter, includeSiblings: false}
-initialState:
-  documentContents: |-
-    .micro {
-      width: sum(50px, 30px, 100px);
-    }
-  selections:
-    - anchor: {line: 1, character: 14}
-      active: {line: 1, character: 14}
-  marks: {}
-finalState:
-  documentContents: |-
-    .micro {
-      width: sum(30px, 100px);
-    }
-  selections:
-    - anchor: {line: 1, character: 13}
-      active: {line: 1, character: 13}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: outside, modifier: {type: containingScope, scopeType: argumentOrParameter, includeSiblings: false}, isImplicit: false}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/css/chuckArgue6.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/css/chuckArgue6.yml
deleted file mode 100644
index 91a5237918..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/css/chuckArgue6.yml
+++ /dev/null
@@ -1,26 +0,0 @@
-languageId: css
-command:
-  version: 1
-  spokenForm: chuck argue
-  action: remove
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: argumentOrParameter, includeSiblings: false}
-initialState:
-  documentContents: |-
-    .micro {
-      width: sum(50px, 30px, 100px);
-    }
-  selections:
-    - anchor: {line: 1, character: 27}
-      active: {line: 1, character: 27}
-  marks: {}
-finalState:
-  documentContents: |-
-    .micro {
-      width: sum(50px, 30px);
-    }
-  selections:
-    - anchor: {line: 1, character: 23}
-      active: {line: 1, character: 23}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: outside, modifier: {type: containingScope, scopeType: argumentOrParameter, includeSiblings: false}, isImplicit: false}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/css/chuckArgue7.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/css/chuckArgue7.yml
deleted file mode 100644
index 844718f808..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/css/chuckArgue7.yml
+++ /dev/null
@@ -1,26 +0,0 @@
-languageId: css
-command:
-  version: 1
-  spokenForm: chuck argue
-  action: remove
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: argumentOrParameter, includeSiblings: false}
-initialState:
-  documentContents: |-
-    div {
-      clip-path: polygon(50% 0%, 60% 40%, 100% 50%, 60% 60%, 50% 100%, 40% 60%, 0% 50%, 40% 40%);
-    }
-  selections:
-    - anchor: {line: 1, character: 85}
-      active: {line: 1, character: 85}
-  marks: {}
-finalState:
-  documentContents: |-
-    div {
-      clip-path: polygon(50% 0%, 60% 40%, 100% 50%, 60% 60%, 50% 100%, 40% 60%, 0% 50%);
-    }
-  selections:
-    - anchor: {line: 1, character: 82}
-      active: {line: 1, character: 82}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: outside, modifier: {type: containingScope, scopeType: argumentOrParameter, includeSiblings: false}, isImplicit: false}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/css/chuckArgue8.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/css/chuckArgue8.yml
deleted file mode 100644
index 4e71a3f98d..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/css/chuckArgue8.yml
+++ /dev/null
@@ -1,26 +0,0 @@
-languageId: css
-command:
-  version: 1
-  spokenForm: chuck argue
-  action: remove
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: argumentOrParameter, includeSiblings: false}
-initialState:
-  documentContents: |-
-    a {
-      clip-path: ellipse(115px 55px at 50% 40%);
-    }
-  selections:
-    - anchor: {line: 1, character: 41}
-      active: {line: 1, character: 41}
-  marks: {}
-finalState:
-  documentContents: |-
-    a {
-      clip-path: ellipse(115px 55px);
-    }
-  selections:
-    - anchor: {line: 1, character: 31}
-      active: {line: 1, character: 31}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: outside, modifier: {type: containingScope, scopeType: argumentOrParameter, includeSiblings: false}, isImplicit: false}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/css/chuckEveryArgue2.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/css/chuckEveryArgue2.yml
deleted file mode 100644
index eab16fbb2a..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/css/chuckEveryArgue2.yml
+++ /dev/null
@@ -1,26 +0,0 @@
-languageId: css
-command:
-  version: 1
-  spokenForm: chuck every argue
-  action: remove
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: argumentOrParameter, includeSiblings: true}
-initialState:
-  documentContents: |-
-    a {
-      clip-path: ellipse(115px 55px at 50% 40%);
-    }
-  selections:
-    - anchor: {line: 1, character: 36}
-      active: {line: 1, character: 36}
-  marks: {}
-finalState:
-  documentContents: |-
-    a {
-      clip-path: ellipse();
-    }
-  selections:
-    - anchor: {line: 1, character: 21}
-      active: {line: 1, character: 21}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: outside, modifier: {type: containingScope, scopeType: argumentOrParameter, includeSiblings: true}, isImplicit: false}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/css/chuckState.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/css/chuckState.yml
deleted file mode 100644
index 4c2008644f..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/css/chuckState.yml
+++ /dev/null
@@ -1,20 +0,0 @@
-languageId: css
-command:
-  version: 1
-  spokenForm: chuck state
-  action: remove
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: statement, includeSiblings: false}
-initialState:
-  documentContents: "@namespace prefix \"XML-namespace-URL\";"
-  selections:
-    - anchor: {line: 0, character: 15}
-      active: {line: 0, character: 15}
-  marks: {}
-finalState:
-  documentContents: ""
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: outside, modifier: {type: containingScope, scopeType: statement, includeSiblings: false}, isImplicit: false}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/css/chuckState2.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/css/chuckState2.yml
deleted file mode 100644
index 2e3daf0083..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/css/chuckState2.yml
+++ /dev/null
@@ -1,26 +0,0 @@
-languageId: css
-command:
-  version: 1
-  spokenForm: chuck state
-  action: remove
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: statement, includeSiblings: false}
-initialState:
-  documentContents: |
-    @keyframes important1 {
-      from { margin-top: 50px; }
-      50%  { margin-top: 150px !important; } /* ignored */
-      to   { margin-top: 100px; }
-    }
-  selections:
-    - anchor: {line: 0, character: 2}
-      active: {line: 0, character: 2}
-  marks: {}
-finalState:
-  documentContents: |+
-
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: outside, modifier: {type: containingScope, scopeType: statement, includeSiblings: false}, isImplicit: false}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/css/chuckValue.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/css/chuckValue.yml
deleted file mode 100644
index def390107f..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/css/chuckValue.yml
+++ /dev/null
@@ -1,20 +0,0 @@
-languageId: css
-command:
-  version: 1
-  spokenForm: chuck value
-  action: remove
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: value, includeSiblings: false}
-initialState:
-  documentContents: "@namespace prefix \"XML-namespace-URL\";"
-  selections:
-    - anchor: {line: 0, character: 16}
-      active: {line: 0, character: 16}
-  marks: {}
-finalState:
-  documentContents: "@namespace;"
-  selections:
-    - anchor: {line: 0, character: 10}
-      active: {line: 0, character: 10}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: outside, modifier: {type: containingScope, scopeType: value, includeSiblings: false}, isImplicit: false}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/css/chuckValue2.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/css/chuckValue2.yml
deleted file mode 100644
index 860fd1957f..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/css/chuckValue2.yml
+++ /dev/null
@@ -1,20 +0,0 @@
-languageId: css
-command:
-  version: 1
-  spokenForm: chuck value
-  action: remove
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: value, includeSiblings: false}
-initialState:
-  documentContents: "@namespace url(http://www.w3.org/1999/xhtml);"
-  selections:
-    - anchor: {line: 0, character: 6}
-      active: {line: 0, character: 6}
-  marks: {}
-finalState:
-  documentContents: "@namespace;"
-  selections:
-    - anchor: {line: 0, character: 6}
-      active: {line: 0, character: 6}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: outside, modifier: {type: containingScope, scopeType: value, includeSiblings: false}, isImplicit: false}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/css/chuckValue3.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/css/chuckValue3.yml
deleted file mode 100644
index 3be3385339..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/css/chuckValue3.yml
+++ /dev/null
@@ -1,26 +0,0 @@
-languageId: css
-command:
-  version: 1
-  spokenForm: chuck value
-  action: remove
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: value, includeSiblings: false}
-initialState:
-  documentContents: |
-    a { 
-      margin-top: 150px !important; 
-    }
-  selections:
-    - anchor: {line: 1, character: 7}
-      active: {line: 1, character: 7}
-  marks: {}
-finalState:
-  documentContents: |
-    a { 
-      margin-top:; 
-    }
-  selections:
-    - anchor: {line: 1, character: 7}
-      active: {line: 1, character: 7}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: outside, modifier: {type: containingScope, scopeType: value, includeSiblings: false}, isImplicit: false}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/css/clearUnit.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/css/clearUnit.yml
deleted file mode 100644
index 4b907020dd..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/css/clearUnit.yml
+++ /dev/null
@@ -1,29 +0,0 @@
-languageId: css
-command:
-  spokenForm: clear unit
-  version: 3
-  targets:
-    - type: primitive
-      modifiers:
-        - type: containingScope
-          scopeType: {type: unit}
-  usePrePhraseSnapshot: true
-  action: {name: clearAndSetSelection}
-initialState:
-  documentContents: |-
-    div {
-        padding: 25px 50px 75px 100px;
-    }
-  selections:
-    - anchor: {line: 1, character: 16}
-      active: {line: 1, character: 16}
-  marks: {}
-finalState:
-  documentContents: |-
-    div {
-        padding: 25 50px 75px 100px;
-    }
-  selections:
-    - anchor: {line: 1, character: 15}
-      active: {line: 1, character: 15}
-fullTargets: [{type: primitive, mark: {type: cursor}, modifiers: [{type: containingScope, scopeType: {type: unit}}]}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/css/clearUnit2.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/css/clearUnit2.yml
deleted file mode 100644
index 05ebbffcc8..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/css/clearUnit2.yml
+++ /dev/null
@@ -1,29 +0,0 @@
-languageId: css
-command:
-  spokenForm: clear unit
-  version: 3
-  targets:
-    - type: primitive
-      modifiers:
-        - type: containingScope
-          scopeType: {type: unit}
-  usePrePhraseSnapshot: false
-  action: {name: clearAndSetSelection}
-initialState:
-  documentContents: |-
-    div {
-        padding: 25px 50px 75px 100px;
-    }
-  selections:
-    - anchor: {line: 1, character: 31}
-      active: {line: 1, character: 31}
-  marks: {}
-finalState:
-  documentContents: |-
-    div {
-        padding: 25px 50px 75px 100;
-    }
-  selections:
-    - anchor: {line: 1, character: 31}
-      active: {line: 1, character: 31}
-fullTargets: [{type: primitive, mark: {type: cursor}, modifiers: [{type: containingScope, scopeType: {type: unit}}]}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/css/clearUnit3.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/css/clearUnit3.yml
deleted file mode 100644
index fcd8898ba7..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/css/clearUnit3.yml
+++ /dev/null
@@ -1,29 +0,0 @@
-languageId: css
-command:
-  spokenForm: clear unit
-  version: 3
-  targets:
-    - type: primitive
-      modifiers:
-        - type: containingScope
-          scopeType: {type: unit}
-  usePrePhraseSnapshot: true
-  action: {name: clearAndSetSelection}
-initialState:
-  documentContents: |-
-    div {
-        padding-left: 25px 50px 75px 100px;
-    }  
-  selections:
-    - anchor: {line: 1, character: 19}
-      active: {line: 1, character: 19}
-  marks: {}
-finalState:
-  documentContents: |-
-    div {
-        padding-left: 25 50px 75px 100px;
-    }  
-  selections:
-    - anchor: {line: 1, character: 20}
-      active: {line: 1, character: 20}
-fullTargets: [{type: primitive, mark: {type: cursor}, modifiers: [{type: containingScope, scopeType: {type: unit}}]}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/css/clearUnit4.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/css/clearUnit4.yml
deleted file mode 100644
index 4d812d19d0..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/css/clearUnit4.yml
+++ /dev/null
@@ -1,29 +0,0 @@
-languageId: css
-command:
-  spokenForm: clear unit
-  version: 3
-  targets:
-    - type: primitive
-      modifiers:
-        - type: containingScope
-          scopeType: {type: unit}
-  usePrePhraseSnapshot: false
-  action: {name: clearAndSetSelection}
-initialState:
-  documentContents: |-
-    div {
-        padding-left: 25px 50px 75px 100px;
-    }  
-  selections:
-    - anchor: {line: 1, character: 34}
-      active: {line: 1, character: 34}
-  marks: {}
-finalState:
-  documentContents: |-
-    div {
-        padding-left: 25px 50px 75px 100;
-    }  
-  selections:
-    - anchor: {line: 1, character: 36}
-      active: {line: 1, character: 36}
-fullTargets: [{type: primitive, mark: {type: cursor}, modifiers: [{type: containingScope, scopeType: {type: unit}}]}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/css/clearUnit5.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/css/clearUnit5.yml
deleted file mode 100644
index 7188671244..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/css/clearUnit5.yml
+++ /dev/null
@@ -1,37 +0,0 @@
-languageId: css
-command:
-  spokenForm: clear unit
-  version: 3
-  targets:
-    - type: primitive
-      modifiers:
-        - type: containingScope
-          scopeType: {type: unit}
-  usePrePhraseSnapshot: true
-  action: {name: clearAndSetSelection}
-initialState:
-  documentContents: |-
-    div {
-        padding: 25px 50px 75px 100px;
-    }
-      
-  selections:
-    - anchor: {line: 1, character: 4}
-      active: {line: 1, character: 4}
-  marks: {}
-finalState:
-  documentContents: |-
-    div {
-        padding: 25 50 75 100;
-    }
-      
-  selections:
-    - anchor: {line: 1, character: 15}
-      active: {line: 1, character: 15}
-    - anchor: {line: 1, character: 18}
-      active: {line: 1, character: 18}
-    - anchor: {line: 1, character: 21}
-      active: {line: 1, character: 21}
-    - anchor: {line: 1, character: 25}
-      active: {line: 1, character: 25}
-fullTargets: [{type: primitive, mark: {type: cursor}, modifiers: [{type: containingScope, scopeType: {type: unit}}]}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/go/changeCall.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/go/changeCall.yml
deleted file mode 100644
index 446d8f8d9b..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/go/changeCall.yml
+++ /dev/null
@@ -1,20 +0,0 @@
-languageId: go
-command:
-  version: 1
-  spokenForm: change call
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: functionCall, includeSiblings: false}
-initialState:
-  documentContents: "b := Student{ Name: \"Bob\", }"
-  selections:
-    - anchor: {line: 0, character: 19}
-      active: {line: 0, character: 19}
-  marks: {}
-finalState:
-  documentContents: "b := "
-  selections:
-    - anchor: {line: 0, character: 5}
-      active: {line: 0, character: 5}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: containingScope, scopeType: functionCall, includeSiblings: false}, isImplicit: false}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/go/changeCallee.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/go/changeCallee.yml
deleted file mode 100644
index 599d5f04d6..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/go/changeCallee.yml
+++ /dev/null
@@ -1,20 +0,0 @@
-languageId: go
-command:
-  version: 1
-  spokenForm: change callee
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: functionCallee, includeSiblings: false}
-initialState:
-  documentContents: test()
-  selections:
-    - anchor: {line: 0, character: 5}
-      active: {line: 0, character: 5}
-  marks: {}
-finalState:
-  documentContents: ()
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: containingScope, scopeType: functionCallee, includeSiblings: false}, isImplicit: false}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/go/changeCallee2.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/go/changeCallee2.yml
deleted file mode 100644
index 86d45109ed..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/go/changeCallee2.yml
+++ /dev/null
@@ -1,20 +0,0 @@
-languageId: go
-command:
-  version: 1
-  spokenForm: change callee
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: functionCallee, includeSiblings: false}
-initialState:
-  documentContents: test(anArgument)()
-  selections:
-    - anchor: {line: 0, character: 17}
-      active: {line: 0, character: 17}
-  marks: {}
-finalState:
-  documentContents: ()
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: containingScope, scopeType: functionCallee, includeSiblings: false}, isImplicit: false}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/go/changeCallee3.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/go/changeCallee3.yml
deleted file mode 100644
index 9b8f569540..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/go/changeCallee3.yml
+++ /dev/null
@@ -1,20 +0,0 @@
-languageId: go
-command:
-  version: 1
-  spokenForm: change callee
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: functionCallee, includeSiblings: false}
-initialState:
-  documentContents: object.test();
-  selections:
-    - anchor: {line: 0, character: 12}
-      active: {line: 0, character: 12}
-  marks: {}
-finalState:
-  documentContents: ();
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: containingScope, scopeType: functionCallee, includeSiblings: false}, isImplicit: false}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/go/changeCallee4.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/go/changeCallee4.yml
deleted file mode 100644
index 3886034709..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/go/changeCallee4.yml
+++ /dev/null
@@ -1,20 +0,0 @@
-languageId: go
-command:
-  version: 1
-  spokenForm: change callee
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: functionCallee, includeSiblings: false}
-initialState:
-  documentContents: object.test[1]();
-  selections:
-    - anchor: {line: 0, character: 15}
-      active: {line: 0, character: 15}
-  marks: {}
-finalState:
-  documentContents: ();
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: containingScope, scopeType: functionCallee, includeSiblings: false}, isImplicit: false}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/go/changeCallee5.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/go/changeCallee5.yml
deleted file mode 100644
index 54f6380cfe..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/go/changeCallee5.yml
+++ /dev/null
@@ -1,20 +0,0 @@
-languageId: go
-command:
-  version: 1
-  spokenForm: change callee
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: functionCallee, includeSiblings: false}
-initialState:
-  documentContents: "b := Student{ Name: \"Bob\" }"
-  selections:
-    - anchor: {line: 0, character: 22}
-      active: {line: 0, character: 22}
-  marks: {}
-finalState:
-  documentContents: "b := { Name: \"Bob\" }"
-  selections:
-    - anchor: {line: 0, character: 5}
-      active: {line: 0, character: 5}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: containingScope, scopeType: functionCallee, includeSiblings: false}, isImplicit: false}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/go/chuckArg.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/go/chuckArg.yml
deleted file mode 100644
index 62a2f12861..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/go/chuckArg.yml
+++ /dev/null
@@ -1,20 +0,0 @@
-languageId: go
-command:
-  version: 1
-  spokenForm: chuck arg
-  action: remove
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: argumentOrParameter, includeSiblings: false}
-initialState:
-  documentContents: "func add(x, y int) int {\n\t return add(x, add(1, 2))\n}"
-  selections:
-    - anchor: {line: 1, character: 13}
-      active: {line: 1, character: 13}
-  marks: {}
-finalState:
-  documentContents: "func add(x, y int) int {\n\t return add(add(1, 2))\n}"
-  selections:
-    - anchor: {line: 1, character: 13}
-      active: {line: 1, character: 13}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: outside, modifier: {type: containingScope, scopeType: argumentOrParameter, includeSiblings: false}}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/go/chuckArg2.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/go/chuckArg2.yml
deleted file mode 100644
index 4d7282e93b..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/go/chuckArg2.yml
+++ /dev/null
@@ -1,20 +0,0 @@
-languageId: go
-command:
-  version: 1
-  spokenForm: chuck arg
-  action: remove
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: argumentOrParameter, includeSiblings: false}
-initialState:
-  documentContents: "func add(x, y int) int {\n\t return add(add(1, 2))\n}"
-  selections:
-    - anchor: {line: 1, character: 13}
-      active: {line: 1, character: 13}
-  marks: {}
-finalState:
-  documentContents: "func add(x, y int) int {\n\t return add()\n}"
-  selections:
-    - anchor: {line: 1, character: 13}
-      active: {line: 1, character: 13}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: outside, modifier: {type: containingScope, scopeType: argumentOrParameter, includeSiblings: false}}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/go/chuckValue.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/go/chuckValue.yml
deleted file mode 100644
index eda44d5daf..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/go/chuckValue.yml
+++ /dev/null
@@ -1,20 +0,0 @@
-languageId: go
-command:
-  version: 1
-  spokenForm: chuck value
-  action: remove
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: value, includeSiblings: false}
-initialState:
-  documentContents: " return true"
-  selections:
-    - anchor: {line: 0, character: 5}
-      active: {line: 0, character: 5}
-  marks: {}
-finalState:
-  documentContents: " return"
-  selections:
-    - anchor: {line: 0, character: 5}
-      active: {line: 0, character: 5}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: outside, modifier: {type: containingScope, scopeType: value, includeSiblings: false}, isImplicit: false}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/go/clearCondition.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/go/clearCondition.yml
deleted file mode 100644
index b214d16b98..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/go/clearCondition.yml
+++ /dev/null
@@ -1,20 +0,0 @@
-languageId: go
-command:
-  version: 1
-  spokenForm: clear condition
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: condition, includeSiblings: false}
-initialState:
-  documentContents: "if true {\n\treturn true\n}"
-  selections:
-    - anchor: {line: 1, character: 1}
-      active: {line: 1, character: 1}
-  marks: {}
-finalState:
-  documentContents: "if  {\n\treturn true\n}"
-  selections:
-    - anchor: {line: 0, character: 3}
-      active: {line: 0, character: 3}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: containingScope, scopeType: condition, includeSiblings: false}, isImplicit: false}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/go/clearIfState.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/go/clearIfState.yml
deleted file mode 100644
index 75e4c9c985..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/go/clearIfState.yml
+++ /dev/null
@@ -1,20 +0,0 @@
-languageId: go
-command:
-  version: 1
-  spokenForm: clear if state
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: ifStatement, includeSiblings: false}
-initialState:
-  documentContents: "if true {\n\treturn true\n}"
-  selections:
-    - anchor: {line: 1, character: 12}
-      active: {line: 1, character: 12}
-  marks: {}
-finalState:
-  documentContents: ""
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: containingScope, scopeType: ifStatement, includeSiblings: false}}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/go/clearPair.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/go/clearPair.yml
deleted file mode 100644
index 93a1c9a219..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/go/clearPair.yml
+++ /dev/null
@@ -1,20 +0,0 @@
-languageId: go
-command:
-  version: 1
-  spokenForm: clear pair
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: surroundingPair, delimiter: any}
-initialState:
-  documentContents: "\"(hello)\""
-  selections:
-    - anchor: {line: 0, character: 6}
-      active: {line: 0, character: 6}
-  marks: {}
-finalState:
-  documentContents: "\"\""
-  selections:
-    - anchor: {line: 0, character: 1}
-      active: {line: 0, character: 1}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: surroundingPair, delimiter: any}, isImplicit: false}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/go/clearState.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/go/clearState.yml
deleted file mode 100644
index 630f4d1430..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/go/clearState.yml
+++ /dev/null
@@ -1,20 +0,0 @@
-languageId: go
-command:
-  version: 1
-  spokenForm: clear state
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: statement, includeSiblings: false}
-initialState:
-  documentContents: "if true {\n\t\n}"
-  selections:
-    - anchor: {line: 1, character: 1}
-      active: {line: 1, character: 1}
-  marks: {}
-finalState:
-  documentContents: ""
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: containingScope, scopeType: statement, includeSiblings: false}}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/go/takeArg.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/go/takeArg.yml
deleted file mode 100644
index e92b043701..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/go/takeArg.yml
+++ /dev/null
@@ -1,20 +0,0 @@
-languageId: go
-command:
-  version: 1
-  spokenForm: take arg
-  action: setSelection
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: argumentOrParameter, includeSiblings: false}
-initialState:
-  documentContents: "func add(x int, y int) int {\n\treturn x + y\n}"
-  selections:
-    - anchor: {line: 0, character: 11}
-      active: {line: 0, character: 11}
-  marks: {}
-finalState:
-  documentContents: "func add(x int, y int) int {\n\treturn x + y\n}"
-  selections:
-    - anchor: {line: 0, character: 9}
-      active: {line: 0, character: 14}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: containingScope, scopeType: argumentOrParameter, includeSiblings: false}}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/go/takeArg2.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/go/takeArg2.yml
deleted file mode 100644
index 8a41072882..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/go/takeArg2.yml
+++ /dev/null
@@ -1,20 +0,0 @@
-languageId: go
-command:
-  version: 1
-  spokenForm: take arg
-  action: setSelection
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: argumentOrParameter, includeSiblings: false}
-initialState:
-  documentContents: "func add(x int, y int) int {\n\treturn x + y\n}"
-  selections:
-    - anchor: {line: 0, character: 19}
-      active: {line: 0, character: 19}
-  marks: {}
-finalState:
-  documentContents: "func add(x int, y int) int {\n\treturn x + y\n}"
-  selections:
-    - anchor: {line: 0, character: 16}
-      active: {line: 0, character: 21}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: containingScope, scopeType: argumentOrParameter, includeSiblings: false}}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/go/takeArg3.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/go/takeArg3.yml
deleted file mode 100644
index 5808dc190d..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/go/takeArg3.yml
+++ /dev/null
@@ -1,20 +0,0 @@
-languageId: go
-command:
-  version: 1
-  spokenForm: take arg
-  action: setSelection
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: argumentOrParameter, includeSiblings: false}
-initialState:
-  documentContents: "func add(x int, y int) int {\n\treturn add(x, y)\n}"
-  selections:
-    - anchor: {line: 1, character: 13}
-      active: {line: 1, character: 13}
-  marks: {}
-finalState:
-  documentContents: "func add(x int, y int) int {\n\treturn add(x, y)\n}"
-  selections:
-    - anchor: {line: 1, character: 12}
-      active: {line: 1, character: 13}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: containingScope, scopeType: argumentOrParameter, includeSiblings: false}}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/go/takeCall.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/go/takeCall.yml
deleted file mode 100644
index 9f7896b485..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/go/takeCall.yml
+++ /dev/null
@@ -1,20 +0,0 @@
-languageId: go
-command:
-  version: 1
-  spokenForm: take call
-  action: setSelection
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: functionCall, includeSiblings: false}
-initialState:
-  documentContents: add(1, 2)
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-  marks: {}
-finalState:
-  documentContents: add(1, 2)
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 9}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: containingScope, scopeType: functionCall, includeSiblings: false}}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/go/takeComment.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/go/takeComment.yml
deleted file mode 100644
index 5db1a6df03..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/go/takeComment.yml
+++ /dev/null
@@ -1,20 +0,0 @@
-languageId: go
-command:
-  version: 1
-  spokenForm: take comment
-  action: setSelection
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: comment, includeSiblings: false}
-initialState:
-  documentContents: // Hello World
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-  marks: {}
-finalState:
-  documentContents: // Hello World
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 14}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: containingScope, scopeType: comment, includeSiblings: false}}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/go/takeEveryItem.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/go/takeEveryItem.yml
deleted file mode 100644
index e9235c6376..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/go/takeEveryItem.yml
+++ /dev/null
@@ -1,22 +0,0 @@
-languageId: go
-command:
-  version: 1
-  spokenForm: take every item
-  action: setSelection
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: collectionItem, includeSiblings: true}
-initialState:
-  documentContents: "map[string]string{\"air\": \"bat\", \"cap\": \"drum\"}"
-  selections:
-    - anchor: {line: 0, character: 42}
-      active: {line: 0, character: 42}
-  marks: {}
-finalState:
-  documentContents: "map[string]string{\"air\": \"bat\", \"cap\": \"drum\"}"
-  selections:
-    - anchor: {line: 0, character: 18}
-      active: {line: 0, character: 30}
-    - anchor: {line: 0, character: 32}
-      active: {line: 0, character: 45}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: containingScope, scopeType: collectionItem, includeSiblings: true}}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/go/takeEveryKey.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/go/takeEveryKey.yml
deleted file mode 100644
index 4127c4ca44..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/go/takeEveryKey.yml
+++ /dev/null
@@ -1,22 +0,0 @@
-languageId: go
-command:
-  version: 1
-  spokenForm: take every key
-  action: setSelection
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: collectionKey, includeSiblings: true}
-initialState:
-  documentContents: "map[string]string{\"air\": \"bat\", \"cap\": \"drum\"}"
-  selections:
-    - anchor: {line: 0, character: 42}
-      active: {line: 0, character: 42}
-  marks: {}
-finalState:
-  documentContents: "map[string]string{\"air\": \"bat\", \"cap\": \"drum\"}"
-  selections:
-    - anchor: {line: 0, character: 18}
-      active: {line: 0, character: 23}
-    - anchor: {line: 0, character: 32}
-      active: {line: 0, character: 37}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: containingScope, scopeType: collectionKey, includeSiblings: true}}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/go/takeFunk.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/go/takeFunk.yml
deleted file mode 100644
index ddc5829519..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/go/takeFunk.yml
+++ /dev/null
@@ -1,20 +0,0 @@
-languageId: go
-command:
-  version: 1
-  spokenForm: take funk
-  action: setSelection
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: namedFunction, includeSiblings: false}
-initialState:
-  documentContents: "func add(x int, y int) int {\n\treturn add(x, y)\n}"
-  selections:
-    - anchor: {line: 1, character: 11}
-      active: {line: 1, character: 11}
-  marks: {}
-finalState:
-  documentContents: "func add(x int, y int) int {\n\treturn add(x, y)\n}"
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 2, character: 1}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: containingScope, scopeType: namedFunction, includeSiblings: false}}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/go/takeFunkName.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/go/takeFunkName.yml
deleted file mode 100644
index f039de17d2..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/go/takeFunkName.yml
+++ /dev/null
@@ -1,20 +0,0 @@
-languageId: go
-command:
-  version: 1
-  spokenForm: take funk name
-  action: setSelection
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: functionName, includeSiblings: false}
-initialState:
-  documentContents: "func add(x, y int, z int) int {\n\treturn x + y\n}"
-  selections:
-    - anchor: {line: 1, character: 9}
-      active: {line: 1, character: 9}
-  marks: {}
-finalState:
-  documentContents: "func add(x, y int, z int) int {\n\treturn x + y\n}"
-  selections:
-    - anchor: {line: 0, character: 5}
-      active: {line: 0, character: 8}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: containingScope, scopeType: functionName, includeSiblings: false}}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/go/takeItem.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/go/takeItem.yml
deleted file mode 100644
index 73412adf79..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/go/takeItem.yml
+++ /dev/null
@@ -1,20 +0,0 @@
-languageId: go
-command:
-  version: 1
-  spokenForm: take item
-  action: setSelection
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: collectionItem, includeSiblings: false}
-initialState:
-  documentContents: x := []string{"a", "b"}
-  selections:
-    - anchor: {line: 0, character: 16}
-      active: {line: 0, character: 16}
-  marks: {}
-finalState:
-  documentContents: x := []string{"a", "b"}
-  selections:
-    - anchor: {line: 0, character: 14}
-      active: {line: 0, character: 17}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: containingScope, scopeType: collectionItem, includeSiblings: false}}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/go/takeKey.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/go/takeKey.yml
deleted file mode 100644
index e5c7f5b9f4..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/go/takeKey.yml
+++ /dev/null
@@ -1,20 +0,0 @@
-languageId: go
-command:
-  version: 1
-  spokenForm: take key
-  action: setSelection
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: collectionKey, includeSiblings: false}
-initialState:
-  documentContents: " x := map[string]string{\"a\": \"b\", \"c\": \"d\"}"
-  selections:
-    - anchor: {line: 0, character: 31}
-      active: {line: 0, character: 31}
-  marks: {}
-finalState:
-  documentContents: " x := map[string]string{\"a\": \"b\", \"c\": \"d\"}"
-  selections:
-    - anchor: {line: 0, character: 24}
-      active: {line: 0, character: 27}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: containingScope, scopeType: collectionKey, includeSiblings: false}}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/go/takeKey2.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/go/takeKey2.yml
deleted file mode 100644
index 305522a588..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/go/takeKey2.yml
+++ /dev/null
@@ -1,20 +0,0 @@
-languageId: go
-command:
-  version: 1
-  spokenForm: take key
-  action: setSelection
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: collectionKey, includeSiblings: false}
-initialState:
-  documentContents: "map[string]string{\"air\": \"bat\", \"cap\": \"drum\"}"
-  selections:
-    - anchor: {line: 0, character: 20}
-      active: {line: 0, character: 20}
-  marks: {}
-finalState:
-  documentContents: "map[string]string{\"air\": \"bat\", \"cap\": \"drum\"}"
-  selections:
-    - anchor: {line: 0, character: 18}
-      active: {line: 0, character: 23}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: containingScope, scopeType: collectionKey, includeSiblings: false}}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/go/takeList.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/go/takeList.yml
deleted file mode 100644
index 09038895ff..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/go/takeList.yml
+++ /dev/null
@@ -1,20 +0,0 @@
-languageId: go
-command:
-  version: 1
-  spokenForm: take list
-  action: setSelection
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: list, includeSiblings: false}
-initialState:
-  documentContents: x := []string{"a", "b"}
-  selections:
-    - anchor: {line: 0, character: 16}
-      active: {line: 0, character: 16}
-  marks: {}
-finalState:
-  documentContents: x := []string{"a", "b"}
-  selections:
-    - anchor: {line: 0, character: 5}
-      active: {line: 0, character: 23}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: containingScope, scopeType: list, includeSiblings: false}}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/go/takeMap.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/go/takeMap.yml
deleted file mode 100644
index bef4078b27..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/go/takeMap.yml
+++ /dev/null
@@ -1,20 +0,0 @@
-languageId: go
-command:
-  version: 1
-  spokenForm: take map
-  action: setSelection
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: map, includeSiblings: false}
-initialState:
-  documentContents: x := map[string]string{"a", "b"}
-  selections:
-    - anchor: {line: 0, character: 24}
-      active: {line: 0, character: 24}
-  marks: {}
-finalState:
-  documentContents: x := map[string]string{"a", "b"}
-  selections:
-    - anchor: {line: 0, character: 5}
-      active: {line: 0, character: 32}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: containingScope, scopeType: map, includeSiblings: false}}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/go/takeState.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/go/takeState.yml
deleted file mode 100644
index ccb98213dc..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/go/takeState.yml
+++ /dev/null
@@ -1,20 +0,0 @@
-languageId: go
-command:
-  version: 1
-  spokenForm: take state
-  action: setSelection
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: statement, includeSiblings: false}
-initialState:
-  documentContents: "type Hello struct {\n\tworld string\n}"
-  selections:
-    - anchor: {line: 1, character: 12}
-      active: {line: 1, character: 12}
-  marks: {}
-finalState:
-  documentContents: "type Hello struct {\n\tworld string\n}"
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 2, character: 1}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: containingScope, scopeType: statement, includeSiblings: false}}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/go/takeString.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/go/takeString.yml
deleted file mode 100644
index 2b9e72df8b..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/go/takeString.yml
+++ /dev/null
@@ -1,20 +0,0 @@
-languageId: go
-command:
-  version: 1
-  spokenForm: take string
-  action: setSelection
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: string, includeSiblings: false}
-initialState:
-  documentContents: x := "hello world"
-  selections:
-    - anchor: {line: 0, character: 7}
-      active: {line: 0, character: 7}
-  marks: {}
-finalState:
-  documentContents: x := "hello world"
-  selections:
-    - anchor: {line: 0, character: 5}
-      active: {line: 0, character: 18}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: containingScope, scopeType: string, includeSiblings: false}}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/go/takeType.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/go/takeType.yml
deleted file mode 100644
index 00bc415b29..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/go/takeType.yml
+++ /dev/null
@@ -1,20 +0,0 @@
-languageId: go
-command:
-  version: 1
-  spokenForm: take type
-  action: setSelection
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: type, includeSiblings: false}
-initialState:
-  documentContents: "func add(x int, y int) int {\n\treturn x + y\n}"
-  selections:
-    - anchor: {line: 1, character: 9}
-      active: {line: 1, character: 9}
-  marks: {}
-finalState:
-  documentContents: "func add(x int, y int) int {\n\treturn x + y\n}"
-  selections:
-    - anchor: {line: 0, character: 23}
-      active: {line: 0, character: 26}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: containingScope, scopeType: type, includeSiblings: false}}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/go/takeValue.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/go/takeValue.yml
deleted file mode 100644
index d82bae414a..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/go/takeValue.yml
+++ /dev/null
@@ -1,20 +0,0 @@
-languageId: go
-command:
-  version: 1
-  spokenForm: take value
-  action: setSelection
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: value, includeSiblings: false}
-initialState:
-  documentContents: " x := map[string]string{\"a\": \"b\", \"c\": \"d\"}"
-  selections:
-    - anchor: {line: 0, character: 26}
-      active: {line: 0, character: 26}
-  marks: {}
-finalState:
-  documentContents: " x := map[string]string{\"a\": \"b\", \"c\": \"d\"}"
-  selections:
-    - anchor: {line: 0, character: 29}
-      active: {line: 0, character: 32}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: containingScope, scopeType: value, includeSiblings: false}}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/go/takeValue2.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/go/takeValue2.yml
deleted file mode 100644
index 153a85e323..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/go/takeValue2.yml
+++ /dev/null
@@ -1,20 +0,0 @@
-languageId: go
-command:
-  version: 1
-  spokenForm: take value
-  action: setSelection
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: value, includeSiblings: false}
-initialState:
-  documentContents: "map[string]string{\"air\": \"bat\", \"cap\": \"drum\"}"
-  selections:
-    - anchor: {line: 0, character: 27}
-      active: {line: 0, character: 27}
-  marks: {}
-finalState:
-  documentContents: "map[string]string{\"air\": \"bat\", \"cap\": \"drum\"}"
-  selections:
-    - anchor: {line: 0, character: 25}
-      active: {line: 0, character: 30}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: containingScope, scopeType: value, includeSiblings: false}}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/html/chuckCoreElement.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/html/chuckCoreElement.yml
deleted file mode 100644
index 0e2077a5e3..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/html/chuckCoreElement.yml
+++ /dev/null
@@ -1,27 +0,0 @@
-languageId: html
-command:
-  spokenForm: chuck core element
-  version: 2
-  targets:
-    - type: primitive
-      modifiers:
-        - {type: interiorOnly}
-        - type: containingScope
-          scopeType: {type: xmlElement}
-  usePrePhraseSnapshot: true
-  action: {name: remove}
-initialState:
-  documentContents: |-
-    <div>
-        aaa
-    </div>
-  selections:
-    - anchor: {line: 1, character: 4}
-      active: {line: 1, character: 4}
-  marks: {}
-finalState:
-  documentContents: <div></div>
-  selections:
-    - anchor: {line: 0, character: 5}
-      active: {line: 0, character: 5}
-fullTargets: [{type: primitive, mark: {type: cursor}, modifiers: [{type: interiorOnly}, {type: containingScope, scopeType: {type: xmlElement}}]}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/html/chuckValueInk.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/html/chuckValueInk.yml
deleted file mode 100644
index 41044cd43b..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/html/chuckValueInk.yml
+++ /dev/null
@@ -1,30 +0,0 @@
-languageId: html
-command:
-  version: 1
-  spokenForm: chuck value ink
-  action: remove
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: value, includeSiblings: false}
-      mark: {type: decoratedSymbol, symbolColor: default, character: i}
-initialState:
-  documentContents: |-
-    <html id="value">
-        
-    </html>
-  selections:
-    - anchor: {line: 1, character: 4}
-      active: {line: 1, character: 4}
-  marks:
-    default.i:
-      start: {line: 0, character: 6}
-      end: {line: 0, character: 8}
-finalState:
-  documentContents: |-
-    <html id>
-        
-    </html>
-  selections:
-    - anchor: {line: 1, character: 4}
-      active: {line: 1, character: 4}
-fullTargets: [{type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: i}, selectionType: token, position: contents, insideOutsideType: outside, modifier: {type: containingScope, scopeType: value, includeSiblings: false}}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/html/clearAttributeVest.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/html/clearAttributeVest.yml
deleted file mode 100644
index cbfc00a516..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/html/clearAttributeVest.yml
+++ /dev/null
@@ -1,30 +0,0 @@
-languageId: html
-command:
-  version: 1
-  spokenForm: clear attribute vest
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: attribute, includeSiblings: false}
-      mark: {type: decoratedSymbol, symbolColor: default, character: v}
-initialState:
-  documentContents: |-
-    <html id="value">
-        
-    </html>
-  selections:
-    - anchor: {line: 1, character: 4}
-      active: {line: 1, character: 4}
-  marks:
-    default.v:
-      start: {line: 0, character: 10}
-      end: {line: 0, character: 15}
-finalState:
-  documentContents: |-
-    <html >
-        
-    </html>
-  selections:
-    - anchor: {line: 0, character: 6}
-      active: {line: 0, character: 6}
-fullTargets: [{type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: v}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: containingScope, scopeType: attribute, includeSiblings: false}}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/html/clearComment.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/html/clearComment.yml
deleted file mode 100644
index 6550d3eada..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/html/clearComment.yml
+++ /dev/null
@@ -1,20 +0,0 @@
-languageId: html
-command:
-  version: 1
-  spokenForm: clear comment
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: comment, includeSiblings: false}
-initialState:
-  documentContents: <!-- Comment -->
-  selections:
-    - anchor: {line: 0, character: 8}
-      active: {line: 0, character: 8}
-  marks: {}
-finalState:
-  documentContents: ""
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: containingScope, scopeType: comment, includeSiblings: false}}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/html/clearCoreElement.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/html/clearCoreElement.yml
deleted file mode 100644
index d1be92254c..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/html/clearCoreElement.yml
+++ /dev/null
@@ -1,31 +0,0 @@
-languageId: html
-command:
-  spokenForm: clear core element
-  version: 2
-  targets:
-    - type: primitive
-      modifiers:
-        - {type: interiorOnly}
-        - type: containingScope
-          scopeType: {type: xmlElement}
-  usePrePhraseSnapshot: true
-  action: {name: clearAndSetSelection}
-initialState:
-  documentContents: |-
-    <div>
-        aaa
-        <span>bbb</span>
-    </div>
-  selections:
-    - anchor: {line: 1, character: 4}
-      active: {line: 1, character: 4}
-  marks: {}
-finalState:
-  documentContents: |-
-    <div>
-        
-    </div>
-  selections:
-    - anchor: {line: 1, character: 4}
-      active: {line: 1, character: 4}
-fullTargets: [{type: primitive, mark: {type: cursor}, modifiers: [{type: interiorOnly}, {type: containingScope, scopeType: {type: xmlElement}}]}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/html/clearCoreElement2.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/html/clearCoreElement2.yml
deleted file mode 100644
index 528ad08913..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/html/clearCoreElement2.yml
+++ /dev/null
@@ -1,30 +0,0 @@
-languageId: html
-command:
-  spokenForm: clear core element
-  version: 2
-  targets:
-    - type: primitive
-      modifiers:
-        - {type: interiorOnly}
-        - type: containingScope
-          scopeType: {type: xmlElement}
-  usePrePhraseSnapshot: true
-  action: {name: clearAndSetSelection}
-initialState:
-  documentContents: |-
-    <div>
-        aaa
-    </div>
-  selections:
-    - anchor: {line: 1, character: 4}
-      active: {line: 1, character: 4}
-  marks: {}
-finalState:
-  documentContents: |-
-    <div>
-        
-    </div>
-  selections:
-    - anchor: {line: 1, character: 4}
-      active: {line: 1, character: 4}
-fullTargets: [{type: primitive, mark: {type: cursor}, modifiers: [{type: interiorOnly}, {type: containingScope, scopeType: {type: xmlElement}}]}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/html/clearElement.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/html/clearElement.yml
deleted file mode 100644
index 6d390036ee..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/html/clearElement.yml
+++ /dev/null
@@ -1,23 +0,0 @@
-languageId: html
-command:
-  version: 1
-  spokenForm: clear element
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: xmlElement, includeSiblings: false}
-initialState:
-  documentContents: |-
-    <html>
-        
-    </html>
-  selections:
-    - anchor: {line: 1, character: 4}
-      active: {line: 1, character: 4}
-  marks: {}
-finalState:
-  documentContents: ""
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: containingScope, scopeType: xmlElement, includeSiblings: false}}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/html/clearEndTag.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/html/clearEndTag.yml
deleted file mode 100644
index 6f0ee10fe4..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/html/clearEndTag.yml
+++ /dev/null
@@ -1,25 +0,0 @@
-languageId: html
-command:
-  version: 1
-  spokenForm: clear end tag
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: xmlEndTag, includeSiblings: false}
-initialState:
-  documentContents: |-
-    <html>
-        
-    </html>
-  selections:
-    - anchor: {line: 1, character: 4}
-      active: {line: 1, character: 4}
-  marks: {}
-finalState:
-  documentContents: |
-    <html>
-        
-  selections:
-    - anchor: {line: 2, character: 0}
-      active: {line: 2, character: 0}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: containingScope, scopeType: xmlEndTag, includeSiblings: false}}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/html/clearKey.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/html/clearKey.yml
deleted file mode 100644
index dace28e43c..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/html/clearKey.yml
+++ /dev/null
@@ -1,26 +0,0 @@
-languageId: html
-command:
-  version: 1
-  spokenForm: clear key
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: collectionKey, includeSiblings: false}
-initialState:
-  documentContents: |-
-    <html id="value">
-        
-    </html>
-  selections:
-    - anchor: {line: 0, character: 9}
-      active: {line: 0, character: 9}
-  marks: {}
-finalState:
-  documentContents: |-
-    <html ="value">
-        
-    </html>
-  selections:
-    - anchor: {line: 0, character: 6}
-      active: {line: 0, character: 6}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: containingScope, scopeType: collectionKey, includeSiblings: false}}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/html/clearName.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/html/clearName.yml
deleted file mode 100644
index 567c424e97..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/html/clearName.yml
+++ /dev/null
@@ -1,26 +0,0 @@
-languageId: html
-command:
-  version: 1
-  spokenForm: clear name
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: name, includeSiblings: false}
-initialState:
-  documentContents: |-
-    <html id="value">
-        
-    </html>
-  selections:
-    - anchor: {line: 0, character: 9}
-      active: {line: 0, character: 9}
-  marks: {}
-finalState:
-  documentContents: |-
-    < id="value">
-        
-    </html>
-  selections:
-    - anchor: {line: 0, character: 1}
-      active: {line: 0, character: 1}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: containingScope, scopeType: name, includeSiblings: false}}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/html/clearStartTag.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/html/clearStartTag.yml
deleted file mode 100644
index 6f2b8ba975..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/html/clearStartTag.yml
+++ /dev/null
@@ -1,26 +0,0 @@
-languageId: html
-command:
-  version: 1
-  spokenForm: clear start tag
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: xmlStartTag, includeSiblings: false}
-initialState:
-  documentContents: |-
-    <html>
-        
-    </html>
-  selections:
-    - anchor: {line: 1, character: 4}
-      active: {line: 1, character: 4}
-  marks: {}
-finalState:
-  documentContents: |2-
-
-        
-    </html>
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: containingScope, scopeType: xmlStartTag, includeSiblings: false}}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/html/clearString.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/html/clearString.yml
deleted file mode 100644
index 6ead36ce6c..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/html/clearString.yml
+++ /dev/null
@@ -1,26 +0,0 @@
-languageId: html
-command:
-  version: 1
-  spokenForm: clear string
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: surroundingPair, delimiter: string}
-initialState:
-  documentContents: |-
-    <html id="value">
-            
-        </html>
-  selections:
-    - anchor: {line: 0, character: 11}
-      active: {line: 0, character: 11}
-  marks: {}
-finalState:
-  documentContents: |-
-    <html id=>
-            
-        </html>
-  selections:
-    - anchor: {line: 0, character: 9}
-      active: {line: 0, character: 9}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: surroundingPair, delimiter: string}}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/html/clearTags.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/html/clearTags.yml
deleted file mode 100644
index 9776692763..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/html/clearTags.yml
+++ /dev/null
@@ -1,27 +0,0 @@
-languageId: html
-command:
-  version: 1
-  spokenForm: clear tags
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: xmlBothTags, includeSiblings: false}
-initialState:
-  documentContents: |-
-    <html>
-        
-    </html>
-  selections:
-    - anchor: {line: 1, character: 4}
-      active: {line: 1, character: 4}
-  marks: {}
-finalState:
-  documentContents: |2
-
-        
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-    - anchor: {line: 2, character: 0}
-      active: {line: 2, character: 0}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: containingScope, scopeType: xmlBothTags, includeSiblings: false}}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/java/changeCall.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/java/changeCall.yml
deleted file mode 100644
index f6c059ab3b..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/java/changeCall.yml
+++ /dev/null
@@ -1,22 +0,0 @@
-languageId: java
-command:
-  version: 1
-  spokenForm: change call
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: functionCall, includeSiblings: false}
-initialState:
-  documentContents: |
-    Box<Integer> integerBox = new Box<>();
-  selections:
-    - anchor: {line: 0, character: 36}
-      active: {line: 0, character: 36}
-  marks: {}
-finalState:
-  documentContents: |
-    Box<Integer> integerBox = ;
-  selections:
-    - anchor: {line: 0, character: 26}
-      active: {line: 0, character: 26}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: containingScope, scopeType: functionCall, includeSiblings: false}, isImplicit: false}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/java/changeCall2.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/java/changeCall2.yml
deleted file mode 100644
index f83a8553f3..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/java/changeCall2.yml
+++ /dev/null
@@ -1,42 +0,0 @@
-languageId: java
-command:
-  version: 1
-  spokenForm: change call
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: functionCall, includeSiblings: false}
-initialState:
-  documentContents: |-
-    class Point {
-      int x, y;
-      Point(int x, int y) {
-        this.x = x;
-        this.y = y;
-      }
-
-      Point() {
-        this(0, 0);
-      }
-    }
-  selections:
-    - anchor: {line: 8, character: 12}
-      active: {line: 8, character: 12}
-  marks: {}
-finalState:
-  documentContents: |-
-    class Point {
-      int x, y;
-      Point(int x, int y) {
-        this.x = x;
-        this.y = y;
-      }
-
-      Point() {
-        
-      }
-    }
-  selections:
-    - anchor: {line: 8, character: 4}
-      active: {line: 8, character: 4}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: containingScope, scopeType: functionCall, includeSiblings: false}, isImplicit: false}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/java/changeCallee.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/java/changeCallee.yml
deleted file mode 100644
index d91ba4454b..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/java/changeCallee.yml
+++ /dev/null
@@ -1,20 +0,0 @@
-languageId: java
-command:
-  version: 1
-  spokenForm: change callee
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: functionCallee, includeSiblings: false}
-initialState:
-  documentContents: new test().bar();
-  selections:
-    - anchor: {line: 0, character: 9}
-      active: {line: 0, character: 9}
-  marks: {}
-finalState:
-  documentContents: new ().bar();
-  selections:
-    - anchor: {line: 0, character: 4}
-      active: {line: 0, character: 4}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: containingScope, scopeType: functionCallee, includeSiblings: false}, isImplicit: false}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/java/changeCallee2.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/java/changeCallee2.yml
deleted file mode 100644
index 28962962b5..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/java/changeCallee2.yml
+++ /dev/null
@@ -1,20 +0,0 @@
-languageId: java
-command:
-  version: 1
-  spokenForm: change callee
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: functionCallee, includeSiblings: false}
-initialState:
-  documentContents: new test().bar();
-  selections:
-    - anchor: {line: 0, character: 15}
-      active: {line: 0, character: 15}
-  marks: {}
-finalState:
-  documentContents: ();
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: containingScope, scopeType: functionCallee, includeSiblings: false}, isImplicit: false}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/java/changeCallee3.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/java/changeCallee3.yml
deleted file mode 100644
index c4cb97a984..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/java/changeCallee3.yml
+++ /dev/null
@@ -1,20 +0,0 @@
-languageId: java
-command:
-  version: 1
-  spokenForm: change callee
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: functionCallee, includeSiblings: false}
-initialState:
-  documentContents: new test[0]();
-  selections:
-    - anchor: {line: 0, character: 12}
-      active: {line: 0, character: 12}
-  marks: {}
-finalState:
-  documentContents: new ();
-  selections:
-    - anchor: {line: 0, character: 4}
-      active: {line: 0, character: 4}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: containingScope, scopeType: functionCallee, includeSiblings: false}, isImplicit: false}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/java/changeCallee5.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/java/changeCallee5.yml
deleted file mode 100644
index 2d7d99dd4b..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/java/changeCallee5.yml
+++ /dev/null
@@ -1,30 +0,0 @@
-languageId: java
-command:
-  version: 1
-  spokenForm: change callee
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: functionCallee, includeSiblings: false}
-initialState:
-  documentContents: |-
-    public class Test {
-        public Test()  {
-            super();
-        }
-    }
-  selections:
-    - anchor: {line: 2, character: 14}
-      active: {line: 2, character: 14}
-  marks: {}
-finalState:
-  documentContents: |-
-    public class Test {
-        public Test()  {
-            ();
-        }
-    }
-  selections:
-    - anchor: {line: 2, character: 8}
-      active: {line: 2, character: 8}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: containingScope, scopeType: functionCallee, includeSiblings: false}, isImplicit: false}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/java/changeCallee6.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/java/changeCallee6.yml
deleted file mode 100644
index 1eff3a7a83..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/java/changeCallee6.yml
+++ /dev/null
@@ -1,20 +0,0 @@
-languageId: java
-command:
-  version: 1
-  spokenForm: change callee
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: functionCallee, includeSiblings: false}
-initialState:
-  documentContents: tests[0].run();
-  selections:
-    - anchor: {line: 0, character: 13}
-      active: {line: 0, character: 13}
-  marks: {}
-finalState:
-  documentContents: ();
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: containingScope, scopeType: functionCallee, includeSiblings: false}, isImplicit: false}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/java/changeCallee7.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/java/changeCallee7.yml
deleted file mode 100644
index 2d7d99dd4b..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/java/changeCallee7.yml
+++ /dev/null
@@ -1,30 +0,0 @@
-languageId: java
-command:
-  version: 1
-  spokenForm: change callee
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: functionCallee, includeSiblings: false}
-initialState:
-  documentContents: |-
-    public class Test {
-        public Test()  {
-            super();
-        }
-    }
-  selections:
-    - anchor: {line: 2, character: 14}
-      active: {line: 2, character: 14}
-  marks: {}
-finalState:
-  documentContents: |-
-    public class Test {
-        public Test()  {
-            ();
-        }
-    }
-  selections:
-    - anchor: {line: 2, character: 8}
-      active: {line: 2, character: 8}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: containingScope, scopeType: functionCallee, includeSiblings: false}, isImplicit: false}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/java/changeCalleeSoap.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/java/changeCalleeSoap.yml
deleted file mode 100644
index 0c034ef99c..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/java/changeCalleeSoap.yml
+++ /dev/null
@@ -1,24 +0,0 @@
-languageId: java
-command:
-  version: 1
-  spokenForm: change callee soap
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: functionCallee, includeSiblings: false}
-      mark: {type: decoratedSymbol, symbolColor: default, character: s}
-initialState:
-  documentContents: someFunction();
-  selections:
-    - anchor: {line: 0, character: 15}
-      active: {line: 0, character: 15}
-  marks:
-    default.s:
-      start: {line: 0, character: 0}
-      end: {line: 0, character: 12}
-finalState:
-  documentContents: ();
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-fullTargets: [{type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: s}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: containingScope, scopeType: functionCallee, includeSiblings: false}, isImplicit: false}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/java/chuckTypeNear.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/java/chuckTypeNear.yml
deleted file mode 100644
index 83aa3fd3af..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/java/chuckTypeNear.yml
+++ /dev/null
@@ -1,34 +0,0 @@
-languageId: java
-command:
-  version: 1
-  spokenForm: chuck type near
-  action: remove
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: type, includeSiblings: false}
-      mark: {type: decoratedSymbol, symbolColor: default, character: 'n'}
-initialState:
-  documentContents: |-
-    public class Java {
-        private Java(String name) {
-            String value = "hello";
-        }
-    }
-  selections:
-    - anchor: {line: 3, character: 1}
-      active: {line: 3, character: 1}
-  marks:
-    default.n:
-      start: {line: 1, character: 24}
-      end: {line: 1, character: 28}
-finalState:
-  documentContents: |-
-    public class Java {
-        private Java(name) {
-            String value = "hello";
-        }
-    }
-  selections:
-    - anchor: {line: 3, character: 1}
-      active: {line: 3, character: 1}
-fullTargets: [{type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: 'n'}, selectionType: token, position: contents, insideOutsideType: outside, modifier: {type: containingScope, scopeType: type, includeSiblings: false}}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/java/chuckTypeUrge.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/java/chuckTypeUrge.yml
deleted file mode 100644
index 2ffbeb3421..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/java/chuckTypeUrge.yml
+++ /dev/null
@@ -1,34 +0,0 @@
-languageId: java
-command:
-  version: 1
-  spokenForm: chuck type urge
-  action: remove
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: type, includeSiblings: false}
-      mark: {type: decoratedSymbol, symbolColor: default, character: u}
-initialState:
-  documentContents: |-
-    public class Java {
-        private Java(String name) {
-            String value = "hello";
-        }
-    }
-  selections:
-    - anchor: {line: 3, character: 1}
-      active: {line: 3, character: 1}
-  marks:
-    default.u:
-      start: {line: 2, character: 15}
-      end: {line: 2, character: 20}
-finalState:
-  documentContents: |-
-    public class Java {
-        private Java(String name) {
-            value = "hello";
-        }
-    }
-  selections:
-    - anchor: {line: 3, character: 1}
-      active: {line: 3, character: 1}
-fullTargets: [{type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: u}, selectionType: token, position: contents, insideOutsideType: outside, modifier: {type: containingScope, scopeType: type, includeSiblings: false}}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/java/chuckValue.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/java/chuckValue.yml
deleted file mode 100644
index 142a5923b6..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/java/chuckValue.yml
+++ /dev/null
@@ -1,90 +0,0 @@
-languageId: java
-command:
-  version: 1
-  spokenForm: chuck value
-  action: remove
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: value, includeSiblings: false}
-initialState:
-  documentContents: |
-    public class MyClass {
-        public static void main(String[] args) {
-            a = 1;
-            a += 1;
-            a -= 1;
-            a *= 1;
-            a /= 1;
-            a %= 1;
-            a &= 1;
-            a |= 1;
-            a ^= 1;
-            a <<= 1;
-            a >>= 1;
-        }
-    }
-  selections:
-    - anchor: {line: 11, character: 14}
-      active: {line: 11, character: 15}
-    - anchor: {line: 3, character: 13}
-      active: {line: 3, character: 14}
-    - anchor: {line: 4, character: 13}
-      active: {line: 4, character: 14}
-    - anchor: {line: 5, character: 13}
-      active: {line: 5, character: 14}
-    - anchor: {line: 6, character: 13}
-      active: {line: 6, character: 14}
-    - anchor: {line: 7, character: 13}
-      active: {line: 7, character: 14}
-    - anchor: {line: 8, character: 13}
-      active: {line: 8, character: 14}
-    - anchor: {line: 9, character: 13}
-      active: {line: 9, character: 14}
-    - anchor: {line: 10, character: 13}
-      active: {line: 10, character: 14}
-    - anchor: {line: 2, character: 12}
-      active: {line: 2, character: 13}
-    - anchor: {line: 12, character: 14}
-      active: {line: 12, character: 15}
-  marks: {}
-finalState:
-  documentContents: |
-    public class MyClass {
-        public static void main(String[] args) {
-            a;
-            a;
-            a;
-            a;
-            a;
-            a;
-            a;
-            a;
-            a;
-            a;
-            a;
-        }
-    }
-  selections:
-    - anchor: {line: 11, character: 9}
-      active: {line: 11, character: 9}
-    - anchor: {line: 3, character: 9}
-      active: {line: 3, character: 9}
-    - anchor: {line: 4, character: 9}
-      active: {line: 4, character: 9}
-    - anchor: {line: 5, character: 9}
-      active: {line: 5, character: 9}
-    - anchor: {line: 6, character: 9}
-      active: {line: 6, character: 9}
-    - anchor: {line: 7, character: 9}
-      active: {line: 7, character: 9}
-    - anchor: {line: 8, character: 9}
-      active: {line: 8, character: 9}
-    - anchor: {line: 9, character: 9}
-      active: {line: 9, character: 9}
-    - anchor: {line: 10, character: 9}
-      active: {line: 10, character: 9}
-    - anchor: {line: 2, character: 9}
-      active: {line: 2, character: 9}
-    - anchor: {line: 12, character: 9}
-      active: {line: 12, character: 9}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: outside, modifier: {type: containingScope, scopeType: value, includeSiblings: false}, isImplicit: false}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/java/clearBranch.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/java/clearBranch.yml
deleted file mode 100644
index f277473e71..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/java/clearBranch.yml
+++ /dev/null
@@ -1,42 +0,0 @@
-languageId: java
-command:
-  spokenForm: clear branch
-  version: 3
-  targets:
-    - type: primitive
-      modifiers:
-        - type: containingScope
-          scopeType: {type: branch}
-  usePrePhraseSnapshot: true
-  action: {name: clearAndSetSelection}
-initialState:
-  documentContents: |-
-    class Aaa {
-      static void bbb() {
-        switch ("0") {
-          case ("0"):
-            break;
-          case ("1"):
-            break;
-        }
-      }
-    }
-  selections:
-    - anchor: {line: 4, character: 12}
-      active: {line: 4, character: 12}
-  marks: {}
-finalState:
-  documentContents: |-
-    class Aaa {
-      static void bbb() {
-        switch ("0") {
-          
-          case ("1"):
-            break;
-        }
-      }
-    }
-  selections:
-    - anchor: {line: 3, character: 6}
-      active: {line: 3, character: 6}
-fullTargets: [{type: primitive, mark: {type: cursor}, modifiers: [{type: containingScope, scopeType: {type: branch}}]}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/java/clearBranch2.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/java/clearBranch2.yml
deleted file mode 100644
index f47bb03355..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/java/clearBranch2.yml
+++ /dev/null
@@ -1,41 +0,0 @@
-languageId: java
-command:
-  spokenForm: clear branch
-  version: 3
-  targets:
-    - type: primitive
-      modifiers:
-        - type: containingScope
-          scopeType: {type: branch}
-  usePrePhraseSnapshot: true
-  action: {name: clearAndSetSelection}
-initialState:
-  documentContents: |-
-    class Aaa {
-      static void bbb() {
-        var s =
-          switch ("0") {
-            case "0" -> "zero";
-            case "1" -> "one";
-          };
-      }
-    }
-  selections:
-    - anchor: {line: 4, character: 23}
-      active: {line: 4, character: 23}
-  marks: {}
-finalState:
-  documentContents: |-
-    class Aaa {
-      static void bbb() {
-        var s =
-          switch ("0") {
-            
-            case "1" -> "one";
-          };
-      }
-    }
-  selections:
-    - anchor: {line: 4, character: 8}
-      active: {line: 4, character: 8}
-fullTargets: [{type: primitive, mark: {type: cursor}, modifiers: [{type: containingScope, scopeType: {type: branch}}]}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/java/clearComment.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/java/clearComment.yml
deleted file mode 100644
index f7d8e78d19..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/java/clearComment.yml
+++ /dev/null
@@ -1,23 +0,0 @@
-languageId: java
-command:
-  spokenForm: clear comment
-  version: 2
-  targets:
-    - type: primitive
-      modifiers:
-        - type: containingScope
-          scopeType: {type: comment}
-  usePrePhraseSnapshot: true
-  action: {name: clearAndSetSelection}
-initialState:
-  documentContents: /* Hello world */
-  selections:
-    - anchor: {line: 0, character: 9}
-      active: {line: 0, character: 9}
-  marks: {}
-finalState:
-  documentContents: ""
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-fullTargets: [{type: primitive, mark: {type: cursor}, modifiers: [{type: containingScope, scopeType: {type: comment}}]}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/java/clearName.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/java/clearName.yml
deleted file mode 100644
index 00fad0e0ef..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/java/clearName.yml
+++ /dev/null
@@ -1,20 +0,0 @@
-languageId: java
-command:
-  version: 1
-  spokenForm: clear name
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: name, includeSiblings: false}
-initialState:
-  documentContents: a += "world"
-  selections:
-    - anchor: {line: 0, character: 6}
-      active: {line: 0, character: 6}
-  marks: {}
-finalState:
-  documentContents: " += \"world\""
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: containingScope, scopeType: name, includeSiblings: false}, isImplicit: false}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/java/clearState.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/java/clearState.yml
deleted file mode 100644
index cb3fc83c75..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/java/clearState.yml
+++ /dev/null
@@ -1,34 +0,0 @@
-languageId: java
-command:
-  version: 1
-  spokenForm: clear state
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: statement, includeSiblings: false}
-initialState:
-  documentContents: |
-    public class MyClass {
-        public static void main(String[] args) {
-            switch("foo") {
-                case "bar":
-                    
-                    break;
-            }
-        }
-    }
-  selections:
-    - anchor: {line: 4, character: 16}
-      active: {line: 4, character: 16}
-  marks: {}
-finalState:
-  documentContents: |
-    public class MyClass {
-        public static void main(String[] args) {
-            
-        }
-    }
-  selections:
-    - anchor: {line: 2, character: 8}
-      active: {line: 2, character: 8}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: containingScope, scopeType: statement, includeSiblings: false}, isImplicit: false}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/java/clearState2.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/java/clearState2.yml
deleted file mode 100644
index 062ca6dd13..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/java/clearState2.yml
+++ /dev/null
@@ -1,38 +0,0 @@
-languageId: java
-command:
-  version: 1
-  spokenForm: clear state
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: statement, includeSiblings: false}
-initialState:
-  documentContents: |
-    public class MyClass {
-        public static void main(String[] args) {
-            if() {
-                
-            }
-            else if() {
-                
-            }
-            else {
-                
-            }
-        }
-    }
-  selections:
-    - anchor: {line: 3, character: 12}
-      active: {line: 3, character: 12}
-  marks: {}
-finalState:
-  documentContents: |
-    public class MyClass {
-        public static void main(String[] args) {
-            
-        }
-    }
-  selections:
-    - anchor: {line: 2, character: 8}
-      active: {line: 2, character: 8}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: containingScope, scopeType: statement, includeSiblings: false}, isImplicit: false}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/java/clearState3.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/java/clearState3.yml
deleted file mode 100644
index 0435e858e7..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/java/clearState3.yml
+++ /dev/null
@@ -1,30 +0,0 @@
-languageId: java
-command:
-  spokenForm: clear state
-  version: 3
-  targets:
-    - type: primitive
-      modifiers:
-        - type: containingScope
-          scopeType: {type: statement}
-  usePrePhraseSnapshot: true
-  action: {name: clearAndSetSelection}
-initialState:
-  documentContents: |
-    public class MyClass {
-        @Inject
-        private Aaa aaa;
-    }
-  selections:
-    - anchor: {line: 2, character: 4}
-      active: {line: 2, character: 4}
-  marks: {}
-finalState:
-  documentContents: |
-    public class MyClass {
-        
-    }
-  selections:
-    - anchor: {line: 1, character: 4}
-      active: {line: 1, character: 4}
-fullTargets: [{type: primitive, mark: {type: cursor}, modifiers: [{type: containingScope, scopeType: {type: statement}}]}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/java/clearState4.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/java/clearState4.yml
deleted file mode 100644
index 4a15ba7dd6..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/java/clearState4.yml
+++ /dev/null
@@ -1,29 +0,0 @@
-languageId: java
-command:
-  spokenForm: clear state
-  version: 3
-  targets:
-    - type: primitive
-      modifiers:
-        - type: containingScope
-          scopeType: {type: statement}
-  usePrePhraseSnapshot: true
-  action: {name: clearAndSetSelection}
-initialState:
-  documentContents: |
-    public class MyClass {
-        private String value = "hello";
-    }
-  selections:
-    - anchor: {line: 1, character: 4}
-      active: {line: 1, character: 4}
-  marks: {}
-finalState:
-  documentContents: |
-    public class MyClass {
-        
-    }
-  selections:
-    - anchor: {line: 1, character: 4}
-      active: {line: 1, character: 4}
-fullTargets: [{type: primitive, mark: {type: cursor}, modifiers: [{type: containingScope, scopeType: {type: statement}}]}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/java/clearState5.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/java/clearState5.yml
deleted file mode 100644
index 965689c480..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/java/clearState5.yml
+++ /dev/null
@@ -1,30 +0,0 @@
-languageId: java
-command:
-  spokenForm: clear state
-  version: 3
-  targets:
-    - type: primitive
-      modifiers:
-        - type: containingScope
-          scopeType: {type: statement}
-  usePrePhraseSnapshot: true
-  action: {name: clearAndSetSelection}
-initialState:
-  documentContents: |
-    public class MyClass {
-        public MyClass() {
-        }
-    }
-  selections:
-    - anchor: {line: 1, character: 4}
-      active: {line: 1, character: 4}
-  marks: {}
-finalState:
-  documentContents: |
-    public class MyClass {
-        
-    }
-  selections:
-    - anchor: {line: 1, character: 4}
-      active: {line: 1, character: 4}
-fullTargets: [{type: primitive, mark: {type: cursor}, modifiers: [{type: containingScope, scopeType: {type: statement}}]}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/java/clearState6.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/java/clearState6.yml
deleted file mode 100644
index 8db87d9f4b..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/java/clearState6.yml
+++ /dev/null
@@ -1,30 +0,0 @@
-languageId: java
-command:
-  spokenForm: clear state
-  version: 3
-  targets:
-    - type: primitive
-      modifiers:
-        - type: containingScope
-          scopeType: {type: statement}
-  usePrePhraseSnapshot: true
-  action: {name: clearAndSetSelection}
-initialState:
-  documentContents: |
-    public class MyClass {
-        private void myFunction() {
-        }
-    }
-  selections:
-    - anchor: {line: 1, character: 4}
-      active: {line: 1, character: 4}
-  marks: {}
-finalState:
-  documentContents: |
-    public class MyClass {
-        
-    }
-  selections:
-    - anchor: {line: 1, character: 4}
-      active: {line: 1, character: 4}
-fullTargets: [{type: primitive, mark: {type: cursor}, modifiers: [{type: containingScope, scopeType: {type: statement}}]}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/java/clearState7.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/java/clearState7.yml
deleted file mode 100644
index 3f7f622264..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/java/clearState7.yml
+++ /dev/null
@@ -1,26 +0,0 @@
-languageId: java
-command:
-  spokenForm: clear state
-  version: 3
-  targets:
-    - type: primitive
-      modifiers:
-        - type: containingScope
-          scopeType: {type: statement}
-  usePrePhraseSnapshot: true
-  action: {name: clearAndSetSelection}
-initialState:
-  documentContents: |
-    public class MyClass {
-    }
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-  marks: {}
-finalState:
-  documentContents: |+
-
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-fullTargets: [{type: primitive, mark: {type: cursor}, modifiers: [{type: containingScope, scopeType: {type: statement}}]}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/java/clearSubject.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/java/clearSubject.yml
deleted file mode 100644
index 1e3033055b..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/java/clearSubject.yml
+++ /dev/null
@@ -1,41 +0,0 @@
-languageId: java
-command:
-  spokenForm: clear subject
-  version: 3
-  targets:
-    - type: primitive
-      modifiers:
-        - type: containingScope
-          scopeType: {type: switchStatementSubject}
-  usePrePhraseSnapshot: true
-  action: {name: clearAndSetSelection}
-initialState:
-  documentContents: |
-    class Aaa {
-
-      static void bbb() {
-        switch ("0") {
-          case ("0"):
-            break;
-        }
-      }
-    }
-  selections:
-    - anchor: {line: 4, character: 17}
-      active: {line: 4, character: 17}
-  marks: {}
-finalState:
-  documentContents: |
-    class Aaa {
-
-      static void bbb() {
-        switch () {
-          case ("0"):
-            break;
-        }
-      }
-    }
-  selections:
-    - anchor: {line: 3, character: 12}
-      active: {line: 3, character: 12}
-fullTargets: [{type: primitive, mark: {type: cursor}, modifiers: [{type: containingScope, scopeType: {type: switchStatementSubject}}]}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/java/clearSubject2.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/java/clearSubject2.yml
deleted file mode 100644
index bc22a223cc..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/java/clearSubject2.yml
+++ /dev/null
@@ -1,41 +0,0 @@
-languageId: java
-command:
-  spokenForm: clear subject
-  version: 3
-  targets:
-    - type: primitive
-      modifiers:
-        - type: containingScope
-          scopeType: {type: switchStatementSubject}
-  usePrePhraseSnapshot: true
-  action: {name: clearAndSetSelection}
-initialState:
-  documentContents: |
-    class Aaa {
-
-      static void bbb() {
-        var s =
-          switch ("0") {
-            case "0" -> "zero";
-          };
-      }
-    }
-  selections:
-    - anchor: {line: 5, character: 22}
-      active: {line: 5, character: 22}
-  marks: {}
-finalState:
-  documentContents: |
-    class Aaa {
-
-      static void bbb() {
-        var s =
-          switch () {
-            case "0" -> "zero";
-          };
-      }
-    }
-  selections:
-    - anchor: {line: 4, character: 14}
-      active: {line: 4, character: 14}
-fullTargets: [{type: primitive, mark: {type: cursor}, modifiers: [{type: containingScope, scopeType: {type: switchStatementSubject}}]}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/java/clearValue.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/java/clearValue.yml
deleted file mode 100644
index 7d9b2d105b..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/java/clearValue.yml
+++ /dev/null
@@ -1,20 +0,0 @@
-languageId: java
-command:
-  version: 1
-  spokenForm: clear value
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: value, includeSiblings: false}
-initialState:
-  documentContents: a += "world"
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-  marks: {}
-finalState:
-  documentContents: "a += "
-  selections:
-    - anchor: {line: 0, character: 5}
-      active: {line: 0, character: 5}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: containingScope, scopeType: value, includeSiblings: false}, isImplicit: false}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/java/clearValue2.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/java/clearValue2.yml
deleted file mode 100644
index 511705d91c..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/java/clearValue2.yml
+++ /dev/null
@@ -1,33 +0,0 @@
-languageId: java
-command:
-  spokenForm: clear value
-  version: 2
-  targets:
-    - type: primitive
-      modifiers:
-        - type: containingScope
-          scopeType: {type: value}
-  usePrePhraseSnapshot: true
-  action: {name: clearAndSetSelection}
-initialState:
-  documentContents: |-
-    public class MyClass {
-        String myFunk() {
-            return "hello there";
-        }
-    }
-  selections:
-    - anchor: {line: 2, character: 21}
-      active: {line: 2, character: 21}
-  marks: {}
-finalState:
-  documentContents: |-
-    public class MyClass {
-        String myFunk() {
-            return ;
-        }
-    }
-  selections:
-    - anchor: {line: 2, character: 15}
-      active: {line: 2, character: 15}
-fullTargets: [{type: primitive, mark: {type: cursor}, modifiers: [{type: containingScope, scopeType: {type: value}}]}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/java/clearValue3.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/java/clearValue3.yml
deleted file mode 100644
index e9cc806a0e..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/java/clearValue3.yml
+++ /dev/null
@@ -1,33 +0,0 @@
-languageId: java
-command:
-  spokenForm: clear value
-  version: 2
-  targets:
-    - type: primitive
-      modifiers:
-        - type: containingScope
-          scopeType: {type: value}
-  usePrePhraseSnapshot: true
-  action: {name: clearAndSetSelection}
-initialState:
-  documentContents: |-
-    public class MyClass {
-        String myFunk() {
-            return "hello";
-        }
-    }
-  selections:
-    - anchor: {line: 2, character: 8}
-      active: {line: 2, character: 8}
-  marks: {}
-finalState:
-  documentContents: |-
-    public class MyClass {
-        String myFunk() {
-            return ;
-        }
-    }
-  selections:
-    - anchor: {line: 2, character: 15}
-      active: {line: 2, character: 15}
-fullTargets: [{type: primitive, mark: {type: cursor}, modifiers: [{type: containingScope, scopeType: {type: value}}]}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/java/elseStateWrapThis.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/java/elseStateWrapThis.yml
deleted file mode 100644
index 445a310a89..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/java/elseStateWrapThis.yml
+++ /dev/null
@@ -1,26 +0,0 @@
-languageId: java
-command:
-  version: 1
-  spokenForm: else state wrap this
-  action: wrapWithSnippet
-  targets:
-    - type: primitive
-      mark: {type: cursor}
-  extraArgs: [ifElseStatement.alternative]
-initialState:
-  documentContents: int foo = 0;
-  selections:
-    - anchor: {line: 0, character: 6}
-      active: {line: 0, character: 6}
-  marks: {}
-finalState:
-  documentContents: |-
-    if () {
-        
-    } else {
-        int foo = 0;
-    }
-  selections:
-    - anchor: {line: 0, character: 4}
-      active: {line: 0, character: 4}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: containingScope, scopeType: statement, includeSiblings: false}}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/java/ifElseWrapThis.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/java/ifElseWrapThis.yml
deleted file mode 100644
index c32cc2b146..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/java/ifElseWrapThis.yml
+++ /dev/null
@@ -1,26 +0,0 @@
-languageId: java
-command:
-  version: 1
-  spokenForm: if else wrap this
-  action: wrapWithSnippet
-  targets:
-    - type: primitive
-      mark: {type: cursor}
-  extraArgs: [ifElseStatement.consequence]
-initialState:
-  documentContents: int foo = 0;
-  selections:
-    - anchor: {line: 0, character: 6}
-      active: {line: 0, character: 6}
-  marks: {}
-finalState:
-  documentContents: |-
-    if () {
-        int foo = 0;
-    } else {
-        
-    }
-  selections:
-    - anchor: {line: 0, character: 4}
-      active: {line: 0, character: 4}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: containingScope, scopeType: statement, includeSiblings: false}}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/java/ifStateWrapThis.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/java/ifStateWrapThis.yml
deleted file mode 100644
index 5ada429559..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/java/ifStateWrapThis.yml
+++ /dev/null
@@ -1,24 +0,0 @@
-languageId: java
-command:
-  version: 1
-  spokenForm: if state wrap this
-  action: wrapWithSnippet
-  targets:
-    - type: primitive
-      mark: {type: cursor}
-  extraArgs: [ifStatement.consequence]
-initialState:
-  documentContents: int foo = 0;
-  selections:
-    - anchor: {line: 0, character: 6}
-      active: {line: 0, character: 6}
-  marks: {}
-finalState:
-  documentContents: |-
-    if () {
-        int foo = 0;
-    }
-  selections:
-    - anchor: {line: 0, character: 4}
-      active: {line: 0, character: 4}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: containingScope, scopeType: statement, includeSiblings: false}}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/java/pourBranch.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/java/pourBranch.yml
deleted file mode 100644
index ab35f5d13f..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/java/pourBranch.yml
+++ /dev/null
@@ -1,42 +0,0 @@
-languageId: java
-command:
-  spokenForm: pour branch
-  version: 3
-  targets:
-    - type: primitive
-      modifiers:
-        - type: containingScope
-          scopeType: {type: branch}
-  usePrePhraseSnapshot: true
-  action: {name: editNewLineAfter}
-initialState:
-  documentContents: |-
-    class Aaa {
-      static void bbb() {
-        var s =
-          switch ("0") {
-            case "0" -> "zero";
-            case "1" -> "one";
-          };
-      }
-    }
-  selections:
-    - anchor: {line: 4, character: 21}
-      active: {line: 4, character: 21}
-  marks: {}
-finalState:
-  documentContents: |-
-    class Aaa {
-      static void bbb() {
-        var s =
-          switch ("0") {
-            case "0" -> "zero";
-            
-            case "1" -> "one";
-          };
-      }
-    }
-  selections:
-    - anchor: {line: 5, character: 8}
-      active: {line: 5, character: 8}
-fullTargets: [{type: primitive, mark: {type: cursor}, modifiers: [{type: containingScope, scopeType: {type: branch}}]}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/java/takeArg.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/java/takeArg.yml
deleted file mode 100644
index 42dd590196..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/java/takeArg.yml
+++ /dev/null
@@ -1,32 +0,0 @@
-languageId: java
-command:
-  version: 1
-  spokenForm: take arg
-  action: setSelection
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: argumentOrParameter}
-initialState:
-  documentContents: |
-
-    public class MyClass {
-        public MyClass (String name, int value) {
-
-        }
-    }
-  selections:
-    - anchor: {line: 2, character: 26}
-      active: {line: 2, character: 26}
-  marks: {}
-finalState:
-  documentContents: |
-
-    public class MyClass {
-        public MyClass (String name, int value) {
-
-        }
-    }
-  selections:
-    - anchor: {line: 2, character: 20}
-      active: {line: 2, character: 31}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, modifier: {type: containingScope, scopeType: argumentOrParameter}, insideOutsideType: inside}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/java/takeArg2.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/java/takeArg2.yml
deleted file mode 100644
index 2a20024728..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/java/takeArg2.yml
+++ /dev/null
@@ -1,24 +0,0 @@
-languageId: java
-command:
-  version: 1
-  spokenForm: take arg
-  action: setSelection
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: argumentOrParameter}
-initialState:
-  documentContents: |
-
-    myFunk(1, 2, 3);
-  selections:
-    - anchor: {line: 1, character: 8}
-      active: {line: 1, character: 8}
-  marks: {}
-finalState:
-  documentContents: |
-
-    myFunk(1, 2, 3);
-  selections:
-    - anchor: {line: 1, character: 7}
-      active: {line: 1, character: 8}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, modifier: {type: containingScope, scopeType: argumentOrParameter}, insideOutsideType: inside}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/java/takeCall.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/java/takeCall.yml
deleted file mode 100644
index 9fb501cf85..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/java/takeCall.yml
+++ /dev/null
@@ -1,24 +0,0 @@
-languageId: java
-command:
-  version: 1
-  spokenForm: take call
-  action: setSelection
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: functionCall}
-initialState:
-  documentContents: |
-
-    myFunk(1, 2, 3);
-  selections:
-    - anchor: {line: 1, character: 5}
-      active: {line: 1, character: 5}
-  marks: {}
-finalState:
-  documentContents: |
-
-    myFunk(1, 2, 3);
-  selections:
-    - anchor: {line: 1, character: 0}
-      active: {line: 1, character: 15}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, modifier: {type: containingScope, scopeType: functionCall}, insideOutsideType: inside}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/java/takeClass.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/java/takeClass.yml
deleted file mode 100644
index b67b375479..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/java/takeClass.yml
+++ /dev/null
@@ -1,28 +0,0 @@
-languageId: java
-command:
-  version: 1
-  spokenForm: take class
-  action: setSelection
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: class}
-initialState:
-  documentContents: |
-
-    public class MyClass {
-
-    }
-  selections:
-    - anchor: {line: 2, character: 0}
-      active: {line: 2, character: 0}
-  marks: {}
-finalState:
-  documentContents: |
-
-    public class MyClass {
-
-    }
-  selections:
-    - anchor: {line: 1, character: 0}
-      active: {line: 3, character: 1}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, modifier: {type: containingScope, scopeType: class}, insideOutsideType: inside}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/java/takeClassName.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/java/takeClassName.yml
deleted file mode 100644
index e28ae3d0b5..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/java/takeClassName.yml
+++ /dev/null
@@ -1,28 +0,0 @@
-languageId: java
-command:
-  version: 1
-  spokenForm: take class name
-  action: setSelection
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: className}
-initialState:
-  documentContents: |
-
-    public class MyClass {
-
-    }
-  selections:
-    - anchor: {line: 2, character: 0}
-      active: {line: 2, character: 0}
-  marks: {}
-finalState:
-  documentContents: |
-
-    public class MyClass {
-
-    }
-  selections:
-    - anchor: {line: 1, character: 13}
-      active: {line: 1, character: 20}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, modifier: {type: containingScope, scopeType: className}, insideOutsideType: inside}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/java/takeComment.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/java/takeComment.yml
deleted file mode 100644
index a4a224348a..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/java/takeComment.yml
+++ /dev/null
@@ -1,24 +0,0 @@
-languageId: java
-command:
-  version: 1
-  spokenForm: take comment
-  action: setSelection
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: comment}
-initialState:
-  documentContents: |
-
-    // Hello world
-  selections:
-    - anchor: {line: 1, character: 2}
-      active: {line: 1, character: 2}
-  marks: {}
-finalState:
-  documentContents: |
-
-    // Hello world
-  selections:
-    - anchor: {line: 1, character: 0}
-      active: {line: 1, character: 14}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, modifier: {type: containingScope, scopeType: comment}, insideOutsideType: inside}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/java/takeCondition.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/java/takeCondition.yml
deleted file mode 100644
index e0c71bc754..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/java/takeCondition.yml
+++ /dev/null
@@ -1,46 +0,0 @@
-languageId: java
-command:
-  version: 1
-  spokenForm: take condition
-  action: setSelection
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: condition, includeSiblings: false}
-initialState:
-  documentContents: |-
-    public class MyClass {
-        private MyClass () {
-            if (true) {
-
-            }
-            while (true) {
-
-            }
-            for (int i = 0; i < 5; ++i) {
-
-            }
-        }
-    }
-  selections:
-    - anchor: {line: 3, character: 0}
-      active: {line: 3, character: 0}
-  marks: {}
-finalState:
-  documentContents: |-
-    public class MyClass {
-        private MyClass () {
-            if (true) {
-
-            }
-            while (true) {
-
-            }
-            for (int i = 0; i < 5; ++i) {
-
-            }
-        }
-    }
-  selections:
-    - anchor: {line: 2, character: 12}
-      active: {line: 2, character: 16}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: containingScope, scopeType: condition, includeSiblings: false}}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/java/takeCondition2.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/java/takeCondition2.yml
deleted file mode 100644
index 1e3df0ed77..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/java/takeCondition2.yml
+++ /dev/null
@@ -1,46 +0,0 @@
-languageId: java
-command:
-  version: 1
-  spokenForm: take condition
-  action: setSelection
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: condition, includeSiblings: false}
-initialState:
-  documentContents: |-
-    public class MyClass {
-        private MyClass () {
-            if (true) {
-
-            }
-            while (true) {
-
-            }
-            for (int i = 0; i < 5; ++i) {
-
-            }
-        }
-    }
-  selections:
-    - anchor: {line: 6, character: 0}
-      active: {line: 6, character: 0}
-  marks: {}
-finalState:
-  documentContents: |-
-    public class MyClass {
-        private MyClass () {
-            if (true) {
-
-            }
-            while (true) {
-
-            }
-            for (int i = 0; i < 5; ++i) {
-
-            }
-        }
-    }
-  selections:
-    - anchor: {line: 5, character: 15}
-      active: {line: 5, character: 19}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: containingScope, scopeType: condition, includeSiblings: false}}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/java/takeCondition3.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/java/takeCondition3.yml
deleted file mode 100644
index 0fab94a337..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/java/takeCondition3.yml
+++ /dev/null
@@ -1,46 +0,0 @@
-languageId: java
-command:
-  version: 1
-  spokenForm: take condition
-  action: setSelection
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: condition, includeSiblings: false}
-initialState:
-  documentContents: |-
-    public class MyClass {
-        private MyClass () {
-            if (true) {
-
-            }
-            while (true) {
-
-            }
-            for (int i = 0; i < 5; ++i) {
-
-            }
-        }
-    }
-  selections:
-    - anchor: {line: 9, character: 0}
-      active: {line: 9, character: 0}
-  marks: {}
-finalState:
-  documentContents: |-
-    public class MyClass {
-        private MyClass () {
-            if (true) {
-
-            }
-            while (true) {
-
-            }
-            for (int i = 0; i < 5; ++i) {
-
-            }
-        }
-    }
-  selections:
-    - anchor: {line: 8, character: 24}
-      active: {line: 8, character: 29}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: containingScope, scopeType: condition, includeSiblings: false}}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/java/takeEveryArg.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/java/takeEveryArg.yml
deleted file mode 100644
index b10fa06f0f..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/java/takeEveryArg.yml
+++ /dev/null
@@ -1,34 +0,0 @@
-languageId: java
-command:
-  version: 1
-  spokenForm: take every arg
-  action: setSelection
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: argumentOrParameter, includeSiblings: true}
-initialState:
-  documentContents: |
-
-    public class MyClass {
-        public MyClass (String name, int value) {
-
-        }
-    }
-  selections:
-    - anchor: {line: 2, character: 20}
-      active: {line: 2, character: 20}
-  marks: {}
-finalState:
-  documentContents: |
-
-    public class MyClass {
-        public MyClass (String name, int value) {
-
-        }
-    }
-  selections:
-    - anchor: {line: 2, character: 20}
-      active: {line: 2, character: 31}
-    - anchor: {line: 2, character: 33}
-      active: {line: 2, character: 42}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, modifier: {type: containingScope, scopeType: argumentOrParameter, includeSiblings: true}, insideOutsideType: inside}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/java/takeEveryArg2.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/java/takeEveryArg2.yml
deleted file mode 100644
index 667c6932b1..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/java/takeEveryArg2.yml
+++ /dev/null
@@ -1,28 +0,0 @@
-languageId: java
-command:
-  version: 1
-  spokenForm: take every arg
-  action: setSelection
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: argumentOrParameter, includeSiblings: true}
-initialState:
-  documentContents: |
-
-    myFunk(1, 2, 3);
-  selections:
-    - anchor: {line: 1, character: 8}
-      active: {line: 1, character: 8}
-  marks: {}
-finalState:
-  documentContents: |
-
-    myFunk(1, 2, 3);
-  selections:
-    - anchor: {line: 1, character: 7}
-      active: {line: 1, character: 8}
-    - anchor: {line: 1, character: 10}
-      active: {line: 1, character: 11}
-    - anchor: {line: 1, character: 13}
-      active: {line: 1, character: 14}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, modifier: {type: containingScope, scopeType: argumentOrParameter, includeSiblings: true}, insideOutsideType: inside}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/java/takeEveryItem.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/java/takeEveryItem.yml
deleted file mode 100644
index 6ea7809857..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/java/takeEveryItem.yml
+++ /dev/null
@@ -1,28 +0,0 @@
-languageId: java
-command:
-  version: 1
-  spokenForm: take every item
-  action: setSelection
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: collectionItem, includeSiblings: true}
-initialState:
-  documentContents: |
-
-    int[] values = {1, 2, 3};
-  selections:
-    - anchor: {line: 1, character: 17}
-      active: {line: 1, character: 17}
-  marks: {}
-finalState:
-  documentContents: |
-
-    int[] values = {1, 2, 3};
-  selections:
-    - anchor: {line: 1, character: 16}
-      active: {line: 1, character: 17}
-    - anchor: {line: 1, character: 19}
-      active: {line: 1, character: 20}
-    - anchor: {line: 1, character: 22}
-      active: {line: 1, character: 23}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, modifier: {type: containingScope, scopeType: collectionItem, includeSiblings: true}, insideOutsideType: inside}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/java/takeFunk.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/java/takeFunk.yml
deleted file mode 100644
index e0c0857565..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/java/takeFunk.yml
+++ /dev/null
@@ -1,32 +0,0 @@
-languageId: java
-command:
-  version: 1
-  spokenForm: take funk
-  action: setSelection
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: namedFunction}
-initialState:
-  documentContents: |
-
-    public class MyClass {
-        void myFunk () {
-
-        }
-    }
-  selections:
-    - anchor: {line: 3, character: 0}
-      active: {line: 3, character: 0}
-  marks: {}
-finalState:
-  documentContents: |
-
-    public class MyClass {
-        void myFunk () {
-
-        }
-    }
-  selections:
-    - anchor: {line: 2, character: 4}
-      active: {line: 4, character: 5}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, modifier: {type: containingScope, scopeType: namedFunction}, insideOutsideType: inside}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/java/takeFunk2.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/java/takeFunk2.yml
deleted file mode 100644
index c0677e9f44..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/java/takeFunk2.yml
+++ /dev/null
@@ -1,32 +0,0 @@
-languageId: java
-command:
-  version: 1
-  spokenForm: take funk
-  action: setSelection
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: namedFunction}
-initialState:
-  documentContents: |
-
-    public class MyClass {
-        public MyClass () {
-
-        }
-    }
-  selections:
-    - anchor: {line: 3, character: 0}
-      active: {line: 3, character: 0}
-  marks: {}
-finalState:
-  documentContents: |
-
-    public class MyClass {
-        public MyClass () {
-
-        }
-    }
-  selections:
-    - anchor: {line: 2, character: 4}
-      active: {line: 4, character: 5}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, modifier: {type: containingScope, scopeType: namedFunction}, insideOutsideType: inside}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/java/takeFunkName.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/java/takeFunkName.yml
deleted file mode 100644
index d0ce8dedf7..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/java/takeFunkName.yml
+++ /dev/null
@@ -1,32 +0,0 @@
-languageId: java
-command:
-  version: 1
-  spokenForm: take funk name
-  action: setSelection
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: functionName}
-initialState:
-  documentContents: |
-
-    public class MyClass {
-        void myFunk () {
-
-        }
-    }
-  selections:
-    - anchor: {line: 3, character: 0}
-      active: {line: 3, character: 0}
-  marks: {}
-finalState:
-  documentContents: |
-
-    public class MyClass {
-        void myFunk () {
-
-        }
-    }
-  selections:
-    - anchor: {line: 2, character: 9}
-      active: {line: 2, character: 15}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, modifier: {type: containingScope, scopeType: functionName}, insideOutsideType: inside}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/java/takeFunkName2.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/java/takeFunkName2.yml
deleted file mode 100644
index 5efd9e073d..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/java/takeFunkName2.yml
+++ /dev/null
@@ -1,32 +0,0 @@
-languageId: java
-command:
-  version: 1
-  spokenForm: take funk name
-  action: setSelection
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: functionName}
-initialState:
-  documentContents: |
-
-    public class MyClass {
-        public MyClass () {
-
-        }
-    }
-  selections:
-    - anchor: {line: 3, character: 0}
-      active: {line: 3, character: 0}
-  marks: {}
-finalState:
-  documentContents: |
-
-    public class MyClass {
-        public MyClass () {
-
-        }
-    }
-  selections:
-    - anchor: {line: 2, character: 11}
-      active: {line: 2, character: 18}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, modifier: {type: containingScope, scopeType: functionName}, insideOutsideType: inside}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/java/takeIf.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/java/takeIf.yml
deleted file mode 100644
index 6fa0b9b7d3..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/java/takeIf.yml
+++ /dev/null
@@ -1,28 +0,0 @@
-languageId: java
-command:
-  version: 1
-  spokenForm: take if
-  action: setSelection
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: ifStatement}
-initialState:
-  documentContents: |
-
-    if () {
-
-    }
-  selections:
-    - anchor: {line: 2, character: 0}
-      active: {line: 2, character: 0}
-  marks: {}
-finalState:
-  documentContents: |
-
-    if () {
-
-    }
-  selections:
-    - anchor: {line: 1, character: 0}
-      active: {line: 3, character: 1}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, modifier: {type: containingScope, scopeType: ifStatement}, insideOutsideType: inside}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/java/takeItem.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/java/takeItem.yml
deleted file mode 100644
index 5d348b4a95..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/java/takeItem.yml
+++ /dev/null
@@ -1,24 +0,0 @@
-languageId: java
-command:
-  version: 1
-  spokenForm: take item
-  action: setSelection
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: collectionItem}
-initialState:
-  documentContents: |
-
-    int[] values = {1, 2, 3};
-  selections:
-    - anchor: {line: 1, character: 16}
-      active: {line: 1, character: 16}
-  marks: {}
-finalState:
-  documentContents: |
-
-    int[] values = {1, 2, 3};
-  selections:
-    - anchor: {line: 1, character: 16}
-      active: {line: 1, character: 17}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, modifier: {type: containingScope, scopeType: collectionItem}, insideOutsideType: inside}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/java/takeList.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/java/takeList.yml
deleted file mode 100644
index b98a5d6cdc..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/java/takeList.yml
+++ /dev/null
@@ -1,24 +0,0 @@
-languageId: java
-command:
-  version: 1
-  spokenForm: take list
-  action: setSelection
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: list}
-initialState:
-  documentContents: |
-
-    int[] values = {1, 2, 3};
-  selections:
-    - anchor: {line: 1, character: 17}
-      active: {line: 1, character: 17}
-  marks: {}
-finalState:
-  documentContents: |
-
-    int[] values = {1, 2, 3};
-  selections:
-    - anchor: {line: 1, character: 15}
-      active: {line: 1, character: 24}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, modifier: {type: containingScope, scopeType: list}, insideOutsideType: inside}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/java/takeMap.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/java/takeMap.yml
deleted file mode 100644
index d74a3359da..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/java/takeMap.yml
+++ /dev/null
@@ -1,36 +0,0 @@
-languageId: java
-command:
-  version: 1
-  spokenForm: take map
-  action: setSelection
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: map}
-initialState:
-  documentContents: |
-
-    List<String> value = new ArrayList() {
-        {
-            add("a");
-            add("b");
-            add("c");
-        }
-    };
-  selections:
-    - anchor: {line: 3, character: 8}
-      active: {line: 3, character: 8}
-  marks: {}
-finalState:
-  documentContents: |
-
-    List<String> value = new ArrayList() {
-        {
-            add("a");
-            add("b");
-            add("c");
-        }
-    };
-  selections:
-    - anchor: {line: 2, character: 4}
-      active: {line: 6, character: 5}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, modifier: {type: containingScope, scopeType: map}, insideOutsideType: inside}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/java/takeName.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/java/takeName.yml
deleted file mode 100644
index 845f5c0674..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/java/takeName.yml
+++ /dev/null
@@ -1,32 +0,0 @@
-languageId: java
-command:
-  version: 1
-  spokenForm: take name
-  action: setSelection
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: name}
-initialState:
-  documentContents: |
-
-    public class MyClass {
-        void myFunk () {
-
-        }
-    }
-  selections:
-    - anchor: {line: 3, character: 0}
-      active: {line: 3, character: 0}
-  marks: {}
-finalState:
-  documentContents: |
-
-    public class MyClass {
-        void myFunk () {
-
-        }
-    }
-  selections:
-    - anchor: {line: 2, character: 9}
-      active: {line: 2, character: 15}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, modifier: {type: containingScope, scopeType: name}, insideOutsideType: inside}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/java/takeName2.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/java/takeName2.yml
deleted file mode 100644
index 2520a24110..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/java/takeName2.yml
+++ /dev/null
@@ -1,32 +0,0 @@
-languageId: java
-command:
-  version: 1
-  spokenForm: take name
-  action: setSelection
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: name}
-initialState:
-  documentContents: |
-
-    public class MyClass {
-        public MyClass (String name, int value) {
-
-        }
-    }
-  selections:
-    - anchor: {line: 2, character: 26}
-      active: {line: 2, character: 26}
-  marks: {}
-finalState:
-  documentContents: |
-
-    public class MyClass {
-        public MyClass (String name, int value) {
-
-        }
-    }
-  selections:
-    - anchor: {line: 2, character: 27}
-      active: {line: 2, character: 31}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, modifier: {type: containingScope, scopeType: name}, insideOutsideType: inside}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/java/takeName3.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/java/takeName3.yml
deleted file mode 100644
index 34404ca487..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/java/takeName3.yml
+++ /dev/null
@@ -1,24 +0,0 @@
-languageId: java
-command:
-  version: 1
-  spokenForm: take name
-  action: setSelection
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: name}
-initialState:
-  documentContents: |
-
-    String value = "hello world";
-  selections:
-    - anchor: {line: 1, character: 15}
-      active: {line: 1, character: 15}
-  marks: {}
-finalState:
-  documentContents: |
-
-    String value = "hello world";
-  selections:
-    - anchor: {line: 1, character: 7}
-      active: {line: 1, character: 12}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, modifier: {type: containingScope, scopeType: name}, insideOutsideType: inside}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/java/takeState.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/java/takeState.yml
deleted file mode 100644
index 02b1642046..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/java/takeState.yml
+++ /dev/null
@@ -1,28 +0,0 @@
-languageId: java
-command:
-  version: 1
-  spokenForm: take state
-  action: setSelection
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: statement}
-initialState:
-  documentContents: |
-
-    public class MyClass {
-
-    }
-  selections:
-    - anchor: {line: 2, character: 0}
-      active: {line: 2, character: 0}
-  marks: {}
-finalState:
-  documentContents: |
-
-    public class MyClass {
-
-    }
-  selections:
-    - anchor: {line: 1, character: 0}
-      active: {line: 3, character: 1}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, modifier: {type: containingScope, scopeType: statement}, insideOutsideType: inside}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/java/takeString.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/java/takeString.yml
deleted file mode 100644
index 6230d8c1ff..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/java/takeString.yml
+++ /dev/null
@@ -1,24 +0,0 @@
-languageId: java
-command:
-  version: 1
-  spokenForm: take string
-  action: setSelection
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: string}
-initialState:
-  documentContents: |
-
-    String value = "hello world";
-  selections:
-    - anchor: {line: 1, character: 22}
-      active: {line: 1, character: 22}
-  marks: {}
-finalState:
-  documentContents: |
-
-    String value = "hello world";
-  selections:
-    - anchor: {line: 1, character: 15}
-      active: {line: 1, character: 28}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, modifier: {type: containingScope, scopeType: string}, insideOutsideType: inside}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/java/takeType.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/java/takeType.yml
deleted file mode 100644
index 94188d86e5..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/java/takeType.yml
+++ /dev/null
@@ -1,32 +0,0 @@
-languageId: java
-command:
-  version: 1
-  spokenForm: take type
-  action: setSelection
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: type}
-initialState:
-  documentContents: |
-
-    public class MyClass {
-        void myFunk () {
-
-        }
-    }
-  selections:
-    - anchor: {line: 3, character: 0}
-      active: {line: 3, character: 0}
-  marks: {}
-finalState:
-  documentContents: |
-
-    public class MyClass {
-        void myFunk () {
-
-        }
-    }
-  selections:
-    - anchor: {line: 2, character: 4}
-      active: {line: 2, character: 8}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, modifier: {type: containingScope, scopeType: type}, insideOutsideType: inside}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/java/takeType2.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/java/takeType2.yml
deleted file mode 100644
index b41190970d..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/java/takeType2.yml
+++ /dev/null
@@ -1,32 +0,0 @@
-languageId: java
-command:
-  version: 1
-  spokenForm: take type
-  action: setSelection
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: type}
-initialState:
-  documentContents: |
-
-    public class MyClass {
-        public MyClass (String name, int value) {
-
-        }
-    }
-  selections:
-    - anchor: {line: 2, character: 27}
-      active: {line: 2, character: 27}
-  marks: {}
-finalState:
-  documentContents: |
-
-    public class MyClass {
-        public MyClass (String name, int value) {
-
-        }
-    }
-  selections:
-    - anchor: {line: 2, character: 20}
-      active: {line: 2, character: 26}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, modifier: {type: containingScope, scopeType: type}, insideOutsideType: inside}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/java/takeType3.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/java/takeType3.yml
deleted file mode 100644
index 6d368e0910..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/java/takeType3.yml
+++ /dev/null
@@ -1,24 +0,0 @@
-languageId: java
-command:
-  version: 1
-  spokenForm: take type
-  action: setSelection
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: type}
-initialState:
-  documentContents: |
-
-    String value = "hello world";
-  selections:
-    - anchor: {line: 1, character: 15}
-      active: {line: 1, character: 15}
-  marks: {}
-finalState:
-  documentContents: |
-
-    String value = "hello world";
-  selections:
-    - anchor: {line: 1, character: 0}
-      active: {line: 1, character: 6}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, modifier: {type: containingScope, scopeType: type}, insideOutsideType: inside}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/java/takeTypeBlueLook.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/java/takeTypeBlueLook.yml
deleted file mode 100644
index 322532e88e..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/java/takeTypeBlueLook.yml
+++ /dev/null
@@ -1,36 +0,0 @@
-languageId: java
-command:
-  version: 1
-  spokenForm: take type blue look
-  action: setSelection
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: type, includeSiblings: false}
-      mark: {type: decoratedSymbol, symbolColor: blue, character: l}
-initialState:
-  documentContents: |-
-    public class MyClass {
-        private MyClass () {
-            Map<String, String> map = new HashMap<String, String>();
-            List<String> list = new ArrayList<String>();
-        }
-    }
-  selections:
-    - anchor: {line: 2, character: 38}
-      active: {line: 2, character: 61}
-  marks:
-    blue.l:
-      start: {line: 3, character: 8}
-      end: {line: 3, character: 12}
-finalState:
-  documentContents: |-
-    public class MyClass {
-        private MyClass () {
-            Map<String, String> map = new HashMap<String, String>();
-            List<String> list = new ArrayList<String>();
-        }
-    }
-  selections:
-    - anchor: {line: 3, character: 8}
-      active: {line: 3, character: 20}
-fullTargets: [{type: primitive, mark: {type: decoratedSymbol, symbolColor: blue, character: l}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: containingScope, scopeType: type, includeSiblings: false}}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/java/takeTypeGust.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/java/takeTypeGust.yml
deleted file mode 100644
index 3bb429cd7a..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/java/takeTypeGust.yml
+++ /dev/null
@@ -1,36 +0,0 @@
-languageId: java
-command:
-  version: 1
-  spokenForm: take type gust
-  action: setSelection
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: type, includeSiblings: false}
-      mark: {type: decoratedSymbol, symbolColor: default, character: g}
-initialState:
-  documentContents: |-
-    public class MyClass {
-        private MyClass () {
-            Map<String, String> map = new HashMap<String, String>();
-            List<String> list = new ArrayList<String>();
-        }
-    }
-  selections:
-    - anchor: {line: 3, character: 8}
-      active: {line: 3, character: 20}
-  marks:
-    default.g:
-      start: {line: 3, character: 13}
-      end: {line: 3, character: 19}
-finalState:
-  documentContents: |-
-    public class MyClass {
-        private MyClass () {
-            Map<String, String> map = new HashMap<String, String>();
-            List<String> list = new ArrayList<String>();
-        }
-    }
-  selections:
-    - anchor: {line: 3, character: 8}
-      active: {line: 3, character: 20}
-fullTargets: [{type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: g}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: containingScope, scopeType: type, includeSiblings: false}}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/java/takeTypeGust2.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/java/takeTypeGust2.yml
deleted file mode 100644
index 7e98e466ab..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/java/takeTypeGust2.yml
+++ /dev/null
@@ -1,36 +0,0 @@
-languageId: java
-command:
-  version: 1
-  spokenForm: take type gust
-  action: setSelection
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: type, includeSiblings: false}
-      mark: {type: decoratedSymbol, symbolColor: default, character: g}
-initialState:
-  documentContents: |-
-    public class MyClass {
-        private MyClass () {
-            Map<String, String> map = new HashMap<String, String>();
-            List<String> list = new ArrayList<String>();
-        }
-    }
-  selections:
-    - anchor: {line: 3, character: 32}
-      active: {line: 3, character: 49}
-  marks:
-    default.g:
-      start: {line: 3, character: 42}
-      end: {line: 3, character: 48}
-finalState:
-  documentContents: |-
-    public class MyClass {
-        private MyClass () {
-            Map<String, String> map = new HashMap<String, String>();
-            List<String> list = new ArrayList<String>();
-        }
-    }
-  selections:
-    - anchor: {line: 3, character: 32}
-      active: {line: 3, character: 49}
-fullTargets: [{type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: g}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: containingScope, scopeType: type, includeSiblings: false}}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/java/takeTypeHarp.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/java/takeTypeHarp.yml
deleted file mode 100644
index 47b4874f6d..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/java/takeTypeHarp.yml
+++ /dev/null
@@ -1,36 +0,0 @@
-languageId: java
-command:
-  version: 1
-  spokenForm: take type harp
-  action: setSelection
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: type, includeSiblings: false}
-      mark: {type: decoratedSymbol, symbolColor: default, character: h}
-initialState:
-  documentContents: |-
-    public class MyClass {
-        private MyClass () {
-            Map<String, String> map = new HashMap<String, String>();
-            List<String> list = new ArrayList<String>();
-        }
-    }
-  selections:
-    - anchor: {line: 2, character: 8}
-      active: {line: 2, character: 27}
-  marks:
-    default.h:
-      start: {line: 2, character: 38}
-      end: {line: 2, character: 45}
-finalState:
-  documentContents: |-
-    public class MyClass {
-        private MyClass () {
-            Map<String, String> map = new HashMap<String, String>();
-            List<String> list = new ArrayList<String>();
-        }
-    }
-  selections:
-    - anchor: {line: 2, character: 38}
-      active: {line: 2, character: 61}
-fullTargets: [{type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: h}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: containingScope, scopeType: type, includeSiblings: false}}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/java/takeTypeLook.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/java/takeTypeLook.yml
deleted file mode 100644
index f607046467..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/java/takeTypeLook.yml
+++ /dev/null
@@ -1,36 +0,0 @@
-languageId: java
-command:
-  version: 1
-  spokenForm: take type look
-  action: setSelection
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: type, includeSiblings: false}
-      mark: {type: decoratedSymbol, symbolColor: default, character: l}
-initialState:
-  documentContents: |-
-    public class MyClass {
-        private MyClass () {
-            Map<String, String> map = new HashMap<String, String>();
-            List<String> list = new ArrayList<String>();
-        }
-    }
-  selections:
-    - anchor: {line: 2, character: 27}
-      active: {line: 2, character: 27}
-  marks:
-    default.l:
-      start: {line: 3, character: 21}
-      end: {line: 3, character: 25}
-finalState:
-  documentContents: |-
-    public class MyClass {
-        private MyClass () {
-            Map<String, String> map = new HashMap<String, String>();
-            List<String> list = new ArrayList<String>();
-        }
-    }
-  selections:
-    - anchor: {line: 3, character: 8}
-      active: {line: 3, character: 20}
-fullTargets: [{type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: l}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: containingScope, scopeType: type, includeSiblings: false}}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/java/takeTypePit.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/java/takeTypePit.yml
deleted file mode 100644
index 492bacd20c..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/java/takeTypePit.yml
+++ /dev/null
@@ -1,36 +0,0 @@
-languageId: java
-command:
-  version: 1
-  spokenForm: take type pit
-  action: setSelection
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: type, includeSiblings: false}
-      mark: {type: decoratedSymbol, symbolColor: default, character: p}
-initialState:
-  documentContents: |-
-    public class MyClass {
-        private MyClass () {
-            Map<String, String> map = new HashMap<String, String>();
-            List<String> list = new ArrayList<String>();
-        }
-    }
-  selections:
-    - anchor: {line: 3, character: 52}
-      active: {line: 3, character: 52}
-  marks:
-    default.p:
-      start: {line: 2, character: 8}
-      end: {line: 2, character: 11}
-finalState:
-  documentContents: |-
-    public class MyClass {
-        private MyClass () {
-            Map<String, String> map = new HashMap<String, String>();
-            List<String> list = new ArrayList<String>();
-        }
-    }
-  selections:
-    - anchor: {line: 2, character: 8}
-      active: {line: 2, character: 27}
-fullTargets: [{type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: p}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: containingScope, scopeType: type, includeSiblings: false}}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/java/takeTypeSoon.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/java/takeTypeSoon.yml
deleted file mode 100644
index f2759e439d..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/java/takeTypeSoon.yml
+++ /dev/null
@@ -1,36 +0,0 @@
-languageId: java
-command:
-  version: 1
-  spokenForm: take type soon
-  action: setSelection
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: type, includeSiblings: false}
-      mark: {type: decoratedSymbol, symbolColor: default, character: s}
-initialState:
-  documentContents: |-
-    public class MyClass {
-        private MyClass () {
-            Map<String, String> map = new HashMap<String, String>();
-            List<String> list = new ArrayList<String>();
-        }
-    }
-  selections:
-    - anchor: {line: 2, character: 8}
-      active: {line: 2, character: 27}
-  marks:
-    default.s:
-      start: {line: 2, character: 12}
-      end: {line: 2, character: 18}
-finalState:
-  documentContents: |-
-    public class MyClass {
-        private MyClass () {
-            Map<String, String> map = new HashMap<String, String>();
-            List<String> list = new ArrayList<String>();
-        }
-    }
-  selections:
-    - anchor: {line: 2, character: 8}
-      active: {line: 2, character: 27}
-fullTargets: [{type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: s}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: containingScope, scopeType: type, includeSiblings: false}}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/java/takeTypeSoon2.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/java/takeTypeSoon2.yml
deleted file mode 100644
index 5d050eb11d..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/java/takeTypeSoon2.yml
+++ /dev/null
@@ -1,36 +0,0 @@
-languageId: java
-command:
-  version: 1
-  spokenForm: take type soon
-  action: setSelection
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: type, includeSiblings: false}
-      mark: {type: decoratedSymbol, symbolColor: default, character: s}
-initialState:
-  documentContents: |-
-    public class MyClass {
-        private MyClass () {
-            Map<String, String> map = new HashMap<String, String>();
-            List<String> list = new ArrayList<String>();
-        }
-    }
-  selections:
-    - anchor: {line: 2, character: 38}
-      active: {line: 2, character: 61}
-  marks:
-    default.s:
-      start: {line: 2, character: 54}
-      end: {line: 2, character: 60}
-finalState:
-  documentContents: |-
-    public class MyClass {
-        private MyClass () {
-            Map<String, String> map = new HashMap<String, String>();
-            List<String> list = new ArrayList<String>();
-        }
-    }
-  selections:
-    - anchor: {line: 2, character: 38}
-      active: {line: 2, character: 61}
-fullTargets: [{type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: s}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: containingScope, scopeType: type, includeSiblings: false}}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/java/takeTypeTrap.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/java/takeTypeTrap.yml
deleted file mode 100644
index 3b8c23a7b6..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/java/takeTypeTrap.yml
+++ /dev/null
@@ -1,36 +0,0 @@
-languageId: java
-command:
-  version: 1
-  spokenForm: take type trap
-  action: setSelection
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: type, includeSiblings: false}
-      mark: {type: decoratedSymbol, symbolColor: default, character: t}
-initialState:
-  documentContents: |-
-    public class MyClass {
-        private MyClass () {
-            Map<String, String> map = new HashMap<String, String>();
-            List<String> list = new ArrayList<String>();
-        }
-    }
-  selections:
-    - anchor: {line: 2, character: 8}
-      active: {line: 2, character: 27}
-  marks:
-    default.t:
-      start: {line: 2, character: 20}
-      end: {line: 2, character: 26}
-finalState:
-  documentContents: |-
-    public class MyClass {
-        private MyClass () {
-            Map<String, String> map = new HashMap<String, String>();
-            List<String> list = new ArrayList<String>();
-        }
-    }
-  selections:
-    - anchor: {line: 2, character: 8}
-      active: {line: 2, character: 27}
-fullTargets: [{type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: t}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: containingScope, scopeType: type, includeSiblings: false}}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/java/takeTypeTrap2.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/java/takeTypeTrap2.yml
deleted file mode 100644
index 9cfae8af3c..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/java/takeTypeTrap2.yml
+++ /dev/null
@@ -1,36 +0,0 @@
-languageId: java
-command:
-  version: 1
-  spokenForm: take type trap
-  action: setSelection
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: type, includeSiblings: false}
-      mark: {type: decoratedSymbol, symbolColor: default, character: t}
-initialState:
-  documentContents: |-
-    public class MyClass {
-        private MyClass () {
-            Map<String, String> map = new HashMap<String, String>();
-            List<String> list = new ArrayList<String>();
-        }
-    }
-  selections:
-    - anchor: {line: 2, character: 38}
-      active: {line: 2, character: 61}
-  marks:
-    default.t:
-      start: {line: 2, character: 46}
-      end: {line: 2, character: 52}
-finalState:
-  documentContents: |-
-    public class MyClass {
-        private MyClass () {
-            Map<String, String> map = new HashMap<String, String>();
-            List<String> list = new ArrayList<String>();
-        }
-    }
-  selections:
-    - anchor: {line: 2, character: 38}
-      active: {line: 2, character: 61}
-fullTargets: [{type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: t}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: containingScope, scopeType: type, includeSiblings: false}}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/java/takeTypeYank.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/java/takeTypeYank.yml
deleted file mode 100644
index 512cd24f63..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/java/takeTypeYank.yml
+++ /dev/null
@@ -1,36 +0,0 @@
-languageId: java
-command:
-  version: 1
-  spokenForm: take type yank
-  action: setSelection
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: type, includeSiblings: false}
-      mark: {type: decoratedSymbol, symbolColor: default, character: 'y'}
-initialState:
-  documentContents: |-
-    public class MyClass {
-        private MyClass () {
-            Map<String, String> map = new HashMap<String, String>();
-            List<String> list = new ArrayList<String>();
-        }
-    }
-  selections:
-    - anchor: {line: 3, character: 8}
-      active: {line: 3, character: 20}
-  marks:
-    default.y:
-      start: {line: 3, character: 32}
-      end: {line: 3, character: 41}
-finalState:
-  documentContents: |-
-    public class MyClass {
-        private MyClass () {
-            Map<String, String> map = new HashMap<String, String>();
-            List<String> list = new ArrayList<String>();
-        }
-    }
-  selections:
-    - anchor: {line: 3, character: 32}
-      active: {line: 3, character: 49}
-fullTargets: [{type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: 'y'}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: containingScope, scopeType: type, includeSiblings: false}}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/java/takeValue.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/java/takeValue.yml
deleted file mode 100644
index 0227c55631..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/java/takeValue.yml
+++ /dev/null
@@ -1,24 +0,0 @@
-languageId: java
-command:
-  version: 1
-  spokenForm: take value
-  action: setSelection
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: value}
-initialState:
-  documentContents: |
-
-    String value = "hello world";
-  selections:
-    - anchor: {line: 1, character: 12}
-      active: {line: 1, character: 12}
-  marks: {}
-finalState:
-  documentContents: |
-
-    String value = "hello world";
-  selections:
-    - anchor: {line: 1, character: 15}
-      active: {line: 1, character: 28}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, modifier: {type: containingScope, scopeType: value}, insideOutsideType: inside}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/java/tryCatchWrapThis.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/java/tryCatchWrapThis.yml
deleted file mode 100644
index 81b9d94308..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/java/tryCatchWrapThis.yml
+++ /dev/null
@@ -1,26 +0,0 @@
-languageId: java
-command:
-  version: 1
-  spokenForm: try catch wrap this
-  action: wrapWithSnippet
-  targets:
-    - type: primitive
-      mark: {type: cursor}
-  extraArgs: [tryCatchStatement.body]
-initialState:
-  documentContents: int foo = 0;
-  selections:
-    - anchor: {line: 0, character: 6}
-      active: {line: 0, character: 6}
-  marks: {}
-finalState:
-  documentContents: |-
-    try {
-        int foo = 0;
-    } catch () {
-        
-    }
-  selections:
-    - anchor: {line: 2, character: 9}
-      active: {line: 2, character: 9}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: containingScope, scopeType: statement, includeSiblings: false}}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/java/tryCatchWrapThis2.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/java/tryCatchWrapThis2.yml
deleted file mode 100644
index 0ff2115159..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/java/tryCatchWrapThis2.yml
+++ /dev/null
@@ -1,43 +0,0 @@
-languageId: java
-command:
-  version: 1
-  spokenForm: try catch wrap this
-  action: wrapWithSnippet
-  targets:
-    - type: primitive
-      mark: {type: cursor}
-  extraArgs: [tryCatchStatement.body]
-initialState:
-  documentContents: |-
-    if (true) {
-        int foo = 0;
-    }
-
-    int bar = 1;
-  selections:
-    - anchor: {line: 4, character: 0}
-      active: {line: 4, character: 0}
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-  marks: {}
-finalState:
-  documentContents: |-
-    try {
-        if (true) {
-            int foo = 0;
-        }
-    } catch () {
-        
-    }
-
-    try {
-        int bar = 1;
-    } catch () {
-        
-    }
-  selections:
-    - anchor: {line: 10, character: 9}
-      active: {line: 10, character: 9}
-    - anchor: {line: 4, character: 9}
-      active: {line: 4, character: 9}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: containingScope, scopeType: statement, includeSiblings: false}}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/javascript/clearCoreWhale.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/javascript/clearCoreWhale.yml
deleted file mode 100644
index 303774b538..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/javascript/clearCoreWhale.yml
+++ /dev/null
@@ -1,26 +0,0 @@
-languageId: javascript
-command:
-  spokenForm: clear core whale
-  version: 2
-  targets:
-    - type: primitive
-      modifiers:
-        - {type: interiorOnly}
-      mark: {type: decoratedSymbol, symbolColor: default, character: w}
-  usePrePhraseSnapshot: true
-  action: {name: clearAndSetSelection}
-initialState:
-  documentContents: "'(hello world) testing'"
-  selections:
-    - anchor: {line: 0, character: 22}
-      active: {line: 0, character: 22}
-  marks:
-    default.w:
-      start: {line: 0, character: 8}
-      end: {line: 0, character: 13}
-finalState:
-  documentContents: "'() testing'"
-  selections:
-    - anchor: {line: 0, character: 2}
-      active: {line: 0, character: 2}
-fullTargets: [{type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: w}, modifiers: [{type: interiorOnly}]}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/json/takeItem.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/json/takeItem.yml
deleted file mode 100644
index dfd1ac24fe..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/json/takeItem.yml
+++ /dev/null
@@ -1,28 +0,0 @@
-languageId: json
-command:
-  version: 1
-  spokenForm: take item
-  action: setSelection
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: collectionItem}
-initialState:
-  documentContents: |
-
-    {
-        "foo": "bar"
-    }
-  selections:
-    - anchor: {line: 2, character: 9}
-      active: {line: 2, character: 9}
-  marks: {}
-finalState:
-  documentContents: |
-
-    {
-        "foo": "bar"
-    }
-  selections:
-    - anchor: {line: 2, character: 4}
-      active: {line: 2, character: 16}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, modifier: {type: containingScope, scopeType: collectionItem}, insideOutsideType: inside}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/json/takeItem2.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/json/takeItem2.yml
deleted file mode 100644
index 56c1559674..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/json/takeItem2.yml
+++ /dev/null
@@ -1,28 +0,0 @@
-languageId: json
-command:
-  version: 1
-  spokenForm: take item
-  action: setSelection
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: collectionItem}
-initialState:
-  documentContents: |
-
-    {
-        "foo": [1, 2, 3]
-    }
-  selections:
-    - anchor: {line: 2, character: 13}
-      active: {line: 2, character: 13}
-  marks: {}
-finalState:
-  documentContents: |
-
-    {
-        "foo": [1, 2, 3]
-    }
-  selections:
-    - anchor: {line: 2, character: 12}
-      active: {line: 2, character: 13}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, modifier: {type: containingScope, scopeType: collectionItem}, insideOutsideType: inside}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/json/takeKey.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/json/takeKey.yml
deleted file mode 100644
index a4b89d9468..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/json/takeKey.yml
+++ /dev/null
@@ -1,28 +0,0 @@
-languageId: json
-command:
-  version: 1
-  spokenForm: take key
-  action: setSelection
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: collectionKey}
-initialState:
-  documentContents: |
-
-    {
-        "foo": "bar"
-    }
-  selections:
-    - anchor: {line: 2, character: 10}
-      active: {line: 2, character: 10}
-  marks: {}
-finalState:
-  documentContents: |
-
-    {
-        "foo": "bar"
-    }
-  selections:
-    - anchor: {line: 2, character: 4}
-      active: {line: 2, character: 9}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, modifier: {type: containingScope, scopeType: collectionKey}, insideOutsideType: inside}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/json/takeList.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/json/takeList.yml
deleted file mode 100644
index 914db29f15..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/json/takeList.yml
+++ /dev/null
@@ -1,28 +0,0 @@
-languageId: json
-command:
-  version: 1
-  spokenForm: take list
-  action: setSelection
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: list}
-initialState:
-  documentContents: |
-
-    {
-        "foo": [1, 2, 3]
-    }
-  selections:
-    - anchor: {line: 2, character: 19}
-      active: {line: 2, character: 19}
-  marks: {}
-finalState:
-  documentContents: |
-
-    {
-        "foo": [1, 2, 3]
-    }
-  selections:
-    - anchor: {line: 2, character: 11}
-      active: {line: 2, character: 20}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, modifier: {type: containingScope, scopeType: list}, insideOutsideType: inside}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/json/takeString.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/json/takeString.yml
deleted file mode 100644
index 4a6924f109..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/json/takeString.yml
+++ /dev/null
@@ -1,28 +0,0 @@
-languageId: json
-command:
-  version: 1
-  spokenForm: take string
-  action: setSelection
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: string}
-initialState:
-  documentContents: |
-
-    {
-        "foo": "bar"
-    }
-  selections:
-    - anchor: {line: 2, character: 12}
-      active: {line: 2, character: 12}
-  marks: {}
-finalState:
-  documentContents: |
-
-    {
-        "foo": "bar"
-    }
-  selections:
-    - anchor: {line: 2, character: 11}
-      active: {line: 2, character: 16}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, modifier: {type: containingScope, scopeType: string}, insideOutsideType: inside}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/json/takeValue.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/json/takeValue.yml
deleted file mode 100644
index 0ac8d599c1..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/json/takeValue.yml
+++ /dev/null
@@ -1,28 +0,0 @@
-languageId: json
-command:
-  version: 1
-  spokenForm: take value
-  action: setSelection
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: value}
-initialState:
-  documentContents: |
-
-    {
-        "foo": "bar"
-    }
-  selections:
-    - anchor: {line: 2, character: 9}
-      active: {line: 2, character: 9}
-  marks: {}
-finalState:
-  documentContents: |
-
-    {
-        "foo": "bar"
-    }
-  selections:
-    - anchor: {line: 2, character: 11}
-      active: {line: 2, character: 16}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, modifier: {type: containingScope, scopeType: value}, insideOutsideType: inside}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/jsx/takeAttribute.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/jsx/takeAttribute.yml
deleted file mode 100644
index 1abbedd10b..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/jsx/takeAttribute.yml
+++ /dev/null
@@ -1,28 +0,0 @@
-languageId: javascript
-command:
-  version: 1
-  spokenForm: take attribute
-  action: setSelection
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: attribute}
-initialState:
-  documentContents: |
-
-    const Foo = (
-      <div id="bar" name="foo">bar</div>
-    );
-  selections:
-    - anchor: {line: 2, character: 14}
-      active: {line: 2, character: 14}
-  marks: {}
-finalState:
-  documentContents: |
-
-    const Foo = (
-      <div id="bar" name="foo">bar</div>
-    );
-  selections:
-    - anchor: {line: 2, character: 7}
-      active: {line: 2, character: 15}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, modifier: {type: containingScope, scopeType: attribute}, insideOutsideType: inside}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/jsx/takeElement.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/jsx/takeElement.yml
deleted file mode 100644
index 86893d71a3..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/jsx/takeElement.yml
+++ /dev/null
@@ -1,28 +0,0 @@
-languageId: javascript
-command:
-  version: 1
-  spokenForm: take element
-  action: setSelection
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: xmlElement}
-initialState:
-  documentContents: |
-
-    const Foo = (
-      <div id="bar" name="foo">bar</div>
-    );
-  selections:
-    - anchor: {line: 2, character: 15}
-      active: {line: 2, character: 15}
-  marks: {}
-finalState:
-  documentContents: |
-
-    const Foo = (
-      <div id="bar" name="foo">bar</div>
-    );
-  selections:
-    - anchor: {line: 2, character: 2}
-      active: {line: 2, character: 36}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, modifier: {type: containingScope, scopeType: xmlElement}, insideOutsideType: inside}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/jsx/takeEndTag.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/jsx/takeEndTag.yml
deleted file mode 100644
index a09b0384bc..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/jsx/takeEndTag.yml
+++ /dev/null
@@ -1,28 +0,0 @@
-languageId: javascript
-command:
-  version: 1
-  spokenForm: take end tag
-  action: setSelection
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: xmlEndTag}
-initialState:
-  documentContents: |
-
-    const Foo = (
-      <div id="bar" name="foo">bar</div>
-    );
-  selections:
-    - anchor: {line: 2, character: 15}
-      active: {line: 2, character: 15}
-  marks: {}
-finalState:
-  documentContents: |
-
-    const Foo = (
-      <div id="bar" name="foo">bar</div>
-    );
-  selections:
-    - anchor: {line: 2, character: 30}
-      active: {line: 2, character: 36}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, modifier: {type: containingScope, scopeType: xmlEndTag}, insideOutsideType: inside}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/jsx/takeEveryAttribute.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/jsx/takeEveryAttribute.yml
deleted file mode 100644
index 38693560c4..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/jsx/takeEveryAttribute.yml
+++ /dev/null
@@ -1,30 +0,0 @@
-languageId: javascript
-command:
-  version: 1
-  spokenForm: take every attribute
-  action: setSelection
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: attribute, includeSiblings: true}
-initialState:
-  documentContents: |
-
-    const Foo = (
-      <div id="bar" name="foo">bar</div>
-    );
-  selections:
-    - anchor: {line: 2, character: 7}
-      active: {line: 2, character: 15}
-  marks: {}
-finalState:
-  documentContents: |
-
-    const Foo = (
-      <div id="bar" name="foo">bar</div>
-    );
-  selections:
-    - anchor: {line: 2, character: 7}
-      active: {line: 2, character: 15}
-    - anchor: {line: 2, character: 16}
-      active: {line: 2, character: 26}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, modifier: {type: containingScope, scopeType: attribute, includeSiblings: true}, insideOutsideType: inside}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/jsx/takeKey.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/jsx/takeKey.yml
deleted file mode 100644
index ce8ec54330..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/jsx/takeKey.yml
+++ /dev/null
@@ -1,28 +0,0 @@
-languageId: javascript
-command:
-  version: 1
-  spokenForm: take key
-  action: setSelection
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: collectionKey}
-initialState:
-  documentContents: |
-
-    const Foo = (
-      <div id="bar" name="foo">bar</div>
-    );
-  selections:
-    - anchor: {line: 2, character: 10}
-      active: {line: 2, character: 10}
-  marks: {}
-finalState:
-  documentContents: |
-
-    const Foo = (
-      <div id="bar" name="foo">bar</div>
-    );
-  selections:
-    - anchor: {line: 2, character: 7}
-      active: {line: 2, character: 9}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, modifier: {type: containingScope, scopeType: collectionKey}, insideOutsideType: inside}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/jsx/takeStartTag.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/jsx/takeStartTag.yml
deleted file mode 100644
index 7fb040b345..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/jsx/takeStartTag.yml
+++ /dev/null
@@ -1,28 +0,0 @@
-languageId: javascript
-command:
-  version: 1
-  spokenForm: take start tag
-  action: setSelection
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: xmlStartTag}
-initialState:
-  documentContents: |
-
-    const Foo = (
-      <div id="bar" name="foo">bar</div>
-    );
-  selections:
-    - anchor: {line: 2, character: 15}
-      active: {line: 2, character: 15}
-  marks: {}
-finalState:
-  documentContents: |
-
-    const Foo = (
-      <div id="bar" name="foo">bar</div>
-    );
-  selections:
-    - anchor: {line: 2, character: 2}
-      active: {line: 2, character: 27}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, modifier: {type: containingScope, scopeType: xmlStartTag}, insideOutsideType: inside}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/jsx/takeTags.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/jsx/takeTags.yml
deleted file mode 100644
index fa26a08953..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/jsx/takeTags.yml
+++ /dev/null
@@ -1,30 +0,0 @@
-languageId: javascript
-command:
-  version: 1
-  spokenForm: take tags
-  action: setSelection
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: xmlBothTags}
-initialState:
-  documentContents: |
-
-    const Foo = (
-      <div id="bar" name="foo">bar</div>
-    );
-  selections:
-    - anchor: {line: 2, character: 15}
-      active: {line: 2, character: 15}
-  marks: {}
-finalState:
-  documentContents: |
-
-    const Foo = (
-      <div id="bar" name="foo">bar</div>
-    );
-  selections:
-    - anchor: {line: 2, character: 2}
-      active: {line: 2, character: 27}
-    - anchor: {line: 2, character: 30}
-      active: {line: 2, character: 36}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, modifier: {type: containingScope, scopeType: xmlBothTags}, insideOutsideType: inside}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/jsx/takeValue.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/jsx/takeValue.yml
deleted file mode 100644
index e92cf42ad7..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/jsx/takeValue.yml
+++ /dev/null
@@ -1,28 +0,0 @@
-languageId: javascript
-command:
-  version: 1
-  spokenForm: take value
-  action: setSelection
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: value}
-initialState:
-  documentContents: |
-
-    const Foo = (
-      <div id="bar" name="foo">bar</div>
-    );
-  selections:
-    - anchor: {line: 2, character: 7}
-      active: {line: 2, character: 9}
-  marks: {}
-finalState:
-  documentContents: |
-
-    const Foo = (
-      <div id="bar" name="foo">bar</div>
-    );
-  selections:
-    - anchor: {line: 2, character: 10}
-      active: {line: 2, character: 15}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, modifier: {type: containingScope, scopeType: value}, insideOutsideType: inside}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/latex/changeArg.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/latex/changeArg.yml
deleted file mode 100644
index 1b0de6aeee..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/latex/changeArg.yml
+++ /dev/null
@@ -1,24 +0,0 @@
-languageId: latex
-command:
-  version: 1
-  spokenForm: change arg
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: argumentOrParameter, includeSiblings: false}
-initialState:
-  documentContents: |
-    \begin{itemize}
-    \end{itemize}
-  selections:
-    - anchor: {line: 0, character: 11}
-      active: {line: 0, character: 11}
-  marks: {}
-finalState:
-  documentContents: |
-    \begin{}
-    \end{itemize}
-  selections:
-    - anchor: {line: 0, character: 7}
-      active: {line: 0, character: 7}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: containingScope, scopeType: argumentOrParameter, includeSiblings: false}, isImplicit: false}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/latex/changeArg2.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/latex/changeArg2.yml
deleted file mode 100644
index bb859ec4d1..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/latex/changeArg2.yml
+++ /dev/null
@@ -1,22 +0,0 @@
-languageId: latex
-command:
-  version: 1
-  spokenForm: change arg
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: argumentOrParameter, includeSiblings: false}
-initialState:
-  documentContents: |
-    \section{some section}
-  selections:
-    - anchor: {line: 0, character: 16}
-      active: {line: 0, character: 16}
-  marks: {}
-finalState:
-  documentContents: |
-    \section{}
-  selections:
-    - anchor: {line: 0, character: 9}
-      active: {line: 0, character: 9}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: containingScope, scopeType: argumentOrParameter, includeSiblings: false}, isImplicit: false}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/latex/changeArg3.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/latex/changeArg3.yml
deleted file mode 100644
index 58f1f24d46..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/latex/changeArg3.yml
+++ /dev/null
@@ -1,22 +0,0 @@
-languageId: latex
-command:
-  version: 1
-  spokenForm: change arg
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: argumentOrParameter, includeSiblings: false}
-initialState:
-  documentContents: |
-    \href{https://some.url}{some text}
-  selections:
-    - anchor: {line: 0, character: 14}
-      active: {line: 0, character: 14}
-  marks: {}
-finalState:
-  documentContents: |
-    \href{}{some text}
-  selections:
-    - anchor: {line: 0, character: 6}
-      active: {line: 0, character: 6}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: containingScope, scopeType: argumentOrParameter, includeSiblings: false}, isImplicit: false}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/latex/changeArg4.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/latex/changeArg4.yml
deleted file mode 100644
index af74cc3a55..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/latex/changeArg4.yml
+++ /dev/null
@@ -1,20 +0,0 @@
-languageId: latex
-command:
-  version: 1
-  spokenForm: change arg
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: argumentOrParameter, includeSiblings: false}
-initialState:
-  documentContents: \usepackage[utf8]{inputenc}
-  selections:
-    - anchor: {line: 0, character: 14}
-      active: {line: 0, character: 14}
-  marks: {}
-finalState:
-  documentContents: \usepackage[]{inputenc}
-  selections:
-    - anchor: {line: 0, character: 12}
-      active: {line: 0, character: 12}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: containingScope, scopeType: argumentOrParameter, includeSiblings: false}, isImplicit: false}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/latex/changeArg5.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/latex/changeArg5.yml
deleted file mode 100644
index 65fa32ca87..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/latex/changeArg5.yml
+++ /dev/null
@@ -1,20 +0,0 @@
-languageId: latex
-command:
-  version: 1
-  spokenForm: change arg
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: argumentOrParameter, includeSiblings: false}
-initialState:
-  documentContents: \usepackage[utf8]{inputenc}
-  selections:
-    - anchor: {line: 0, character: 22}
-      active: {line: 0, character: 22}
-  marks: {}
-finalState:
-  documentContents: \usepackage[utf8]{}
-  selections:
-    - anchor: {line: 0, character: 18}
-      active: {line: 0, character: 18}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: containingScope, scopeType: argumentOrParameter, includeSiblings: false}, isImplicit: false}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/latex/changeCall.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/latex/changeCall.yml
deleted file mode 100644
index 4fecc83ad8..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/latex/changeCall.yml
+++ /dev/null
@@ -1,22 +0,0 @@
-languageId: latex
-command:
-  version: 1
-  spokenForm: change command
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: functionCall, includeSiblings: false}
-initialState:
-  documentContents: |
-    \href{https://some.url}{some text} \LaTeX
-  selections:
-    - anchor: {line: 0, character: 6}
-      active: {line: 0, character: 6}
-  marks: {}
-finalState:
-  documentContents: |2
-     \LaTeX
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: containingScope, scopeType: functionCall, includeSiblings: false}, isImplicit: false}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/latex/changeCall2.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/latex/changeCall2.yml
deleted file mode 100644
index 4470a26e46..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/latex/changeCall2.yml
+++ /dev/null
@@ -1,24 +0,0 @@
-languageId: latex
-command:
-  version: 1
-  spokenForm: change command
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: functionCall, includeSiblings: false}
-initialState:
-  documentContents: |
-    \begin{itemize}
-    \end{itemize}
-  selections:
-    - anchor: {line: 0, character: 5}
-      active: {line: 0, character: 5}
-  marks: {}
-finalState:
-  documentContents: |
-
-    \end{itemize}
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: containingScope, scopeType: functionCall, includeSiblings: false}, isImplicit: false}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/latex/changeCall3.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/latex/changeCall3.yml
deleted file mode 100644
index 75c4d5b987..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/latex/changeCall3.yml
+++ /dev/null
@@ -1,22 +0,0 @@
-languageId: latex
-command:
-  version: 1
-  spokenForm: change command
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: functionCall, includeSiblings: false}
-initialState:
-  documentContents: |
-    \section{some section}
-  selections:
-    - anchor: {line: 0, character: 5}
-      active: {line: 0, character: 5}
-  marks: {}
-finalState:
-  documentContents: |+
-
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: containingScope, scopeType: functionCall, includeSiblings: false}, isImplicit: false}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/latex/changeCall4.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/latex/changeCall4.yml
deleted file mode 100644
index 28b291d1db..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/latex/changeCall4.yml
+++ /dev/null
@@ -1,22 +0,0 @@
-languageId: latex
-command:
-  version: 1
-  spokenForm: change command
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: functionCall, includeSiblings: false}
-initialState:
-  documentContents: |
-    \section
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-  marks: {}
-finalState:
-  documentContents: |+
-
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: containingScope, scopeType: functionCall, includeSiblings: false}, isImplicit: false}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/latex/changeCall5.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/latex/changeCall5.yml
deleted file mode 100644
index 0872572585..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/latex/changeCall5.yml
+++ /dev/null
@@ -1,22 +0,0 @@
-languageId: latex
-command:
-  version: 1
-  spokenForm: change command
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: functionCall, includeSiblings: false}
-initialState:
-  documentContents: |
-    \section{some section}{}
-  selections:
-    - anchor: {line: 0, character: 6}
-      active: {line: 0, character: 6}
-  marks: {}
-finalState:
-  documentContents: |
-    {}
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: containingScope, scopeType: functionCall, includeSiblings: false}, isImplicit: false}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/latex/changeCallee.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/latex/changeCallee.yml
deleted file mode 100644
index 137140a161..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/latex/changeCallee.yml
+++ /dev/null
@@ -1,20 +0,0 @@
-languageId: latex
-command:
-  version: 1
-  spokenForm: change callee
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: functionCallee, includeSiblings: false}
-initialState:
-  documentContents: \href{https://some.url}{some text} \LaTeX
-  selections:
-    - anchor: {line: 0, character: 3}
-      active: {line: 0, character: 3}
-  marks: {}
-finalState:
-  documentContents: "{https://some.url}{some text} \\LaTeX"
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: containingScope, scopeType: functionCallee, includeSiblings: false}, isImplicit: false}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/latex/changeChapter.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/latex/changeChapter.yml
deleted file mode 100644
index 68d2815eba..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/latex/changeChapter.yml
+++ /dev/null
@@ -1,26 +0,0 @@
-languageId: latex
-command:
-  version: 1
-  spokenForm: change chapter
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: chapter, includeSiblings: false}
-initialState:
-  documentContents: |
-    \chapter{1}
-    \section{child}
-    some text
-    \chapter{2}
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-  marks: {}
-finalState:
-  documentContents: |
-
-    \chapter{2}
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: containingScope, scopeType: chapter, includeSiblings: false}, isImplicit: false}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/latex/changeComment.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/latex/changeComment.yml
deleted file mode 100644
index bd55bc2775..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/latex/changeComment.yml
+++ /dev/null
@@ -1,24 +0,0 @@
-languageId: latex
-command:
-  version: 1
-  spokenForm: change comment
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: comment, includeSiblings: false}
-initialState:
-  documentContents: |
-    \iffalse
-    some comment
-    \fi
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-  marks: {}
-finalState:
-  documentContents: |+
-
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: containingScope, scopeType: comment, includeSiblings: false}, isImplicit: false}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/latex/changeComment2.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/latex/changeComment2.yml
deleted file mode 100644
index 93ad811015..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/latex/changeComment2.yml
+++ /dev/null
@@ -1,22 +0,0 @@
-languageId: latex
-command:
-  version: 1
-  spokenForm: change comment
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: comment, includeSiblings: false}
-initialState:
-  documentContents: |
-    \LaTeX % some comment
-  selections:
-    - anchor: {line: 0, character: 8}
-      active: {line: 0, character: 8}
-  marks: {}
-finalState:
-  documentContents: |
-    \LaTeX 
-  selections:
-    - anchor: {line: 0, character: 7}
-      active: {line: 0, character: 7}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: containingScope, scopeType: comment, includeSiblings: false}, isImplicit: false}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/latex/changeCurly.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/latex/changeCurly.yml
deleted file mode 100644
index 48fec73959..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/latex/changeCurly.yml
+++ /dev/null
@@ -1,22 +0,0 @@
-languageId: latex
-command:
-  version: 1
-  spokenForm: change curly
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: surroundingPair, delimiter: curlyBrackets}
-initialState:
-  documentContents: |
-    \href{https://some.url}{some text}
-  selections:
-    - anchor: {line: 0, character: 27}
-      active: {line: 0, character: 27}
-  marks: {}
-finalState:
-  documentContents: |
-    \href{https://some.url}
-  selections:
-    - anchor: {line: 0, character: 23}
-      active: {line: 0, character: 23}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: surroundingPair, delimiter: curlyBrackets}, isImplicit: false}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/latex/changeEnvironment.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/latex/changeEnvironment.yml
deleted file mode 100644
index 4dd718eb2b..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/latex/changeEnvironment.yml
+++ /dev/null
@@ -1,25 +0,0 @@
-languageId: latex
-command:
-  version: 1
-  spokenForm: change environment
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: environment, includeSiblings: false}
-initialState:
-  documentContents: |
-    \begin{itemize}
-        \item one \LaTeX
-        \item two \LaTeX
-    \end{itemize}
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-  marks: {}
-finalState:
-  documentContents: |+
-
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: containingScope, scopeType: environment, includeSiblings: false}, isImplicit: false}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/latex/changeEveryArg.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/latex/changeEveryArg.yml
deleted file mode 100644
index 2a1c37627a..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/latex/changeEveryArg.yml
+++ /dev/null
@@ -1,24 +0,0 @@
-languageId: latex
-command:
-  version: 1
-  spokenForm: change every arg
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: argumentOrParameter, includeSiblings: true}
-initialState:
-  documentContents: |
-    \href{https://some.url}{some text}
-  selections:
-    - anchor: {line: 0, character: 6}
-      active: {line: 0, character: 6}
-  marks: {}
-finalState:
-  documentContents: |
-    \href{}{}
-  selections:
-    - anchor: {line: 0, character: 6}
-      active: {line: 0, character: 6}
-    - anchor: {line: 0, character: 8}
-      active: {line: 0, character: 8}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: containingScope, scopeType: argumentOrParameter, includeSiblings: true}, isImplicit: false}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/latex/changeEveryItem.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/latex/changeEveryItem.yml
deleted file mode 100644
index 57cf4df600..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/latex/changeEveryItem.yml
+++ /dev/null
@@ -1,30 +0,0 @@
-languageId: latex
-command:
-  version: 1
-  spokenForm: change every item
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: collectionItem, includeSiblings: true}
-initialState:
-  documentContents: |-
-    \begin{itemize}
-        \item one \LaTeX
-        \item two \LaTeX
-    \end{itemize}
-  selections:
-    - anchor: {line: 1, character: 10}
-      active: {line: 1, character: 10}
-  marks: {}
-finalState:
-  documentContents: |-
-    \begin{itemize}
-        \item 
-        \item 
-    \end{itemize}
-  selections:
-    - anchor: {line: 1, character: 10}
-      active: {line: 1, character: 10}
-    - anchor: {line: 2, character: 10}
-      active: {line: 2, character: 10}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: containingScope, scopeType: collectionItem, includeSiblings: true}, isImplicit: false}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/latex/changeItem.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/latex/changeItem.yml
deleted file mode 100644
index 2bdee6c572..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/latex/changeItem.yml
+++ /dev/null
@@ -1,28 +0,0 @@
-languageId: latex
-command:
-  version: 1
-  spokenForm: change item
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: collectionItem, includeSiblings: false}
-initialState:
-  documentContents: |-
-    \begin{itemize}
-        \item one \LaTeX
-        \item two \LaTeX
-    \end{itemize}
-  selections:
-    - anchor: {line: 1, character: 11}
-      active: {line: 1, character: 11}
-  marks: {}
-finalState:
-  documentContents: |-
-    \begin{itemize}
-        \item 
-        \item two \LaTeX
-    \end{itemize}
-  selections:
-    - anchor: {line: 1, character: 10}
-      active: {line: 1, character: 10}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: containingScope, scopeType: collectionItem, includeSiblings: false}, isImplicit: false}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/latex/changeName.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/latex/changeName.yml
deleted file mode 100644
index 730c4bbbc7..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/latex/changeName.yml
+++ /dev/null
@@ -1,24 +0,0 @@
-languageId: latex
-command:
-  version: 1
-  spokenForm: change name
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: name, includeSiblings: false}
-initialState:
-  documentContents: |-
-    \section{some section}
-    Some Text
-  selections:
-    - anchor: {line: 1, character: 7}
-      active: {line: 1, character: 7}
-  marks: {}
-finalState:
-  documentContents: |-
-    \section{}
-    Some Text
-  selections:
-    - anchor: {line: 0, character: 9}
-      active: {line: 0, character: 9}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: containingScope, scopeType: name, includeSiblings: false}, isImplicit: false}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/latex/changeName2.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/latex/changeName2.yml
deleted file mode 100644
index c366a81de7..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/latex/changeName2.yml
+++ /dev/null
@@ -1,24 +0,0 @@
-languageId: latex
-command:
-  version: 1
-  spokenForm: change name
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: name, includeSiblings: false}
-initialState:
-  documentContents: |-
-    \section{some section}
-    Some Text
-  selections:
-    - anchor: {line: 0, character: 12}
-      active: {line: 0, character: 12}
-  marks: {}
-finalState:
-  documentContents: |-
-    \section{}
-    Some Text
-  selections:
-    - anchor: {line: 0, character: 9}
-      active: {line: 0, character: 9}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: containingScope, scopeType: name, includeSiblings: false}, isImplicit: false}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/latex/changeName3.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/latex/changeName3.yml
deleted file mode 100644
index 29b4313295..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/latex/changeName3.yml
+++ /dev/null
@@ -1,26 +0,0 @@
-languageId: latex
-command:
-  version: 1
-  spokenForm: change name
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: name, includeSiblings: false}
-initialState:
-  documentContents: |-
-    \section{some section}
-    \subsection
-    Some Text
-  selections:
-    - anchor: {line: 2, character: 4}
-      active: {line: 2, character: 4}
-  marks: {}
-finalState:
-  documentContents: |-
-    \section{}
-    \subsection
-    Some Text
-  selections:
-    - anchor: {line: 0, character: 9}
-      active: {line: 0, character: 9}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: containingScope, scopeType: name, includeSiblings: false}, isImplicit: false}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/latex/changeParagraph.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/latex/changeParagraph.yml
deleted file mode 100644
index 5918bb564e..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/latex/changeParagraph.yml
+++ /dev/null
@@ -1,26 +0,0 @@
-languageId: latex
-command:
-  version: 1
-  spokenForm: change paragraph
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: namedParagraph, includeSiblings: false}
-initialState:
-  documentContents: |
-    \paragraph{1}
-    \subparagraph{child}
-    some text
-    \paragraph{2}
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-  marks: {}
-finalState:
-  documentContents: |
-
-    \paragraph{2}
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: containingScope, scopeType: paragraph, includeSiblings: false}, isImplicit: false}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/latex/changePart.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/latex/changePart.yml
deleted file mode 100644
index a3600c09c0..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/latex/changePart.yml
+++ /dev/null
@@ -1,26 +0,0 @@
-languageId: latex
-command:
-  version: 1
-  spokenForm: change part
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: part, includeSiblings: false}
-initialState:
-  documentContents: |
-    \part{1}
-    \chapter{child}
-    some text
-    \part{2}
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-  marks: {}
-finalState:
-  documentContents: |
-
-    \part{2}
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: containingScope, scopeType: part, includeSiblings: false}, isImplicit: false}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/latex/changeSection.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/latex/changeSection.yml
deleted file mode 100644
index d9863804c7..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/latex/changeSection.yml
+++ /dev/null
@@ -1,26 +0,0 @@
-languageId: latex
-command:
-  version: 1
-  spokenForm: change section
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: section, includeSiblings: false}
-initialState:
-  documentContents: |
-    \section{1}
-    \subsection{child}
-    some text
-    \section{2}
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-  marks: {}
-finalState:
-  documentContents: |
-
-    \section{2}
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: containingScope, scopeType: section, includeSiblings: false}, isImplicit: false}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/latex/changeSubparagraph.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/latex/changeSubparagraph.yml
deleted file mode 100644
index f85ecf2f55..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/latex/changeSubparagraph.yml
+++ /dev/null
@@ -1,25 +0,0 @@
-languageId: latex
-command:
-  version: 1
-  spokenForm: change subparagraph
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: subParagraph, includeSiblings: false}
-initialState:
-  documentContents: |
-    \subparagraph{1}
-    some text
-    \subparagraph{2}
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-  marks: {}
-finalState:
-  documentContents: |
-
-    \subparagraph{2}
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: containingScope, scopeType: subParagraph, includeSiblings: false}, isImplicit: false}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/latex/changeSubsection.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/latex/changeSubsection.yml
deleted file mode 100644
index 4ae1cec215..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/latex/changeSubsection.yml
+++ /dev/null
@@ -1,26 +0,0 @@
-languageId: latex
-command:
-  version: 1
-  spokenForm: change subsection
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: subSection, includeSiblings: false}
-initialState:
-  documentContents: |
-    \subsection{1}
-    \subsubsection{child}
-    some text
-    \subsection{2}
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-  marks: {}
-finalState:
-  documentContents: |
-
-    \subsection{2}
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: containingScope, scopeType: subSection, includeSiblings: false}, isImplicit: false}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/latex/changeSubsubsection.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/latex/changeSubsubsection.yml
deleted file mode 100644
index c82379a121..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/latex/changeSubsubsection.yml
+++ /dev/null
@@ -1,26 +0,0 @@
-languageId: latex
-command:
-  version: 1
-  spokenForm: change subsubsection
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: subSubSection, includeSiblings: false}
-initialState:
-  documentContents: |-
-    \subsubsection{1}
-    \paragraph{child}
-    some text
-    \subsubsection{2}
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-  marks: {}
-finalState:
-  documentContents: |-
-
-    \subsubsection{2}
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: containingScope, scopeType: subSubSection, includeSiblings: false}, isImplicit: false}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/latex/chuckArg.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/latex/chuckArg.yml
deleted file mode 100644
index 6cc72f7a86..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/latex/chuckArg.yml
+++ /dev/null
@@ -1,20 +0,0 @@
-languageId: latex
-command:
-  version: 1
-  spokenForm: chuck arg
-  action: remove
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: argumentOrParameter, includeSiblings: false}
-initialState:
-  documentContents: \usepackage[utf8]{inputenc}
-  selections:
-    - anchor: {line: 0, character: 14}
-      active: {line: 0, character: 14}
-  marks: {}
-finalState:
-  documentContents: \usepackage{inputenc}
-  selections:
-    - anchor: {line: 0, character: 11}
-      active: {line: 0, character: 11}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: outside, modifier: {type: containingScope, scopeType: argumentOrParameter, includeSiblings: false}, isImplicit: false}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/latex/chuckArg2.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/latex/chuckArg2.yml
deleted file mode 100644
index 5df6ef1993..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/latex/chuckArg2.yml
+++ /dev/null
@@ -1,20 +0,0 @@
-languageId: latex
-command:
-  version: 1
-  spokenForm: chuck arg
-  action: remove
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: argumentOrParameter, includeSiblings: false}
-initialState:
-  documentContents: \usepackage[utf8]{inputenc}
-  selections:
-    - anchor: {line: 0, character: 21}
-      active: {line: 0, character: 21}
-  marks: {}
-finalState:
-  documentContents: \usepackage[utf8]
-  selections:
-    - anchor: {line: 0, character: 17}
-      active: {line: 0, character: 17}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: outside, modifier: {type: containingScope, scopeType: argumentOrParameter, includeSiblings: false}, isImplicit: false}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/latex/chuckArg3.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/latex/chuckArg3.yml
deleted file mode 100644
index 69a8d349bd..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/latex/chuckArg3.yml
+++ /dev/null
@@ -1,20 +0,0 @@
-languageId: latex
-command:
-  version: 1
-  spokenForm: chuck arg
-  action: remove
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: argumentOrParameter, includeSiblings: false}
-initialState:
-  documentContents: \section{some section}
-  selections:
-    - anchor: {line: 0, character: 16}
-      active: {line: 0, character: 16}
-  marks: {}
-finalState:
-  documentContents: \section
-  selections:
-    - anchor: {line: 0, character: 8}
-      active: {line: 0, character: 8}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: outside, modifier: {type: containingScope, scopeType: argumentOrParameter, includeSiblings: false}, isImplicit: false}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/latex/chuckArg4.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/latex/chuckArg4.yml
deleted file mode 100644
index c8580fa46d..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/latex/chuckArg4.yml
+++ /dev/null
@@ -1,24 +0,0 @@
-languageId: latex
-command:
-  version: 1
-  spokenForm: chuck arg
-  action: remove
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: argumentOrParameter, includeSiblings: false}
-initialState:
-  documentContents: |-
-    \begin{itemize}
-    \end{itemize}
-  selections:
-    - anchor: {line: 0, character: 10}
-      active: {line: 0, character: 10}
-  marks: {}
-finalState:
-  documentContents: |-
-    \begin
-    \end{itemize}
-  selections:
-    - anchor: {line: 0, character: 6}
-      active: {line: 0, character: 6}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: outside, modifier: {type: containingScope, scopeType: argumentOrParameter, includeSiblings: false}, isImplicit: false}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/latex/chuckEveryItem.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/latex/chuckEveryItem.yml
deleted file mode 100644
index 124314872b..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/latex/chuckEveryItem.yml
+++ /dev/null
@@ -1,28 +0,0 @@
-languageId: latex
-command:
-  version: 1
-  spokenForm: chuck every item
-  action: remove
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: collectionItem, includeSiblings: true}
-initialState:
-  documentContents: |-
-    \begin{itemize}
-        \item one \LaTeX
-        \item two \LaTeX
-    \end{itemize}
-  selections:
-    - anchor: {line: 1, character: 10}
-      active: {line: 1, character: 10}
-  marks: {}
-finalState:
-  documentContents: |-
-    \begin{itemize}
-        
-        
-    \end{itemize}
-  selections:
-    - anchor: {line: 1, character: 4}
-      active: {line: 1, character: 4}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: outside, modifier: {type: containingScope, scopeType: collectionItem, includeSiblings: true}, isImplicit: false}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/latex/chuckItem.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/latex/chuckItem.yml
deleted file mode 100644
index 6db6980417..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/latex/chuckItem.yml
+++ /dev/null
@@ -1,28 +0,0 @@
-languageId: latex
-command:
-  version: 1
-  spokenForm: chuck item
-  action: remove
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: collectionItem, includeSiblings: false}
-initialState:
-  documentContents: |-
-    \begin{itemize}
-        \item one \LaTeX
-        \item two \LaTeX
-    \end{itemize}
-  selections:
-    - anchor: {line: 1, character: 11}
-      active: {line: 1, character: 11}
-  marks: {}
-finalState:
-  documentContents: |-
-    \begin{itemize}
-        
-        \item two \LaTeX
-    \end{itemize}
-  selections:
-    - anchor: {line: 1, character: 4}
-      active: {line: 1, character: 4}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: outside, modifier: {type: containingScope, scopeType: collectionItem, includeSiblings: false}, isImplicit: false}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/latex/chuckName.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/latex/chuckName.yml
deleted file mode 100644
index e6fdabc51f..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/latex/chuckName.yml
+++ /dev/null
@@ -1,20 +0,0 @@
-languageId: latex
-command:
-  version: 1
-  spokenForm: chuck name
-  action: remove
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: name, includeSiblings: false}
-initialState:
-  documentContents: \section{some section}
-  selections:
-    - anchor: {line: 0, character: 13}
-      active: {line: 0, character: 13}
-  marks: {}
-finalState:
-  documentContents: \section
-  selections:
-    - anchor: {line: 0, character: 8}
-      active: {line: 0, character: 8}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: outside, modifier: {type: containingScope, scopeType: name, includeSiblings: false}, isImplicit: false}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/latex/clearRound.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/latex/clearRound.yml
deleted file mode 100644
index 7dae13f955..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/latex/clearRound.yml
+++ /dev/null
@@ -1,23 +0,0 @@
-languageId: latex
-command:
-  spokenForm: clear round
-  version: 2
-  targets:
-    - type: primitive
-      modifiers:
-        - type: containingScope
-          scopeType: {type: surroundingPair, delimiter: parentheses}
-  usePrePhraseSnapshot: true
-  action: {name: clearAndSetSelection}
-initialState:
-  documentContents: hello (there)
-  selections:
-    - anchor: {line: 0, character: 10}
-      active: {line: 0, character: 10}
-  marks: {}
-finalState:
-  documentContents: "hello "
-  selections:
-    - anchor: {line: 0, character: 6}
-      active: {line: 0, character: 6}
-fullTargets: [{type: primitive, mark: {type: cursor}, modifiers: [{type: containingScope, scopeType: {type: surroundingPair, delimiter: parentheses}}]}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/markdown/changeName.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/markdown/changeName.yml
deleted file mode 100644
index f66fc21361..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/markdown/changeName.yml
+++ /dev/null
@@ -1,26 +0,0 @@
-languageId: markdown
-command:
-  version: 1
-  spokenForm: change name
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: name, includeSiblings: false}
-initialState:
-  documentContents: |-
-    # Hello world
-
-    Testing testing
-  selections:
-    - anchor: {line: 2, character: 14}
-      active: {line: 2, character: 14}
-  marks: {}
-finalState:
-  documentContents: |-
-    # 
-
-    Testing testing
-  selections:
-    - anchor: {line: 0, character: 2}
-      active: {line: 0, character: 2}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: containingScope, scopeType: name, includeSiblings: false}, isImplicit: false}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/markdown/changeName2.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/markdown/changeName2.yml
deleted file mode 100644
index 0339e72674..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/markdown/changeName2.yml
+++ /dev/null
@@ -1,26 +0,0 @@
-languageId: markdown
-command:
-  version: 1
-  spokenForm: change name
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: name, includeSiblings: false}
-initialState:
-  documentContents: |-
-    # Hello world
-
-    Testing testing
-  selections:
-    - anchor: {line: 0, character: 10}
-      active: {line: 0, character: 10}
-  marks: {}
-finalState:
-  documentContents: |-
-    # 
-
-    Testing testing
-  selections:
-    - anchor: {line: 0, character: 2}
-      active: {line: 0, character: 2}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: containingScope, scopeType: name, includeSiblings: false}, isImplicit: false}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/markdown/changeOneSection.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/markdown/changeOneSection.yml
deleted file mode 100644
index c026201a1a..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/markdown/changeOneSection.yml
+++ /dev/null
@@ -1,29 +0,0 @@
-languageId: markdown
-command:
-  version: 1
-  spokenForm: change one section
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: sectionLevelOne, includeSiblings: false}
-initialState:
-  documentContents: |-
-    # Hello world
-
-    Testing testing
-
-    ## Some test
-
-    Hello there
-
-    ## Another test
-  selections:
-    - anchor: {line: 6, character: 9}
-      active: {line: 6, character: 9}
-  marks: {}
-finalState:
-  documentContents: ""
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: containingScope, scopeType: sectionLevelOne, includeSiblings: false}, isImplicit: false}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/markdown/changeOneSection2.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/markdown/changeOneSection2.yml
deleted file mode 100644
index ac965feb59..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/markdown/changeOneSection2.yml
+++ /dev/null
@@ -1,32 +0,0 @@
-languageId: markdown
-command:
-  version: 1
-  spokenForm: change one section
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: sectionLevelOne, includeSiblings: false}
-initialState:
-  documentContents: |-
-    # Hello world
-
-    Testing testing
-
-    ## Some test
-
-    Hello there
-
-    # Another test
-  selections:
-    - anchor: {line: 6, character: 8}
-      active: {line: 6, character: 8}
-  marks: {}
-finalState:
-  documentContents: |-
-
-
-    # Another test
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: containingScope, scopeType: sectionLevelOne, includeSiblings: false}, isImplicit: false}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/markdown/changeSection.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/markdown/changeSection.yml
deleted file mode 100644
index aa793333a4..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/markdown/changeSection.yml
+++ /dev/null
@@ -1,23 +0,0 @@
-languageId: markdown
-command:
-  version: 1
-  spokenForm: change section
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: section, includeSiblings: false}
-initialState:
-  documentContents: |-
-    # Hello world
-
-    Testing testing
-  selections:
-    - anchor: {line: 0, character: 10}
-      active: {line: 0, character: 10}
-  marks: {}
-finalState:
-  documentContents: ""
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: containingScope, scopeType: section, includeSiblings: false}, isImplicit: false}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/markdown/changeSection2.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/markdown/changeSection2.yml
deleted file mode 100644
index 28bb857434..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/markdown/changeSection2.yml
+++ /dev/null
@@ -1,23 +0,0 @@
-languageId: markdown
-command:
-  version: 1
-  spokenForm: change section
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: section, includeSiblings: false}
-initialState:
-  documentContents: |-
-    # Hello world
-
-    Testing testing
-  selections:
-    - anchor: {line: 2, character: 10}
-      active: {line: 2, character: 10}
-  marks: {}
-finalState:
-  documentContents: ""
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: containingScope, scopeType: section, includeSiblings: false}, isImplicit: false}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/markdown/changeSection3.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/markdown/changeSection3.yml
deleted file mode 100644
index 884f9fcc2d..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/markdown/changeSection3.yml
+++ /dev/null
@@ -1,25 +0,0 @@
-languageId: markdown
-command:
-  version: 1
-  spokenForm: change section
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: section, includeSiblings: false}
-initialState:
-  documentContents: |-
-    # Hello world
-
-    Testing testing
-
-    ## Some test
-  selections:
-    - anchor: {line: 2, character: 12}
-      active: {line: 2, character: 12}
-  marks: {}
-finalState:
-  documentContents: ""
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: containingScope, scopeType: section, includeSiblings: false}, isImplicit: false}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/markdown/changeSection4.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/markdown/changeSection4.yml
deleted file mode 100644
index b1f8ac6592..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/markdown/changeSection4.yml
+++ /dev/null
@@ -1,28 +0,0 @@
-languageId: markdown
-command:
-  version: 1
-  spokenForm: change section
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: section, includeSiblings: false}
-initialState:
-  documentContents: |-
-    # Hello world
-
-    Testing testing
-
-    # Some test
-  selections:
-    - anchor: {line: 2, character: 11}
-      active: {line: 2, character: 11}
-  marks: {}
-finalState:
-  documentContents: |-
-
-
-    # Some test
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: containingScope, scopeType: section, includeSiblings: false}, isImplicit: false}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/markdown/changeSection5.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/markdown/changeSection5.yml
deleted file mode 100644
index 6d85c07fe6..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/markdown/changeSection5.yml
+++ /dev/null
@@ -1,36 +0,0 @@
-languageId: markdown
-command:
-  version: 1
-  spokenForm: change section
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: section, includeSiblings: false}
-initialState:
-  documentContents: |-
-    # Hello world
-
-    Testing testing
-
-    ## Some test
-
-    Hello there
-
-    # Another test
-  selections:
-    - anchor: {line: 6, character: 9}
-      active: {line: 6, character: 9}
-  marks: {}
-finalState:
-  documentContents: |-
-    # Hello world
-
-    Testing testing
-
-
-
-    # Another test
-  selections:
-    - anchor: {line: 4, character: 0}
-      active: {line: 4, character: 0}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: containingScope, scopeType: section, includeSiblings: false}, isImplicit: false}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/markdown/changeSection6.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/markdown/changeSection6.yml
deleted file mode 100644
index e844013fa0..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/markdown/changeSection6.yml
+++ /dev/null
@@ -1,33 +0,0 @@
-languageId: markdown
-command:
-  version: 1
-  spokenForm: change section
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: section, includeSiblings: false}
-initialState:
-  documentContents: |-
-    # Hello world
-
-    Testing testing
-
-    ## Some test
-
-    Hello there
-
-    ### Another test
-  selections:
-    - anchor: {line: 6, character: 8}
-      active: {line: 6, character: 8}
-  marks: {}
-finalState:
-  documentContents: |+
-    # Hello world
-
-    Testing testing
-
-  selections:
-    - anchor: {line: 4, character: 0}
-      active: {line: 4, character: 0}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: containingScope, scopeType: section, includeSiblings: false}, isImplicit: false}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/markdown/chuckItem.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/markdown/chuckItem.yml
deleted file mode 100644
index 0c1750c832..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/markdown/chuckItem.yml
+++ /dev/null
@@ -1,26 +0,0 @@
-languageId: markdown
-command:
-  version: 1
-  spokenForm: chuck item
-  action: remove
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: collectionItem, includeSiblings: false}
-initialState:
-  documentContents: |-
-
-    - hello world
-    - whatever now
-  selections:
-    - anchor: {line: 1, character: 12}
-      active: {line: 1, character: 12}
-  marks: {}
-finalState:
-  documentContents: |-
-
-
-    - whatever now
-  selections:
-    - anchor: {line: 1, character: 0}
-      active: {line: 1, character: 0}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: outside, modifier: {type: containingScope, scopeType: collectionItem, includeSiblings: false}, isImplicit: false}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/markdown/chuckName.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/markdown/chuckName.yml
deleted file mode 100644
index d4b7acccf5..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/markdown/chuckName.yml
+++ /dev/null
@@ -1,25 +0,0 @@
-languageId: markdown
-command:
-  version: 1
-  spokenForm: chuck name
-  action: remove
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: name, includeSiblings: false}
-initialState:
-  documentContents: |-
-    # Hello world
-
-    Testing testing
-  selections:
-    - anchor: {line: 2, character: 14}
-      active: {line: 2, character: 14}
-  marks: {}
-finalState:
-  documentContents: |-
-
-    Testing testing
-  selections:
-    - anchor: {line: 1, character: 14}
-      active: {line: 1, character: 14}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: outside, modifier: {type: containingScope, scopeType: name, includeSiblings: false}, isImplicit: false}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/markdown/clearComment.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/markdown/clearComment.yml
deleted file mode 100644
index 9cfea8ed6a..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/markdown/clearComment.yml
+++ /dev/null
@@ -1,20 +0,0 @@
-languageId: markdown
-command:
-  version: 1
-  spokenForm: clear comment
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: comment, includeSiblings: false}
-initialState:
-  documentContents: <!-- hello world -->
-  selections:
-    - anchor: {line: 0, character: 16}
-      active: {line: 0, character: 16}
-  marks: {}
-finalState:
-  documentContents: ""
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: containingScope, scopeType: comment, includeSiblings: false}, isImplicit: false}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/markdown/clearItem.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/markdown/clearItem.yml
deleted file mode 100644
index e67a517d16..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/markdown/clearItem.yml
+++ /dev/null
@@ -1,26 +0,0 @@
-languageId: markdown
-command:
-  version: 1
-  spokenForm: clear item
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: collectionItem, includeSiblings: false}
-initialState:
-  documentContents: |-
-
-    - hello world
-    - whatever now
-  selections:
-    - anchor: {line: 1, character: 12}
-      active: {line: 1, character: 12}
-  marks: {}
-finalState:
-  documentContents: |-
-
-    - 
-    - whatever now
-  selections:
-    - anchor: {line: 1, character: 2}
-      active: {line: 1, character: 2}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: containingScope, scopeType: collectionItem, includeSiblings: false}, isImplicit: false}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/markdown/clearList.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/markdown/clearList.yml
deleted file mode 100644
index 0973e6d531..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/markdown/clearList.yml
+++ /dev/null
@@ -1,24 +0,0 @@
-languageId: markdown
-command:
-  version: 1
-  spokenForm: clear list
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: list, includeSiblings: false}
-initialState:
-  documentContents: |-
-
-    - hello world
-    - this is a test
-  selections:
-    - anchor: {line: 1, character: 12}
-      active: {line: 1, character: 12}
-  marks: {}
-finalState:
-  documentContents: |+
-
-  selections:
-    - anchor: {line: 1, character: 0}
-      active: {line: 1, character: 0}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: containingScope, scopeType: list, includeSiblings: false}, isImplicit: false}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/php/changeArg.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/php/changeArg.yml
deleted file mode 100644
index 3a72a3f135..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/php/changeArg.yml
+++ /dev/null
@@ -1,32 +0,0 @@
-languageId: php
-command:
-  version: 1
-  spokenForm: change arg
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: argumentOrParameter, includeSiblings: false}
-initialState:
-  documentContents: |-
-    <?php
-
-    function myFunc($value)
-    {
-
-    }
-  selections:
-    - anchor: {line: 2, character: 20}
-      active: {line: 2, character: 20}
-  marks: {}
-finalState:
-  documentContents: |-
-    <?php
-
-    function myFunc()
-    {
-
-    }
-  selections:
-    - anchor: {line: 2, character: 16}
-      active: {line: 2, character: 16}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: containingScope, scopeType: argumentOrParameter, includeSiblings: false}, isImplicit: false}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/php/changeArg10.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/php/changeArg10.yml
deleted file mode 100644
index cfba31ae90..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/php/changeArg10.yml
+++ /dev/null
@@ -1,26 +0,0 @@
-languageId: php
-command:
-  version: 1
-  spokenForm: change arg
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: argumentOrParameter, includeSiblings: false}
-initialState:
-  documentContents: |-
-    <?php
-
-    myFunc($value, $num, $param);
-  selections:
-    - anchor: {line: 2, character: 16}
-      active: {line: 2, character: 16}
-  marks: {}
-finalState:
-  documentContents: |-
-    <?php
-
-    myFunc($value, , $param);
-  selections:
-    - anchor: {line: 2, character: 15}
-      active: {line: 2, character: 15}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: containingScope, scopeType: argumentOrParameter, includeSiblings: false}, isImplicit: false}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/php/changeArg2.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/php/changeArg2.yml
deleted file mode 100644
index c593790a7c..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/php/changeArg2.yml
+++ /dev/null
@@ -1,32 +0,0 @@
-languageId: php
-command:
-  version: 1
-  spokenForm: change arg
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: argumentOrParameter, includeSiblings: false}
-initialState:
-  documentContents: |-
-    <?php
-
-    function myFunc(...$nums)
-    {
-
-    }
-  selections:
-    - anchor: {line: 2, character: 20}
-      active: {line: 2, character: 20}
-  marks: {}
-finalState:
-  documentContents: |-
-    <?php
-
-    function myFunc()
-    {
-
-    }
-  selections:
-    - anchor: {line: 2, character: 16}
-      active: {line: 2, character: 16}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: containingScope, scopeType: argumentOrParameter, includeSiblings: false}, isImplicit: false}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/php/changeArg3.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/php/changeArg3.yml
deleted file mode 100644
index d7a00b781c..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/php/changeArg3.yml
+++ /dev/null
@@ -1,32 +0,0 @@
-languageId: php
-command:
-  version: 1
-  spokenForm: change arg
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: argumentOrParameter, includeSiblings: false}
-initialState:
-  documentContents: |-
-    <?php
-
-    function myFunc($value, ...$nums)
-    {
-
-    }
-  selections:
-    - anchor: {line: 2, character: 20}
-      active: {line: 2, character: 20}
-  marks: {}
-finalState:
-  documentContents: |-
-    <?php
-
-    function myFunc(, ...$nums)
-    {
-
-    }
-  selections:
-    - anchor: {line: 2, character: 16}
-      active: {line: 2, character: 16}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: containingScope, scopeType: argumentOrParameter, includeSiblings: false}, isImplicit: false}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/php/changeArg4.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/php/changeArg4.yml
deleted file mode 100644
index d739bb6309..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/php/changeArg4.yml
+++ /dev/null
@@ -1,32 +0,0 @@
-languageId: php
-command:
-  version: 1
-  spokenForm: change arg
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: argumentOrParameter, includeSiblings: false}
-initialState:
-  documentContents: |-
-    <?php
-
-    function myFunc($value, ...$nums)
-    {
-
-    }
-  selections:
-    - anchor: {line: 2, character: 28}
-      active: {line: 2, character: 28}
-  marks: {}
-finalState:
-  documentContents: |-
-    <?php
-
-    function myFunc($value, )
-    {
-
-    }
-  selections:
-    - anchor: {line: 2, character: 24}
-      active: {line: 2, character: 24}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: containingScope, scopeType: argumentOrParameter, includeSiblings: false}, isImplicit: false}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/php/changeArg5.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/php/changeArg5.yml
deleted file mode 100644
index 6a2cf52ce9..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/php/changeArg5.yml
+++ /dev/null
@@ -1,32 +0,0 @@
-languageId: php
-command:
-  version: 1
-  spokenForm: change arg
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: argumentOrParameter, includeSiblings: false}
-initialState:
-  documentContents: |-
-    <?php
-
-    function myFunc($value, $num, $param)
-    {
-
-    }
-  selections:
-    - anchor: {line: 2, character: 26}
-      active: {line: 2, character: 26}
-  marks: {}
-finalState:
-  documentContents: |-
-    <?php
-
-    function myFunc($value, , $param)
-    {
-
-    }
-  selections:
-    - anchor: {line: 2, character: 24}
-      active: {line: 2, character: 24}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: containingScope, scopeType: argumentOrParameter, includeSiblings: false}, isImplicit: false}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/php/changeArg6.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/php/changeArg6.yml
deleted file mode 100644
index 57bea1b10f..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/php/changeArg6.yml
+++ /dev/null
@@ -1,26 +0,0 @@
-languageId: php
-command:
-  version: 1
-  spokenForm: change arg
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: argumentOrParameter, includeSiblings: false}
-initialState:
-  documentContents: |-
-    <?php
-
-    myFunc($value);
-  selections:
-    - anchor: {line: 2, character: 11}
-      active: {line: 2, character: 11}
-  marks: {}
-finalState:
-  documentContents: |-
-    <?php
-
-    myFunc();
-  selections:
-    - anchor: {line: 2, character: 7}
-      active: {line: 2, character: 7}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: containingScope, scopeType: argumentOrParameter, includeSiblings: false}, isImplicit: false}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/php/changeArg7.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/php/changeArg7.yml
deleted file mode 100644
index 36a473395c..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/php/changeArg7.yml
+++ /dev/null
@@ -1,26 +0,0 @@
-languageId: php
-command:
-  version: 1
-  spokenForm: change arg
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: argumentOrParameter, includeSiblings: false}
-initialState:
-  documentContents: |-
-    <?php
-
-    myFunc(...$nums);"
-  selections:
-    - anchor: {line: 2, character: 11}
-      active: {line: 2, character: 11}
-  marks: {}
-finalState:
-  documentContents: |-
-    <?php
-
-    myFunc();"
-  selections:
-    - anchor: {line: 2, character: 7}
-      active: {line: 2, character: 7}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: containingScope, scopeType: argumentOrParameter, includeSiblings: false}, isImplicit: false}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/php/changeArg8.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/php/changeArg8.yml
deleted file mode 100644
index 9887fbbaef..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/php/changeArg8.yml
+++ /dev/null
@@ -1,26 +0,0 @@
-languageId: php
-command:
-  version: 1
-  spokenForm: change arg
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: argumentOrParameter, includeSiblings: false}
-initialState:
-  documentContents: |-
-    <?php
-
-    myFunc($value, ...$nums);
-  selections:
-    - anchor: {line: 2, character: 11}
-      active: {line: 2, character: 11}
-  marks: {}
-finalState:
-  documentContents: |-
-    <?php
-
-    myFunc(, ...$nums);
-  selections:
-    - anchor: {line: 2, character: 7}
-      active: {line: 2, character: 7}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: containingScope, scopeType: argumentOrParameter, includeSiblings: false}, isImplicit: false}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/php/changeArg9.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/php/changeArg9.yml
deleted file mode 100644
index bc20cfa93b..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/php/changeArg9.yml
+++ /dev/null
@@ -1,26 +0,0 @@
-languageId: php
-command:
-  version: 1
-  spokenForm: change arg
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: argumentOrParameter, includeSiblings: false}
-initialState:
-  documentContents: |-
-    <?php
-
-    myFunc($value, ...$nums);
-  selections:
-    - anchor: {line: 2, character: 19}
-      active: {line: 2, character: 19}
-  marks: {}
-finalState:
-  documentContents: |-
-    <?php
-
-    myFunc($value, );
-  selections:
-    - anchor: {line: 2, character: 15}
-      active: {line: 2, character: 15}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: containingScope, scopeType: argumentOrParameter, includeSiblings: false}, isImplicit: false}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/php/changeCall.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/php/changeCall.yml
deleted file mode 100644
index 143b80fbb1..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/php/changeCall.yml
+++ /dev/null
@@ -1,26 +0,0 @@
-languageId: php
-command:
-  version: 1
-  spokenForm: change call
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: functionCall, includeSiblings: false}
-initialState:
-  documentContents: |-
-    <?php
-
-    myFunk(1, 2, 3);
-  selections:
-    - anchor: {line: 2, character: 6}
-      active: {line: 2, character: 6}
-  marks: {}
-finalState:
-  documentContents: |-
-    <?php
-
-    ;
-  selections:
-    - anchor: {line: 2, character: 0}
-      active: {line: 2, character: 0}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: containingScope, scopeType: functionCall, includeSiblings: false}, isImplicit: false}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/php/changeCall2.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/php/changeCall2.yml
deleted file mode 100644
index 18bba64bb5..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/php/changeCall2.yml
+++ /dev/null
@@ -1,26 +0,0 @@
-languageId: php
-command:
-  version: 1
-  spokenForm: change call
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: functionCall, includeSiblings: false}
-initialState:
-  documentContents: |-
-    <?php
-
-    new MyClass();
-  selections:
-    - anchor: {line: 2, character: 4}
-      active: {line: 2, character: 4}
-  marks: {}
-finalState:
-  documentContents: |-
-    <?php
-
-    ;
-  selections:
-    - anchor: {line: 2, character: 0}
-      active: {line: 2, character: 0}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: containingScope, scopeType: functionCall, includeSiblings: false}, isImplicit: false}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/php/changeClass.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/php/changeClass.yml
deleted file mode 100644
index 2c7e5845b3..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/php/changeClass.yml
+++ /dev/null
@@ -1,28 +0,0 @@
-languageId: php
-command:
-  version: 1
-  spokenForm: change class
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: class, includeSiblings: false}
-initialState:
-  documentContents: |-
-    <?php
-
-    class MyClass
-    {
-
-    }
-  selections:
-    - anchor: {line: 4, character: 0}
-      active: {line: 4, character: 0}
-  marks: {}
-finalState:
-  documentContents: |+
-    <?php
-
-  selections:
-    - anchor: {line: 2, character: 0}
-      active: {line: 2, character: 0}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: containingScope, scopeType: class, includeSiblings: false}, isImplicit: false}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/php/changeClassName.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/php/changeClassName.yml
deleted file mode 100644
index a75f5845d5..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/php/changeClassName.yml
+++ /dev/null
@@ -1,32 +0,0 @@
-languageId: php
-command:
-  version: 1
-  spokenForm: change class name
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: className, includeSiblings: false}
-initialState:
-  documentContents: |-
-    <?php
-
-    class MyClass
-    {
-
-    }
-  selections:
-    - anchor: {line: 4, character: 0}
-      active: {line: 4, character: 0}
-  marks: {}
-finalState:
-  documentContents: |-
-    <?php
-
-    class 
-    {
-
-    }
-  selections:
-    - anchor: {line: 2, character: 6}
-      active: {line: 2, character: 6}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: containingScope, scopeType: className, includeSiblings: false}, isImplicit: false}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/php/changeComment.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/php/changeComment.yml
deleted file mode 100644
index 88092311a9..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/php/changeComment.yml
+++ /dev/null
@@ -1,25 +0,0 @@
-languageId: php
-command:
-  version: 1
-  spokenForm: change comment
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: comment, includeSiblings: false}
-initialState:
-  documentContents: |-
-    <?php
-
-    // Hello world!
-  selections:
-    - anchor: {line: 2, character: 2}
-      active: {line: 2, character: 2}
-  marks: {}
-finalState:
-  documentContents: |+
-    <?php
-
-  selections:
-    - anchor: {line: 2, character: 0}
-      active: {line: 2, character: 0}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: containingScope, scopeType: comment, includeSiblings: false}, isImplicit: false}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/php/changeEveryArg.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/php/changeEveryArg.yml
deleted file mode 100644
index 3988e21f02..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/php/changeEveryArg.yml
+++ /dev/null
@@ -1,34 +0,0 @@
-languageId: php
-command:
-  version: 1
-  spokenForm: change every arg
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: argumentOrParameter, includeSiblings: true}
-initialState:
-  documentContents: |-
-    <?php
-
-    function myFunc($value, $nums)
-    {
-
-    }
-  selections:
-    - anchor: {line: 2, character: 20}
-      active: {line: 2, character: 20}
-  marks: {}
-finalState:
-  documentContents: |-
-    <?php
-
-    function myFunc(, )
-    {
-
-    }
-  selections:
-    - anchor: {line: 2, character: 16}
-      active: {line: 2, character: 16}
-    - anchor: {line: 2, character: 18}
-      active: {line: 2, character: 18}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: containingScope, scopeType: argumentOrParameter, includeSiblings: true}, isImplicit: false}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/php/changeEveryItem.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/php/changeEveryItem.yml
deleted file mode 100644
index 25c317e58d..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/php/changeEveryItem.yml
+++ /dev/null
@@ -1,30 +0,0 @@
-languageId: php
-command:
-  version: 1
-  spokenForm: change every item
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: collectionItem, includeSiblings: true}
-initialState:
-  documentContents: |-
-    <?php
-
-    [1, 2, 3];
-  selections:
-    - anchor: {line: 2, character: 4}
-      active: {line: 2, character: 4}
-  marks: {}
-finalState:
-  documentContents: |-
-    <?php
-
-    [, , ];
-  selections:
-    - anchor: {line: 2, character: 1}
-      active: {line: 2, character: 1}
-    - anchor: {line: 2, character: 3}
-      active: {line: 2, character: 3}
-    - anchor: {line: 2, character: 5}
-      active: {line: 2, character: 5}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: containingScope, scopeType: collectionItem, includeSiblings: true}, isImplicit: false}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/php/changeFunk.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/php/changeFunk.yml
deleted file mode 100644
index 4fa6a4ab65..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/php/changeFunk.yml
+++ /dev/null
@@ -1,27 +0,0 @@
-languageId: php
-command:
-  version: 1
-  spokenForm: change funk
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: namedFunction, includeSiblings: false}
-initialState:
-  documentContents: |-
-    <?php
-
-    function myFunc() {
-
-    }
-  selections:
-    - anchor: {line: 3, character: 0}
-      active: {line: 3, character: 0}
-  marks: {}
-finalState:
-  documentContents: |+
-    <?php
-
-  selections:
-    - anchor: {line: 2, character: 0}
-      active: {line: 2, character: 0}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: containingScope, scopeType: namedFunction, includeSiblings: false}, isImplicit: false}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/php/changeFunkName.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/php/changeFunkName.yml
deleted file mode 100644
index 397da37ae4..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/php/changeFunkName.yml
+++ /dev/null
@@ -1,32 +0,0 @@
-languageId: php
-command:
-  version: 1
-  spokenForm: change funk name
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: functionName, includeSiblings: false}
-initialState:
-  documentContents: |-
-    <?php
-
-    function helloWorld()
-    {
-
-    }
-  selections:
-    - anchor: {line: 4, character: 0}
-      active: {line: 4, character: 0}
-  marks: {}
-finalState:
-  documentContents: |-
-    <?php
-
-    function ()
-    {
-
-    }
-  selections:
-    - anchor: {line: 2, character: 9}
-      active: {line: 2, character: 9}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: containingScope, scopeType: functionName, includeSiblings: false}, isImplicit: false}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/php/changeFunkName2.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/php/changeFunkName2.yml
deleted file mode 100644
index 21b15b865b..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/php/changeFunkName2.yml
+++ /dev/null
@@ -1,38 +0,0 @@
-languageId: php
-command:
-  version: 1
-  spokenForm: change funk name
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: functionName, includeSiblings: false}
-initialState:
-  documentContents: |-
-    <?php
-
-    class MyClass
-    {
-        public function helloWorld()
-        {
-
-        }
-    }
-  selections:
-    - anchor: {line: 6, character: 0}
-      active: {line: 6, character: 0}
-  marks: {}
-finalState:
-  documentContents: |-
-    <?php
-
-    class MyClass
-    {
-        public function ()
-        {
-
-        }
-    }
-  selections:
-    - anchor: {line: 4, character: 20}
-      active: {line: 4, character: 20}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: containingScope, scopeType: functionName, includeSiblings: false}, isImplicit: false}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/php/changeIfState.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/php/changeIfState.yml
deleted file mode 100644
index d0c3d9d047..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/php/changeIfState.yml
+++ /dev/null
@@ -1,27 +0,0 @@
-languageId: php
-command:
-  version: 1
-  spokenForm: change if state
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: ifStatement, includeSiblings: false}
-initialState:
-  documentContents: |-
-    <?php
-
-    if (true) {
-        return;
-    }
-  selections:
-    - anchor: {line: 3, character: 4}
-      active: {line: 3, character: 4}
-  marks: {}
-finalState:
-  documentContents: |+
-    <?php
-
-  selections:
-    - anchor: {line: 2, character: 0}
-      active: {line: 2, character: 0}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: containingScope, scopeType: ifStatement, includeSiblings: false}, isImplicit: false}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/php/changeItem.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/php/changeItem.yml
deleted file mode 100644
index 3244840425..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/php/changeItem.yml
+++ /dev/null
@@ -1,26 +0,0 @@
-languageId: php
-command:
-  version: 1
-  spokenForm: change item
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: collectionItem, includeSiblings: false}
-initialState:
-  documentContents: |-
-    <?php
-
-    [1, 2, 3];
-  selections:
-    - anchor: {line: 2, character: 5}
-      active: {line: 2, character: 5}
-  marks: {}
-finalState:
-  documentContents: |-
-    <?php
-
-    [1, , 3];
-  selections:
-    - anchor: {line: 2, character: 4}
-      active: {line: 2, character: 4}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: containingScope, scopeType: collectionItem, includeSiblings: false}, isImplicit: false}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/php/changeItem2.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/php/changeItem2.yml
deleted file mode 100644
index 2fc2da6d2f..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/php/changeItem2.yml
+++ /dev/null
@@ -1,26 +0,0 @@
-languageId: php
-command:
-  version: 1
-  spokenForm: change item
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: collectionItem, includeSiblings: false}
-initialState:
-  documentContents: |-
-    <?php
-
-    [1, 2, 3];
-  selections:
-    - anchor: {line: 2, character: 7}
-      active: {line: 2, character: 7}
-  marks: {}
-finalState:
-  documentContents: |-
-    <?php
-
-    [1, 2, ];
-  selections:
-    - anchor: {line: 2, character: 7}
-      active: {line: 2, character: 7}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: containingScope, scopeType: collectionItem, includeSiblings: false}, isImplicit: false}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/php/changeItem3.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/php/changeItem3.yml
deleted file mode 100644
index b6aa627703..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/php/changeItem3.yml
+++ /dev/null
@@ -1,26 +0,0 @@
-languageId: php
-command:
-  version: 1
-  spokenForm: change item
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: collectionItem, includeSiblings: false}
-initialState:
-  documentContents: |-
-    <?php
-
-    [1];
-  selections:
-    - anchor: {line: 2, character: 1}
-      active: {line: 2, character: 1}
-  marks: {}
-finalState:
-  documentContents: |-
-    <?php
-
-    [];
-  selections:
-    - anchor: {line: 2, character: 1}
-      active: {line: 2, character: 1}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: containingScope, scopeType: collectionItem, includeSiblings: false}, isImplicit: false}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/php/changeItem4.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/php/changeItem4.yml
deleted file mode 100644
index 25667b1817..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/php/changeItem4.yml
+++ /dev/null
@@ -1,26 +0,0 @@
-languageId: php
-command:
-  version: 1
-  spokenForm: change item
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: collectionItem, includeSiblings: false}
-initialState:
-  documentContents: |-
-    <?php
-
-    ['first' => 1, 'second' => 2, 'third' => 3];
-  selections:
-    - anchor: {line: 2, character: 24}
-      active: {line: 2, character: 24}
-  marks: {}
-finalState:
-  documentContents: |-
-    <?php
-
-    ['first' => 1, , 'third' => 3];
-  selections:
-    - anchor: {line: 2, character: 15}
-      active: {line: 2, character: 15}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: containingScope, scopeType: collectionItem, includeSiblings: false}, isImplicit: false}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/php/changeItem5.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/php/changeItem5.yml
deleted file mode 100644
index e8e0a64a6a..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/php/changeItem5.yml
+++ /dev/null
@@ -1,26 +0,0 @@
-languageId: php
-command:
-  version: 1
-  spokenForm: change item
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: collectionItem, includeSiblings: false}
-initialState:
-  documentContents: |-
-    <?php
-
-    ['first' => 1];
-  selections:
-    - anchor: {line: 2, character: 8}
-      active: {line: 2, character: 8}
-  marks: {}
-finalState:
-  documentContents: |-
-    <?php
-
-    [];
-  selections:
-    - anchor: {line: 2, character: 1}
-      active: {line: 2, character: 1}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: containingScope, scopeType: collectionItem, includeSiblings: false}, isImplicit: false}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/php/changeKey.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/php/changeKey.yml
deleted file mode 100644
index d99aaff9f7..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/php/changeKey.yml
+++ /dev/null
@@ -1,26 +0,0 @@
-languageId: php
-command:
-  version: 1
-  spokenForm: change key
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: collectionKey, includeSiblings: false}
-initialState:
-  documentContents: |-
-    <?php
-
-    ['num' => 1];
-  selections:
-    - anchor: {line: 2, character: 9}
-      active: {line: 2, character: 9}
-  marks: {}
-finalState:
-  documentContents: |-
-    <?php
-
-    [ => 1];
-  selections:
-    - anchor: {line: 2, character: 1}
-      active: {line: 2, character: 1}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: containingScope, scopeType: collectionKey, includeSiblings: false}, isImplicit: false}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/php/changeKey2.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/php/changeKey2.yml
deleted file mode 100644
index 37d4eae69b..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/php/changeKey2.yml
+++ /dev/null
@@ -1,26 +0,0 @@
-languageId: php
-command:
-  version: 1
-  spokenForm: change key
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: collectionKey, includeSiblings: false}
-initialState:
-  documentContents: |-
-    <?php
-
-    ['num' => 1];
-  selections:
-    - anchor: {line: 2, character: 3}
-      active: {line: 2, character: 3}
-  marks: {}
-finalState:
-  documentContents: |-
-    <?php
-
-    [ => 1];
-  selections:
-    - anchor: {line: 2, character: 1}
-      active: {line: 2, character: 1}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: containingScope, scopeType: collectionKey, includeSiblings: false}, isImplicit: false}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/php/changeLambda.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/php/changeLambda.yml
deleted file mode 100644
index a464106997..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/php/changeLambda.yml
+++ /dev/null
@@ -1,28 +0,0 @@
-languageId: php
-command:
-  version: 1
-  spokenForm: change lambda
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: anonymousFunction, includeSiblings: false}
-initialState:
-  documentContents: |-
-    <?php
-
-    $myFunc = function() {
-
-    };
-  selections:
-    - anchor: {line: 3, character: 0}
-      active: {line: 3, character: 0}
-  marks: {}
-finalState:
-  documentContents: |-
-    <?php
-
-    $myFunc = ;
-  selections:
-    - anchor: {line: 2, character: 10}
-      active: {line: 2, character: 10}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: containingScope, scopeType: anonymousFunction, includeSiblings: false}, isImplicit: false}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/php/changeLambda2.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/php/changeLambda2.yml
deleted file mode 100644
index 36259cf191..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/php/changeLambda2.yml
+++ /dev/null
@@ -1,26 +0,0 @@
-languageId: php
-command:
-  version: 1
-  spokenForm: change lambda
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: anonymousFunction, includeSiblings: false}
-initialState:
-  documentContents: |-
-    <?php
-
-    $myFunc = fn() => 'Hello world';
-  selections:
-    - anchor: {line: 2, character: 25}
-      active: {line: 2, character: 25}
-  marks: {}
-finalState:
-  documentContents: |-
-    <?php
-
-    $myFunc = ;
-  selections:
-    - anchor: {line: 2, character: 10}
-      active: {line: 2, character: 10}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: containingScope, scopeType: anonymousFunction, includeSiblings: false}, isImplicit: false}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/php/changeLambda3.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/php/changeLambda3.yml
deleted file mode 100644
index 0d1e396d03..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/php/changeLambda3.yml
+++ /dev/null
@@ -1,28 +0,0 @@
-languageId: php
-command:
-  version: 1
-  spokenForm: change lambda
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: anonymousFunction, includeSiblings: false}
-initialState:
-  documentContents: |-
-    <?php
-
-    myFunc(function() {
-
-    });
-  selections:
-    - anchor: {line: 3, character: 0}
-      active: {line: 3, character: 0}
-  marks: {}
-finalState:
-  documentContents: |-
-    <?php
-
-    myFunc();
-  selections:
-    - anchor: {line: 2, character: 7}
-      active: {line: 2, character: 7}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: containingScope, scopeType: anonymousFunction, includeSiblings: false}, isImplicit: false}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/php/changeLambda4.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/php/changeLambda4.yml
deleted file mode 100644
index caebb4b752..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/php/changeLambda4.yml
+++ /dev/null
@@ -1,26 +0,0 @@
-languageId: php
-command:
-  version: 1
-  spokenForm: change lambda
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: anonymousFunction, includeSiblings: false}
-initialState:
-  documentContents: |-
-    <?php
-
-    myFunc(fn() => 'Hello world');
-  selections:
-    - anchor: {line: 2, character: 22}
-      active: {line: 2, character: 22}
-  marks: {}
-finalState:
-  documentContents: |-
-    <?php
-
-    myFunc();
-  selections:
-    - anchor: {line: 2, character: 7}
-      active: {line: 2, character: 7}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: containingScope, scopeType: anonymousFunction, includeSiblings: false}, isImplicit: false}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/php/changeName.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/php/changeName.yml
deleted file mode 100644
index 03c9e2a0de..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/php/changeName.yml
+++ /dev/null
@@ -1,32 +0,0 @@
-languageId: php
-command:
-  version: 1
-  spokenForm: change name
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: name, includeSiblings: false}
-initialState:
-  documentContents: |-
-    <?php
-
-    function helloWorld()
-    {
-
-    }
-  selections:
-    - anchor: {line: 4, character: 0}
-      active: {line: 4, character: 0}
-  marks: {}
-finalState:
-  documentContents: |-
-    <?php
-
-    function ()
-    {
-
-    }
-  selections:
-    - anchor: {line: 2, character: 9}
-      active: {line: 2, character: 9}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: containingScope, scopeType: name, includeSiblings: false}, isImplicit: false}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/php/changeName2.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/php/changeName2.yml
deleted file mode 100644
index e1a1bbd5a3..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/php/changeName2.yml
+++ /dev/null
@@ -1,32 +0,0 @@
-languageId: php
-command:
-  version: 1
-  spokenForm: change name
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: name, includeSiblings: false}
-initialState:
-  documentContents: |-
-    <?php
-
-    class MyClass
-    {
-
-    }
-  selections:
-    - anchor: {line: 4, character: 0}
-      active: {line: 4, character: 0}
-  marks: {}
-finalState:
-  documentContents: |-
-    <?php
-
-    class 
-    {
-
-    }
-  selections:
-    - anchor: {line: 2, character: 6}
-      active: {line: 2, character: 6}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: containingScope, scopeType: name, includeSiblings: false}, isImplicit: false}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/php/changeName3.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/php/changeName3.yml
deleted file mode 100644
index 563d305691..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/php/changeName3.yml
+++ /dev/null
@@ -1,38 +0,0 @@
-languageId: php
-command:
-  version: 1
-  spokenForm: change name
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: name, includeSiblings: false}
-initialState:
-  documentContents: |-
-    <?php
-
-    class MyClass
-    {
-        public function helloWorld()
-        {
-
-        }
-    }
-  selections:
-    - anchor: {line: 6, character: 0}
-      active: {line: 6, character: 0}
-  marks: {}
-finalState:
-  documentContents: |-
-    <?php
-
-    class MyClass
-    {
-        public function ()
-        {
-
-        }
-    }
-  selections:
-    - anchor: {line: 4, character: 20}
-      active: {line: 4, character: 20}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: containingScope, scopeType: name, includeSiblings: false}, isImplicit: false}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/php/changeName4.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/php/changeName4.yml
deleted file mode 100644
index e2a9a66c23..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/php/changeName4.yml
+++ /dev/null
@@ -1,42 +0,0 @@
-languageId: php
-command:
-  version: 1
-  spokenForm: change name
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: name, includeSiblings: false}
-initialState:
-  documentContents: |-
-    <?php
-
-    class MyClass
-    {
-        public $value = 'default';
-
-        public function helloWorld()
-        {
-
-        }
-    }
-  selections:
-    - anchor: {line: 5, character: 0}
-      active: {line: 5, character: 0}
-  marks: {}
-finalState:
-  documentContents: |-
-    <?php
-
-    class 
-    {
-        public $value = 'default';
-
-        public function helloWorld()
-        {
-
-        }
-    }
-  selections:
-    - anchor: {line: 2, character: 6}
-      active: {line: 2, character: 6}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: containingScope, scopeType: name, includeSiblings: false}, isImplicit: false}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/php/changeName5.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/php/changeName5.yml
deleted file mode 100644
index edb2f684c3..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/php/changeName5.yml
+++ /dev/null
@@ -1,26 +0,0 @@
-languageId: php
-command:
-  version: 1
-  spokenForm: change name
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: name, includeSiblings: false}
-initialState:
-  documentContents: |-
-    <?php
-
-    $value = 'Hello world';
-  selections:
-    - anchor: {line: 2, character: 15}
-      active: {line: 2, character: 15}
-  marks: {}
-finalState:
-  documentContents: |-
-    <?php
-
-     = 'Hello world';
-  selections:
-    - anchor: {line: 2, character: 0}
-      active: {line: 2, character: 0}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: containingScope, scopeType: name, includeSiblings: false}, isImplicit: false}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/php/changeName6.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/php/changeName6.yml
deleted file mode 100644
index 58d81d268b..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/php/changeName6.yml
+++ /dev/null
@@ -1,26 +0,0 @@
-languageId: php
-command:
-  version: 1
-  spokenForm: change name
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: name, includeSiblings: false}
-initialState:
-  documentContents: |-
-    <?php
-
-    $value = 'Hello world';
-  selections:
-    - anchor: {line: 2, character: 4}
-      active: {line: 2, character: 4}
-  marks: {}
-finalState:
-  documentContents: |-
-    <?php
-
-     = 'Hello world';
-  selections:
-    - anchor: {line: 2, character: 0}
-      active: {line: 2, character: 0}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: containingScope, scopeType: name, includeSiblings: false}, isImplicit: false}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/php/changeRound.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/php/changeRound.yml
deleted file mode 100644
index 94050cfab9..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/php/changeRound.yml
+++ /dev/null
@@ -1,26 +0,0 @@
-languageId: php
-command:
-  version: 1
-  spokenForm: change round
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: surroundingPair, delimiter: parentheses}
-initialState:
-  documentContents: |-
-    <?php
-
-    "Hello (world)";
-  selections:
-    - anchor: {line: 2, character: 11}
-      active: {line: 2, character: 11}
-  marks: {}
-finalState:
-  documentContents: |-
-    <?php
-
-    "Hello ";
-  selections:
-    - anchor: {line: 2, character: 7}
-      active: {line: 2, character: 7}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: surroundingPair, delimiter: parentheses}, isImplicit: false}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/php/changeString.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/php/changeString.yml
deleted file mode 100644
index c0e222b493..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/php/changeString.yml
+++ /dev/null
@@ -1,26 +0,0 @@
-languageId: php
-command:
-  version: 1
-  spokenForm: change string
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: surroundingPair, delimiter: string}
-initialState:
-  documentContents: |-
-    <?php
-
-    "Hello world";
-  selections:
-    - anchor: {line: 2, character: 7}
-      active: {line: 2, character: 7}
-  marks: {}
-finalState:
-  documentContents: |-
-    <?php
-
-    ;
-  selections:
-    - anchor: {line: 2, character: 0}
-      active: {line: 2, character: 0}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: surroundingPair, delimiter: string}, isImplicit: false}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/php/changeString2.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/php/changeString2.yml
deleted file mode 100644
index 67277cafea..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/php/changeString2.yml
+++ /dev/null
@@ -1,26 +0,0 @@
-languageId: php
-command:
-  version: 1
-  spokenForm: change string
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: surroundingPair, delimiter: string}
-initialState:
-  documentContents: |-
-    <?php
-
-    "Hello {$name}";
-  selections:
-    - anchor: {line: 2, character: 11}
-      active: {line: 2, character: 11}
-  marks: {}
-finalState:
-  documentContents: |-
-    <?php
-
-    ;
-  selections:
-    - anchor: {line: 2, character: 0}
-      active: {line: 2, character: 0}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: surroundingPair, delimiter: string}, isImplicit: false}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/php/changeType.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/php/changeType.yml
deleted file mode 100644
index 6eceda3eff..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/php/changeType.yml
+++ /dev/null
@@ -1,30 +0,0 @@
-languageId: php
-command:
-  version: 1
-  spokenForm: change type
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: type, includeSiblings: false}
-initialState:
-  documentContents: |-
-    <?php
-
-    function myFunc(string $str) {
-
-    }
-  selections:
-    - anchor: {line: 2, character: 25}
-      active: {line: 2, character: 25}
-  marks: {}
-finalState:
-  documentContents: |-
-    <?php
-
-    function myFunc( $str) {
-
-    }
-  selections:
-    - anchor: {line: 2, character: 16}
-      active: {line: 2, character: 16}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: containingScope, scopeType: type, includeSiblings: false}, isImplicit: false}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/php/changeType2.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/php/changeType2.yml
deleted file mode 100644
index 5e589605a2..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/php/changeType2.yml
+++ /dev/null
@@ -1,30 +0,0 @@
-languageId: php
-command:
-  version: 1
-  spokenForm: change type
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: type, includeSiblings: false}
-initialState:
-  documentContents: |-
-    <?php
-
-    function myFunc(string $str) {
-
-    }
-  selections:
-    - anchor: {line: 2, character: 19}
-      active: {line: 2, character: 19}
-  marks: {}
-finalState:
-  documentContents: |-
-    <?php
-
-    function myFunc( $str) {
-
-    }
-  selections:
-    - anchor: {line: 2, character: 16}
-      active: {line: 2, character: 16}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: containingScope, scopeType: type, includeSiblings: false}, isImplicit: false}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/php/changeType3.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/php/changeType3.yml
deleted file mode 100644
index cdec23540b..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/php/changeType3.yml
+++ /dev/null
@@ -1,30 +0,0 @@
-languageId: php
-command:
-  version: 1
-  spokenForm: change type
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: type, includeSiblings: false}
-initialState:
-  documentContents: |-
-    <?php
-
-    function myFunc(array ...$nums) {
-
-    }
-  selections:
-    - anchor: {line: 2, character: 25}
-      active: {line: 2, character: 25}
-  marks: {}
-finalState:
-  documentContents: |-
-    <?php
-
-    function myFunc( ...$nums) {
-
-    }
-  selections:
-    - anchor: {line: 2, character: 16}
-      active: {line: 2, character: 16}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: containingScope, scopeType: type, includeSiblings: false}, isImplicit: false}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/php/changeType4.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/php/changeType4.yml
deleted file mode 100644
index c64504c11b..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/php/changeType4.yml
+++ /dev/null
@@ -1,26 +0,0 @@
-languageId: php
-command:
-  version: 1
-  spokenForm: change type
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: type, includeSiblings: false}
-initialState:
-  documentContents: |-
-    <?php
-
-    (string) $str;
-  selections:
-    - anchor: {line: 2, character: 10}
-      active: {line: 2, character: 10}
-  marks: {}
-finalState:
-  documentContents: |-
-    <?php
-
-    () $str;
-  selections:
-    - anchor: {line: 2, character: 1}
-      active: {line: 2, character: 1}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: containingScope, scopeType: type, includeSiblings: false}, isImplicit: false}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/php/changeType5.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/php/changeType5.yml
deleted file mode 100644
index b570026d0a..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/php/changeType5.yml
+++ /dev/null
@@ -1,34 +0,0 @@
-languageId: php
-command:
-  version: 1
-  spokenForm: change type
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: type, includeSiblings: false}
-initialState:
-  documentContents: |-
-    <?php
-
-    try {
-
-    } catch (Exception $e) {
-
-    }
-  selections:
-    - anchor: {line: 4, character: 20}
-      active: {line: 4, character: 20}
-  marks: {}
-finalState:
-  documentContents: |-
-    <?php
-
-    try {
-
-    } catch ( $e) {
-
-    }
-  selections:
-    - anchor: {line: 4, character: 9}
-      active: {line: 4, character: 9}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: containingScope, scopeType: type, includeSiblings: false}, isImplicit: false}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/php/changeType6.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/php/changeType6.yml
deleted file mode 100644
index 44e3c241c1..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/php/changeType6.yml
+++ /dev/null
@@ -1,30 +0,0 @@
-languageId: php
-command:
-  version: 1
-  spokenForm: change type
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: type, includeSiblings: false}
-initialState:
-  documentContents: |-
-    <?php
-
-    class MyClass {
-        public string $value = 'default';
-    }
-  selections:
-    - anchor: {line: 3, character: 32}
-      active: {line: 3, character: 32}
-  marks: {}
-finalState:
-  documentContents: |-
-    <?php
-
-    class MyClass {
-        public  $value = 'default';
-    }
-  selections:
-    - anchor: {line: 3, character: 11}
-      active: {line: 3, character: 11}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: containingScope, scopeType: type, includeSiblings: false}, isImplicit: false}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/php/changeValue.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/php/changeValue.yml
deleted file mode 100644
index 05fcdb0c0b..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/php/changeValue.yml
+++ /dev/null
@@ -1,26 +0,0 @@
-languageId: php
-command:
-  version: 1
-  spokenForm: change value
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: value, includeSiblings: false}
-initialState:
-  documentContents: |-
-    <?php
-
-    ['num' => 1];
-  selections:
-    - anchor: {line: 2, character: 9}
-      active: {line: 2, character: 9}
-  marks: {}
-finalState:
-  documentContents: |-
-    <?php
-
-    ['num' => ];
-  selections:
-    - anchor: {line: 2, character: 10}
-      active: {line: 2, character: 10}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: containingScope, scopeType: value, includeSiblings: false}, isImplicit: false}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/php/changeValue2.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/php/changeValue2.yml
deleted file mode 100644
index 084736d7c6..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/php/changeValue2.yml
+++ /dev/null
@@ -1,26 +0,0 @@
-languageId: php
-command:
-  version: 1
-  spokenForm: change value
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: value, includeSiblings: false}
-initialState:
-  documentContents: |-
-    <?php
-
-    $value = 'Hello world';
-  selections:
-    - anchor: {line: 2, character: 15}
-      active: {line: 2, character: 15}
-  marks: {}
-finalState:
-  documentContents: |-
-    <?php
-
-    $value = ;
-  selections:
-    - anchor: {line: 2, character: 9}
-      active: {line: 2, character: 9}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: containingScope, scopeType: value, includeSiblings: false}, isImplicit: false}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/php/changeValue3.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/php/changeValue3.yml
deleted file mode 100644
index 79ed336adb..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/php/changeValue3.yml
+++ /dev/null
@@ -1,26 +0,0 @@
-languageId: php
-command:
-  version: 1
-  spokenForm: change value
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: value, includeSiblings: false}
-initialState:
-  documentContents: |-
-    <?php
-
-    $value += 42;
-  selections:
-    - anchor: {line: 2, character: 6}
-      active: {line: 2, character: 6}
-  marks: {}
-finalState:
-  documentContents: |-
-    <?php
-
-    $value += ;
-  selections:
-    - anchor: {line: 2, character: 10}
-      active: {line: 2, character: 10}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: containingScope, scopeType: value, includeSiblings: false}, isImplicit: false}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/php/changeValue4.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/php/changeValue4.yml
deleted file mode 100644
index 32d43a10e1..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/php/changeValue4.yml
+++ /dev/null
@@ -1,26 +0,0 @@
-languageId: php
-command:
-  version: 1
-  spokenForm: change value
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: value, includeSiblings: false}
-initialState:
-  documentContents: |-
-    <?php
-
-    return $value;
-  selections:
-    - anchor: {line: 2, character: 6}
-      active: {line: 2, character: 6}
-  marks: {}
-finalState:
-  documentContents: |-
-    <?php
-
-    return ;
-  selections:
-    - anchor: {line: 2, character: 7}
-      active: {line: 2, character: 7}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: containingScope, scopeType: value, includeSiblings: false}, isImplicit: false}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/php/changeValue5.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/php/changeValue5.yml
deleted file mode 100644
index 86be7827b6..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/php/changeValue5.yml
+++ /dev/null
@@ -1,26 +0,0 @@
-languageId: php
-command:
-  version: 1
-  spokenForm: change value
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: value, includeSiblings: false}
-initialState:
-  documentContents: |-
-    <?php
-
-    ['num' => 1];
-  selections:
-    - anchor: {line: 2, character: 3}
-      active: {line: 2, character: 3}
-  marks: {}
-finalState:
-  documentContents: |-
-    <?php
-
-    ['num' => ];
-  selections:
-    - anchor: {line: 2, character: 10}
-      active: {line: 2, character: 10}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: containingScope, scopeType: value, includeSiblings: false}, isImplicit: false}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/php/changeValue6.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/php/changeValue6.yml
deleted file mode 100644
index ea85997d47..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/php/changeValue6.yml
+++ /dev/null
@@ -1,26 +0,0 @@
-languageId: php
-command:
-  version: 1
-  spokenForm: change value
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: value, includeSiblings: false}
-initialState:
-  documentContents: |-
-    <?php
-
-    $value = 'Hello world';
-  selections:
-    - anchor: {line: 2, character: 3}
-      active: {line: 2, character: 3}
-  marks: {}
-finalState:
-  documentContents: |-
-    <?php
-
-    $value = ;
-  selections:
-    - anchor: {line: 2, character: 9}
-      active: {line: 2, character: 9}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: containingScope, scopeType: value, includeSiblings: false}, isImplicit: false}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/php/changeValue7.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/php/changeValue7.yml
deleted file mode 100644
index 479c78118f..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/php/changeValue7.yml
+++ /dev/null
@@ -1,26 +0,0 @@
-languageId: php
-command:
-  version: 1
-  spokenForm: change value
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: value, includeSiblings: false}
-initialState:
-  documentContents: |-
-    <?php
-
-    yield $value;
-  selections:
-    - anchor: {line: 2, character: 9}
-      active: {line: 2, character: 9}
-  marks: {}
-finalState:
-  documentContents: |-
-    <?php
-
-    yield ;
-  selections:
-    - anchor: {line: 2, character: 6}
-      active: {line: 2, character: 6}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: containingScope, scopeType: value, includeSiblings: false}, isImplicit: false}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/php/chuckArg.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/php/chuckArg.yml
deleted file mode 100644
index 48e3e0afef..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/php/chuckArg.yml
+++ /dev/null
@@ -1,32 +0,0 @@
-languageId: php
-command:
-  version: 1
-  spokenForm: chuck arg
-  action: remove
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: argumentOrParameter, includeSiblings: false}
-initialState:
-  documentContents: |-
-    <?php
-
-    function myFunc($value)
-    {
-
-    }
-  selections:
-    - anchor: {line: 2, character: 20}
-      active: {line: 2, character: 20}
-  marks: {}
-finalState:
-  documentContents: |-
-    <?php
-
-    function myFunc()
-    {
-
-    }
-  selections:
-    - anchor: {line: 2, character: 16}
-      active: {line: 2, character: 16}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: outside, modifier: {type: containingScope, scopeType: argumentOrParameter, includeSiblings: false}, isImplicit: false}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/php/chuckArg10.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/php/chuckArg10.yml
deleted file mode 100644
index 4ac3746a2a..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/php/chuckArg10.yml
+++ /dev/null
@@ -1,26 +0,0 @@
-languageId: php
-command:
-  version: 1
-  spokenForm: chuck arg
-  action: remove
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: argumentOrParameter, includeSiblings: false}
-initialState:
-  documentContents: |-
-    <?php
-
-    myFunc($value, $num, $param);
-  selections:
-    - anchor: {line: 2, character: 16}
-      active: {line: 2, character: 16}
-  marks: {}
-finalState:
-  documentContents: |-
-    <?php
-
-    myFunc($value, $param);
-  selections:
-    - anchor: {line: 2, character: 15}
-      active: {line: 2, character: 15}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: outside, modifier: {type: containingScope, scopeType: argumentOrParameter, includeSiblings: false}, isImplicit: false}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/php/chuckArg2.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/php/chuckArg2.yml
deleted file mode 100644
index 92a400c163..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/php/chuckArg2.yml
+++ /dev/null
@@ -1,32 +0,0 @@
-languageId: php
-command:
-  version: 1
-  spokenForm: chuck arg
-  action: remove
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: argumentOrParameter, includeSiblings: false}
-initialState:
-  documentContents: |-
-    <?php
-
-    function myFunc(...$nums)
-    {
-
-    }
-  selections:
-    - anchor: {line: 2, character: 20}
-      active: {line: 2, character: 20}
-  marks: {}
-finalState:
-  documentContents: |-
-    <?php
-
-    function myFunc()
-    {
-
-    }
-  selections:
-    - anchor: {line: 2, character: 16}
-      active: {line: 2, character: 16}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: outside, modifier: {type: containingScope, scopeType: argumentOrParameter, includeSiblings: false}, isImplicit: false}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/php/chuckArg3.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/php/chuckArg3.yml
deleted file mode 100644
index f735e9cc15..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/php/chuckArg3.yml
+++ /dev/null
@@ -1,32 +0,0 @@
-languageId: php
-command:
-  version: 1
-  spokenForm: chuck arg
-  action: remove
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: argumentOrParameter, includeSiblings: false}
-initialState:
-  documentContents: |-
-    <?php
-
-    function myFunc($value, ...$nums)
-    {
-
-    }
-  selections:
-    - anchor: {line: 2, character: 20}
-      active: {line: 2, character: 20}
-  marks: {}
-finalState:
-  documentContents: |-
-    <?php
-
-    function myFunc(...$nums)
-    {
-
-    }
-  selections:
-    - anchor: {line: 2, character: 16}
-      active: {line: 2, character: 16}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: outside, modifier: {type: containingScope, scopeType: argumentOrParameter, includeSiblings: false}, isImplicit: false}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/php/chuckArg4.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/php/chuckArg4.yml
deleted file mode 100644
index 98abe9146c..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/php/chuckArg4.yml
+++ /dev/null
@@ -1,32 +0,0 @@
-languageId: php
-command:
-  version: 1
-  spokenForm: chuck arg
-  action: remove
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: argumentOrParameter, includeSiblings: false}
-initialState:
-  documentContents: |-
-    <?php
-
-    function myFunc($value, ...$nums)
-    {
-
-    }
-  selections:
-    - anchor: {line: 2, character: 28}
-      active: {line: 2, character: 28}
-  marks: {}
-finalState:
-  documentContents: |-
-    <?php
-
-    function myFunc($value)
-    {
-
-    }
-  selections:
-    - anchor: {line: 2, character: 22}
-      active: {line: 2, character: 22}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: outside, modifier: {type: containingScope, scopeType: argumentOrParameter, includeSiblings: false}, isImplicit: false}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/php/chuckArg5.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/php/chuckArg5.yml
deleted file mode 100644
index ac5a05d822..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/php/chuckArg5.yml
+++ /dev/null
@@ -1,32 +0,0 @@
-languageId: php
-command:
-  version: 1
-  spokenForm: chuck arg
-  action: remove
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: argumentOrParameter, includeSiblings: false}
-initialState:
-  documentContents: |-
-    <?php
-
-    function myFunc($value, $num, $param)
-    {
-
-    }
-  selections:
-    - anchor: {line: 2, character: 26}
-      active: {line: 2, character: 26}
-  marks: {}
-finalState:
-  documentContents: |-
-    <?php
-
-    function myFunc($value, $param)
-    {
-
-    }
-  selections:
-    - anchor: {line: 2, character: 24}
-      active: {line: 2, character: 24}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: outside, modifier: {type: containingScope, scopeType: argumentOrParameter, includeSiblings: false}, isImplicit: false}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/php/chuckArg6.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/php/chuckArg6.yml
deleted file mode 100644
index 7903ab9a3c..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/php/chuckArg6.yml
+++ /dev/null
@@ -1,26 +0,0 @@
-languageId: php
-command:
-  version: 1
-  spokenForm: chuck arg
-  action: remove
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: argumentOrParameter, includeSiblings: false}
-initialState:
-  documentContents: |-
-    <?php
-
-    myFunc($value);"
-  selections:
-    - anchor: {line: 2, character: 11}
-      active: {line: 2, character: 11}
-  marks: {}
-finalState:
-  documentContents: |-
-    <?php
-
-    myFunc();"
-  selections:
-    - anchor: {line: 2, character: 7}
-      active: {line: 2, character: 7}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: outside, modifier: {type: containingScope, scopeType: argumentOrParameter, includeSiblings: false}, isImplicit: false}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/php/chuckArg7.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/php/chuckArg7.yml
deleted file mode 100644
index 015f2ef9a3..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/php/chuckArg7.yml
+++ /dev/null
@@ -1,26 +0,0 @@
-languageId: php
-command:
-  version: 1
-  spokenForm: chuck arg
-  action: remove
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: argumentOrParameter, includeSiblings: false}
-initialState:
-  documentContents: |-
-    <?php
-
-    myFunc(...$nums);
-  selections:
-    - anchor: {line: 2, character: 11}
-      active: {line: 2, character: 11}
-  marks: {}
-finalState:
-  documentContents: |-
-    <?php
-
-    myFunc();
-  selections:
-    - anchor: {line: 2, character: 7}
-      active: {line: 2, character: 7}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: outside, modifier: {type: containingScope, scopeType: argumentOrParameter, includeSiblings: false}, isImplicit: false}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/php/chuckArg8.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/php/chuckArg8.yml
deleted file mode 100644
index 908d8dd97d..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/php/chuckArg8.yml
+++ /dev/null
@@ -1,26 +0,0 @@
-languageId: php
-command:
-  version: 1
-  spokenForm: chuck arg
-  action: remove
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: argumentOrParameter, includeSiblings: false}
-initialState:
-  documentContents: |-
-    <?php
-
-    myFunc($value, ...$nums);
-  selections:
-    - anchor: {line: 2, character: 11}
-      active: {line: 2, character: 11}
-  marks: {}
-finalState:
-  documentContents: |-
-    <?php
-
-    myFunc(...$nums);
-  selections:
-    - anchor: {line: 2, character: 7}
-      active: {line: 2, character: 7}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: outside, modifier: {type: containingScope, scopeType: argumentOrParameter, includeSiblings: false}, isImplicit: false}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/php/chuckArg9.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/php/chuckArg9.yml
deleted file mode 100644
index 9e9c543042..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/php/chuckArg9.yml
+++ /dev/null
@@ -1,26 +0,0 @@
-languageId: php
-command:
-  version: 1
-  spokenForm: chuck arg
-  action: remove
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: argumentOrParameter, includeSiblings: false}
-initialState:
-  documentContents: |-
-    <?php
-
-    myFunc($value, ...$nums);
-  selections:
-    - anchor: {line: 2, character: 19}
-      active: {line: 2, character: 19}
-  marks: {}
-finalState:
-  documentContents: |-
-    <?php
-
-    myFunc($value);
-  selections:
-    - anchor: {line: 2, character: 13}
-      active: {line: 2, character: 13}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: outside, modifier: {type: containingScope, scopeType: argumentOrParameter, includeSiblings: false}, isImplicit: false}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/php/chuckEveryArg.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/php/chuckEveryArg.yml
deleted file mode 100644
index 51de07d7ad..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/php/chuckEveryArg.yml
+++ /dev/null
@@ -1,32 +0,0 @@
-languageId: php
-command:
-  version: 1
-  spokenForm: chuck every arg
-  action: remove
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: argumentOrParameter, includeSiblings: true}
-initialState:
-  documentContents: |-
-    <?php
-
-    function myFunc($value, $nums)
-    {
-
-    }
-  selections:
-    - anchor: {line: 2, character: 20}
-      active: {line: 2, character: 20}
-  marks: {}
-finalState:
-  documentContents: |-
-    <?php
-
-    function myFunc()
-    {
-
-    }
-  selections:
-    - anchor: {line: 2, character: 16}
-      active: {line: 2, character: 16}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: outside, modifier: {type: containingScope, scopeType: argumentOrParameter, includeSiblings: true}, isImplicit: false}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/php/chuckEveryItem.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/php/chuckEveryItem.yml
deleted file mode 100644
index c20af5bea1..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/php/chuckEveryItem.yml
+++ /dev/null
@@ -1,26 +0,0 @@
-languageId: php
-command:
-  version: 1
-  spokenForm: chuck every item
-  action: remove
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: collectionItem, includeSiblings: true}
-initialState:
-  documentContents: |-
-    <?php
-
-    [1, 2, 3];
-  selections:
-    - anchor: {line: 2, character: 4}
-      active: {line: 2, character: 4}
-  marks: {}
-finalState:
-  documentContents: |-
-    <?php
-
-    [];
-  selections:
-    - anchor: {line: 2, character: 1}
-      active: {line: 2, character: 1}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: outside, modifier: {type: containingScope, scopeType: collectionItem, includeSiblings: true}, isImplicit: false}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/php/chuckFunk.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/php/chuckFunk.yml
deleted file mode 100644
index 18723c6c11..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/php/chuckFunk.yml
+++ /dev/null
@@ -1,27 +0,0 @@
-languageId: php
-command:
-  version: 1
-  spokenForm: chuck funk
-  action: remove
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: namedFunction, includeSiblings: false}
-initialState:
-  documentContents: |-
-    <?php
-
-    $myFunc = function() {
-
-    };
-  selections:
-    - anchor: {line: 3, character: 0}
-      active: {line: 3, character: 0}
-  marks: {}
-finalState:
-  documentContents: |+
-    <?php
-
-  selections:
-    - anchor: {line: 2, character: 0}
-      active: {line: 2, character: 0}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: outside, modifier: {type: containingScope, scopeType: namedFunction, includeSiblings: false}, isImplicit: false}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/php/chuckFunk2.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/php/chuckFunk2.yml
deleted file mode 100644
index 5701e170de..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/php/chuckFunk2.yml
+++ /dev/null
@@ -1,25 +0,0 @@
-languageId: php
-command:
-  version: 1
-  spokenForm: chuck funk
-  action: remove
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: namedFunction, includeSiblings: false}
-initialState:
-  documentContents: |-
-    <?php
-
-    $myFunc = fn() => 'Hello world';
-  selections:
-    - anchor: {line: 2, character: 25}
-      active: {line: 2, character: 25}
-  marks: {}
-finalState:
-  documentContents: |+
-    <?php
-
-  selections:
-    - anchor: {line: 2, character: 0}
-      active: {line: 2, character: 0}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: outside, modifier: {type: containingScope, scopeType: namedFunction, includeSiblings: false}, isImplicit: false}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/php/chuckInside.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/php/chuckInside.yml
deleted file mode 100644
index 5abbd08c19..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/php/chuckInside.yml
+++ /dev/null
@@ -1,26 +0,0 @@
-languageId: php
-command:
-  version: 1
-  spokenForm: chuck inside
-  action: remove
-  targets:
-    - type: primitive
-      modifier: {type: surroundingPair, delimiter: any, delimiterInclusion: interiorOnly}
-initialState:
-  documentContents: |-
-    <?php
-
-    "hello world";
-  selections:
-    - anchor: {line: 2, character: 7}
-      active: {line: 2, character: 7}
-  marks: {}
-finalState:
-  documentContents: |-
-    <?php
-
-    "";
-  selections:
-    - anchor: {line: 2, character: 1}
-      active: {line: 2, character: 1}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: outside, modifier: {type: surroundingPair, delimiter: any, delimiterInclusion: interiorOnly}, isImplicit: false}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/php/chuckItem.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/php/chuckItem.yml
deleted file mode 100644
index e8e6981eac..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/php/chuckItem.yml
+++ /dev/null
@@ -1,26 +0,0 @@
-languageId: php
-command:
-  version: 1
-  spokenForm: chuck item
-  action: remove
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: collectionItem, includeSiblings: false}
-initialState:
-  documentContents: |-
-    <?php
-
-    [1, 2, 3];
-  selections:
-    - anchor: {line: 2, character: 5}
-      active: {line: 2, character: 5}
-  marks: {}
-finalState:
-  documentContents: |-
-    <?php
-
-    [1, 3];
-  selections:
-    - anchor: {line: 2, character: 4}
-      active: {line: 2, character: 4}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: outside, modifier: {type: containingScope, scopeType: collectionItem, includeSiblings: false}, isImplicit: false}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/php/chuckItem2.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/php/chuckItem2.yml
deleted file mode 100644
index 9a28e097aa..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/php/chuckItem2.yml
+++ /dev/null
@@ -1,26 +0,0 @@
-languageId: php
-command:
-  version: 1
-  spokenForm: chuck item
-  action: remove
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: collectionItem, includeSiblings: false}
-initialState:
-  documentContents: |-
-    <?php
-
-    [1, 2, 3];
-  selections:
-    - anchor: {line: 2, character: 7}
-      active: {line: 2, character: 7}
-  marks: {}
-finalState:
-  documentContents: |-
-    <?php
-
-    [1, 2];
-  selections:
-    - anchor: {line: 2, character: 5}
-      active: {line: 2, character: 5}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: outside, modifier: {type: containingScope, scopeType: collectionItem, includeSiblings: false}, isImplicit: false}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/php/chuckItem3.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/php/chuckItem3.yml
deleted file mode 100644
index 2e90c672d8..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/php/chuckItem3.yml
+++ /dev/null
@@ -1,26 +0,0 @@
-languageId: php
-command:
-  version: 1
-  spokenForm: chuck item
-  action: remove
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: collectionItem, includeSiblings: false}
-initialState:
-  documentContents: |-
-    <?php
-
-    [1];
-  selections:
-    - anchor: {line: 2, character: 1}
-      active: {line: 2, character: 1}
-  marks: {}
-finalState:
-  documentContents: |-
-    <?php
-
-    [];
-  selections:
-    - anchor: {line: 2, character: 1}
-      active: {line: 2, character: 1}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: outside, modifier: {type: containingScope, scopeType: collectionItem, includeSiblings: false}, isImplicit: false}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/php/chuckItem4.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/php/chuckItem4.yml
deleted file mode 100644
index 9cf7f67926..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/php/chuckItem4.yml
+++ /dev/null
@@ -1,26 +0,0 @@
-languageId: php
-command:
-  version: 1
-  spokenForm: chuck item
-  action: remove
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: collectionItem, includeSiblings: false}
-initialState:
-  documentContents: |-
-    <?php
-
-    ['first' => 1, 'second' => 2, 'third' => 3];
-  selections:
-    - anchor: {line: 2, character: 24}
-      active: {line: 2, character: 24}
-  marks: {}
-finalState:
-  documentContents: |-
-    <?php
-
-    ['first' => 1, 'third' => 3];
-  selections:
-    - anchor: {line: 2, character: 15}
-      active: {line: 2, character: 15}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: outside, modifier: {type: containingScope, scopeType: collectionItem, includeSiblings: false}, isImplicit: false}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/php/chuckItem5.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/php/chuckItem5.yml
deleted file mode 100644
index 821d3df7e7..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/php/chuckItem5.yml
+++ /dev/null
@@ -1,26 +0,0 @@
-languageId: php
-command:
-  version: 1
-  spokenForm: chuck item
-  action: remove
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: collectionItem, includeSiblings: false}
-initialState:
-  documentContents: |-
-    <?php
-
-    ['first' => 1];
-  selections:
-    - anchor: {line: 2, character: 11}
-      active: {line: 2, character: 11}
-  marks: {}
-finalState:
-  documentContents: |-
-    <?php
-
-    [];
-  selections:
-    - anchor: {line: 2, character: 1}
-      active: {line: 2, character: 1}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: outside, modifier: {type: containingScope, scopeType: collectionItem, includeSiblings: false}, isImplicit: false}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/php/chuckKey.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/php/chuckKey.yml
deleted file mode 100644
index ec9f51b176..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/php/chuckKey.yml
+++ /dev/null
@@ -1,26 +0,0 @@
-languageId: php
-command:
-  version: 1
-  spokenForm: chuck key
-  action: remove
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: collectionKey, includeSiblings: false}
-initialState:
-  documentContents: |-
-    <?php
-
-    ['num' => 1];
-  selections:
-    - anchor: {line: 2, character: 9}
-      active: {line: 2, character: 9}
-  marks: {}
-finalState:
-  documentContents: |-
-    <?php
-
-    [1];
-  selections:
-    - anchor: {line: 2, character: 1}
-      active: {line: 2, character: 1}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: outside, modifier: {type: containingScope, scopeType: collectionKey, includeSiblings: false}, isImplicit: false}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/php/chuckKey2.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/php/chuckKey2.yml
deleted file mode 100644
index d163c19c76..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/php/chuckKey2.yml
+++ /dev/null
@@ -1,26 +0,0 @@
-languageId: php
-command:
-  version: 1
-  spokenForm: chuck key
-  action: remove
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: collectionKey, includeSiblings: false}
-initialState:
-  documentContents: |-
-    <?php
-
-    ['num' => 1];
-  selections:
-    - anchor: {line: 2, character: 3}
-      active: {line: 2, character: 3}
-  marks: {}
-finalState:
-  documentContents: |-
-    <?php
-
-    [1];
-  selections:
-    - anchor: {line: 2, character: 1}
-      active: {line: 2, character: 1}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: outside, modifier: {type: containingScope, scopeType: collectionKey, includeSiblings: false}, isImplicit: false}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/php/chuckPair.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/php/chuckPair.yml
deleted file mode 100644
index 055875c5aa..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/php/chuckPair.yml
+++ /dev/null
@@ -1,26 +0,0 @@
-languageId: php
-command:
-  version: 1
-  spokenForm: chuck pair
-  action: remove
-  targets:
-    - type: primitive
-      modifier: {type: surroundingPair, delimiter: any}
-initialState:
-  documentContents: |-
-    <?php
-
-    "hello world";
-  selections:
-    - anchor: {line: 2, character: 7}
-      active: {line: 2, character: 7}
-  marks: {}
-finalState:
-  documentContents: |-
-    <?php
-
-    ;
-  selections:
-    - anchor: {line: 2, character: 0}
-      active: {line: 2, character: 0}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: outside, modifier: {type: surroundingPair, delimiter: any}, isImplicit: false}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/php/chuckType.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/php/chuckType.yml
deleted file mode 100644
index 1b952492d6..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/php/chuckType.yml
+++ /dev/null
@@ -1,30 +0,0 @@
-languageId: php
-command:
-  version: 1
-  spokenForm: chuck type
-  action: remove
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: type, includeSiblings: false}
-initialState:
-  documentContents: |-
-    <?php
-
-    function myFunc(string $str) {
-
-    }
-  selections:
-    - anchor: {line: 2, character: 25}
-      active: {line: 2, character: 25}
-  marks: {}
-finalState:
-  documentContents: |-
-    <?php
-
-    function myFunc($str) {
-
-    }
-  selections:
-    - anchor: {line: 2, character: 18}
-      active: {line: 2, character: 18}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: outside, modifier: {type: containingScope, scopeType: type, includeSiblings: false}, isImplicit: false}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/php/chuckType2.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/php/chuckType2.yml
deleted file mode 100644
index 495a28cf06..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/php/chuckType2.yml
+++ /dev/null
@@ -1,30 +0,0 @@
-languageId: php
-command:
-  version: 1
-  spokenForm: chuck type
-  action: remove
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: type, includeSiblings: false}
-initialState:
-  documentContents: |-
-    <?php
-
-    function myFunc(string $str) {
-
-    }
-  selections:
-    - anchor: {line: 2, character: 19}
-      active: {line: 2, character: 19}
-  marks: {}
-finalState:
-  documentContents: |-
-    <?php
-
-    function myFunc($str) {
-
-    }
-  selections:
-    - anchor: {line: 2, character: 16}
-      active: {line: 2, character: 16}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: outside, modifier: {type: containingScope, scopeType: type, includeSiblings: false}, isImplicit: false}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/php/chuckType3.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/php/chuckType3.yml
deleted file mode 100644
index 397041035a..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/php/chuckType3.yml
+++ /dev/null
@@ -1,30 +0,0 @@
-languageId: php
-command:
-  version: 1
-  spokenForm: chuck type
-  action: remove
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: type, includeSiblings: false}
-initialState:
-  documentContents: |-
-    <?php
-
-    function myFunc(array ...$nums) {
-
-    }
-  selections:
-    - anchor: {line: 2, character: 25}
-      active: {line: 2, character: 25}
-  marks: {}
-finalState:
-  documentContents: |-
-    <?php
-
-    function myFunc(...$nums) {
-
-    }
-  selections:
-    - anchor: {line: 2, character: 19}
-      active: {line: 2, character: 19}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: outside, modifier: {type: containingScope, scopeType: type, includeSiblings: false}, isImplicit: false}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/php/chuckType4.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/php/chuckType4.yml
deleted file mode 100644
index 3fe58e15c9..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/php/chuckType4.yml
+++ /dev/null
@@ -1,26 +0,0 @@
-languageId: php
-command:
-  version: 1
-  spokenForm: chuck type
-  action: remove
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: type, includeSiblings: false}
-initialState:
-  documentContents: |-
-    <?php
-
-    (string) $str;
-  selections:
-    - anchor: {line: 2, character: 10}
-      active: {line: 2, character: 10}
-  marks: {}
-finalState:
-  documentContents: |-
-    <?php
-
-    $str;
-  selections:
-    - anchor: {line: 2, character: 1}
-      active: {line: 2, character: 1}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: outside, modifier: {type: containingScope, scopeType: type, includeSiblings: false}, isImplicit: false}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/php/chuckType5.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/php/chuckType5.yml
deleted file mode 100644
index fa6c96c439..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/php/chuckType5.yml
+++ /dev/null
@@ -1,26 +0,0 @@
-languageId: php
-command:
-  version: 1
-  spokenForm: chuck type
-  action: remove
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: type, includeSiblings: false}
-initialState:
-  documentContents: |-
-    <?php
-
-    $str = ( string ) $num;
-  selections:
-    - anchor: {line: 2, character: 18}
-      active: {line: 2, character: 18}
-  marks: {}
-finalState:
-  documentContents: |-
-    <?php
-
-    $str = $num;
-  selections:
-    - anchor: {line: 2, character: 7}
-      active: {line: 2, character: 7}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: outside, modifier: {type: containingScope, scopeType: type, includeSiblings: false}, isImplicit: false}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/php/chuckValue.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/php/chuckValue.yml
deleted file mode 100644
index 4edc679198..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/php/chuckValue.yml
+++ /dev/null
@@ -1,26 +0,0 @@
-languageId: php
-command:
-  version: 1
-  spokenForm: chuck value
-  action: remove
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: value, includeSiblings: false}
-initialState:
-  documentContents: |-
-    <?php
-
-    ['num' => 1];
-  selections:
-    - anchor: {line: 2, character: 9}
-      active: {line: 2, character: 9}
-  marks: {}
-finalState:
-  documentContents: |-
-    <?php
-
-    ['num'];
-  selections:
-    - anchor: {line: 2, character: 6}
-      active: {line: 2, character: 6}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: outside, modifier: {type: containingScope, scopeType: value, includeSiblings: false}, isImplicit: false}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/php/chuckValue10.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/php/chuckValue10.yml
deleted file mode 100644
index 6ab98980b8..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/php/chuckValue10.yml
+++ /dev/null
@@ -1,26 +0,0 @@
-languageId: php
-command:
-  version: 1
-  spokenForm: chuck value
-  action: remove
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: value, includeSiblings: false}
-initialState:
-  documentContents: |-
-    <?php
-
-    yield $value;
-  selections:
-    - anchor: {line: 2, character: 9}
-      active: {line: 2, character: 9}
-  marks: {}
-finalState:
-  documentContents: |-
-    <?php
-
-    yield;
-  selections:
-    - anchor: {line: 2, character: 5}
-      active: {line: 2, character: 5}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: outside, modifier: {type: containingScope, scopeType: value, includeSiblings: false}, isImplicit: false}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/php/chuckValue2.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/php/chuckValue2.yml
deleted file mode 100644
index b04819cb00..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/php/chuckValue2.yml
+++ /dev/null
@@ -1,26 +0,0 @@
-languageId: php
-command:
-  version: 1
-  spokenForm: chuck value
-  action: remove
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: value, includeSiblings: false}
-initialState:
-  documentContents: |-
-    <?php
-
-    $value = 'Hello world';
-  selections:
-    - anchor: {line: 2, character: 3}
-      active: {line: 2, character: 3}
-  marks: {}
-finalState:
-  documentContents: |-
-    <?php
-
-    $value;
-  selections:
-    - anchor: {line: 2, character: 3}
-      active: {line: 2, character: 3}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: outside, modifier: {type: containingScope, scopeType: value, includeSiblings: false}, isImplicit: false}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/php/chuckValue3.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/php/chuckValue3.yml
deleted file mode 100644
index 9a154684ba..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/php/chuckValue3.yml
+++ /dev/null
@@ -1,26 +0,0 @@
-languageId: php
-command:
-  version: 1
-  spokenForm: chuck value
-  action: remove
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: value, includeSiblings: false}
-initialState:
-  documentContents: |-
-    <?php
-
-    $value += 42;
-  selections:
-    - anchor: {line: 2, character: 3}
-      active: {line: 2, character: 3}
-  marks: {}
-finalState:
-  documentContents: |-
-    <?php
-
-    $value;
-  selections:
-    - anchor: {line: 2, character: 3}
-      active: {line: 2, character: 3}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: outside, modifier: {type: containingScope, scopeType: value, includeSiblings: false}, isImplicit: false}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/php/chuckValue4.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/php/chuckValue4.yml
deleted file mode 100644
index 9ed04e42ee..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/php/chuckValue4.yml
+++ /dev/null
@@ -1,26 +0,0 @@
-languageId: php
-command:
-  version: 1
-  spokenForm: chuck value
-  action: remove
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: value, includeSiblings: false}
-initialState:
-  documentContents: |-
-    <?php
-
-    return $value;
-  selections:
-    - anchor: {line: 2, character: 3}
-      active: {line: 2, character: 3}
-  marks: {}
-finalState:
-  documentContents: |-
-    <?php
-
-    return;
-  selections:
-    - anchor: {line: 2, character: 3}
-      active: {line: 2, character: 3}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: outside, modifier: {type: containingScope, scopeType: value, includeSiblings: false}, isImplicit: false}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/php/chuckValue5.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/php/chuckValue5.yml
deleted file mode 100644
index b23e40cfb9..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/php/chuckValue5.yml
+++ /dev/null
@@ -1,26 +0,0 @@
-languageId: php
-command:
-  version: 1
-  spokenForm: chuck value
-  action: remove
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: value, includeSiblings: false}
-initialState:
-  documentContents: |-
-    <?php
-
-    $value = 'Hello world';
-  selections:
-    - anchor: {line: 2, character: 16}
-      active: {line: 2, character: 16}
-  marks: {}
-finalState:
-  documentContents: |-
-    <?php
-
-    $value;
-  selections:
-    - anchor: {line: 2, character: 6}
-      active: {line: 2, character: 6}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: outside, modifier: {type: containingScope, scopeType: value, includeSiblings: false}, isImplicit: false}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/php/chuckValue6.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/php/chuckValue6.yml
deleted file mode 100644
index 78b7a956d8..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/php/chuckValue6.yml
+++ /dev/null
@@ -1,26 +0,0 @@
-languageId: php
-command:
-  version: 1
-  spokenForm: chuck value
-  action: remove
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: value, includeSiblings: false}
-initialState:
-  documentContents: |-
-    <?php
-
-    $value = 42;
-  selections:
-    - anchor: {line: 2, character: 10}
-      active: {line: 2, character: 10}
-  marks: {}
-finalState:
-  documentContents: |-
-    <?php
-
-    $value;
-  selections:
-    - anchor: {line: 2, character: 6}
-      active: {line: 2, character: 6}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: outside, modifier: {type: containingScope, scopeType: value, includeSiblings: false}, isImplicit: false}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/php/chuckValue7.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/php/chuckValue7.yml
deleted file mode 100644
index 8c62739cc1..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/php/chuckValue7.yml
+++ /dev/null
@@ -1,26 +0,0 @@
-languageId: php
-command:
-  version: 1
-  spokenForm: chuck value
-  action: remove
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: value, includeSiblings: false}
-initialState:
-  documentContents: |-
-    <?php
-
-    return $value;
-  selections:
-    - anchor: {line: 2, character: 10}
-      active: {line: 2, character: 10}
-  marks: {}
-finalState:
-  documentContents: |-
-    <?php
-
-    return;
-  selections:
-    - anchor: {line: 2, character: 6}
-      active: {line: 2, character: 6}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: outside, modifier: {type: containingScope, scopeType: value, includeSiblings: false}, isImplicit: false}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/php/chuckValue8.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/php/chuckValue8.yml
deleted file mode 100644
index 4f9bc04b54..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/php/chuckValue8.yml
+++ /dev/null
@@ -1,26 +0,0 @@
-languageId: php
-command:
-  version: 1
-  spokenForm: chuck value
-  action: remove
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: value, includeSiblings: false}
-initialState:
-  documentContents: |-
-    <?php
-
-    ['num' => 1];
-  selections:
-    - anchor: {line: 2, character: 3}
-      active: {line: 2, character: 3}
-  marks: {}
-finalState:
-  documentContents: |-
-    <?php
-
-    ['num'];
-  selections:
-    - anchor: {line: 2, character: 3}
-      active: {line: 2, character: 3}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: outside, modifier: {type: containingScope, scopeType: value, includeSiblings: false}, isImplicit: false}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/php/chuckValue9.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/php/chuckValue9.yml
deleted file mode 100644
index 44345b335f..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/php/chuckValue9.yml
+++ /dev/null
@@ -1,26 +0,0 @@
-languageId: php
-command:
-  version: 1
-  spokenForm: chuck value
-  action: remove
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: value, includeSiblings: false}
-initialState:
-  documentContents: |-
-    <?php
-
-    $value = 'Hello world';
-  selections:
-    - anchor: {line: 2, character: 15}
-      active: {line: 2, character: 15}
-  marks: {}
-finalState:
-  documentContents: |-
-    <?php
-
-    $value;
-  selections:
-    - anchor: {line: 2, character: 6}
-      active: {line: 2, character: 6}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: outside, modifier: {type: containingScope, scopeType: value, includeSiblings: false}, isImplicit: false}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/php/elseWrapThis.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/php/elseWrapThis.yml
deleted file mode 100644
index a6a8056c21..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/php/elseWrapThis.yml
+++ /dev/null
@@ -1,31 +0,0 @@
-languageId: php
-command:
-  version: 1
-  spokenForm: else wrap this
-  action: wrapWithSnippet
-  targets:
-    - type: primitive
-      mark: {type: cursor}
-  extraArgs: [ifElseStatement.alternative]
-initialState:
-  documentContents: |-
-    <?php
-
-    $foo = "Hello world";
-  selections:
-    - anchor: {line: 2, character: 7}
-      active: {line: 2, character: 7}
-  marks: {}
-finalState:
-  documentContents: |-
-    <?php
-
-    if () {
-        
-    } else {
-        $foo = "Hello world";
-    }
-  selections:
-    - anchor: {line: 2, character: 4}
-      active: {line: 2, character: 4}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: containingScope, scopeType: statement, includeSiblings: false}, isImplicit: false}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/php/ifElseWrapThis.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/php/ifElseWrapThis.yml
deleted file mode 100644
index 32aa1acbef..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/php/ifElseWrapThis.yml
+++ /dev/null
@@ -1,31 +0,0 @@
-languageId: php
-command:
-  version: 1
-  spokenForm: if else wrap this
-  action: wrapWithSnippet
-  targets:
-    - type: primitive
-      mark: {type: cursor}
-  extraArgs: [ifElseStatement.consequence]
-initialState:
-  documentContents: |-
-    <?php
-
-    $foo = "Hello world";
-  selections:
-    - anchor: {line: 2, character: 7}
-      active: {line: 2, character: 7}
-  marks: {}
-finalState:
-  documentContents: |-
-    <?php
-
-    if () {
-        $foo = "Hello world";
-    } else {
-        
-    }
-  selections:
-    - anchor: {line: 2, character: 4}
-      active: {line: 2, character: 4}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: containingScope, scopeType: statement, includeSiblings: false}, isImplicit: false}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/php/ifWrapThis.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/php/ifWrapThis.yml
deleted file mode 100644
index fe7ed86284..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/php/ifWrapThis.yml
+++ /dev/null
@@ -1,29 +0,0 @@
-languageId: php
-command:
-  version: 1
-  spokenForm: if wrap this
-  action: wrapWithSnippet
-  targets:
-    - type: primitive
-      mark: {type: cursor}
-  extraArgs: [ifStatement.consequence]
-initialState:
-  documentContents: |-
-    <?php
-
-    $foo = "Hello world";
-  selections:
-    - anchor: {line: 2, character: 7}
-      active: {line: 2, character: 7}
-  marks: {}
-finalState:
-  documentContents: |-
-    <?php
-
-    if () {
-        $foo = "Hello world";
-    }
-  selections:
-    - anchor: {line: 2, character: 4}
-      active: {line: 2, character: 4}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: containingScope, scopeType: statement, includeSiblings: false}, isImplicit: false}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/php/tryWrapThis.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/php/tryWrapThis.yml
deleted file mode 100644
index 489bfd6fa0..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/php/tryWrapThis.yml
+++ /dev/null
@@ -1,31 +0,0 @@
-languageId: php
-command:
-  version: 1
-  spokenForm: try wrap this
-  action: wrapWithSnippet
-  targets:
-    - type: primitive
-      mark: {type: cursor}
-  extraArgs: [tryCatchStatement.body]
-initialState:
-  documentContents: |-
-    <?php
-
-    $foo = "Hello world";
-  selections:
-    - anchor: {line: 2, character: 7}
-      active: {line: 2, character: 7}
-  marks: {}
-finalState:
-  documentContents: |-
-    <?php
-
-    try {
-        $foo = "Hello world";
-    } catch () {
-        
-    }
-  selections:
-    - anchor: {line: 4, character: 9}
-      active: {line: 4, character: 9}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: containingScope, scopeType: statement, includeSiblings: false}, isImplicit: false}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/php/tryWrapThis2.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/php/tryWrapThis2.yml
deleted file mode 100644
index 443aeed4d4..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/php/tryWrapThis2.yml
+++ /dev/null
@@ -1,47 +0,0 @@
-languageId: php
-command:
-  version: 1
-  spokenForm: try wrap this
-  action: wrapWithSnippet
-  targets:
-    - type: primitive
-      mark: {type: cursor}
-  extraArgs: [tryCatchStatement.body]
-initialState:
-  documentContents: |-
-    <?php
-
-    if (true) {
-        $foo = "Hello world";
-    }
-
-    $bar = 42;
-  selections:
-    - anchor: {line: 2, character: 0}
-      active: {line: 2, character: 0}
-    - anchor: {line: 6, character: 0}
-      active: {line: 6, character: 0}
-  marks: {}
-finalState:
-  documentContents: |-
-    <?php
-
-    try {
-        if (true) {
-            $foo = "Hello world";
-        }
-    } catch () {
-        
-    }
-
-    try {
-        $bar = 42;
-    } catch () {
-        
-    }
-  selections:
-    - anchor: {line: 6, character: 9}
-      active: {line: 6, character: 9}
-    - anchor: {line: 12, character: 9}
-      active: {line: 12, character: 9}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: containingScope, scopeType: statement, includeSiblings: false}, isImplicit: false}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/python/changeCallee.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/python/changeCallee.yml
deleted file mode 100644
index f701c2b77a..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/python/changeCallee.yml
+++ /dev/null
@@ -1,20 +0,0 @@
-languageId: python
-command:
-  version: 1
-  spokenForm: change callee
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: functionCallee, includeSiblings: false}
-initialState:
-  documentContents: test()()
-  selections:
-    - anchor: {line: 0, character: 7}
-      active: {line: 0, character: 7}
-  marks: {}
-finalState:
-  documentContents: ()
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: containingScope, scopeType: functionCallee, includeSiblings: false}, isImplicit: false}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/python/changeCallee3.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/python/changeCallee3.yml
deleted file mode 100644
index ef787c74ea..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/python/changeCallee3.yml
+++ /dev/null
@@ -1,20 +0,0 @@
-languageId: python
-command:
-  version: 1
-  spokenForm: change callee
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: functionCallee, includeSiblings: false}
-initialState:
-  documentContents: "eval(action)[0]()\r\n"
-  selections:
-    - anchor: {line: 0, character: 16}
-      active: {line: 0, character: 16}
-  marks: {}
-finalState:
-  documentContents: "()\r\n"
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: containingScope, scopeType: functionCallee, includeSiblings: false}, isImplicit: false}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/python/changeCallee4.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/python/changeCallee4.yml
deleted file mode 100644
index f9ddbfb782..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/python/changeCallee4.yml
+++ /dev/null
@@ -1,20 +0,0 @@
-languageId: python
-command:
-  version: 1
-  spokenForm: change callee
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: functionCallee, includeSiblings: false}
-initialState:
-  documentContents: object.method()
-  selections:
-    - anchor: {line: 0, character: 14}
-      active: {line: 0, character: 14}
-  marks: {}
-finalState:
-  documentContents: ()
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: containingScope, scopeType: functionCallee, includeSiblings: false}, isImplicit: false}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/python/changeCalleeParen.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/python/changeCalleeParen.yml
deleted file mode 100644
index be2b03b279..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/python/changeCalleeParen.yml
+++ /dev/null
@@ -1,24 +0,0 @@
-languageId: python
-command:
-  version: 1
-  spokenForm: change callee paren
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: functionCallee, includeSiblings: false}
-      mark: {type: decoratedSymbol, symbolColor: default, character: (}
-initialState:
-  documentContents: test()
-  selections:
-    - anchor: {line: 0, character: 6}
-      active: {line: 0, character: 6}
-  marks:
-    default.(:
-      start: {line: 0, character: 4}
-      end: {line: 0, character: 5}
-finalState:
-  documentContents: ()
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-fullTargets: [{type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: (}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: containingScope, scopeType: functionCallee, includeSiblings: false}, isImplicit: false}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/python/chuckArgDrum.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/python/chuckArgDrum.yml
deleted file mode 100644
index 87e246ffdb..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/python/chuckArgDrum.yml
+++ /dev/null
@@ -1,24 +0,0 @@
-languageId: python
-command:
-  version: 1
-  spokenForm: chuck arg drum
-  action: remove
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: argumentOrParameter, includeSiblings: false}
-      mark: {type: decoratedSymbol, symbolColor: default, character: d}
-initialState:
-  documentContents: "\" \".join((word for word in word_list), (word for word in word_list))"
-  selections:
-    - anchor: {line: 0, character: 39}
-      active: {line: 0, character: 67}
-  marks:
-    default.d:
-      start: {line: 0, character: 19}
-      end: {line: 0, character: 23}
-finalState:
-  documentContents: "\" \".join((word for word in word_list))"
-  selections:
-    - anchor: {line: 0, character: 9}
-      active: {line: 0, character: 37}
-fullTargets: [{type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: d}, selectionType: token, position: contents, insideOutsideType: outside, modifier: {type: containingScope, scopeType: argumentOrParameter, includeSiblings: false}, isImplicit: false}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/python/chuckArgFine.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/python/chuckArgFine.yml
deleted file mode 100644
index 2d844a6ae5..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/python/chuckArgFine.yml
+++ /dev/null
@@ -1,24 +0,0 @@
-languageId: python
-command:
-  version: 1
-  spokenForm: chuck arg fine
-  action: remove
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: argumentOrParameter, includeSiblings: false}
-      mark: {type: decoratedSymbol, symbolColor: default, character: f}
-initialState:
-  documentContents: "\" \".join((word for word in word_list), \"words\")"
-  selections:
-    - anchor: {line: 0, character: 47}
-      active: {line: 0, character: 47}
-  marks:
-    default.f:
-      start: {line: 0, character: 15}
-      end: {line: 0, character: 18}
-finalState:
-  documentContents: "\" \".join(\"words\")"
-  selections:
-    - anchor: {line: 0, character: 17}
-      active: {line: 0, character: 17}
-fullTargets: [{type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: f}, selectionType: token, position: contents, insideOutsideType: outside, modifier: {type: containingScope, scopeType: argumentOrParameter, includeSiblings: false}, isImplicit: false}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/python/chuckArgWhale.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/python/chuckArgWhale.yml
deleted file mode 100644
index beb28c1a5c..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/python/chuckArgWhale.yml
+++ /dev/null
@@ -1,24 +0,0 @@
-languageId: python
-command:
-  version: 1
-  spokenForm: chuck arg whale
-  action: remove
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: argumentOrParameter, includeSiblings: false}
-      mark: {type: decoratedSymbol, symbolColor: default, character: w}
-initialState:
-  documentContents: "\" \".join(word for word in word_list)"
-  selections:
-    - anchor: {line: 0, character: 36}
-      active: {line: 0, character: 36}
-  marks:
-    default.w:
-      start: {line: 0, character: 18}
-      end: {line: 0, character: 22}
-finalState:
-  documentContents: "\" \".join()"
-  selections:
-    - anchor: {line: 0, character: 10}
-      active: {line: 0, character: 10}
-fullTargets: [{type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: w}, selectionType: token, position: contents, insideOutsideType: outside, modifier: {type: containingScope, scopeType: argumentOrParameter, includeSiblings: false}, isImplicit: false}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/python/chuckEveryArgAir.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/python/chuckEveryArgAir.yml
deleted file mode 100644
index 6fe9bb06e5..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/python/chuckEveryArgAir.yml
+++ /dev/null
@@ -1,24 +0,0 @@
-languageId: python
-command:
-  version: 1
-  spokenForm: chuck every arg air
-  action: remove
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: argumentOrParameter, includeSiblings: true}
-      mark: {type: decoratedSymbol, symbolColor: default, character: a}
-initialState:
-  documentContents: "\" \".join((word for word in word_list), (name for name in name_list))"
-  selections:
-    - anchor: {line: 0, character: 68}
-      active: {line: 0, character: 68}
-  marks:
-    default.a:
-      start: {line: 0, character: 40}
-      end: {line: 0, character: 44}
-finalState:
-  documentContents: "\" \".join()"
-  selections:
-    - anchor: {line: 0, character: 10}
-      active: {line: 0, character: 10}
-fullTargets: [{type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: a}, selectionType: token, position: contents, insideOutsideType: outside, modifier: {type: containingScope, scopeType: argumentOrParameter, includeSiblings: true}, isImplicit: false}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/python/chuckEveryArgRed.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/python/chuckEveryArgRed.yml
deleted file mode 100644
index aa98a18d89..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/python/chuckEveryArgRed.yml
+++ /dev/null
@@ -1,24 +0,0 @@
-languageId: python
-command:
-  version: 1
-  spokenForm: chuck every arg red
-  action: remove
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: argumentOrParameter, includeSiblings: true}
-      mark: {type: decoratedSymbol, symbolColor: default, character: r}
-initialState:
-  documentContents: "\" \".join(word for word in word_list)"
-  selections:
-    - anchor: {line: 0, character: 36}
-      active: {line: 0, character: 36}
-  marks:
-    default.r:
-      start: {line: 0, character: 9}
-      end: {line: 0, character: 13}
-finalState:
-  documentContents: "\" \".join()"
-  selections:
-    - anchor: {line: 0, character: 10}
-      active: {line: 0, character: 10}
-fullTargets: [{type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: r}, selectionType: token, position: contents, insideOutsideType: outside, modifier: {type: containingScope, scopeType: argumentOrParameter, includeSiblings: true}, isImplicit: false}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/python/chuckEveryArgSit.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/python/chuckEveryArgSit.yml
deleted file mode 100644
index 05c7fe5490..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/python/chuckEveryArgSit.yml
+++ /dev/null
@@ -1,24 +0,0 @@
-languageId: python
-command:
-  version: 1
-  spokenForm: chuck every arg sit
-  action: remove
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: argumentOrParameter, includeSiblings: true}
-      mark: {type: decoratedSymbol, symbolColor: default, character: i}
-initialState:
-  documentContents: "\" \".join((word for word in word_list), another_argument)"
-  selections:
-    - anchor: {line: 0, character: 56}
-      active: {line: 0, character: 56}
-  marks:
-    default.i:
-      start: {line: 0, character: 24}
-      end: {line: 0, character: 26}
-finalState:
-  documentContents: "\" \".join()"
-  selections:
-    - anchor: {line: 0, character: 10}
-      active: {line: 0, character: 10}
-fullTargets: [{type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: i}, selectionType: token, position: contents, insideOutsideType: outside, modifier: {type: containingScope, scopeType: argumentOrParameter, includeSiblings: true}, isImplicit: false}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/python/chuckKey.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/python/chuckKey.yml
deleted file mode 100644
index 6c01100e64..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/python/chuckKey.yml
+++ /dev/null
@@ -1,28 +0,0 @@
-languageId: python
-command:
-  version: 1
-  spokenForm: chuck key
-  action: remove
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: collectionKey, includeSiblings: false}
-initialState:
-  documentContents: |-
-    {
-        "foo": "bar",
-        "baz": "bongo",
-    }
-  selections:
-    - anchor: {line: 1, character: 5}
-      active: {line: 1, character: 5}
-  marks: {}
-finalState:
-  documentContents: |-
-    {
-        "bar",
-        "baz": "bongo",
-    }
-  selections:
-    - anchor: {line: 1, character: 4}
-      active: {line: 1, character: 4}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: outside, modifier: {type: containingScope, scopeType: collectionKey, includeSiblings: false}}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/python/chuckKey2.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/python/chuckKey2.yml
deleted file mode 100644
index 96648540ea..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/python/chuckKey2.yml
+++ /dev/null
@@ -1,28 +0,0 @@
-languageId: python
-command:
-  version: 1
-  spokenForm: chuck key
-  action: remove
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: collectionKey, includeSiblings: false}
-initialState:
-  documentContents: |-
-    {
-        "foo": "bar",
-        "baz": "bongo",
-    }
-  selections:
-    - anchor: {line: 1, character: 12}
-      active: {line: 1, character: 12}
-  marks: {}
-finalState:
-  documentContents: |-
-    {
-        "bar",
-        "baz": "bongo",
-    }
-  selections:
-    - anchor: {line: 1, character: 5}
-      active: {line: 1, character: 5}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: outside, modifier: {type: containingScope, scopeType: collectionKey, includeSiblings: false}}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/python/chuckType.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/python/chuckType.yml
deleted file mode 100644
index fb50c73016..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/python/chuckType.yml
+++ /dev/null
@@ -1,20 +0,0 @@
-languageId: python
-command:
-  version: 1
-  spokenForm: chuck type
-  action: remove
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: type, includeSiblings: false}
-initialState:
-  documentContents: "foo: str = 'hello'"
-  selections:
-    - anchor: {line: 0, character: 1}
-      active: {line: 0, character: 1}
-  marks: {}
-finalState:
-  documentContents: foo = 'hello'
-  selections:
-    - anchor: {line: 0, character: 1}
-      active: {line: 0, character: 1}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: outside, modifier: {type: containingScope, scopeType: type, includeSiblings: false}}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/python/chuckTypeSoon.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/python/chuckTypeSoon.yml
deleted file mode 100644
index 4bb9725247..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/python/chuckTypeSoon.yml
+++ /dev/null
@@ -1,28 +0,0 @@
-languageId: python
-command:
-  version: 1
-  spokenForm: chuck type soon
-  action: remove
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: type, includeSiblings: false}
-      mark: {type: decoratedSymbol, symbolColor: default, character: s}
-initialState:
-  documentContents: |-
-    def my_funk(value: str) -> str:
-        pass
-  selections:
-    - anchor: {line: 1, character: 8}
-      active: {line: 1, character: 8}
-  marks:
-    default.s:
-      start: {line: 0, character: 19}
-      end: {line: 0, character: 22}
-finalState:
-  documentContents: |-
-    def my_funk(value) -> str:
-        pass
-  selections:
-    - anchor: {line: 1, character: 8}
-      active: {line: 1, character: 8}
-fullTargets: [{type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: s}, selectionType: token, position: contents, insideOutsideType: outside, modifier: {type: containingScope, scopeType: type, includeSiblings: false}}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/python/chuckTypeTrap.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/python/chuckTypeTrap.yml
deleted file mode 100644
index 99e3a7c5cc..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/python/chuckTypeTrap.yml
+++ /dev/null
@@ -1,28 +0,0 @@
-languageId: python
-command:
-  version: 1
-  spokenForm: chuck type trap
-  action: remove
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: type, includeSiblings: false}
-      mark: {type: decoratedSymbol, symbolColor: default, character: t}
-initialState:
-  documentContents: |-
-    def my_funk(value: str) -> str:
-        pass
-  selections:
-    - anchor: {line: 1, character: 8}
-      active: {line: 1, character: 8}
-  marks:
-    default.t:
-      start: {line: 0, character: 27}
-      end: {line: 0, character: 30}
-finalState:
-  documentContents: |-
-    def my_funk(value: str):
-        pass
-  selections:
-    - anchor: {line: 1, character: 8}
-      active: {line: 1, character: 8}
-fullTargets: [{type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: t}, selectionType: token, position: contents, insideOutsideType: outside, modifier: {type: containingScope, scopeType: type, includeSiblings: false}}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/python/chuckValue.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/python/chuckValue.yml
deleted file mode 100644
index cb0a20bad9..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/python/chuckValue.yml
+++ /dev/null
@@ -1,20 +0,0 @@
-languageId: python
-command:
-  version: 1
-  spokenForm: chuck value
-  action: remove
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: value, includeSiblings: false}
-initialState:
-  documentContents: "foo: str = \"hello\""
-  selections:
-    - anchor: {line: 0, character: 2}
-      active: {line: 0, character: 2}
-  marks: {}
-finalState:
-  documentContents: "foo: str"
-  selections:
-    - anchor: {line: 0, character: 2}
-      active: {line: 0, character: 2}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: outside, modifier: {type: containingScope, scopeType: value, includeSiblings: false}}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/python/chuckValue2.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/python/chuckValue2.yml
deleted file mode 100644
index fb0b5c1281..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/python/chuckValue2.yml
+++ /dev/null
@@ -1,24 +0,0 @@
-languageId: python
-command:
-  version: 1
-  spokenForm: chuck value
-  action: remove
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: value, includeSiblings: false}
-initialState:
-  documentContents: |-
-    def foo():
-        return "hello"
-  selections:
-    - anchor: {line: 1, character: 14}
-      active: {line: 1, character: 14}
-  marks: {}
-finalState:
-  documentContents: |-
-    def foo():
-        return
-  selections:
-    - anchor: {line: 1, character: 10}
-      active: {line: 1, character: 10}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: outside, modifier: {type: containingScope, scopeType: value, includeSiblings: false}}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/python/chuckValue3.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/python/chuckValue3.yml
deleted file mode 100644
index 106d4bacbd..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/python/chuckValue3.yml
+++ /dev/null
@@ -1,94 +0,0 @@
-languageId: python
-command:
-  version: 1
-  spokenForm: chuck value
-  action: remove
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: value, includeSiblings: false}
-initialState:
-  documentContents: |
-    a = 1;
-    a += 1;
-    a -= 1;
-    a *= 1;
-    a /= 1;
-    a %= 1;
-    a //= 1;
-    a **= 1;
-    a &= 1;
-    a |= 1;
-    a ^= 1;
-    a <<= 1;
-    a >>= 1;
-  selections:
-    - anchor: {line: 12, character: 6}
-      active: {line: 12, character: 7}
-    - anchor: {line: 1, character: 5}
-      active: {line: 1, character: 6}
-    - anchor: {line: 2, character: 5}
-      active: {line: 2, character: 6}
-    - anchor: {line: 3, character: 5}
-      active: {line: 3, character: 6}
-    - anchor: {line: 4, character: 5}
-      active: {line: 4, character: 6}
-    - anchor: {line: 5, character: 5}
-      active: {line: 5, character: 6}
-    - anchor: {line: 6, character: 6}
-      active: {line: 6, character: 7}
-    - anchor: {line: 7, character: 6}
-      active: {line: 7, character: 7}
-    - anchor: {line: 8, character: 5}
-      active: {line: 8, character: 6}
-    - anchor: {line: 9, character: 5}
-      active: {line: 9, character: 6}
-    - anchor: {line: 10, character: 5}
-      active: {line: 10, character: 6}
-    - anchor: {line: 11, character: 6}
-      active: {line: 11, character: 7}
-    - anchor: {line: 0, character: 4}
-      active: {line: 0, character: 5}
-  marks: {}
-finalState:
-  documentContents: |
-    a;
-    a;
-    a;
-    a;
-    a;
-    a;
-    a;
-    a;
-    a;
-    a;
-    a;
-    a;
-    a;
-  selections:
-    - anchor: {line: 12, character: 1}
-      active: {line: 12, character: 1}
-    - anchor: {line: 1, character: 1}
-      active: {line: 1, character: 1}
-    - anchor: {line: 2, character: 1}
-      active: {line: 2, character: 1}
-    - anchor: {line: 3, character: 1}
-      active: {line: 3, character: 1}
-    - anchor: {line: 4, character: 1}
-      active: {line: 4, character: 1}
-    - anchor: {line: 5, character: 1}
-      active: {line: 5, character: 1}
-    - anchor: {line: 6, character: 1}
-      active: {line: 6, character: 1}
-    - anchor: {line: 7, character: 1}
-      active: {line: 7, character: 1}
-    - anchor: {line: 8, character: 1}
-      active: {line: 8, character: 1}
-    - anchor: {line: 9, character: 1}
-      active: {line: 9, character: 1}
-    - anchor: {line: 10, character: 1}
-      active: {line: 10, character: 1}
-    - anchor: {line: 11, character: 1}
-      active: {line: 11, character: 1}
-    - anchor: {line: 0, character: 1}
-      active: {line: 0, character: 1}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: outside, modifier: {type: containingScope, scopeType: value, includeSiblings: false}, isImplicit: false}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/python/clearBranch.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/python/clearBranch.yml
deleted file mode 100644
index 69447caea9..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/python/clearBranch.yml
+++ /dev/null
@@ -1,32 +0,0 @@
-languageId: python
-command:
-  spokenForm: clear branch
-  version: 3
-  targets:
-    - type: primitive
-      modifiers:
-        - type: containingScope
-          scopeType: {type: branch}
-  usePrePhraseSnapshot: true
-  action: {name: clearAndSetSelection}
-initialState:
-  documentContents: |
-    match 0:
-        case [0]:
-            pass
-        case [1]:
-            pass
-  selections:
-    - anchor: {line: 2, character: 10}
-      active: {line: 2, character: 10}
-  marks: {}
-finalState:
-  documentContents: |
-    match 0:
-        
-        case [1]:
-            pass
-  selections:
-    - anchor: {line: 1, character: 4}
-      active: {line: 1, character: 4}
-fullTargets: [{type: primitive, mark: {type: cursor}, modifiers: [{type: containingScope, scopeType: {type: branch}}]}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/python/clearBranch10.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/python/clearBranch10.yml
deleted file mode 100644
index 0f8c0d35c7..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/python/clearBranch10.yml
+++ /dev/null
@@ -1,33 +0,0 @@
-languageId: python
-command:
-  version: 3
-  spokenForm: clear branch
-  action: {name: clearAndSetSelection}
-  targets:
-    - type: primitive
-      modifiers:
-        - type: containingScope
-          scopeType: {type: branch}
-  usePrePhraseSnapshot: false
-initialState:
-  documentContents: |-
-    try:
-      pass
-    except:
-      pass
-    finally:
-      pass
-  selections:
-    - anchor: {line: 5, character: 2}
-      active: {line: 5, character: 2}
-  marks: {}
-finalState:
-  documentContents: |
-    try:
-      pass
-    except:
-      pass
-  selections:
-    - anchor: {line: 4, character: 0}
-      active: {line: 4, character: 0}
-fullTargets: [{type: primitive, mark: {type: cursor}, modifiers: [{type: containingScope, scopeType: {type: branch}}]}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/python/clearBranch11.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/python/clearBranch11.yml
deleted file mode 100644
index 5495459daf..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/python/clearBranch11.yml
+++ /dev/null
@@ -1,23 +0,0 @@
-languageId: python
-command:
-  version: 3
-  spokenForm: clear branch
-  action: {name: clearAndSetSelection}
-  targets:
-    - type: primitive
-      modifiers:
-        - type: containingScope
-          scopeType: {type: branch}
-  usePrePhraseSnapshot: true
-initialState:
-  documentContents: aaa = bbb if ccc else ddd
-  selections:
-    - anchor: {line: 0, character: 6}
-      active: {line: 0, character: 6}
-  marks: {}
-finalState:
-  documentContents: aaa =  if ccc else ddd
-  selections:
-    - anchor: {line: 0, character: 6}
-      active: {line: 0, character: 6}
-fullTargets: [{type: primitive, mark: {type: cursor}, modifiers: [{type: containingScope, scopeType: {type: branch}}]}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/python/clearBranch12.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/python/clearBranch12.yml
deleted file mode 100644
index 29a3a226be..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/python/clearBranch12.yml
+++ /dev/null
@@ -1,23 +0,0 @@
-languageId: python
-command:
-  version: 3
-  spokenForm: clear branch
-  action: {name: clearAndSetSelection}
-  targets:
-    - type: primitive
-      modifiers:
-        - type: containingScope
-          scopeType: {type: branch}
-  usePrePhraseSnapshot: false
-initialState:
-  documentContents: aaa = bbb if ccc else ddd
-  selections:
-    - anchor: {line: 0, character: 22}
-      active: {line: 0, character: 22}
-  marks: {}
-finalState:
-  documentContents: "aaa = bbb if ccc else "
-  selections:
-    - anchor: {line: 0, character: 22}
-      active: {line: 0, character: 22}
-fullTargets: [{type: primitive, mark: {type: cursor}, modifiers: [{type: containingScope, scopeType: {type: branch}}]}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/python/clearBranch13.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/python/clearBranch13.yml
deleted file mode 100644
index 9d87653bd5..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/python/clearBranch13.yml
+++ /dev/null
@@ -1,19 +0,0 @@
-languageId: python
-command:
-  version: 3
-  spokenForm: clear branch
-  action: {name: clearAndSetSelection}
-  targets:
-    - type: primitive
-      modifiers:
-        - type: containingScope
-          scopeType: {type: branch}
-  usePrePhraseSnapshot: true
-initialState:
-  documentContents: aaa = bbb if ccc else ddd
-  selections:
-    - anchor: {line: 0, character: 13}
-      active: {line: 0, character: 13}
-  marks: {}
-thrownError: {name: NoContainingScopeError}
-fullTargets: [{type: primitive, mark: {type: cursor}, modifiers: [{type: containingScope, scopeType: {type: branch}}]}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/python/clearBranch14.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/python/clearBranch14.yml
deleted file mode 100644
index 3f51c89439..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/python/clearBranch14.yml
+++ /dev/null
@@ -1,34 +0,0 @@
-languageId: python
-command:
-  version: 3
-  spokenForm: clear branch
-  action: {name: clearAndSetSelection}
-  targets:
-    - type: primitive
-      modifiers:
-        - type: containingScope
-          scopeType: {type: branch}
-  usePrePhraseSnapshot: true
-initialState:
-  documentContents: |-
-    try:
-      pass
-    except* ValueError as eg:
-      pass
-    else:
-      pass
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-  marks: {}
-finalState:
-  documentContents: |-
-
-    except* ValueError as eg:
-      pass
-    else:
-      pass
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-fullTargets: [{type: primitive, mark: {type: cursor}, modifiers: [{type: containingScope, scopeType: {type: branch}}]}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/python/clearBranch15.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/python/clearBranch15.yml
deleted file mode 100644
index f702f27099..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/python/clearBranch15.yml
+++ /dev/null
@@ -1,34 +0,0 @@
-languageId: python
-command:
-  version: 3
-  spokenForm: clear branch
-  action: {name: clearAndSetSelection}
-  targets:
-    - type: primitive
-      modifiers:
-        - type: containingScope
-          scopeType: {type: branch}
-  usePrePhraseSnapshot: false
-initialState:
-  documentContents: |-
-    try:
-      pass
-    except* ValueError as eg:
-      pass
-    else:
-      pass
-  selections:
-    - anchor: {line: 2, character: 0}
-      active: {line: 2, character: 0}
-  marks: {}
-finalState:
-  documentContents: |-
-    try:
-      pass
-
-    else:
-      pass
-  selections:
-    - anchor: {line: 2, character: 0}
-      active: {line: 2, character: 0}
-fullTargets: [{type: primitive, mark: {type: cursor}, modifiers: [{type: containingScope, scopeType: {type: branch}}]}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/python/clearBranch16.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/python/clearBranch16.yml
deleted file mode 100644
index 44462f031c..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/python/clearBranch16.yml
+++ /dev/null
@@ -1,33 +0,0 @@
-languageId: python
-command:
-  version: 3
-  spokenForm: clear branch
-  action: {name: clearAndSetSelection}
-  targets:
-    - type: primitive
-      modifiers:
-        - type: containingScope
-          scopeType: {type: branch}
-  usePrePhraseSnapshot: false
-initialState:
-  documentContents: |-
-    try:
-      pass
-    except* ValueError as eg:
-      pass
-    else:
-      pass
-  selections:
-    - anchor: {line: 4, character: 0}
-      active: {line: 4, character: 0}
-  marks: {}
-finalState:
-  documentContents: |
-    try:
-      pass
-    except* ValueError as eg:
-      pass
-  selections:
-    - anchor: {line: 4, character: 0}
-      active: {line: 4, character: 0}
-fullTargets: [{type: primitive, mark: {type: cursor}, modifiers: [{type: containingScope, scopeType: {type: branch}}]}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/python/clearBranch17.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/python/clearBranch17.yml
deleted file mode 100644
index c24f3007bb..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/python/clearBranch17.yml
+++ /dev/null
@@ -1,29 +0,0 @@
-languageId: python
-command:
-  version: 3
-  spokenForm: clear branch
-  action: {name: clearAndSetSelection}
-  targets:
-    - type: primitive
-      modifiers:
-        - type: containingScope
-          scopeType: {type: branch}
-  usePrePhraseSnapshot: true
-initialState:
-  documentContents: |-
-    while True:
-      pass
-    else:
-      pass
-  selections:
-    - anchor: {line: 3, character: 2}
-      active: {line: 3, character: 2}
-  marks: {}
-finalState:
-  documentContents: |
-    while True:
-      pass
-  selections:
-    - anchor: {line: 2, character: 0}
-      active: {line: 2, character: 0}
-fullTargets: [{type: primitive, mark: {type: cursor}, modifiers: [{type: containingScope, scopeType: {type: branch}}]}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/python/clearBranch18.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/python/clearBranch18.yml
deleted file mode 100644
index 22874924ff..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/python/clearBranch18.yml
+++ /dev/null
@@ -1,30 +0,0 @@
-languageId: python
-command:
-  version: 3
-  spokenForm: clear branch
-  action: {name: clearAndSetSelection}
-  targets:
-    - type: primitive
-      modifiers:
-        - type: containingScope
-          scopeType: {type: branch}
-  usePrePhraseSnapshot: false
-initialState:
-  documentContents: |-
-    while True:
-      pass
-    else:
-      pass
-  selections:
-    - anchor: {line: 1, character: 2}
-      active: {line: 1, character: 2}
-  marks: {}
-finalState:
-  documentContents: |-
-
-    else:
-      pass
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-fullTargets: [{type: primitive, mark: {type: cursor}, modifiers: [{type: containingScope, scopeType: {type: branch}}]}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/python/clearBranch19.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/python/clearBranch19.yml
deleted file mode 100644
index ff7bb60a48..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/python/clearBranch19.yml
+++ /dev/null
@@ -1,29 +0,0 @@
-languageId: python
-command:
-  version: 3
-  spokenForm: clear branch
-  action: {name: clearAndSetSelection}
-  targets:
-    - type: primitive
-      modifiers:
-        - type: containingScope
-          scopeType: {type: branch}
-  usePrePhraseSnapshot: false
-initialState:
-  documentContents: |-
-    for aaa in bbb:
-      pass
-    else:
-      pass
-  selections:
-    - anchor: {line: 3, character: 2}
-      active: {line: 3, character: 2}
-  marks: {}
-finalState:
-  documentContents: |
-    for aaa in bbb:
-      pass
-  selections:
-    - anchor: {line: 2, character: 0}
-      active: {line: 2, character: 0}
-fullTargets: [{type: primitive, mark: {type: cursor}, modifiers: [{type: containingScope, scopeType: {type: branch}}]}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/python/clearBranch2.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/python/clearBranch2.yml
deleted file mode 100644
index 55a2473525..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/python/clearBranch2.yml
+++ /dev/null
@@ -1,34 +0,0 @@
-languageId: python
-command:
-  version: 3
-  spokenForm: clear branch
-  action: {name: clearAndSetSelection}
-  targets:
-    - type: primitive
-      modifiers:
-        - type: containingScope
-          scopeType: {type: branch}
-  usePrePhraseSnapshot: true
-initialState:
-  documentContents: |-
-    if True:
-        pass
-    elif False:
-        pass
-    else:
-        pass
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-  marks: {}
-finalState:
-  documentContents: |-
-
-    elif False:
-        pass
-    else:
-        pass
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-fullTargets: [{type: primitive, mark: {type: cursor}, modifiers: [{type: containingScope, scopeType: {type: branch}}]}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/python/clearBranch20.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/python/clearBranch20.yml
deleted file mode 100644
index a36c050f0a..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/python/clearBranch20.yml
+++ /dev/null
@@ -1,30 +0,0 @@
-languageId: python
-command:
-  version: 3
-  spokenForm: clear branch
-  action: {name: clearAndSetSelection}
-  targets:
-    - type: primitive
-      modifiers:
-        - type: containingScope
-          scopeType: {type: branch}
-  usePrePhraseSnapshot: false
-initialState:
-  documentContents: |-
-    for aaa in bbb:
-      pass
-    else:
-      pass
-  selections:
-    - anchor: {line: 1, character: 2}
-      active: {line: 1, character: 2}
-  marks: {}
-finalState:
-  documentContents: |-
-
-    else:
-      pass
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-fullTargets: [{type: primitive, mark: {type: cursor}, modifiers: [{type: containingScope, scopeType: {type: branch}}]}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/python/clearBranch3.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/python/clearBranch3.yml
deleted file mode 100644
index 5235a8c145..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/python/clearBranch3.yml
+++ /dev/null
@@ -1,34 +0,0 @@
-languageId: python
-command:
-  version: 3
-  spokenForm: clear branch
-  action: {name: clearAndSetSelection}
-  targets:
-    - type: primitive
-      modifiers:
-        - type: containingScope
-          scopeType: {type: branch}
-  usePrePhraseSnapshot: false
-initialState:
-  documentContents: |-
-    if True:
-        pass
-    elif False:
-        pass
-    else:
-        pass
-  selections:
-    - anchor: {line: 1, character: 4}
-      active: {line: 1, character: 4}
-  marks: {}
-finalState:
-  documentContents: |-
-
-    elif False:
-        pass
-    else:
-        pass
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-fullTargets: [{type: primitive, mark: {type: cursor}, modifiers: [{type: containingScope, scopeType: {type: branch}}]}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/python/clearBranch4.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/python/clearBranch4.yml
deleted file mode 100644
index 92a6471761..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/python/clearBranch4.yml
+++ /dev/null
@@ -1,34 +0,0 @@
-languageId: python
-command:
-  version: 3
-  spokenForm: clear branch
-  action: {name: clearAndSetSelection}
-  targets:
-    - type: primitive
-      modifiers:
-        - type: containingScope
-          scopeType: {type: branch}
-  usePrePhraseSnapshot: false
-initialState:
-  documentContents: |-
-    if True:
-        pass
-    elif False:
-        pass
-    else:
-        pass
-  selections:
-    - anchor: {line: 2, character: 0}
-      active: {line: 2, character: 0}
-  marks: {}
-finalState:
-  documentContents: |-
-    if True:
-        pass
-
-    else:
-        pass
-  selections:
-    - anchor: {line: 2, character: 0}
-      active: {line: 2, character: 0}
-fullTargets: [{type: primitive, mark: {type: cursor}, modifiers: [{type: containingScope, scopeType: {type: branch}}]}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/python/clearBranch5.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/python/clearBranch5.yml
deleted file mode 100644
index 45fbdf3998..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/python/clearBranch5.yml
+++ /dev/null
@@ -1,34 +0,0 @@
-languageId: python
-command:
-  version: 3
-  spokenForm: clear branch
-  action: {name: clearAndSetSelection}
-  targets:
-    - type: primitive
-      modifiers:
-        - type: containingScope
-          scopeType: {type: branch}
-  usePrePhraseSnapshot: false
-initialState:
-  documentContents: |-
-    if True:
-        pass
-    elif False:
-        pass
-    else:
-        pass
-  selections:
-    - anchor: {line: 3, character: 4}
-      active: {line: 3, character: 4}
-  marks: {}
-finalState:
-  documentContents: |-
-    if True:
-        pass
-
-    else:
-        pass
-  selections:
-    - anchor: {line: 2, character: 0}
-      active: {line: 2, character: 0}
-fullTargets: [{type: primitive, mark: {type: cursor}, modifiers: [{type: containingScope, scopeType: {type: branch}}]}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/python/clearBranch6.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/python/clearBranch6.yml
deleted file mode 100644
index 9939a351db..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/python/clearBranch6.yml
+++ /dev/null
@@ -1,33 +0,0 @@
-languageId: python
-command:
-  version: 3
-  spokenForm: clear branch
-  action: {name: clearAndSetSelection}
-  targets:
-    - type: primitive
-      modifiers:
-        - type: containingScope
-          scopeType: {type: branch}
-  usePrePhraseSnapshot: false
-initialState:
-  documentContents: |-
-    if True:
-        pass
-    elif False:
-        pass
-    else:
-        pass
-  selections:
-    - anchor: {line: 4, character: 0}
-      active: {line: 4, character: 0}
-  marks: {}
-finalState:
-  documentContents: |
-    if True:
-        pass
-    elif False:
-        pass
-  selections:
-    - anchor: {line: 4, character: 0}
-      active: {line: 4, character: 0}
-fullTargets: [{type: primitive, mark: {type: cursor}, modifiers: [{type: containingScope, scopeType: {type: branch}}]}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/python/clearBranch7.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/python/clearBranch7.yml
deleted file mode 100644
index 83a77ee277..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/python/clearBranch7.yml
+++ /dev/null
@@ -1,33 +0,0 @@
-languageId: python
-command:
-  version: 3
-  spokenForm: clear branch
-  action: {name: clearAndSetSelection}
-  targets:
-    - type: primitive
-      modifiers:
-        - type: containingScope
-          scopeType: {type: branch}
-  usePrePhraseSnapshot: false
-initialState:
-  documentContents: |-
-    if True:
-        pass
-    elif False:
-        pass
-    else:
-        pass
-  selections:
-    - anchor: {line: 5, character: 4}
-      active: {line: 5, character: 4}
-  marks: {}
-finalState:
-  documentContents: |
-    if True:
-        pass
-    elif False:
-        pass
-  selections:
-    - anchor: {line: 4, character: 0}
-      active: {line: 4, character: 0}
-fullTargets: [{type: primitive, mark: {type: cursor}, modifiers: [{type: containingScope, scopeType: {type: branch}}]}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/python/clearBranch8.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/python/clearBranch8.yml
deleted file mode 100644
index d90fac752f..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/python/clearBranch8.yml
+++ /dev/null
@@ -1,34 +0,0 @@
-languageId: python
-command:
-  version: 3
-  spokenForm: clear branch
-  action: {name: clearAndSetSelection}
-  targets:
-    - type: primitive
-      modifiers:
-        - type: containingScope
-          scopeType: {type: branch}
-  usePrePhraseSnapshot: true
-initialState:
-  documentContents: |-
-    try:
-      pass
-    except:
-      pass
-    finally:
-      pass
-  selections:
-    - anchor: {line: 1, character: 2}
-      active: {line: 1, character: 2}
-  marks: {}
-finalState:
-  documentContents: |-
-
-    except:
-      pass
-    finally:
-      pass
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-fullTargets: [{type: primitive, mark: {type: cursor}, modifiers: [{type: containingScope, scopeType: {type: branch}}]}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/python/clearBranch9.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/python/clearBranch9.yml
deleted file mode 100644
index c19b4accef..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/python/clearBranch9.yml
+++ /dev/null
@@ -1,34 +0,0 @@
-languageId: python
-command:
-  version: 3
-  spokenForm: clear branch
-  action: {name: clearAndSetSelection}
-  targets:
-    - type: primitive
-      modifiers:
-        - type: containingScope
-          scopeType: {type: branch}
-  usePrePhraseSnapshot: false
-initialState:
-  documentContents: |-
-    try:
-      pass
-    except:
-      pass
-    finally:
-      pass
-  selections:
-    - anchor: {line: 3, character: 2}
-      active: {line: 3, character: 2}
-  marks: {}
-finalState:
-  documentContents: |-
-    try:
-      pass
-
-    finally:
-      pass
-  selections:
-    - anchor: {line: 2, character: 0}
-      active: {line: 2, character: 0}
-fullTargets: [{type: primitive, mark: {type: cursor}, modifiers: [{type: containingScope, scopeType: {type: branch}}]}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/python/clearCondition.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/python/clearCondition.yml
deleted file mode 100644
index 9417d30da9..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/python/clearCondition.yml
+++ /dev/null
@@ -1,23 +0,0 @@
-languageId: python
-command:
-  spokenForm: clear condition
-  version: 3
-  targets:
-    - type: primitive
-      modifiers:
-        - type: containingScope
-          scopeType: {type: condition}
-  usePrePhraseSnapshot: true
-  action: {name: clearAndSetSelection}
-initialState:
-  documentContents: aaa if bbb else ccc
-  selections:
-    - anchor: {line: 0, character: 16}
-      active: {line: 0, character: 16}
-  marks: {}
-finalState:
-  documentContents: aaa if  else ccc
-  selections:
-    - anchor: {line: 0, character: 7}
-      active: {line: 0, character: 7}
-fullTargets: [{type: primitive, mark: {type: cursor}, modifiers: [{type: containingScope, scopeType: {type: condition}}]}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/python/clearCondition2.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/python/clearCondition2.yml
deleted file mode 100644
index ba35ec50ec..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/python/clearCondition2.yml
+++ /dev/null
@@ -1,23 +0,0 @@
-languageId: python
-command:
-  spokenForm: clear condition
-  version: 3
-  targets:
-    - type: primitive
-      modifiers:
-        - type: containingScope
-          scopeType: {type: condition}
-  usePrePhraseSnapshot: true
-  action: {name: clearAndSetSelection}
-initialState:
-  documentContents: "[aaa for aaa in bbb if ccc]"
-  selections:
-    - anchor: {line: 0, character: 1}
-      active: {line: 0, character: 1}
-  marks: {}
-finalState:
-  documentContents: "[aaa for aaa in bbb if ]"
-  selections:
-    - anchor: {line: 0, character: 23}
-      active: {line: 0, character: 23}
-fullTargets: [{type: primitive, mark: {type: cursor}, modifiers: [{type: containingScope, scopeType: {type: condition}}]}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/python/clearCondition3.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/python/clearCondition3.yml
deleted file mode 100644
index 92ce49e57e..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/python/clearCondition3.yml
+++ /dev/null
@@ -1,23 +0,0 @@
-languageId: python
-command:
-  spokenForm: clear condition
-  version: 3
-  targets:
-    - type: primitive
-      modifiers:
-        - type: containingScope
-          scopeType: {type: condition}
-  usePrePhraseSnapshot: true
-  action: {name: clearAndSetSelection}
-initialState:
-  documentContents: (aaa for aaa in bbb if ccc)
-  selections:
-    - anchor: {line: 0, character: 1}
-      active: {line: 0, character: 1}
-  marks: {}
-finalState:
-  documentContents: (aaa for aaa in bbb if )
-  selections:
-    - anchor: {line: 0, character: 23}
-      active: {line: 0, character: 23}
-fullTargets: [{type: primitive, mark: {type: cursor}, modifiers: [{type: containingScope, scopeType: {type: condition}}]}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/python/clearCondition4.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/python/clearCondition4.yml
deleted file mode 100644
index e9f6a3d2b1..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/python/clearCondition4.yml
+++ /dev/null
@@ -1,23 +0,0 @@
-languageId: python
-command:
-  spokenForm: clear condition
-  version: 3
-  targets:
-    - type: primitive
-      modifiers:
-        - type: containingScope
-          scopeType: {type: condition}
-  usePrePhraseSnapshot: false
-  action: {name: clearAndSetSelection}
-initialState:
-  documentContents: "{aaa for aaa in bbb if ccc}"
-  selections:
-    - anchor: {line: 0, character: 1}
-      active: {line: 0, character: 1}
-  marks: {}
-finalState:
-  documentContents: "{aaa for aaa in bbb if }"
-  selections:
-    - anchor: {line: 0, character: 23}
-      active: {line: 0, character: 23}
-fullTargets: [{type: primitive, mark: {type: cursor}, modifiers: [{type: containingScope, scopeType: {type: condition}}]}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/python/clearCondition5.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/python/clearCondition5.yml
deleted file mode 100644
index 40610d0fa2..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/python/clearCondition5.yml
+++ /dev/null
@@ -1,23 +0,0 @@
-languageId: python
-command:
-  spokenForm: clear condition
-  version: 3
-  targets:
-    - type: primitive
-      modifiers:
-        - type: containingScope
-          scopeType: {type: condition}
-  usePrePhraseSnapshot: false
-  action: {name: clearAndSetSelection}
-initialState:
-  documentContents: "{aaa: aaa for aaa in bbb if ccc}"
-  selections:
-    - anchor: {line: 0, character: 1}
-      active: {line: 0, character: 1}
-  marks: {}
-finalState:
-  documentContents: "{aaa: aaa for aaa in bbb if }"
-  selections:
-    - anchor: {line: 0, character: 28}
-      active: {line: 0, character: 28}
-fullTargets: [{type: primitive, mark: {type: cursor}, modifiers: [{type: containingScope, scopeType: {type: condition}}]}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/python/clearCondition6.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/python/clearCondition6.yml
deleted file mode 100644
index 63a174ed84..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/python/clearCondition6.yml
+++ /dev/null
@@ -1,29 +0,0 @@
-languageId: python
-command:
-  spokenForm: clear condition
-  version: 3
-  targets:
-    - type: primitive
-      modifiers:
-        - type: containingScope
-          scopeType: {type: condition}
-  usePrePhraseSnapshot: true
-  action: {name: clearAndSetSelection}
-initialState:
-  documentContents: |-
-    match 0:
-        case a if a > 1:
-            pass
-  selections:
-    - anchor: {line: 2, character: 8}
-      active: {line: 2, character: 8}
-  marks: {}
-finalState:
-  documentContents: |-
-    match 0:
-        case a if :
-            pass
-  selections:
-    - anchor: {line: 1, character: 14}
-      active: {line: 1, character: 14}
-fullTargets: [{type: primitive, mark: {type: cursor}, modifiers: [{type: containingScope, scopeType: {type: condition}}]}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/python/clearEveryItem.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/python/clearEveryItem.yml
deleted file mode 100644
index 836271f976..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/python/clearEveryItem.yml
+++ /dev/null
@@ -1,27 +0,0 @@
-languageId: python
-command:
-  spokenForm: clear every item
-  version: 2
-  targets:
-    - type: primitive
-      modifiers:
-        - type: everyScope
-          scopeType: {type: collectionItem}
-  usePrePhraseSnapshot: true
-  action: {name: clearAndSetSelection}
-initialState:
-  documentContents: from talon import Context, Module, actions
-  selections:
-    - anchor: {line: 0, character: 25}
-      active: {line: 0, character: 25}
-  marks: {}
-finalState:
-  documentContents: "from talon import , , "
-  selections:
-    - anchor: {line: 0, character: 18}
-      active: {line: 0, character: 18}
-    - anchor: {line: 0, character: 20}
-      active: {line: 0, character: 20}
-    - anchor: {line: 0, character: 22}
-      active: {line: 0, character: 22}
-fullTargets: [{type: primitive, mark: {type: cursor}, modifiers: [{type: everyScope, scopeType: {type: collectionItem}}]}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/python/clearEveryItem2.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/python/clearEveryItem2.yml
deleted file mode 100644
index f5bc6e466a..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/python/clearEveryItem2.yml
+++ /dev/null
@@ -1,29 +0,0 @@
-languageId: python
-command:
-  spokenForm: clear every item
-  version: 2
-  targets:
-    - type: primitive
-      modifiers:
-        - type: everyScope
-          scopeType: {type: collectionItem}
-  usePrePhraseSnapshot: true
-  action: {name: clearAndSetSelection}
-initialState:
-  documentContents: |-
-    def aaa():
-        global bbb, ccc
-  selections:
-    - anchor: {line: 1, character: 14}
-      active: {line: 1, character: 14}
-  marks: {}
-finalState:
-  documentContents: |-
-    def aaa():
-        global , 
-  selections:
-    - anchor: {line: 1, character: 11}
-      active: {line: 1, character: 11}
-    - anchor: {line: 1, character: 13}
-      active: {line: 1, character: 13}
-fullTargets: [{type: primitive, mark: {type: cursor}, modifiers: [{type: everyScope, scopeType: {type: collectionItem}}]}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/python/clearEveryValue.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/python/clearEveryValue.yml
deleted file mode 100644
index 5379168613..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/python/clearEveryValue.yml
+++ /dev/null
@@ -1,30 +0,0 @@
-languageId: python
-command:
-  version: 1
-  spokenForm: clear every value
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: value, includeSiblings: true}
-initialState:
-  documentContents: |-
-    {
-        "foo": "bar",
-        "baz": "bongo",
-    }
-  selections:
-    - anchor: {line: 1, character: 13}
-      active: {line: 1, character: 13}
-  marks: {}
-finalState:
-  documentContents: |-
-    {
-        "foo": ,
-        "baz": ,
-    }
-  selections:
-    - anchor: {line: 1, character: 11}
-      active: {line: 1, character: 11}
-    - anchor: {line: 2, character: 11}
-      active: {line: 2, character: 11}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: containingScope, scopeType: value, includeSiblings: true}}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/python/clearName.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/python/clearName.yml
deleted file mode 100644
index 47d2a18630..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/python/clearName.yml
+++ /dev/null
@@ -1,20 +0,0 @@
-languageId: python
-command:
-  version: 1
-  spokenForm: clear name
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: name, includeSiblings: false}
-initialState:
-  documentContents: a += "world"
-  selections:
-    - anchor: {line: 0, character: 6}
-      active: {line: 0, character: 6}
-  marks: {}
-finalState:
-  documentContents: " += \"world\""
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: containingScope, scopeType: name, includeSiblings: false}, isImplicit: false}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/python/clearSubject.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/python/clearSubject.yml
deleted file mode 100644
index 8de348e4c9..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/python/clearSubject.yml
+++ /dev/null
@@ -1,29 +0,0 @@
-languageId: python
-command:
-  spokenForm: clear subject
-  version: 3
-  targets:
-    - type: primitive
-      modifiers:
-        - type: containingScope
-          scopeType: {type: switchStatementSubject}
-  usePrePhraseSnapshot: true
-  action: {name: clearAndSetSelection}
-initialState:
-  documentContents: |
-    match 0:
-        case [0]:
-            pass
-  selections:
-    - anchor: {line: 2, character: 8}
-      active: {line: 2, character: 8}
-  marks: {}
-finalState:
-  documentContents: |
-    match :
-        case [0]:
-            pass
-  selections:
-    - anchor: {line: 0, character: 6}
-      active: {line: 0, character: 6}
-fullTargets: [{type: primitive, mark: {type: cursor}, modifiers: [{type: containingScope, scopeType: {type: switchStatementSubject}}]}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/python/clearValue.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/python/clearValue.yml
deleted file mode 100644
index 8f70f2cc1c..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/python/clearValue.yml
+++ /dev/null
@@ -1,24 +0,0 @@
-languageId: python
-command:
-  version: 1
-  spokenForm: clear value
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: value, includeSiblings: false}
-initialState:
-  documentContents: |-
-    def foo():
-        return "hello"
-  selections:
-    - anchor: {line: 1, character: 14}
-      active: {line: 1, character: 14}
-  marks: {}
-finalState:
-  documentContents: |-
-    def foo():
-        return 
-  selections:
-    - anchor: {line: 1, character: 11}
-      active: {line: 1, character: 11}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: containingScope, scopeType: value, includeSiblings: false}}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/python/clearValue2.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/python/clearValue2.yml
deleted file mode 100644
index 789780be1e..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/python/clearValue2.yml
+++ /dev/null
@@ -1,24 +0,0 @@
-languageId: python
-command:
-  version: 1
-  spokenForm: clear value
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: value, includeSiblings: false}
-initialState:
-  documentContents: |-
-    def foo():
-        return "hello"
-  selections:
-    - anchor: {line: 1, character: 7}
-      active: {line: 1, character: 7}
-  marks: {}
-finalState:
-  documentContents: |-
-    def foo():
-        return 
-  selections:
-    - anchor: {line: 1, character: 11}
-      active: {line: 1, character: 11}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: containingScope, scopeType: value, includeSiblings: false}}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/python/clearValue3.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/python/clearValue3.yml
deleted file mode 100644
index 53a879436c..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/python/clearValue3.yml
+++ /dev/null
@@ -1,20 +0,0 @@
-languageId: python
-command:
-  version: 1
-  spokenForm: clear value
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: value, includeSiblings: false}
-initialState:
-  documentContents: a += "world"
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-  marks: {}
-finalState:
-  documentContents: "a += "
-  selections:
-    - anchor: {line: 0, character: 5}
-      active: {line: 0, character: 5}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: containingScope, scopeType: value, includeSiblings: false}, isImplicit: false}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/python/ditchBranch.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/python/ditchBranch.yml
deleted file mode 100644
index 770c51f515..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/python/ditchBranch.yml
+++ /dev/null
@@ -1,34 +0,0 @@
-languageId: python
-command:
-  version: 3
-  spokenForm: ditch branch
-  action: {name: remove}
-  targets:
-    - type: primitive
-      modifiers:
-        - type: containingScope
-          scopeType: {type: branch}
-  usePrePhraseSnapshot: true
-initialState:
-  documentContents: |-
-    if True:
-        pass
-    elif False:
-        pass
-    else:
-        pass
-  selections:
-    - anchor: {line: 2, character: 0}
-      active: {line: 2, character: 0}
-  marks: {}
-finalState:
-  documentContents: |-
-    if True:
-        pass
-
-    else:
-        pass
-  selections:
-    - anchor: {line: 2, character: 0}
-      active: {line: 2, character: 0}
-fullTargets: [{type: primitive, mark: {type: cursor}, modifiers: [{type: containingScope, scopeType: {type: branch}}]}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/python/ditchBranch2.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/python/ditchBranch2.yml
deleted file mode 100644
index 43fd22b2a8..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/python/ditchBranch2.yml
+++ /dev/null
@@ -1,33 +0,0 @@
-languageId: python
-command:
-  version: 3
-  spokenForm: ditch branch
-  action: {name: remove}
-  targets:
-    - type: primitive
-      modifiers:
-        - type: containingScope
-          scopeType: {type: branch}
-  usePrePhraseSnapshot: false
-initialState:
-  documentContents: |-
-    if True:
-        pass
-    elif False:
-        pass
-    else:
-        pass
-  selections:
-    - anchor: {line: 4, character: 0}
-      active: {line: 4, character: 0}
-  marks: {}
-finalState:
-  documentContents: |
-    if True:
-        pass
-    elif False:
-        pass
-  selections:
-    - anchor: {line: 4, character: 0}
-      active: {line: 4, character: 0}
-fullTargets: [{type: primitive, mark: {type: cursor}, modifiers: [{type: containingScope, scopeType: {type: branch}}]}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/python/ditchCondition.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/python/ditchCondition.yml
deleted file mode 100644
index 5a786d6c2b..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/python/ditchCondition.yml
+++ /dev/null
@@ -1,23 +0,0 @@
-languageId: python
-command:
-  spokenForm: ditch condition
-  version: 3
-  targets:
-    - type: primitive
-      modifiers:
-        - type: containingScope
-          scopeType: {type: condition}
-  usePrePhraseSnapshot: true
-  action: {name: remove}
-initialState:
-  documentContents: "[aaa for aaa in bbb if ccc]"
-  selections:
-    - anchor: {line: 0, character: 1}
-      active: {line: 0, character: 1}
-  marks: {}
-finalState:
-  documentContents: "[aaa for aaa in bbb ]"
-  selections:
-    - anchor: {line: 0, character: 1}
-      active: {line: 0, character: 1}
-fullTargets: [{type: primitive, mark: {type: cursor}, modifiers: [{type: containingScope, scopeType: {type: condition}}]}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/python/ditchCondition2.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/python/ditchCondition2.yml
deleted file mode 100644
index 1be74d6e85..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/python/ditchCondition2.yml
+++ /dev/null
@@ -1,29 +0,0 @@
-languageId: python
-command:
-  spokenForm: ditch condition
-  version: 3
-  targets:
-    - type: primitive
-      modifiers:
-        - type: containingScope
-          scopeType: {type: condition}
-  usePrePhraseSnapshot: true
-  action: {name: remove}
-initialState:
-  documentContents: |-
-    match 0:
-        case a if a > 1:
-            pass
-  selections:
-    - anchor: {line: 2, character: 8}
-      active: {line: 2, character: 8}
-  marks: {}
-finalState:
-  documentContents: |-
-    match 0:
-        case a :
-            pass
-  selections:
-    - anchor: {line: 2, character: 8}
-      active: {line: 2, character: 8}
-fullTargets: [{type: primitive, mark: {type: cursor}, modifiers: [{type: containingScope, scopeType: {type: condition}}]}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/python/elseStateWrapThis.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/python/elseStateWrapThis.yml
deleted file mode 100644
index 9b2510aa5b..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/python/elseStateWrapThis.yml
+++ /dev/null
@@ -1,25 +0,0 @@
-languageId: python
-command:
-  version: 1
-  spokenForm: else state wrap this
-  action: wrapWithSnippet
-  targets:
-    - type: primitive
-      mark: {type: cursor}
-  extraArgs: [ifElseStatement.alternative]
-initialState:
-  documentContents: foo = "hello"
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-  marks: {}
-finalState:
-  documentContents: |-
-    if :
-        
-    else:
-        foo = "hello"
-  selections:
-    - anchor: {line: 0, character: 3}
-      active: {line: 0, character: 3}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: containingScope, scopeType: statement, includeSiblings: false}}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/python/ifElseWrapThis.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/python/ifElseWrapThis.yml
deleted file mode 100644
index 0227caa39e..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/python/ifElseWrapThis.yml
+++ /dev/null
@@ -1,25 +0,0 @@
-languageId: python
-command:
-  version: 1
-  spokenForm: if else wrap this
-  action: wrapWithSnippet
-  targets:
-    - type: primitive
-      mark: {type: cursor}
-  extraArgs: [ifElseStatement.consequence]
-initialState:
-  documentContents: foo = "hello"
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-  marks: {}
-finalState:
-  documentContents: |-
-    if :
-        foo = "hello"
-    else:
-        
-  selections:
-    - anchor: {line: 0, character: 3}
-      active: {line: 0, character: 3}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: containingScope, scopeType: statement, includeSiblings: false}}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/python/ifStateWrapThis.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/python/ifStateWrapThis.yml
deleted file mode 100644
index d3d1ffbd15..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/python/ifStateWrapThis.yml
+++ /dev/null
@@ -1,23 +0,0 @@
-languageId: python
-command:
-  version: 1
-  spokenForm: if state wrap this
-  action: wrapWithSnippet
-  targets:
-    - type: primitive
-      mark: {type: cursor}
-  extraArgs: [ifStatement.consequence]
-initialState:
-  documentContents: foo = "hello"
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-  marks: {}
-finalState:
-  documentContents: |-
-    if :
-        foo = "hello"
-  selections:
-    - anchor: {line: 0, character: 3}
-      active: {line: 0, character: 3}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: containingScope, scopeType: statement, includeSiblings: false}}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/python/takeArg.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/python/takeArg.yml
deleted file mode 100644
index b29d56720d..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/python/takeArg.yml
+++ /dev/null
@@ -1,26 +0,0 @@
-languageId: python
-command:
-  version: 1
-  spokenForm: take arg
-  action: setSelection
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: argumentOrParameter}
-initialState:
-  documentContents: |
-
-    def my_funk(name: str, value) -> str:
-        return
-  selections:
-    - anchor: {line: 1, character: 12}
-      active: {line: 1, character: 12}
-  marks: {}
-finalState:
-  documentContents: |
-
-    def my_funk(name: str, value) -> str:
-        return
-  selections:
-    - anchor: {line: 1, character: 12}
-      active: {line: 1, character: 21}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, modifier: {type: containingScope, scopeType: argumentOrParameter}, insideOutsideType: inside}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/python/takeArg2.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/python/takeArg2.yml
deleted file mode 100644
index b3d5037ecb..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/python/takeArg2.yml
+++ /dev/null
@@ -1,24 +0,0 @@
-languageId: python
-command:
-  version: 1
-  spokenForm: take arg
-  action: setSelection
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: argumentOrParameter}
-initialState:
-  documentContents: |-
-
-    my_funk(1, 2, 3)
-  selections:
-    - anchor: {line: 1, character: 8}
-      active: {line: 1, character: 8}
-  marks: {}
-finalState:
-  documentContents: |-
-
-    my_funk(1, 2, 3)
-  selections:
-    - anchor: {line: 1, character: 8}
-      active: {line: 1, character: 9}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, modifier: {type: containingScope, scopeType: argumentOrParameter}, insideOutsideType: inside}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/python/takeArgDrum.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/python/takeArgDrum.yml
deleted file mode 100644
index 30e5e1bd2a..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/python/takeArgDrum.yml
+++ /dev/null
@@ -1,24 +0,0 @@
-languageId: python
-command:
-  version: 1
-  spokenForm: take arg drum
-  action: setSelection
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: argumentOrParameter, includeSiblings: false}
-      mark: {type: decoratedSymbol, symbolColor: default, character: d}
-initialState:
-  documentContents: "\" \".join((word for word in word_list), \"words\")"
-  selections:
-    - anchor: {line: 0, character: 47}
-      active: {line: 0, character: 47}
-  marks:
-    default.d:
-      start: {line: 0, character: 19}
-      end: {line: 0, character: 23}
-finalState:
-  documentContents: "\" \".join((word for word in word_list), \"words\")"
-  selections:
-    - anchor: {line: 0, character: 9}
-      active: {line: 0, character: 37}
-fullTargets: [{type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: d}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: containingScope, scopeType: argumentOrParameter, includeSiblings: false}, isImplicit: false}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/python/takeArgRed.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/python/takeArgRed.yml
deleted file mode 100644
index 3074555909..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/python/takeArgRed.yml
+++ /dev/null
@@ -1,24 +0,0 @@
-languageId: python
-command:
-  version: 1
-  spokenForm: take arg red
-  action: setSelection
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: argumentOrParameter, includeSiblings: false}
-      mark: {type: decoratedSymbol, symbolColor: default, character: r}
-initialState:
-  documentContents: "\" \".join(word for word in word_list)"
-  selections:
-    - anchor: {line: 0, character: 36}
-      active: {line: 0, character: 36}
-  marks:
-    default.r:
-      start: {line: 0, character: 9}
-      end: {line: 0, character: 13}
-finalState:
-  documentContents: "\" \".join(word for word in word_list)"
-  selections:
-    - anchor: {line: 0, character: 9}
-      active: {line: 0, character: 35}
-fullTargets: [{type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: r}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: containingScope, scopeType: argumentOrParameter, includeSiblings: false}, isImplicit: false}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/python/takeArgWhale.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/python/takeArgWhale.yml
deleted file mode 100644
index b8f2099956..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/python/takeArgWhale.yml
+++ /dev/null
@@ -1,24 +0,0 @@
-languageId: python
-command:
-  version: 1
-  spokenForm: take arg whale
-  action: setSelection
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: argumentOrParameter, includeSiblings: false}
-      mark: {type: decoratedSymbol, symbolColor: default, character: w}
-initialState:
-  documentContents: "\" \".join((word for word in word_list), (word for word in word_list))"
-  selections:
-    - anchor: {line: 0, character: 68}
-      active: {line: 0, character: 68}
-  marks:
-    default.w:
-      start: {line: 0, character: 49}
-      end: {line: 0, character: 53}
-finalState:
-  documentContents: "\" \".join((word for word in word_list), (word for word in word_list))"
-  selections:
-    - anchor: {line: 0, character: 39}
-      active: {line: 0, character: 67}
-fullTargets: [{type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: w}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: containingScope, scopeType: argumentOrParameter, includeSiblings: false}, isImplicit: false}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/python/takeCall.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/python/takeCall.yml
deleted file mode 100644
index 109b37d7be..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/python/takeCall.yml
+++ /dev/null
@@ -1,24 +0,0 @@
-languageId: python
-command:
-  version: 1
-  spokenForm: take call
-  action: setSelection
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: functionCall}
-initialState:
-  documentContents: |-
-
-    my_funk(1, 2, 3)
-  selections:
-    - anchor: {line: 1, character: 4}
-      active: {line: 1, character: 4}
-  marks: {}
-finalState:
-  documentContents: |-
-
-    my_funk(1, 2, 3)
-  selections:
-    - anchor: {line: 1, character: 0}
-      active: {line: 1, character: 16}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, modifier: {type: containingScope, scopeType: functionCall}, insideOutsideType: inside}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/python/takeClass.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/python/takeClass.yml
deleted file mode 100644
index 9c35b5fa1f..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/python/takeClass.yml
+++ /dev/null
@@ -1,26 +0,0 @@
-languageId: python
-command:
-  version: 1
-  spokenForm: take class
-  action: setSelection
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: class}
-initialState:
-  documentContents: |-
-
-    class MyClass:
-        """"""
-  selections:
-    - anchor: {line: 2, character: 4}
-      active: {line: 2, character: 4}
-  marks: {}
-finalState:
-  documentContents: |-
-
-    class MyClass:
-        """"""
-  selections:
-    - anchor: {line: 1, character: 0}
-      active: {line: 2, character: 10}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, modifier: {type: containingScope, scopeType: class}, insideOutsideType: inside}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/python/takeClass2.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/python/takeClass2.yml
deleted file mode 100644
index 8b2fc88aa0..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/python/takeClass2.yml
+++ /dev/null
@@ -1,28 +0,0 @@
-languageId: python
-command:
-  version: 1
-  spokenForm: take class
-  action: setSelection
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: class}
-initialState:
-  documentContents: |-
-
-    @annotation
-    class MyClass:
-        """"""
-  selections:
-    - anchor: {line: 3, character: 4}
-      active: {line: 3, character: 4}
-  marks: {}
-finalState:
-  documentContents: |-
-
-    @annotation
-    class MyClass:
-        """"""
-  selections:
-    - anchor: {line: 1, character: 0}
-      active: {line: 3, character: 10}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, modifier: {type: containingScope, scopeType: class}, insideOutsideType: inside}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/python/takeClassName.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/python/takeClassName.yml
deleted file mode 100644
index d21938571b..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/python/takeClassName.yml
+++ /dev/null
@@ -1,26 +0,0 @@
-languageId: python
-command:
-  version: 1
-  spokenForm: take class name
-  action: setSelection
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: className}
-initialState:
-  documentContents: |-
-
-    class MyClass:
-        """"""
-  selections:
-    - anchor: {line: 2, character: 4}
-      active: {line: 2, character: 4}
-  marks: {}
-finalState:
-  documentContents: |-
-
-    class MyClass:
-        """"""
-  selections:
-    - anchor: {line: 1, character: 6}
-      active: {line: 1, character: 13}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, modifier: {type: containingScope, scopeType: className}, insideOutsideType: inside}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/python/takeComment.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/python/takeComment.yml
deleted file mode 100644
index a3a04c2413..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/python/takeComment.yml
+++ /dev/null
@@ -1,24 +0,0 @@
-languageId: python
-command:
-  version: 1
-  spokenForm: take comment
-  action: setSelection
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: comment}
-initialState:
-  documentContents: |
-
-    # Hello world
-  selections:
-    - anchor: {line: 1, character: 1}
-      active: {line: 1, character: 1}
-  marks: {}
-finalState:
-  documentContents: |
-
-    # Hello world
-  selections:
-    - anchor: {line: 1, character: 0}
-      active: {line: 1, character: 13}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, modifier: {type: containingScope, scopeType: comment}, insideOutsideType: inside}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/python/takeCondition.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/python/takeCondition.yml
deleted file mode 100644
index afca18c247..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/python/takeCondition.yml
+++ /dev/null
@@ -1,30 +0,0 @@
-languageId: python
-command:
-  version: 1
-  spokenForm: take condition
-  action: setSelection
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: condition, includeSiblings: false}
-initialState:
-  documentContents: |-
-    if True:
-        pass
-
-    while True:
-        pass
-  selections:
-    - anchor: {line: 4, character: 4}
-      active: {line: 4, character: 4}
-  marks: {}
-finalState:
-  documentContents: |-
-    if True:
-        pass
-
-    while True:
-        pass
-  selections:
-    - anchor: {line: 3, character: 6}
-      active: {line: 3, character: 10}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: containingScope, scopeType: condition, includeSiblings: false}}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/python/takeCondition2.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/python/takeCondition2.yml
deleted file mode 100644
index 6838b5e2e9..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/python/takeCondition2.yml
+++ /dev/null
@@ -1,30 +0,0 @@
-languageId: python
-command:
-  version: 1
-  spokenForm: take condition
-  action: setSelection
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: condition, includeSiblings: false}
-initialState:
-  documentContents: |-
-    if True:
-        pass
-
-    while True:
-        pass
-  selections:
-    - anchor: {line: 1, character: 4}
-      active: {line: 1, character: 4}
-  marks: {}
-finalState:
-  documentContents: |-
-    if True:
-        pass
-
-    while True:
-        pass
-  selections:
-    - anchor: {line: 0, character: 3}
-      active: {line: 0, character: 7}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: containingScope, scopeType: condition, includeSiblings: false}}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/python/takeEveryArg.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/python/takeEveryArg.yml
deleted file mode 100644
index e64ae4cbcb..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/python/takeEveryArg.yml
+++ /dev/null
@@ -1,28 +0,0 @@
-languageId: python
-command:
-  version: 1
-  spokenForm: take every arg
-  action: setSelection
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: argumentOrParameter, includeSiblings: true}
-initialState:
-  documentContents: |
-
-    def my_funk(name: str, value) -> str:
-        return
-  selections:
-    - anchor: {line: 1, character: 12}
-      active: {line: 1, character: 12}
-  marks: {}
-finalState:
-  documentContents: |
-
-    def my_funk(name: str, value) -> str:
-        return
-  selections:
-    - anchor: {line: 1, character: 12}
-      active: {line: 1, character: 21}
-    - anchor: {line: 1, character: 23}
-      active: {line: 1, character: 28}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, modifier: {type: containingScope, scopeType: argumentOrParameter, includeSiblings: true}, insideOutsideType: inside}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/python/takeEveryArg2.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/python/takeEveryArg2.yml
deleted file mode 100644
index d3bce18d5e..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/python/takeEveryArg2.yml
+++ /dev/null
@@ -1,28 +0,0 @@
-languageId: python
-command:
-  version: 1
-  spokenForm: take every arg
-  action: setSelection
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: argumentOrParameter, includeSiblings: true}
-initialState:
-  documentContents: |-
-
-    my_funk(1, 2, 3)
-  selections:
-    - anchor: {line: 1, character: 8}
-      active: {line: 1, character: 8}
-  marks: {}
-finalState:
-  documentContents: |-
-
-    my_funk(1, 2, 3)
-  selections:
-    - anchor: {line: 1, character: 8}
-      active: {line: 1, character: 9}
-    - anchor: {line: 1, character: 11}
-      active: {line: 1, character: 12}
-    - anchor: {line: 1, character: 14}
-      active: {line: 1, character: 15}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, modifier: {type: containingScope, scopeType: argumentOrParameter, includeSiblings: true}, insideOutsideType: inside}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/python/takeEveryItem.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/python/takeEveryItem.yml
deleted file mode 100644
index a8051ee67b..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/python/takeEveryItem.yml
+++ /dev/null
@@ -1,28 +0,0 @@
-languageId: python
-command:
-  version: 1
-  spokenForm: take every item
-  action: setSelection
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: collectionItem, includeSiblings: true}
-initialState:
-  documentContents: |
-
-    value = [1, 2, 3]
-  selections:
-    - anchor: {line: 1, character: 9}
-      active: {line: 1, character: 9}
-  marks: {}
-finalState:
-  documentContents: |
-
-    value = [1, 2, 3]
-  selections:
-    - anchor: {line: 1, character: 9}
-      active: {line: 1, character: 10}
-    - anchor: {line: 1, character: 12}
-      active: {line: 1, character: 13}
-    - anchor: {line: 1, character: 15}
-      active: {line: 1, character: 16}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, modifier: {type: containingScope, scopeType: collectionItem, includeSiblings: true}, insideOutsideType: inside}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/python/takeEveryItem2.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/python/takeEveryItem2.yml
deleted file mode 100644
index 0752924602..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/python/takeEveryItem2.yml
+++ /dev/null
@@ -1,28 +0,0 @@
-languageId: python
-command:
-  version: 1
-  spokenForm: take every item
-  action: setSelection
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: collectionItem, includeSiblings: true}
-initialState:
-  documentContents: |
-
-    value = {1, 2, 3}
-  selections:
-    - anchor: {line: 1, character: 9}
-      active: {line: 1, character: 9}
-  marks: {}
-finalState:
-  documentContents: |
-
-    value = {1, 2, 3}
-  selections:
-    - anchor: {line: 1, character: 9}
-      active: {line: 1, character: 10}
-    - anchor: {line: 1, character: 12}
-      active: {line: 1, character: 13}
-    - anchor: {line: 1, character: 15}
-      active: {line: 1, character: 16}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, modifier: {type: containingScope, scopeType: collectionItem, includeSiblings: true}, insideOutsideType: inside}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/python/takeEveryItem3.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/python/takeEveryItem3.yml
deleted file mode 100644
index f04bff8e81..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/python/takeEveryItem3.yml
+++ /dev/null
@@ -1,28 +0,0 @@
-languageId: python
-command:
-  version: 1
-  spokenForm: take every item
-  action: setSelection
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: collectionItem, includeSiblings: true}
-initialState:
-  documentContents: |
-
-    value = {a: 1, b: 2, c: 3}
-  selections:
-    - anchor: {line: 1, character: 9}
-      active: {line: 1, character: 9}
-  marks: {}
-finalState:
-  documentContents: |
-
-    value = {a: 1, b: 2, c: 3}
-  selections:
-    - anchor: {line: 1, character: 9}
-      active: {line: 1, character: 13}
-    - anchor: {line: 1, character: 15}
-      active: {line: 1, character: 19}
-    - anchor: {line: 1, character: 21}
-      active: {line: 1, character: 25}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, modifier: {type: containingScope, scopeType: collectionItem, includeSiblings: true}, insideOutsideType: inside}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/python/takeFunk.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/python/takeFunk.yml
deleted file mode 100644
index abe8c7086a..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/python/takeFunk.yml
+++ /dev/null
@@ -1,26 +0,0 @@
-languageId: python
-command:
-  version: 1
-  spokenForm: take funk
-  action: setSelection
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: namedFunction}
-initialState:
-  documentContents: |
-
-    def my_funk(name: str, value) -> str:
-        return
-  selections:
-    - anchor: {line: 2, character: 4}
-      active: {line: 2, character: 4}
-  marks: {}
-finalState:
-  documentContents: |
-
-    def my_funk(name: str, value) -> str:
-        return
-  selections:
-    - anchor: {line: 1, character: 0}
-      active: {line: 2, character: 10}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, modifier: {type: containingScope, scopeType: namedFunction}, insideOutsideType: inside}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/python/takeFunk2.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/python/takeFunk2.yml
deleted file mode 100644
index 4d7421d937..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/python/takeFunk2.yml
+++ /dev/null
@@ -1,28 +0,0 @@
-languageId: python
-command:
-  version: 1
-  spokenForm: take funk
-  action: setSelection
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: namedFunction}
-initialState:
-  documentContents: |-
-
-    @annotation
-    def my_funk(name: str, value) -> str:
-        return
-  selections:
-    - anchor: {line: 3, character: 4}
-      active: {line: 3, character: 4}
-  marks: {}
-finalState:
-  documentContents: |-
-
-    @annotation
-    def my_funk(name: str, value) -> str:
-        return
-  selections:
-    - anchor: {line: 1, character: 0}
-      active: {line: 3, character: 10}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, modifier: {type: containingScope, scopeType: namedFunction}, insideOutsideType: inside}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/python/takeFunkName.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/python/takeFunkName.yml
deleted file mode 100644
index 50bafcf321..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/python/takeFunkName.yml
+++ /dev/null
@@ -1,26 +0,0 @@
-languageId: python
-command:
-  version: 1
-  spokenForm: take funk name
-  action: setSelection
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: functionName}
-initialState:
-  documentContents: |
-
-    def my_funk(name: str, value) -> str:
-        return
-  selections:
-    - anchor: {line: 2, character: 4}
-      active: {line: 2, character: 4}
-  marks: {}
-finalState:
-  documentContents: |
-
-    def my_funk(name: str, value) -> str:
-        return
-  selections:
-    - anchor: {line: 1, character: 4}
-      active: {line: 1, character: 11}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, modifier: {type: containingScope, scopeType: functionName}, insideOutsideType: inside}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/python/takeIf.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/python/takeIf.yml
deleted file mode 100644
index 97b8522999..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/python/takeIf.yml
+++ /dev/null
@@ -1,26 +0,0 @@
-languageId: python
-command:
-  version: 1
-  spokenForm: take if
-  action: setSelection
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: ifStatement}
-initialState:
-  documentContents: |-
-
-    if True:
-        return
-  selections:
-    - anchor: {line: 2, character: 4}
-      active: {line: 2, character: 4}
-  marks: {}
-finalState:
-  documentContents: |-
-
-    if True:
-        return
-  selections:
-    - anchor: {line: 1, character: 0}
-      active: {line: 2, character: 10}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, modifier: {type: containingScope, scopeType: ifStatement}, insideOutsideType: inside}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/python/takeItem.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/python/takeItem.yml
deleted file mode 100644
index 9ce0540bc5..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/python/takeItem.yml
+++ /dev/null
@@ -1,24 +0,0 @@
-languageId: python
-command:
-  version: 1
-  spokenForm: take item
-  action: setSelection
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: collectionItem}
-initialState:
-  documentContents: |
-
-    value = [1, 2, 3]
-  selections:
-    - anchor: {line: 1, character: 9}
-      active: {line: 1, character: 9}
-  marks: {}
-finalState:
-  documentContents: |
-
-    value = [1, 2, 3]
-  selections:
-    - anchor: {line: 1, character: 9}
-      active: {line: 1, character: 10}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, modifier: {type: containingScope, scopeType: collectionItem}, insideOutsideType: inside}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/python/takeItem2.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/python/takeItem2.yml
deleted file mode 100644
index 0fe043241e..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/python/takeItem2.yml
+++ /dev/null
@@ -1,24 +0,0 @@
-languageId: python
-command:
-  version: 1
-  spokenForm: take item
-  action: setSelection
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: collectionItem}
-initialState:
-  documentContents: |
-
-    value = {1, 2, 3}
-  selections:
-    - anchor: {line: 1, character: 9}
-      active: {line: 1, character: 9}
-  marks: {}
-finalState:
-  documentContents: |
-
-    value = {1, 2, 3}
-  selections:
-    - anchor: {line: 1, character: 9}
-      active: {line: 1, character: 10}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, modifier: {type: containingScope, scopeType: collectionItem}, insideOutsideType: inside}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/python/takeItem3.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/python/takeItem3.yml
deleted file mode 100644
index 78a1f19bb7..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/python/takeItem3.yml
+++ /dev/null
@@ -1,24 +0,0 @@
-languageId: python
-command:
-  version: 1
-  spokenForm: take item
-  action: setSelection
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: collectionItem}
-initialState:
-  documentContents: |
-
-    value = {a: 1, b: 2, c: 3}
-  selections:
-    - anchor: {line: 1, character: 9}
-      active: {line: 1, character: 9}
-  marks: {}
-finalState:
-  documentContents: |
-
-    value = {a: 1, b: 2, c: 3}
-  selections:
-    - anchor: {line: 1, character: 9}
-      active: {line: 1, character: 13}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, modifier: {type: containingScope, scopeType: collectionItem}, insideOutsideType: inside}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/python/takeKey.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/python/takeKey.yml
deleted file mode 100644
index a88d497c41..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/python/takeKey.yml
+++ /dev/null
@@ -1,24 +0,0 @@
-languageId: python
-command:
-  version: 1
-  spokenForm: take key
-  action: setSelection
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: collectionKey}
-initialState:
-  documentContents: |
-
-    value = {a: 1, b: 2, c: 3}
-  selections:
-    - anchor: {line: 1, character: 12}
-      active: {line: 1, character: 12}
-  marks: {}
-finalState:
-  documentContents: |
-
-    value = {a: 1, b: 2, c: 3}
-  selections:
-    - anchor: {line: 1, character: 9}
-      active: {line: 1, character: 10}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, modifier: {type: containingScope, scopeType: collectionKey}, insideOutsideType: inside}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/python/takeLambda.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/python/takeLambda.yml
deleted file mode 100644
index 9675558913..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/python/takeLambda.yml
+++ /dev/null
@@ -1,24 +0,0 @@
-languageId: python
-command:
-  version: 1
-  spokenForm: take lambda
-  action: setSelection
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: anonymousFunction}
-initialState:
-  documentContents: |
-
-    value = lambda x: x
-  selections:
-    - anchor: {line: 1, character: 14}
-      active: {line: 1, character: 14}
-  marks: {}
-finalState:
-  documentContents: |
-
-    value = lambda x: x
-  selections:
-    - anchor: {line: 1, character: 8}
-      active: {line: 1, character: 19}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, modifier: {type: containingScope, scopeType: anonymousFunction}, insideOutsideType: inside}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/python/takeLambdaMade.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/python/takeLambdaMade.yml
deleted file mode 100644
index bdbc45864d..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/python/takeLambdaMade.yml
+++ /dev/null
@@ -1,28 +0,0 @@
-languageId: python
-command:
-  version: 1
-  spokenForm: take lambda made
-  action: setSelection
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: anonymousFunction, includeSiblings: false}
-      mark: {type: decoratedSymbol, symbolColor: default, character: m}
-initialState:
-  documentContents: |-
-
-    lambda a: print("hello")
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-  marks:
-    default.m:
-      start: {line: 1, character: 0}
-      end: {line: 1, character: 6}
-finalState:
-  documentContents: |-
-
-    lambda a: print("hello")
-  selections:
-    - anchor: {line: 1, character: 0}
-      active: {line: 1, character: 24}
-fullTargets: [{type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: m}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: containingScope, scopeType: anonymousFunction, includeSiblings: false}}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/python/takeLambdaPit.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/python/takeLambdaPit.yml
deleted file mode 100644
index b5babafec6..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/python/takeLambdaPit.yml
+++ /dev/null
@@ -1,28 +0,0 @@
-languageId: python
-command:
-  version: 1
-  spokenForm: take lambda pit
-  action: setSelection
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: anonymousFunction, includeSiblings: false}
-      mark: {type: decoratedSymbol, symbolColor: default, character: p}
-initialState:
-  documentContents: |-
-
-    lambda a: print("hello")
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-  marks:
-    default.p:
-      start: {line: 1, character: 10}
-      end: {line: 1, character: 15}
-finalState:
-  documentContents: |-
-
-    lambda a: print("hello")
-  selections:
-    - anchor: {line: 1, character: 0}
-      active: {line: 1, character: 24}
-fullTargets: [{type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: p}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: containingScope, scopeType: anonymousFunction, includeSiblings: false}}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/python/takeList.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/python/takeList.yml
deleted file mode 100644
index 3d7792fc95..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/python/takeList.yml
+++ /dev/null
@@ -1,24 +0,0 @@
-languageId: python
-command:
-  version: 1
-  spokenForm: take list
-  action: setSelection
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: list}
-initialState:
-  documentContents: |
-
-    value = [1, 2, 3]
-  selections:
-    - anchor: {line: 1, character: 9}
-      active: {line: 1, character: 9}
-  marks: {}
-finalState:
-  documentContents: |
-
-    value = [1, 2, 3]
-  selections:
-    - anchor: {line: 1, character: 8}
-      active: {line: 1, character: 17}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, modifier: {type: containingScope, scopeType: list}, insideOutsideType: inside}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/python/takeList2.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/python/takeList2.yml
deleted file mode 100644
index 015e7135ee..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/python/takeList2.yml
+++ /dev/null
@@ -1,24 +0,0 @@
-languageId: python
-command:
-  version: 1
-  spokenForm: take list
-  action: setSelection
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: list}
-initialState:
-  documentContents: |
-
-    value = {1, 2, 3}
-  selections:
-    - anchor: {line: 1, character: 9}
-      active: {line: 1, character: 9}
-  marks: {}
-finalState:
-  documentContents: |
-
-    value = {1, 2, 3}
-  selections:
-    - anchor: {line: 1, character: 8}
-      active: {line: 1, character: 17}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, modifier: {type: containingScope, scopeType: list}, insideOutsideType: inside}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/python/takeMap.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/python/takeMap.yml
deleted file mode 100644
index 11bbc91c30..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/python/takeMap.yml
+++ /dev/null
@@ -1,24 +0,0 @@
-languageId: python
-command:
-  version: 1
-  spokenForm: take map
-  action: setSelection
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: map}
-initialState:
-  documentContents: |
-
-    value = {a: 1, b: 2, c: 3}
-  selections:
-    - anchor: {line: 1, character: 9}
-      active: {line: 1, character: 9}
-  marks: {}
-finalState:
-  documentContents: |
-
-    value = {a: 1, b: 2, c: 3}
-  selections:
-    - anchor: {line: 1, character: 8}
-      active: {line: 1, character: 26}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, modifier: {type: containingScope, scopeType: map}, insideOutsideType: inside}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/python/takeName.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/python/takeName.yml
deleted file mode 100644
index 7db4278936..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/python/takeName.yml
+++ /dev/null
@@ -1,24 +0,0 @@
-languageId: python
-command:
-  version: 1
-  spokenForm: take name
-  action: setSelection
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: name}
-initialState:
-  documentContents: |
-
-    value = "hello world"
-  selections:
-    - anchor: {line: 1, character: 7}
-      active: {line: 1, character: 7}
-  marks: {}
-finalState:
-  documentContents: |
-
-    value = "hello world"
-  selections:
-    - anchor: {line: 1, character: 0}
-      active: {line: 1, character: 5}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, modifier: {type: containingScope, scopeType: name}, insideOutsideType: inside}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/python/takeName2.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/python/takeName2.yml
deleted file mode 100644
index 22a61f3871..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/python/takeName2.yml
+++ /dev/null
@@ -1,26 +0,0 @@
-languageId: python
-command:
-  version: 1
-  spokenForm: take name
-  action: setSelection
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: name}
-initialState:
-  documentContents: |
-
-    def my_funk(name: str, value) -> str:
-        return
-  selections:
-    - anchor: {line: 1, character: 19}
-      active: {line: 1, character: 19}
-  marks: {}
-finalState:
-  documentContents: |
-
-    def my_funk(name: str, value) -> str:
-        return
-  selections:
-    - anchor: {line: 1, character: 12}
-      active: {line: 1, character: 16}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, modifier: {type: containingScope, scopeType: name}, insideOutsideType: inside}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/python/takeName3.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/python/takeName3.yml
deleted file mode 100644
index 9f91b2f4cc..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/python/takeName3.yml
+++ /dev/null
@@ -1,26 +0,0 @@
-languageId: python
-command:
-  version: 1
-  spokenForm: take name
-  action: setSelection
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: name}
-initialState:
-  documentContents: |-
-
-    class MyClass:
-        """"""
-  selections:
-    - anchor: {line: 2, character: 4}
-      active: {line: 2, character: 4}
-  marks: {}
-finalState:
-  documentContents: |-
-
-    class MyClass:
-        """"""
-  selections:
-    - anchor: {line: 1, character: 6}
-      active: {line: 1, character: 13}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, modifier: {type: containingScope, scopeType: name}, insideOutsideType: inside}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/python/takeState.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/python/takeState.yml
deleted file mode 100644
index 207f1d4989..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/python/takeState.yml
+++ /dev/null
@@ -1,24 +0,0 @@
-languageId: python
-command:
-  version: 1
-  spokenForm: take state
-  action: setSelection
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: statement}
-initialState:
-  documentContents: |
-
-    value = "hello world"
-  selections:
-    - anchor: {line: 1, character: 6}
-      active: {line: 1, character: 6}
-  marks: {}
-finalState:
-  documentContents: |
-
-    value = "hello world"
-  selections:
-    - anchor: {line: 1, character: 0}
-      active: {line: 1, character: 21}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, modifier: {type: containingScope, scopeType: statement}, insideOutsideType: inside}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/python/takeString.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/python/takeString.yml
deleted file mode 100644
index dd66df19e5..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/python/takeString.yml
+++ /dev/null
@@ -1,24 +0,0 @@
-languageId: python
-command:
-  version: 1
-  spokenForm: take string
-  action: setSelection
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: string}
-initialState:
-  documentContents: |
-
-    value = "hello world"
-  selections:
-    - anchor: {line: 1, character: 15}
-      active: {line: 1, character: 15}
-  marks: {}
-finalState:
-  documentContents: |
-
-    value = "hello world"
-  selections:
-    - anchor: {line: 1, character: 8}
-      active: {line: 1, character: 21}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, modifier: {type: containingScope, scopeType: string}, insideOutsideType: inside}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/python/takeType.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/python/takeType.yml
deleted file mode 100644
index 7a7337c3a2..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/python/takeType.yml
+++ /dev/null
@@ -1,26 +0,0 @@
-languageId: python
-command:
-  version: 1
-  spokenForm: take type
-  action: setSelection
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: type}
-initialState:
-  documentContents: |
-
-    def my_funk(name: str, value) -> str:
-        return
-  selections:
-    - anchor: {line: 2, character: 4}
-      active: {line: 2, character: 4}
-  marks: {}
-finalState:
-  documentContents: |
-
-    def my_funk(name: str, value) -> str:
-        return
-  selections:
-    - anchor: {line: 1, character: 33}
-      active: {line: 1, character: 36}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, modifier: {type: containingScope, scopeType: type}, insideOutsideType: inside}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/python/takeType2.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/python/takeType2.yml
deleted file mode 100644
index 3a9c45149e..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/python/takeType2.yml
+++ /dev/null
@@ -1,26 +0,0 @@
-languageId: python
-command:
-  version: 1
-  spokenForm: take type
-  action: setSelection
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: type}
-initialState:
-  documentContents: |
-
-    def my_funk(name: str, value) -> str:
-        return
-  selections:
-    - anchor: {line: 1, character: 16}
-      active: {line: 1, character: 16}
-  marks: {}
-finalState:
-  documentContents: |
-
-    def my_funk(name: str, value) -> str:
-        return
-  selections:
-    - anchor: {line: 1, character: 18}
-      active: {line: 1, character: 21}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, modifier: {type: containingScope, scopeType: type}, insideOutsideType: inside}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/python/takeValue.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/python/takeValue.yml
deleted file mode 100644
index ea8491f8ff..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/python/takeValue.yml
+++ /dev/null
@@ -1,24 +0,0 @@
-languageId: python
-command:
-  version: 1
-  spokenForm: take value
-  action: setSelection
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: value}
-initialState:
-  documentContents: |
-
-    value = "hello world"
-  selections:
-    - anchor: {line: 1, character: 5}
-      active: {line: 1, character: 5}
-  marks: {}
-finalState:
-  documentContents: |
-
-    value = "hello world"
-  selections:
-    - anchor: {line: 1, character: 8}
-      active: {line: 1, character: 21}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, modifier: {type: containingScope, scopeType: value}, insideOutsideType: inside}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/python/takeValue2.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/python/takeValue2.yml
deleted file mode 100644
index 4342558d83..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/python/takeValue2.yml
+++ /dev/null
@@ -1,24 +0,0 @@
-languageId: python
-command:
-  version: 1
-  spokenForm: take value
-  action: setSelection
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: value}
-initialState:
-  documentContents: |
-
-    value = {a: 1, b: 2, c: 3}
-  selections:
-    - anchor: {line: 1, character: 10}
-      active: {line: 1, character: 10}
-  marks: {}
-finalState:
-  documentContents: |
-
-    value = {a: 1, b: 2, c: 3}
-  selections:
-    - anchor: {line: 1, character: 12}
-      active: {line: 1, character: 13}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, modifier: {type: containingScope, scopeType: value}, insideOutsideType: inside}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/python/takeValueZero.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/python/takeValueZero.yml
deleted file mode 100644
index 54ae3224fb..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/python/takeValueZero.yml
+++ /dev/null
@@ -1,30 +0,0 @@
-languageId: python
-command:
-  version: 1
-  spokenForm: take value zero
-  action: setSelection
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: value, includeSiblings: false}
-      mark: {type: decoratedSymbol, symbolColor: default, character: '0'}
-initialState:
-  documentContents: |-
-    {
-        "foo": bar[0]
-    }
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-  marks:
-    default.0:
-      start: {line: 1, character: 15}
-      end: {line: 1, character: 16}
-finalState:
-  documentContents: |-
-    {
-        "foo": bar[0]
-    }
-  selections:
-    - anchor: {line: 1, character: 11}
-      active: {line: 1, character: 17}
-fullTargets: [{type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: '0'}, selectionType: token, position: contents, modifier: {type: containingScope, scopeType: value, includeSiblings: false}, insideOutsideType: inside}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/python/tryCatchWrapThis.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/python/tryCatchWrapThis.yml
deleted file mode 100644
index eb0dfe4965..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/python/tryCatchWrapThis.yml
+++ /dev/null
@@ -1,25 +0,0 @@
-languageId: python
-command:
-  version: 1
-  spokenForm: try catch wrap this
-  action: wrapWithSnippet
-  targets:
-    - type: primitive
-      mark: {type: cursor}
-  extraArgs: [tryCatchStatement.body]
-initialState:
-  documentContents: foo = "hello"
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-  marks: {}
-finalState:
-  documentContents: |-
-    try:
-        foo = "hello"
-    except :
-        
-  selections:
-    - anchor: {line: 2, character: 7}
-      active: {line: 2, character: 7}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: containingScope, scopeType: statement, includeSiblings: false}}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/python/tryCatchWrapThis2.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/python/tryCatchWrapThis2.yml
deleted file mode 100644
index 72d9fffc58..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/python/tryCatchWrapThis2.yml
+++ /dev/null
@@ -1,39 +0,0 @@
-languageId: python
-command:
-  version: 1
-  spokenForm: try catch wrap this
-  action: wrapWithSnippet
-  targets:
-    - type: primitive
-      mark: {type: cursor}
-  extraArgs: [tryCatchStatement.body]
-initialState:
-  documentContents: |-
-    if True:
-        foo = "hello"
-
-    bar = "hello"
-  selections:
-    - anchor: {line: 3, character: 0}
-      active: {line: 3, character: 0}
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-  marks: {}
-finalState:
-  documentContents: |-
-    try:
-        if True:
-            foo = "hello"
-    except :
-        
-
-    try:
-        bar = "hello"
-    except :
-        
-  selections:
-    - anchor: {line: 8, character: 7}
-      active: {line: 8, character: 7}
-    - anchor: {line: 3, character: 7}
-      active: {line: 3, character: 7}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: containingScope, scopeType: statement, includeSiblings: false}}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/ruby/changeArg.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/ruby/changeArg.yml
deleted file mode 100644
index 49f1ae3d8e..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/ruby/changeArg.yml
+++ /dev/null
@@ -1,26 +0,0 @@
-languageId: ruby
-command:
-  version: 1
-  spokenForm: change arg
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: argumentOrParameter, includeSiblings: false}
-initialState:
-  documentContents: |-
-    def hello(name)
-
-    end
-  selections:
-    - anchor: {line: 0, character: 13}
-      active: {line: 0, character: 13}
-  marks: {}
-finalState:
-  documentContents: |-
-    def hello()
-
-    end
-  selections:
-    - anchor: {line: 0, character: 10}
-      active: {line: 0, character: 10}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: containingScope, scopeType: argumentOrParameter, includeSiblings: false}, isImplicit: false}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/ruby/changeArgWhale.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/ruby/changeArgWhale.yml
deleted file mode 100644
index c450eb7c2b..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/ruby/changeArgWhale.yml
+++ /dev/null
@@ -1,24 +0,0 @@
-languageId: ruby
-command:
-  version: 1
-  spokenForm: change arg whale
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: argumentOrParameter, includeSiblings: false}
-      mark: {type: decoratedSymbol, symbolColor: default, character: w}
-initialState:
-  documentContents: a.call(hello, world)
-  selections:
-    - anchor: {line: 0, character: 20}
-      active: {line: 0, character: 20}
-  marks:
-    default.w:
-      start: {line: 0, character: 14}
-      end: {line: 0, character: 19}
-finalState:
-  documentContents: a.call(hello, )
-  selections:
-    - anchor: {line: 0, character: 14}
-      active: {line: 0, character: 14}
-fullTargets: [{type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: w}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: containingScope, scopeType: argumentOrParameter, includeSiblings: false}, isImplicit: false}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/ruby/changeArgWhale2.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/ruby/changeArgWhale2.yml
deleted file mode 100644
index c10f3c04c3..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/ruby/changeArgWhale2.yml
+++ /dev/null
@@ -1,24 +0,0 @@
-languageId: ruby
-command:
-  version: 1
-  spokenForm: change arg whale
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: argumentOrParameter, includeSiblings: false}
-      mark: {type: decoratedSymbol, symbolColor: default, character: w}
-initialState:
-  documentContents: a(hello, world)
-  selections:
-    - anchor: {line: 0, character: 11}
-      active: {line: 0, character: 11}
-  marks:
-    default.w:
-      start: {line: 0, character: 9}
-      end: {line: 0, character: 14}
-finalState:
-  documentContents: a(hello, )
-  selections:
-    - anchor: {line: 0, character: 9}
-      active: {line: 0, character: 9}
-fullTargets: [{type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: w}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: containingScope, scopeType: argumentOrParameter, includeSiblings: false}, isImplicit: false}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/ruby/changeArgWhale3.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/ruby/changeArgWhale3.yml
deleted file mode 100644
index 55909b0091..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/ruby/changeArgWhale3.yml
+++ /dev/null
@@ -1,24 +0,0 @@
-languageId: ruby
-command:
-  version: 1
-  spokenForm: change arg whale
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: argumentOrParameter, includeSiblings: false}
-      mark: {type: decoratedSymbol, symbolColor: default, character: w}
-initialState:
-  documentContents: yield(hello, world)
-  selections:
-    - anchor: {line: 0, character: 17}
-      active: {line: 0, character: 17}
-  marks:
-    default.w:
-      start: {line: 0, character: 13}
-      end: {line: 0, character: 18}
-finalState:
-  documentContents: yield(hello, )
-  selections:
-    - anchor: {line: 0, character: 13}
-      active: {line: 0, character: 13}
-fullTargets: [{type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: w}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: containingScope, scopeType: argumentOrParameter, includeSiblings: false}, isImplicit: false}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/ruby/changeCall.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/ruby/changeCall.yml
deleted file mode 100644
index d66df78045..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/ruby/changeCall.yml
+++ /dev/null
@@ -1,20 +0,0 @@
-languageId: ruby
-command:
-  version: 1
-  spokenForm: change call
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: functionCall, includeSiblings: false}
-initialState:
-  documentContents: a(1, 2)
-  selections:
-    - anchor: {line: 0, character: 6}
-      active: {line: 0, character: 6}
-  marks: {}
-finalState:
-  documentContents: ""
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: containingScope, scopeType: functionCall, includeSiblings: false}, isImplicit: false}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/ruby/changeClass.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/ruby/changeClass.yml
deleted file mode 100644
index afd594699b..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/ruby/changeClass.yml
+++ /dev/null
@@ -1,23 +0,0 @@
-languageId: ruby
-command:
-  version: 1
-  spokenForm: change class
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: class, includeSiblings: false}
-initialState:
-  documentContents: |-
-    class Hi
-
-    end
-  selections:
-    - anchor: {line: 1, character: 0}
-      active: {line: 1, character: 0}
-  marks: {}
-finalState:
-  documentContents: ""
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: containingScope, scopeType: class, includeSiblings: false}, isImplicit: false}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/ruby/changeComment.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/ruby/changeComment.yml
deleted file mode 100644
index ff4d0565f4..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/ruby/changeComment.yml
+++ /dev/null
@@ -1,20 +0,0 @@
-languageId: ruby
-command:
-  version: 1
-  spokenForm: change comment
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: comment, includeSiblings: false}
-initialState:
-  documentContents: "# Hello World"
-  selections:
-    - anchor: {line: 0, character: 9}
-      active: {line: 0, character: 9}
-  marks: {}
-finalState:
-  documentContents: ""
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: containingScope, scopeType: comment, includeSiblings: false}, isImplicit: false}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/ruby/changeComment2.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/ruby/changeComment2.yml
deleted file mode 100644
index f95d1620b4..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/ruby/changeComment2.yml
+++ /dev/null
@@ -1,20 +0,0 @@
-languageId: ruby
-command:
-  version: 1
-  spokenForm: change comment
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: comment, includeSiblings: false}
-initialState:
-  documentContents: "a = 0 # Hello World"
-  selections:
-    - anchor: {line: 0, character: 8}
-      active: {line: 0, character: 8}
-  marks: {}
-finalState:
-  documentContents: "a = 0 "
-  selections:
-    - anchor: {line: 0, character: 6}
-      active: {line: 0, character: 6}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: containingScope, scopeType: comment, includeSiblings: false}, isImplicit: false}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/ruby/changeComment3.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/ruby/changeComment3.yml
deleted file mode 100644
index b1008375f8..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/ruby/changeComment3.yml
+++ /dev/null
@@ -1,23 +0,0 @@
-languageId: ruby
-command:
-  version: 1
-  spokenForm: change comment
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: comment, includeSiblings: false}
-initialState:
-  documentContents: |-
-    =begin
-       Hi   
-    =end
-  selections:
-    - anchor: {line: 1, character: 3}
-      active: {line: 1, character: 3}
-  marks: {}
-finalState:
-  documentContents: ""
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: containingScope, scopeType: comment, includeSiblings: false}, isImplicit: false}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/ruby/changeCondition.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/ruby/changeCondition.yml
deleted file mode 100644
index dafa08977b..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/ruby/changeCondition.yml
+++ /dev/null
@@ -1,26 +0,0 @@
-languageId: ruby
-command:
-  version: 1
-  spokenForm: change condition
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: condition, includeSiblings: false}
-initialState:
-  documentContents: |-
-    if true
-
-    end
-  selections:
-    - anchor: {line: 1, character: 0}
-      active: {line: 1, character: 0}
-  marks: {}
-finalState:
-  documentContents: |-
-    if 
-
-    end
-  selections:
-    - anchor: {line: 0, character: 3}
-      active: {line: 0, character: 3}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: containingScope, scopeType: condition, includeSiblings: false}, isImplicit: false}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/ruby/changeEveryArg.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/ruby/changeEveryArg.yml
deleted file mode 100644
index 1594ed4235..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/ruby/changeEveryArg.yml
+++ /dev/null
@@ -1,22 +0,0 @@
-languageId: ruby
-command:
-  version: 1
-  spokenForm: change every arg
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: argumentOrParameter, includeSiblings: true}
-initialState:
-  documentContents: a.call(hello, world)
-  selections:
-    - anchor: {line: 0, character: 17}
-      active: {line: 0, character: 17}
-  marks: {}
-finalState:
-  documentContents: a.call(, )
-  selections:
-    - anchor: {line: 0, character: 7}
-      active: {line: 0, character: 7}
-    - anchor: {line: 0, character: 9}
-      active: {line: 0, character: 9}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: containingScope, scopeType: argumentOrParameter, includeSiblings: true}, isImplicit: false}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/ruby/changeEveryArg2.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/ruby/changeEveryArg2.yml
deleted file mode 100644
index 8ffc1ea887..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/ruby/changeEveryArg2.yml
+++ /dev/null
@@ -1,22 +0,0 @@
-languageId: ruby
-command:
-  version: 1
-  spokenForm: change every arg
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: argumentOrParameter, includeSiblings: true}
-initialState:
-  documentContents: a(hello, world)
-  selections:
-    - anchor: {line: 0, character: 11}
-      active: {line: 0, character: 11}
-  marks: {}
-finalState:
-  documentContents: a(, )
-  selections:
-    - anchor: {line: 0, character: 2}
-      active: {line: 0, character: 2}
-    - anchor: {line: 0, character: 4}
-      active: {line: 0, character: 4}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: containingScope, scopeType: argumentOrParameter, includeSiblings: true}, isImplicit: false}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/ruby/changeEveryArg3.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/ruby/changeEveryArg3.yml
deleted file mode 100644
index ee3b5afc2a..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/ruby/changeEveryArg3.yml
+++ /dev/null
@@ -1,22 +0,0 @@
-languageId: ruby
-command:
-  version: 1
-  spokenForm: change every arg
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: argumentOrParameter, includeSiblings: true}
-initialState:
-  documentContents: yield(hello, world)
-  selections:
-    - anchor: {line: 0, character: 17}
-      active: {line: 0, character: 17}
-  marks: {}
-finalState:
-  documentContents: yield(, )
-  selections:
-    - anchor: {line: 0, character: 6}
-      active: {line: 0, character: 6}
-    - anchor: {line: 0, character: 8}
-      active: {line: 0, character: 8}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: containingScope, scopeType: argumentOrParameter, includeSiblings: true}, isImplicit: false}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/ruby/changeEveryItem.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/ruby/changeEveryItem.yml
deleted file mode 100644
index d79fcc2276..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/ruby/changeEveryItem.yml
+++ /dev/null
@@ -1,24 +0,0 @@
-languageId: ruby
-command:
-  version: 1
-  spokenForm: change every item
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: collectionItem, includeSiblings: true}
-initialState:
-  documentContents: "[1, 2, 3]"
-  selections:
-    - anchor: {line: 0, character: 6}
-      active: {line: 0, character: 6}
-  marks: {}
-finalState:
-  documentContents: "[, , ]"
-  selections:
-    - anchor: {line: 0, character: 1}
-      active: {line: 0, character: 1}
-    - anchor: {line: 0, character: 3}
-      active: {line: 0, character: 3}
-    - anchor: {line: 0, character: 5}
-      active: {line: 0, character: 5}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: containingScope, scopeType: collectionItem, includeSiblings: true}, isImplicit: false}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/ruby/changeEveryKey.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/ruby/changeEveryKey.yml
deleted file mode 100644
index 69a2c61ec6..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/ruby/changeEveryKey.yml
+++ /dev/null
@@ -1,22 +0,0 @@
-languageId: ruby
-command:
-  version: 1
-  spokenForm: change every key
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: collectionKey, includeSiblings: true}
-initialState:
-  documentContents: h = {"1" => "one", "2" => "two"}
-  selections:
-    - anchor: {line: 0, character: 30}
-      active: {line: 0, character: 30}
-  marks: {}
-finalState:
-  documentContents: h = { => "one",  => "two"}
-  selections:
-    - anchor: {line: 0, character: 5}
-      active: {line: 0, character: 5}
-    - anchor: {line: 0, character: 16}
-      active: {line: 0, character: 16}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: containingScope, scopeType: collectionKey, includeSiblings: true}, isImplicit: false}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/ruby/changeEveryKey2.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/ruby/changeEveryKey2.yml
deleted file mode 100644
index 6d1fbab7c0..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/ruby/changeEveryKey2.yml
+++ /dev/null
@@ -1,22 +0,0 @@
-languageId: ruby
-command:
-  version: 1
-  spokenForm: change every key
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: collectionKey, includeSiblings: true}
-initialState:
-  documentContents: "h = {\"1\": \"one\", \"2\": \"two\" }"
-  selections:
-    - anchor: {line: 0, character: 25}
-      active: {line: 0, character: 25}
-  marks: {}
-finalState:
-  documentContents: "h = {: \"one\", : \"two\" }"
-  selections:
-    - anchor: {line: 0, character: 5}
-      active: {line: 0, character: 5}
-    - anchor: {line: 0, character: 14}
-      active: {line: 0, character: 14}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: containingScope, scopeType: collectionKey, includeSiblings: true}, isImplicit: false}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/ruby/changeEveryKey3.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/ruby/changeEveryKey3.yml
deleted file mode 100644
index 65b0ef7592..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/ruby/changeEveryKey3.yml
+++ /dev/null
@@ -1,22 +0,0 @@
-languageId: ruby
-command:
-  version: 1
-  spokenForm: change every key
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: collectionKey, includeSiblings: true}
-initialState:
-  documentContents: h = {"1" => "one", "2" => "two" }
-  selections:
-    - anchor: {line: 0, character: 28}
-      active: {line: 0, character: 28}
-  marks: {}
-finalState:
-  documentContents: h = { => "one",  => "two" }
-  selections:
-    - anchor: {line: 0, character: 5}
-      active: {line: 0, character: 5}
-    - anchor: {line: 0, character: 16}
-      active: {line: 0, character: 16}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: containingScope, scopeType: collectionKey, includeSiblings: true}, isImplicit: false}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/ruby/changeEveryKey4.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/ruby/changeEveryKey4.yml
deleted file mode 100644
index 5601def548..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/ruby/changeEveryKey4.yml
+++ /dev/null
@@ -1,22 +0,0 @@
-languageId: ruby
-command:
-  version: 1
-  spokenForm: change every key
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: collectionKey, includeSiblings: true}
-initialState:
-  documentContents: "h = { one: \"one\", two: \"two\" }"
-  selections:
-    - anchor: {line: 0, character: 21}
-      active: {line: 0, character: 21}
-  marks: {}
-finalState:
-  documentContents: "h = { : \"one\", : \"two\" }"
-  selections:
-    - anchor: {line: 0, character: 6}
-      active: {line: 0, character: 6}
-    - anchor: {line: 0, character: 15}
-      active: {line: 0, character: 15}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: containingScope, scopeType: collectionKey, includeSiblings: true}, isImplicit: false}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/ruby/changeFunk.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/ruby/changeFunk.yml
deleted file mode 100644
index 16dea18e96..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/ruby/changeFunk.yml
+++ /dev/null
@@ -1,23 +0,0 @@
-languageId: ruby
-command:
-  version: 1
-  spokenForm: change funk
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: namedFunction, includeSiblings: false}
-initialState:
-  documentContents: |-
-    def hello_world
-        puts "hi"
-    end
-  selections:
-    - anchor: {line: 1, character: 3}
-      active: {line: 1, character: 3}
-  marks: {}
-finalState:
-  documentContents: ""
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: containingScope, scopeType: namedFunction, includeSiblings: false}, isImplicit: false}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/ruby/changeFunk2.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/ruby/changeFunk2.yml
deleted file mode 100644
index 6ed85c0eae..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/ruby/changeFunk2.yml
+++ /dev/null
@@ -1,26 +0,0 @@
-languageId: ruby
-command:
-  spokenForm: change funk
-  version: 2
-  targets:
-    - type: primitive
-      modifiers:
-        - type: containingScope
-          scopeType: {type: namedFunction}
-  usePrePhraseSnapshot: true
-  action: {name: clearAndSetSelection}
-initialState:
-  documentContents: |-
-    def self.hello_world
-      puts "hi"
-    end
-  selections:
-    - anchor: {line: 1, character: 2}
-      active: {line: 1, character: 2}
-  marks: {}
-finalState:
-  documentContents: ""
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-fullTargets: [{type: primitive, mark: {type: cursor}, modifiers: [{type: containingScope, scopeType: {type: namedFunction}}]}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/ruby/changeFunk3.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/ruby/changeFunk3.yml
deleted file mode 100644
index 902502986e..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/ruby/changeFunk3.yml
+++ /dev/null
@@ -1,26 +0,0 @@
-languageId: ruby
-command:
-  spokenForm: change funk
-  version: 2
-  targets:
-    - type: primitive
-      modifiers:
-        - type: containingScope
-          scopeType: {type: namedFunction}
-  usePrePhraseSnapshot: true
-  action: {name: clearAndSetSelection}
-initialState:
-  documentContents: |-
-    def Thing.hello_world
-      puts "hi"
-    end
-  selections:
-    - anchor: {line: 1, character: 2}
-      active: {line: 1, character: 2}
-  marks: {}
-finalState:
-  documentContents: ""
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-fullTargets: [{type: primitive, mark: {type: cursor}, modifiers: [{type: containingScope, scopeType: {type: namedFunction}}]}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/ruby/changeFunk4.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/ruby/changeFunk4.yml
deleted file mode 100644
index 57a06c0ac0..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/ruby/changeFunk4.yml
+++ /dev/null
@@ -1,35 +0,0 @@
-languageId: ruby
-command:
-  spokenForm: change funk
-  version: 2
-  targets:
-    - type: primitive
-      modifiers:
-        - type: containingScope
-          scopeType: {type: namedFunction}
-  usePrePhraseSnapshot: true
-  action: {name: clearAndSetSelection}
-initialState:
-  documentContents: |-
-    class Test
-      class << self
-        def hello_world
-          puts "hi"
-        end
-      end
-    end
-  selections:
-    - anchor: {line: 3, character: 6}
-      active: {line: 3, character: 6}
-  marks: {}
-finalState:
-  documentContents: |-
-    class Test
-      class << self
-        
-      end
-    end
-  selections:
-    - anchor: {line: 2, character: 4}
-      active: {line: 2, character: 4}
-fullTargets: [{type: primitive, mark: {type: cursor}, modifiers: [{type: containingScope, scopeType: {type: namedFunction}}]}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/ruby/changeFunkName.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/ruby/changeFunkName.yml
deleted file mode 100644
index aedc18aaf5..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/ruby/changeFunkName.yml
+++ /dev/null
@@ -1,29 +0,0 @@
-languageId: ruby
-command:
-  spokenForm: change funk name
-  version: 2
-  targets:
-    - type: primitive
-      modifiers:
-        - type: containingScope
-          scopeType: {type: functionName}
-  usePrePhraseSnapshot: true
-  action: {name: clearAndSetSelection}
-initialState:
-  documentContents: |-
-    def self.hello_world
-      puts "hi"
-    end
-  selections:
-    - anchor: {line: 1, character: 2}
-      active: {line: 1, character: 2}
-  marks: {}
-finalState:
-  documentContents: |-
-    def self.
-      puts "hi"
-    end
-  selections:
-    - anchor: {line: 0, character: 9}
-      active: {line: 0, character: 9}
-fullTargets: [{type: primitive, mark: {type: cursor}, modifiers: [{type: containingScope, scopeType: {type: functionName}}]}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/ruby/changeFunkName2.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/ruby/changeFunkName2.yml
deleted file mode 100644
index 8f65279904..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/ruby/changeFunkName2.yml
+++ /dev/null
@@ -1,29 +0,0 @@
-languageId: ruby
-command:
-  spokenForm: change funk name
-  version: 2
-  targets:
-    - type: primitive
-      modifiers:
-        - type: containingScope
-          scopeType: {type: functionName}
-  usePrePhraseSnapshot: true
-  action: {name: clearAndSetSelection}
-initialState:
-  documentContents: |-
-    def Thing.hello_world
-      puts "hi"
-    end
-  selections:
-    - anchor: {line: 1, character: 2}
-      active: {line: 1, character: 2}
-  marks: {}
-finalState:
-  documentContents: |-
-    def Thing.
-      puts "hi"
-    end
-  selections:
-    - anchor: {line: 0, character: 10}
-      active: {line: 0, character: 10}
-fullTargets: [{type: primitive, mark: {type: cursor}, modifiers: [{type: containingScope, scopeType: {type: functionName}}]}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/ruby/changeFunkName3.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/ruby/changeFunkName3.yml
deleted file mode 100644
index 10f7d91aa5..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/ruby/changeFunkName3.yml
+++ /dev/null
@@ -1,37 +0,0 @@
-languageId: ruby
-command:
-  spokenForm: change funk name
-  version: 2
-  targets:
-    - type: primitive
-      modifiers:
-        - type: containingScope
-          scopeType: {type: functionName}
-  usePrePhraseSnapshot: true
-  action: {name: clearAndSetSelection}
-initialState:
-  documentContents: |-
-    class Test
-      class << self
-        def hello_world
-          puts "hi"
-        end
-      end
-    end
-  selections:
-    - anchor: {line: 3, character: 6}
-      active: {line: 3, character: 6}
-  marks: {}
-finalState:
-  documentContents: |-
-    class Test
-      class << self
-        def 
-          puts "hi"
-        end
-      end
-    end
-  selections:
-    - anchor: {line: 2, character: 8}
-      active: {line: 2, character: 8}
-fullTargets: [{type: primitive, mark: {type: cursor}, modifiers: [{type: containingScope, scopeType: {type: functionName}}]}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/ruby/changeIfState.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/ruby/changeIfState.yml
deleted file mode 100644
index 10866ec97f..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/ruby/changeIfState.yml
+++ /dev/null
@@ -1,23 +0,0 @@
-languageId: ruby
-command:
-  version: 1
-  spokenForm: change if state
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: ifStatement, includeSiblings: false}
-initialState:
-  documentContents: |-
-    if true
-
-    end
-  selections:
-    - anchor: {line: 2, character: 2}
-      active: {line: 2, character: 2}
-  marks: {}
-finalState:
-  documentContents: ""
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: containingScope, scopeType: ifStatement, includeSiblings: false}, isImplicit: false}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/ruby/changeItemThis.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/ruby/changeItemThis.yml
deleted file mode 100644
index 7de71aff01..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/ruby/changeItemThis.yml
+++ /dev/null
@@ -1,21 +0,0 @@
-languageId: ruby
-command:
-  version: 1
-  spokenForm: change item this
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: collectionItem, includeSiblings: false}
-      mark: {type: cursor}
-initialState:
-  documentContents: "[1, 2, 3]"
-  selections:
-    - anchor: {line: 0, character: 4}
-      active: {line: 0, character: 4}
-  marks: {}
-finalState:
-  documentContents: "[1, , 3]"
-  selections:
-    - anchor: {line: 0, character: 4}
-      active: {line: 0, character: 4}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: containingScope, scopeType: collectionItem, includeSiblings: false}, isImplicit: false}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/ruby/changeKey.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/ruby/changeKey.yml
deleted file mode 100644
index 92e737d2c5..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/ruby/changeKey.yml
+++ /dev/null
@@ -1,20 +0,0 @@
-languageId: ruby
-command:
-  version: 1
-  spokenForm: change key
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: collectionKey, includeSiblings: false}
-initialState:
-  documentContents: h = {"1" => "one"}
-  selections:
-    - anchor: {line: 0, character: 11}
-      active: {line: 0, character: 11}
-  marks: {}
-finalState:
-  documentContents: h = { => "one"}
-  selections:
-    - anchor: {line: 0, character: 5}
-      active: {line: 0, character: 5}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: containingScope, scopeType: collectionKey, includeSiblings: false}, isImplicit: false}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/ruby/changeKey2.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/ruby/changeKey2.yml
deleted file mode 100644
index 5640086a10..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/ruby/changeKey2.yml
+++ /dev/null
@@ -1,20 +0,0 @@
-languageId: ruby
-command:
-  version: 1
-  spokenForm: change key
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: collectionKey, includeSiblings: false}
-initialState:
-  documentContents: "h = {\"1\": \"one\" }"
-  selections:
-    - anchor: {line: 0, character: 11}
-      active: {line: 0, character: 11}
-  marks: {}
-finalState:
-  documentContents: "h = {: \"one\" }"
-  selections:
-    - anchor: {line: 0, character: 5}
-      active: {line: 0, character: 5}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: containingScope, scopeType: collectionKey, includeSiblings: false}, isImplicit: false}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/ruby/changeLambda.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/ruby/changeLambda.yml
deleted file mode 100644
index c41fe5d71f..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/ruby/changeLambda.yml
+++ /dev/null
@@ -1,20 +0,0 @@
-languageId: ruby
-command:
-  version: 1
-  spokenForm: change lambda
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: anonymousFunction, includeSiblings: false}
-initialState:
-  documentContents: hi = -> { puts "Hi!" }
-  selections:
-    - anchor: {line: 0, character: 17}
-      active: {line: 0, character: 17}
-  marks: {}
-finalState:
-  documentContents: "hi = "
-  selections:
-    - anchor: {line: 0, character: 5}
-      active: {line: 0, character: 5}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: containingScope, scopeType: anonymousFunction, includeSiblings: false}, isImplicit: false}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/ruby/changeLambda2.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/ruby/changeLambda2.yml
deleted file mode 100644
index c06e44f2f7..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/ruby/changeLambda2.yml
+++ /dev/null
@@ -1,26 +0,0 @@
-languageId: ruby
-command:
-  version: 1
-  spokenForm: change lambda
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: anonymousFunction, includeSiblings: false}
-initialState:
-  documentContents: |+
-    [1,2,3].each do |i|
-        puts i
-    end
-
-  selections:
-    - anchor: {line: 1, character: 10}
-      active: {line: 1, character: 10}
-  marks: {}
-finalState:
-  documentContents: |+
-    [1,2,3].each 
-
-  selections:
-    - anchor: {line: 0, character: 13}
-      active: {line: 0, character: 13}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: containingScope, scopeType: anonymousFunction, includeSiblings: false}, isImplicit: false}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/ruby/changeLambda3.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/ruby/changeLambda3.yml
deleted file mode 100644
index 0bb69e972f..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/ruby/changeLambda3.yml
+++ /dev/null
@@ -1,22 +0,0 @@
-languageId: ruby
-command:
-  version: 1
-  spokenForm: change lambda
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: anonymousFunction, includeSiblings: false}
-initialState:
-  documentContents: |
-    [1,2,3].each { |i| puts i }
-  selections:
-    - anchor: {line: 0, character: 26}
-      active: {line: 0, character: 26}
-  marks: {}
-finalState:
-  documentContents: |
-    [1,2,3].each 
-  selections:
-    - anchor: {line: 0, character: 13}
-      active: {line: 0, character: 13}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: containingScope, scopeType: anonymousFunction, includeSiblings: false}, isImplicit: false}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/ruby/changeLambda4.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/ruby/changeLambda4.yml
deleted file mode 100644
index 92736840ad..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/ruby/changeLambda4.yml
+++ /dev/null
@@ -1,20 +0,0 @@
-languageId: ruby
-command:
-  version: 1
-  spokenForm: change lambda
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: anonymousFunction, includeSiblings: false}
-initialState:
-  documentContents: Proc.new { puts "hi" }
-  selections:
-    - anchor: {line: 0, character: 20}
-      active: {line: 0, character: 20}
-  marks: {}
-finalState:
-  documentContents: ""
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: containingScope, scopeType: anonymousFunction, includeSiblings: false}, isImplicit: false}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/ruby/changeLambda5.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/ruby/changeLambda5.yml
deleted file mode 100644
index 79f75a758f..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/ruby/changeLambda5.yml
+++ /dev/null
@@ -1,20 +0,0 @@
-languageId: ruby
-command:
-  version: 1
-  spokenForm: change lambda
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: anonymousFunction, includeSiblings: false}
-initialState:
-  documentContents: lambda { puts "hi" }
-  selections:
-    - anchor: {line: 0, character: 6}
-      active: {line: 0, character: 6}
-  marks: {}
-finalState:
-  documentContents: ""
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: containingScope, scopeType: anonymousFunction, includeSiblings: false}, isImplicit: false}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/ruby/changeList.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/ruby/changeList.yml
deleted file mode 100644
index 85b7c63576..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/ruby/changeList.yml
+++ /dev/null
@@ -1,20 +0,0 @@
-languageId: ruby
-command:
-  version: 1
-  spokenForm: change list
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: list, includeSiblings: false}
-initialState:
-  documentContents: a = [1,2,3]
-  selections:
-    - anchor: {line: 0, character: 10}
-      active: {line: 0, character: 10}
-  marks: {}
-finalState:
-  documentContents: "a = "
-  selections:
-    - anchor: {line: 0, character: 4}
-      active: {line: 0, character: 4}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: containingScope, scopeType: list, includeSiblings: false}, isImplicit: false}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/ruby/changeList2.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/ruby/changeList2.yml
deleted file mode 100644
index 741fa44920..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/ruby/changeList2.yml
+++ /dev/null
@@ -1,20 +0,0 @@
-languageId: ruby
-command:
-  version: 1
-  spokenForm: change list
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: list, includeSiblings: false}
-initialState:
-  documentContents: a = %w(1, 2, 3)
-  selections:
-    - anchor: {line: 0, character: 8}
-      active: {line: 0, character: 8}
-  marks: {}
-finalState:
-  documentContents: "a = "
-  selections:
-    - anchor: {line: 0, character: 4}
-      active: {line: 0, character: 4}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: containingScope, scopeType: list, includeSiblings: false}, isImplicit: false}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/ruby/changeList3.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/ruby/changeList3.yml
deleted file mode 100644
index 8684916e44..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/ruby/changeList3.yml
+++ /dev/null
@@ -1,20 +0,0 @@
-languageId: ruby
-command:
-  version: 1
-  spokenForm: change list
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: list, includeSiblings: false}
-initialState:
-  documentContents: a = %i(1, 2, 3)
-  selections:
-    - anchor: {line: 0, character: 8}
-      active: {line: 0, character: 8}
-  marks: {}
-finalState:
-  documentContents: "a = "
-  selections:
-    - anchor: {line: 0, character: 4}
-      active: {line: 0, character: 4}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: containingScope, scopeType: list, includeSiblings: false}, isImplicit: false}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/ruby/changeMap.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/ruby/changeMap.yml
deleted file mode 100644
index 39515f0a83..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/ruby/changeMap.yml
+++ /dev/null
@@ -1,20 +0,0 @@
-languageId: ruby
-command:
-  version: 1
-  spokenForm: change map
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: map, includeSiblings: false}
-initialState:
-  documentContents: h = {"1" => "one"}
-  selections:
-    - anchor: {line: 0, character: 11}
-      active: {line: 0, character: 11}
-  marks: {}
-finalState:
-  documentContents: "h = "
-  selections:
-    - anchor: {line: 0, character: 4}
-      active: {line: 0, character: 4}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: containingScope, scopeType: map, includeSiblings: false}, isImplicit: false}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/ruby/changeName.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/ruby/changeName.yml
deleted file mode 100644
index 935edb975f..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/ruby/changeName.yml
+++ /dev/null
@@ -1,26 +0,0 @@
-languageId: ruby
-command:
-  version: 1
-  spokenForm: change name
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: name, includeSiblings: false}
-initialState:
-  documentContents: |-
-    def hello
-
-    end
-  selections:
-    - anchor: {line: 1, character: 0}
-      active: {line: 1, character: 0}
-  marks: {}
-finalState:
-  documentContents: |-
-    def 
-
-    end
-  selections:
-    - anchor: {line: 0, character: 4}
-      active: {line: 0, character: 4}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: containingScope, scopeType: name, includeSiblings: false}, isImplicit: false}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/ruby/changeName2.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/ruby/changeName2.yml
deleted file mode 100644
index a5224e527e..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/ruby/changeName2.yml
+++ /dev/null
@@ -1,26 +0,0 @@
-languageId: ruby
-command:
-  version: 1
-  spokenForm: change name
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: name, includeSiblings: false}
-initialState:
-  documentContents: |-
-    class Hello
-
-    end
-  selections:
-    - anchor: {line: 1, character: 0}
-      active: {line: 1, character: 0}
-  marks: {}
-finalState:
-  documentContents: |-
-    class 
-
-    end
-  selections:
-    - anchor: {line: 0, character: 6}
-      active: {line: 0, character: 6}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: containingScope, scopeType: name, includeSiblings: false}, isImplicit: false}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/ruby/changeName3.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/ruby/changeName3.yml
deleted file mode 100644
index 241e12eb93..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/ruby/changeName3.yml
+++ /dev/null
@@ -1,29 +0,0 @@
-languageId: ruby
-command:
-  spokenForm: change name
-  version: 2
-  targets:
-    - type: primitive
-      modifiers:
-        - type: containingScope
-          scopeType: {type: name}
-  usePrePhraseSnapshot: true
-  action: {name: clearAndSetSelection}
-initialState:
-  documentContents: |-
-    def self.hello_world
-      puts "hi"
-    end
-  selections:
-    - anchor: {line: 1, character: 2}
-      active: {line: 1, character: 2}
-  marks: {}
-finalState:
-  documentContents: |-
-    def self.
-      puts "hi"
-    end
-  selections:
-    - anchor: {line: 0, character: 9}
-      active: {line: 0, character: 9}
-fullTargets: [{type: primitive, mark: {type: cursor}, modifiers: [{type: containingScope, scopeType: {type: name}}]}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/ruby/changeNameThis.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/ruby/changeNameThis.yml
deleted file mode 100644
index 096e7438b6..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/ruby/changeNameThis.yml
+++ /dev/null
@@ -1,21 +0,0 @@
-languageId: ruby
-command:
-  version: 1
-  spokenForm: change name this
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: name, includeSiblings: false}
-      mark: {type: cursor}
-initialState:
-  documentContents: a = "hello"
-  selections:
-    - anchor: {line: 0, character: 8}
-      active: {line: 0, character: 8}
-  marks: {}
-finalState:
-  documentContents: " = \"hello\""
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: containingScope, scopeType: name, includeSiblings: false}, isImplicit: false}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/ruby/changeRegex.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/ruby/changeRegex.yml
deleted file mode 100644
index f1b74ab801..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/ruby/changeRegex.yml
+++ /dev/null
@@ -1,20 +0,0 @@
-languageId: ruby
-command:
-  version: 1
-  spokenForm: change regex
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: regularExpression, includeSiblings: false}
-initialState:
-  documentContents: a = /.*/
-  selections:
-    - anchor: {line: 0, character: 7}
-      active: {line: 0, character: 7}
-  marks: {}
-finalState:
-  documentContents: "a = "
-  selections:
-    - anchor: {line: 0, character: 4}
-      active: {line: 0, character: 4}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: containingScope, scopeType: regularExpression, includeSiblings: false}, isImplicit: false}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/ruby/changeRound.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/ruby/changeRound.yml
deleted file mode 100644
index 5f86d06834..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/ruby/changeRound.yml
+++ /dev/null
@@ -1,20 +0,0 @@
-languageId: ruby
-command:
-  version: 1
-  spokenForm: change round
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: surroundingPair, delimiter: parentheses}
-initialState:
-  documentContents: "\"hello (world)\""
-  selections:
-    - anchor: {line: 0, character: 11}
-      active: {line: 0, character: 11}
-  marks: {}
-finalState:
-  documentContents: "\"hello \""
-  selections:
-    - anchor: {line: 0, character: 7}
-      active: {line: 0, character: 7}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: surroundingPair, delimiter: parentheses}, isImplicit: false}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/ruby/changeRound2.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/ruby/changeRound2.yml
deleted file mode 100644
index 9d4de2b0fd..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/ruby/changeRound2.yml
+++ /dev/null
@@ -1,26 +0,0 @@
-languageId: ruby
-command:
-  version: 1
-  spokenForm: change round
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: surroundingPair, delimiter: parentheses}
-initialState:
-  documentContents: |
-    <<-HI
-        ok (what)
-    HI
-  selections:
-    - anchor: {line: 1, character: 10}
-      active: {line: 1, character: 10}
-  marks: {}
-finalState:
-  documentContents: |
-    <<-HI
-        ok 
-    HI
-  selections:
-    - anchor: {line: 1, character: 7}
-      active: {line: 1, character: 7}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: surroundingPair, delimiter: parentheses}, isImplicit: false}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/ruby/changeState.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/ruby/changeState.yml
deleted file mode 100644
index 5786ae47e5..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/ruby/changeState.yml
+++ /dev/null
@@ -1,23 +0,0 @@
-languageId: ruby
-command:
-  version: 1
-  spokenForm: change state
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: statement, includeSiblings: false}
-initialState:
-  documentContents: |-
-    if true
-
-    end
-  selections:
-    - anchor: {line: 1, character: 0}
-      active: {line: 1, character: 0}
-  marks: {}
-finalState:
-  documentContents: ""
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: containingScope, scopeType: statement, includeSiblings: false}, isImplicit: false}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/ruby/changeState2.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/ruby/changeState2.yml
deleted file mode 100644
index d859a443b4..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/ruby/changeState2.yml
+++ /dev/null
@@ -1,20 +0,0 @@
-languageId: ruby
-command:
-  version: 1
-  spokenForm: change state
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: statement, includeSiblings: false}
-initialState:
-  documentContents: str = "hello world"
-  selections:
-    - anchor: {line: 0, character: 18}
-      active: {line: 0, character: 18}
-  marks: {}
-finalState:
-  documentContents: ""
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: containingScope, scopeType: statement, includeSiblings: false}, isImplicit: false}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/ruby/changeState3.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/ruby/changeState3.yml
deleted file mode 100644
index be27d7df27..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/ruby/changeState3.yml
+++ /dev/null
@@ -1,26 +0,0 @@
-languageId: ruby
-command:
-  version: 1
-  spokenForm: change state
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: statement, includeSiblings: false}
-initialState:
-  documentContents: |-
-    while true  do
-      puts "hi"
-    end
-  selections:
-    - anchor: {line: 1, character: 5}
-      active: {line: 1, character: 5}
-  marks: {}
-finalState:
-  documentContents: |-
-    while true  do
-      
-    end
-  selections:
-    - anchor: {line: 1, character: 2}
-      active: {line: 1, character: 2}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: containingScope, scopeType: statement, includeSiblings: false}, isImplicit: false}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/ruby/changeState4.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/ruby/changeState4.yml
deleted file mode 100644
index cc8234e889..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/ruby/changeState4.yml
+++ /dev/null
@@ -1,26 +0,0 @@
-languageId: ruby
-command:
-  version: 1
-  spokenForm: change state
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: statement, includeSiblings: false}
-initialState:
-  documentContents: |-
-    class << self
-      a = 10
-    end
-  selections:
-    - anchor: {line: 1, character: 7}
-      active: {line: 1, character: 7}
-  marks: {}
-finalState:
-  documentContents: |-
-    class << self
-      
-    end
-  selections:
-    - anchor: {line: 1, character: 2}
-      active: {line: 1, character: 2}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: containingScope, scopeType: statement, includeSiblings: false}, isImplicit: false}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/ruby/changeState5.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/ruby/changeState5.yml
deleted file mode 100644
index dff58ac817..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/ruby/changeState5.yml
+++ /dev/null
@@ -1,26 +0,0 @@
-languageId: ruby
-command:
-  version: 1
-  spokenForm: change state
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: statement, includeSiblings: false}
-initialState:
-  documentContents: |-
-    def foo.method2
-      a = 10
-    end
-  selections:
-    - anchor: {line: 1, character: 5}
-      active: {line: 1, character: 5}
-  marks: {}
-finalState:
-  documentContents: |-
-    def foo.method2
-      
-    end
-  selections:
-    - anchor: {line: 1, character: 2}
-      active: {line: 1, character: 2}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: containingScope, scopeType: statement, includeSiblings: false}, isImplicit: false}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/ruby/changeString.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/ruby/changeString.yml
deleted file mode 100644
index 4e93b675fc..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/ruby/changeString.yml
+++ /dev/null
@@ -1,20 +0,0 @@
-languageId: ruby
-command:
-  version: 1
-  spokenForm: change string
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: surroundingPair, delimiter: string}
-initialState:
-  documentContents: "\"Hello World\""
-  selections:
-    - anchor: {line: 0, character: 13}
-      active: {line: 0, character: 13}
-  marks: {}
-finalState:
-  documentContents: ""
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: surroundingPair, delimiter: string}, isImplicit: false}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/ruby/changeString2.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/ruby/changeString2.yml
deleted file mode 100644
index 607ca9efdd..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/ruby/changeString2.yml
+++ /dev/null
@@ -1,23 +0,0 @@
-languageId: ruby
-command:
-  version: 1
-  spokenForm: change string
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: surroundingPair, delimiter: string}
-initialState:
-  documentContents: |-
-    a = %Q(Multi
-    Line
-    String)
-  selections:
-    - anchor: {line: 1, character: 4}
-      active: {line: 1, character: 4}
-  marks: {}
-finalState:
-  documentContents: "a = "
-  selections:
-    - anchor: {line: 0, character: 4}
-      active: {line: 0, character: 4}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: surroundingPair, delimiter: string}, isImplicit: false}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/ruby/changeValue.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/ruby/changeValue.yml
deleted file mode 100644
index 522f7ee94b..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/ruby/changeValue.yml
+++ /dev/null
@@ -1,26 +0,0 @@
-languageId: ruby
-command:
-  version: 1
-  spokenForm: change value
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: value, includeSiblings: false}
-initialState:
-  documentContents: |
-    def a
-        return 100
-    end
-  selections:
-    - anchor: {line: 1, character: 6}
-      active: {line: 1, character: 6}
-  marks: {}
-finalState:
-  documentContents: |
-    def a
-        return 
-    end
-  selections:
-    - anchor: {line: 1, character: 11}
-      active: {line: 1, character: 11}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: containingScope, scopeType: value, includeSiblings: false}, isImplicit: false}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/ruby/chuckArg.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/ruby/chuckArg.yml
deleted file mode 100644
index 2c029ad683..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/ruby/chuckArg.yml
+++ /dev/null
@@ -1,26 +0,0 @@
-languageId: ruby
-command:
-  version: 1
-  spokenForm: chuck arg
-  action: remove
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: argumentOrParameter, includeSiblings: false}
-initialState:
-  documentContents: |-
-    def hello_world(name)
-        puts "hi #{name)"
-    end
-  selections:
-    - anchor: {line: 0, character: 19}
-      active: {line: 0, character: 19}
-  marks: {}
-finalState:
-  documentContents: |-
-    def hello_world()
-        puts "hi #{name)"
-    end
-  selections:
-    - anchor: {line: 0, character: 16}
-      active: {line: 0, character: 16}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: outside, modifier: {type: containingScope, scopeType: argumentOrParameter, includeSiblings: false}, isImplicit: false}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/ruby/chuckArg2.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/ruby/chuckArg2.yml
deleted file mode 100644
index 321e6862f2..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/ruby/chuckArg2.yml
+++ /dev/null
@@ -1,22 +0,0 @@
-languageId: ruby
-command:
-  version: 1
-  spokenForm: chuck arg
-  action: remove
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: argumentOrParameter, includeSiblings: false}
-initialState:
-  documentContents: |
-    [1, 2, 3].each_with_the_next { |n, i| }
-  selections:
-    - anchor: {line: 0, character: 33}
-      active: {line: 0, character: 33}
-  marks: {}
-finalState:
-  documentContents: |
-    [1, 2, 3].each_with_the_next { |i| }
-  selections:
-    - anchor: {line: 0, character: 32}
-      active: {line: 0, character: 32}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: outside, modifier: {type: containingScope, scopeType: argumentOrParameter, includeSiblings: false}, isImplicit: false}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/ruby/chuckArg3.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/ruby/chuckArg3.yml
deleted file mode 100644
index e5ecdaa596..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/ruby/chuckArg3.yml
+++ /dev/null
@@ -1,22 +0,0 @@
-languageId: ruby
-command:
-  version: 1
-  spokenForm: chuck arg
-  action: remove
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: argumentOrParameter, includeSiblings: false}
-initialState:
-  documentContents: |
-    [1, 2, 3].each_with_the_next { |n, i| }
-  selections:
-    - anchor: {line: 0, character: 35}
-      active: {line: 0, character: 35}
-  marks: {}
-finalState:
-  documentContents: |
-    [1, 2, 3].each_with_the_next { |n, | }
-  selections:
-    - anchor: {line: 0, character: 35}
-      active: {line: 0, character: 35}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: outside, modifier: {type: containingScope, scopeType: argumentOrParameter, includeSiblings: false}, isImplicit: false}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/ruby/chuckArg4.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/ruby/chuckArg4.yml
deleted file mode 100644
index 453169243f..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/ruby/chuckArg4.yml
+++ /dev/null
@@ -1,29 +0,0 @@
-languageId: ruby
-command:
-  spokenForm: chuck arg
-  version: 2
-  targets:
-    - type: primitive
-      modifiers:
-        - type: containingScope
-          scopeType: {type: argumentOrParameter}
-  usePrePhraseSnapshot: true
-  action: {name: remove}
-initialState:
-  documentContents: |-
-    def self.hello(name)
-
-    end
-  selections:
-    - anchor: {line: 0, character: 15}
-      active: {line: 0, character: 15}
-  marks: {}
-finalState:
-  documentContents: |-
-    def self.hello()
-
-    end
-  selections:
-    - anchor: {line: 0, character: 15}
-      active: {line: 0, character: 15}
-fullTargets: [{type: primitive, mark: {type: cursor}, modifiers: [{type: containingScope, scopeType: {type: argumentOrParameter}}]}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/ruby/chuckEveryArg.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/ruby/chuckEveryArg.yml
deleted file mode 100644
index 369ab3b755..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/ruby/chuckEveryArg.yml
+++ /dev/null
@@ -1,26 +0,0 @@
-languageId: ruby
-command:
-  version: 1
-  spokenForm: chuck every arg
-  action: remove
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: argumentOrParameter, includeSiblings: true}
-initialState:
-  documentContents: |-
-    def hello_world(name, name2)
-        puts "hi #{name} and #{name2}"
-    end
-  selections:
-    - anchor: {line: 0, character: 20}
-      active: {line: 0, character: 20}
-  marks: {}
-finalState:
-  documentContents: |-
-    def hello_world()
-        puts "hi #{name} and #{name2}"
-    end
-  selections:
-    - anchor: {line: 0, character: 16}
-      active: {line: 0, character: 16}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: outside, modifier: {type: containingScope, scopeType: argumentOrParameter, includeSiblings: true}, isImplicit: false}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/ruby/chuckEveryArg2.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/ruby/chuckEveryArg2.yml
deleted file mode 100644
index ff6c5f7a8d..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/ruby/chuckEveryArg2.yml
+++ /dev/null
@@ -1,22 +0,0 @@
-languageId: ruby
-command:
-  version: 1
-  spokenForm: chuck every arg
-  action: remove
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: argumentOrParameter, includeSiblings: true}
-initialState:
-  documentContents: |
-    [1, 2, 3].each_with_the_next { |n, i| }
-  selections:
-    - anchor: {line: 0, character: 34}
-      active: {line: 0, character: 34}
-  marks: {}
-finalState:
-  documentContents: |
-    [1, 2, 3].each_with_the_next { || }
-  selections:
-    - anchor: {line: 0, character: 32}
-      active: {line: 0, character: 32}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: outside, modifier: {type: containingScope, scopeType: argumentOrParameter, includeSiblings: true}, isImplicit: false}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/ruby/chuckEveryItem.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/ruby/chuckEveryItem.yml
deleted file mode 100644
index 7aed7c30a8..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/ruby/chuckEveryItem.yml
+++ /dev/null
@@ -1,22 +0,0 @@
-languageId: ruby
-command:
-  version: 1
-  spokenForm: chuck every item
-  action: remove
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: collectionItem, includeSiblings: true}
-initialState:
-  documentContents: |
-    [1, 2, 3]
-  selections:
-    - anchor: {line: 0, character: 7}
-      active: {line: 0, character: 7}
-  marks: {}
-finalState:
-  documentContents: |
-    []
-  selections:
-    - anchor: {line: 0, character: 1}
-      active: {line: 0, character: 1}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: outside, modifier: {type: containingScope, scopeType: collectionItem, includeSiblings: true}, isImplicit: false}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/ruby/chuckItem.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/ruby/chuckItem.yml
deleted file mode 100644
index 0fc9dfd3e3..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/ruby/chuckItem.yml
+++ /dev/null
@@ -1,22 +0,0 @@
-languageId: ruby
-command:
-  version: 1
-  spokenForm: chuck item
-  action: remove
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: collectionItem, includeSiblings: false}
-initialState:
-  documentContents: |
-    [1, 2, 3]
-  selections:
-    - anchor: {line: 0, character: 5}
-      active: {line: 0, character: 5}
-  marks: {}
-finalState:
-  documentContents: |
-    [1, 3]
-  selections:
-    - anchor: {line: 0, character: 4}
-      active: {line: 0, character: 4}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: outside, modifier: {type: containingScope, scopeType: collectionItem, includeSiblings: false}, isImplicit: false}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/ruby/chuckItem2.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/ruby/chuckItem2.yml
deleted file mode 100644
index d70d0f8bcd..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/ruby/chuckItem2.yml
+++ /dev/null
@@ -1,22 +0,0 @@
-languageId: ruby
-command:
-  version: 1
-  spokenForm: chuck item
-  action: remove
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: collectionItem, includeSiblings: false}
-initialState:
-  documentContents: |
-    [1, 2, 3]
-  selections:
-    - anchor: {line: 0, character: 7}
-      active: {line: 0, character: 7}
-  marks: {}
-finalState:
-  documentContents: |
-    [1, 2]
-  selections:
-    - anchor: {line: 0, character: 5}
-      active: {line: 0, character: 5}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: outside, modifier: {type: containingScope, scopeType: collectionItem, includeSiblings: false}, isImplicit: false}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/ruby/chuckItem3.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/ruby/chuckItem3.yml
deleted file mode 100644
index 8f44e07194..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/ruby/chuckItem3.yml
+++ /dev/null
@@ -1,22 +0,0 @@
-languageId: ruby
-command:
-  version: 1
-  spokenForm: chuck item
-  action: remove
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: collectionItem, includeSiblings: false}
-initialState:
-  documentContents: |
-    %w(hello world)
-  selections:
-    - anchor: {line: 0, character: 14}
-      active: {line: 0, character: 14}
-  marks: {}
-finalState:
-  documentContents: |
-    %w(hello)
-  selections:
-    - anchor: {line: 0, character: 8}
-      active: {line: 0, character: 8}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: outside, modifier: {type: containingScope, scopeType: collectionItem, includeSiblings: false}, isImplicit: false}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/ruby/chuckItem4.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/ruby/chuckItem4.yml
deleted file mode 100644
index f9aa631910..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/ruby/chuckItem4.yml
+++ /dev/null
@@ -1,22 +0,0 @@
-languageId: ruby
-command:
-  version: 1
-  spokenForm: chuck item
-  action: remove
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: collectionItem, includeSiblings: false}
-initialState:
-  documentContents: |
-    %w(hello world)
-  selections:
-    - anchor: {line: 0, character: 7}
-      active: {line: 0, character: 7}
-  marks: {}
-finalState:
-  documentContents: |
-    %w(world)
-  selections:
-    - anchor: {line: 0, character: 3}
-      active: {line: 0, character: 3}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: outside, modifier: {type: containingScope, scopeType: collectionItem, includeSiblings: false}, isImplicit: false}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/ruby/chuckItem5.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/ruby/chuckItem5.yml
deleted file mode 100644
index 91e2705952..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/ruby/chuckItem5.yml
+++ /dev/null
@@ -1,22 +0,0 @@
-languageId: ruby
-command:
-  version: 1
-  spokenForm: chuck item
-  action: remove
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: collectionItem, includeSiblings: false}
-initialState:
-  documentContents: |
-    %i(hello world)
-  selections:
-    - anchor: {line: 0, character: 4}
-      active: {line: 0, character: 4}
-  marks: {}
-finalState:
-  documentContents: |
-    %i(world)
-  selections:
-    - anchor: {line: 0, character: 3}
-      active: {line: 0, character: 3}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: outside, modifier: {type: containingScope, scopeType: collectionItem, includeSiblings: false}, isImplicit: false}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/ruby/chuckItem6.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/ruby/chuckItem6.yml
deleted file mode 100644
index 62a19a93e8..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/ruby/chuckItem6.yml
+++ /dev/null
@@ -1,22 +0,0 @@
-languageId: ruby
-command:
-  version: 1
-  spokenForm: chuck item
-  action: remove
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: collectionItem, includeSiblings: false}
-initialState:
-  documentContents: |
-    %i(hello world)
-  selections:
-    - anchor: {line: 0, character: 12}
-      active: {line: 0, character: 12}
-  marks: {}
-finalState:
-  documentContents: |
-    %i(hello)
-  selections:
-    - anchor: {line: 0, character: 8}
-      active: {line: 0, character: 8}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: outside, modifier: {type: containingScope, scopeType: collectionItem, includeSiblings: false}, isImplicit: false}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/ruby/chuckItem7.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/ruby/chuckItem7.yml
deleted file mode 100644
index b074b6375b..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/ruby/chuckItem7.yml
+++ /dev/null
@@ -1,22 +0,0 @@
-languageId: ruby
-command:
-  version: 1
-  spokenForm: chuck item
-  action: remove
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: collectionItem, includeSiblings: false}
-initialState:
-  documentContents: |
-    { i: 10, z: 99}
-  selections:
-    - anchor: {line: 0, character: 13}
-      active: {line: 0, character: 13}
-  marks: {}
-finalState:
-  documentContents: |
-    { i: 10}
-  selections:
-    - anchor: {line: 0, character: 7}
-      active: {line: 0, character: 7}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: outside, modifier: {type: containingScope, scopeType: collectionItem, includeSiblings: false}, isImplicit: false}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/ruby/chuckNameThis.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/ruby/chuckNameThis.yml
deleted file mode 100644
index 8be0e711e8..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/ruby/chuckNameThis.yml
+++ /dev/null
@@ -1,21 +0,0 @@
-languageId: ruby
-command:
-  version: 1
-  spokenForm: chuck name this
-  action: remove
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: name, includeSiblings: false}
-      mark: {type: cursor}
-initialState:
-  documentContents: a += 1
-  selections:
-    - anchor: {line: 0, character: 5}
-      active: {line: 0, character: 5}
-  marks: {}
-finalState:
-  documentContents: += 1
-  selections:
-    - anchor: {line: 0, character: 3}
-      active: {line: 0, character: 3}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: outside, modifier: {type: containingScope, scopeType: name, includeSiblings: false}, isImplicit: false}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/ruby/chuckNameThis2.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/ruby/chuckNameThis2.yml
deleted file mode 100644
index 1c59c7a3b5..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/ruby/chuckNameThis2.yml
+++ /dev/null
@@ -1,21 +0,0 @@
-languageId: ruby
-command:
-  version: 1
-  spokenForm: chuck name this
-  action: remove
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: name, includeSiblings: false}
-      mark: {type: cursor}
-initialState:
-  documentContents: a = 1
-  selections:
-    - anchor: {line: 0, character: 4}
-      active: {line: 0, character: 4}
-  marks: {}
-finalState:
-  documentContents: "= 1"
-  selections:
-    - anchor: {line: 0, character: 2}
-      active: {line: 0, character: 2}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: outside, modifier: {type: containingScope, scopeType: name, includeSiblings: false}, isImplicit: false}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/ruby/chuckState.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/ruby/chuckState.yml
deleted file mode 100644
index 727b71cccf..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/ruby/chuckState.yml
+++ /dev/null
@@ -1,26 +0,0 @@
-languageId: ruby
-command:
-  version: 1
-  spokenForm: chuck state
-  action: remove
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: statement, includeSiblings: false}
-initialState:
-  documentContents: |-
-    if true 
-      a = 1
-    end
-  selections:
-    - anchor: {line: 1, character: 6}
-      active: {line: 1, character: 6}
-  marks: {}
-finalState:
-  documentContents: |-
-    if true 
-
-    end
-  selections:
-    - anchor: {line: 1, character: 0}
-      active: {line: 1, character: 0}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: outside, modifier: {type: containingScope, scopeType: statement, includeSiblings: false}, isImplicit: false}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/ruby/chuckState10.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/ruby/chuckState10.yml
deleted file mode 100644
index 4de379ac03..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/ruby/chuckState10.yml
+++ /dev/null
@@ -1,30 +0,0 @@
-languageId: ruby
-command:
-  version: 1
-  spokenForm: chuck state
-  action: remove
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: statement, includeSiblings: false}
-initialState:
-  documentContents: |-
-    begin
-      a = 10
-    ensure 
-      a = 10
-    end
-  selections:
-    - anchor: {line: 3, character: 6}
-      active: {line: 3, character: 6}
-  marks: {}
-finalState:
-  documentContents: |-
-    begin
-      a = 10
-    ensure 
-
-    end
-  selections:
-    - anchor: {line: 3, character: 0}
-      active: {line: 3, character: 0}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: outside, modifier: {type: containingScope, scopeType: statement, includeSiblings: false}, isImplicit: false}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/ruby/chuckState11.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/ruby/chuckState11.yml
deleted file mode 100644
index 62e9b5e3dc..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/ruby/chuckState11.yml
+++ /dev/null
@@ -1,34 +0,0 @@
-languageId: ruby
-command:
-  version: 1
-  spokenForm: chuck state
-  action: remove
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: statement, includeSiblings: false}
-initialState:
-  documentContents: |-
-    begin
-      a = 10
-    else
-      a = 10
-    ensure 
-      a = 10
-    end
-  selections:
-    - anchor: {line: 3, character: 6}
-      active: {line: 3, character: 6}
-  marks: {}
-finalState:
-  documentContents: |-
-    begin
-      a = 10
-    else
-
-    ensure 
-      a = 10
-    end
-  selections:
-    - anchor: {line: 3, character: 0}
-      active: {line: 3, character: 0}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: outside, modifier: {type: containingScope, scopeType: statement, includeSiblings: false}, isImplicit: false}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/ruby/chuckState2.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/ruby/chuckState2.yml
deleted file mode 100644
index 6809d196f6..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/ruby/chuckState2.yml
+++ /dev/null
@@ -1,26 +0,0 @@
-languageId: ruby
-command:
-  version: 1
-  spokenForm: chuck state
-  action: remove
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: statement, includeSiblings: false}
-initialState:
-  documentContents: |-
-    while true  do
-      a = 1
-    end
-  selections:
-    - anchor: {line: 1, character: 6}
-      active: {line: 1, character: 6}
-  marks: {}
-finalState:
-  documentContents: |-
-    while true  do
-
-    end
-  selections:
-    - anchor: {line: 1, character: 0}
-      active: {line: 1, character: 0}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: outside, modifier: {type: containingScope, scopeType: statement, includeSiblings: false}, isImplicit: false}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/ruby/chuckState3.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/ruby/chuckState3.yml
deleted file mode 100644
index 8642a97b61..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/ruby/chuckState3.yml
+++ /dev/null
@@ -1,26 +0,0 @@
-languageId: ruby
-command:
-  version: 1
-  spokenForm: chuck state
-  action: remove
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: statement, includeSiblings: false}
-initialState:
-  documentContents: |-
-    [].each do |i|
-      puts i
-    end
-  selections:
-    - anchor: {line: 1, character: 7}
-      active: {line: 1, character: 7}
-  marks: {}
-finalState:
-  documentContents: |-
-    [].each do |i|
-
-    end
-  selections:
-    - anchor: {line: 1, character: 0}
-      active: {line: 1, character: 0}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: outside, modifier: {type: containingScope, scopeType: statement, includeSiblings: false}, isImplicit: false}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/ruby/chuckState4.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/ruby/chuckState4.yml
deleted file mode 100644
index 23516dec04..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/ruby/chuckState4.yml
+++ /dev/null
@@ -1,26 +0,0 @@
-languageId: ruby
-command:
-  version: 1
-  spokenForm: chuck state
-  action: remove
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: statement, includeSiblings: false}
-initialState:
-  documentContents: |-
-    [].each { |i|
-      puts i
-    }
-  selections:
-    - anchor: {line: 1, character: 2}
-      active: {line: 1, character: 2}
-  marks: {}
-finalState:
-  documentContents: |-
-    [].each { |i|
-
-    }
-  selections:
-    - anchor: {line: 1, character: 0}
-      active: {line: 1, character: 0}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: outside, modifier: {type: containingScope, scopeType: statement, includeSiblings: false}, isImplicit: false}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/ruby/chuckState5.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/ruby/chuckState5.yml
deleted file mode 100644
index a4df9631e1..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/ruby/chuckState5.yml
+++ /dev/null
@@ -1,26 +0,0 @@
-languageId: ruby
-command:
-  version: 1
-  spokenForm: chuck state
-  action: remove
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: statement, includeSiblings: false}
-initialState:
-  documentContents: |-
-    begin
-      puts("hi")
-    end until true
-  selections:
-    - anchor: {line: 1, character: 2}
-      active: {line: 1, character: 2}
-  marks: {}
-finalState:
-  documentContents: |-
-    begin
-
-    end until true
-  selections:
-    - anchor: {line: 1, character: 0}
-      active: {line: 1, character: 0}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: outside, modifier: {type: containingScope, scopeType: statement, includeSiblings: false}, isImplicit: false}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/ruby/chuckState6.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/ruby/chuckState6.yml
deleted file mode 100644
index bd7c7ed9fd..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/ruby/chuckState6.yml
+++ /dev/null
@@ -1,23 +0,0 @@
-languageId: ruby
-command:
-  version: 1
-  spokenForm: chuck state
-  action: remove
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: statement, includeSiblings: false}
-initialState:
-  documentContents: |-
-    begin
-      puts("hi")
-    end until true
-  selections:
-    - anchor: {line: 2, character: 5}
-      active: {line: 2, character: 5}
-  marks: {}
-finalState:
-  documentContents: ""
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: outside, modifier: {type: containingScope, scopeType: statement, includeSiblings: false}, isImplicit: false}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/ruby/chuckState7.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/ruby/chuckState7.yml
deleted file mode 100644
index c989e4c944..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/ruby/chuckState7.yml
+++ /dev/null
@@ -1,32 +0,0 @@
-languageId: ruby
-command:
-  version: 1
-  spokenForm: chuck state
-  action: remove
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: statement, includeSiblings: false}
-initialState:
-  documentContents: |-
-    case abc
-    when true
-      a = 0
-    else
-      a = 10
-    end
-  selections:
-    - anchor: {line: 2, character: 4}
-      active: {line: 2, character: 4}
-  marks: {}
-finalState:
-  documentContents: |-
-    case abc
-    when true
-
-    else
-      a = 10
-    end
-  selections:
-    - anchor: {line: 2, character: 0}
-      active: {line: 2, character: 0}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: outside, modifier: {type: containingScope, scopeType: statement, includeSiblings: false}, isImplicit: false}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/ruby/chuckState8.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/ruby/chuckState8.yml
deleted file mode 100644
index d030513b37..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/ruby/chuckState8.yml
+++ /dev/null
@@ -1,32 +0,0 @@
-languageId: ruby
-command:
-  version: 1
-  spokenForm: chuck state
-  action: remove
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: statement, includeSiblings: false}
-initialState:
-  documentContents: |-
-    case abc
-    when true
-      a = 0
-    else
-      a = 10
-    end
-  selections:
-    - anchor: {line: 4, character: 4}
-      active: {line: 4, character: 4}
-  marks: {}
-finalState:
-  documentContents: |-
-    case abc
-    when true
-      a = 0
-    else
-
-    end
-  selections:
-    - anchor: {line: 4, character: 0}
-      active: {line: 4, character: 0}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: outside, modifier: {type: containingScope, scopeType: statement, includeSiblings: false}, isImplicit: false}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/ruby/chuckState9.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/ruby/chuckState9.yml
deleted file mode 100644
index 940f18fea4..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/ruby/chuckState9.yml
+++ /dev/null
@@ -1,30 +0,0 @@
-languageId: ruby
-command:
-  version: 1
-  spokenForm: chuck state
-  action: remove
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: statement, includeSiblings: false}
-initialState:
-  documentContents: |-
-    begin
-      a = 10
-    ensure 
-      a = 10
-    end
-  selections:
-    - anchor: {line: 1, character: 5}
-      active: {line: 1, character: 5}
-  marks: {}
-finalState:
-  documentContents: |-
-    begin
-
-    ensure 
-      a = 10
-    end
-  selections:
-    - anchor: {line: 1, character: 0}
-      active: {line: 1, character: 0}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: outside, modifier: {type: containingScope, scopeType: statement, includeSiblings: false}, isImplicit: false}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/ruby/chuckValue.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/ruby/chuckValue.yml
deleted file mode 100644
index 82269e2b86..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/ruby/chuckValue.yml
+++ /dev/null
@@ -1,20 +0,0 @@
-languageId: ruby
-command:
-  version: 1
-  spokenForm: chuck value
-  action: remove
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: value, includeSiblings: false}
-initialState:
-  documentContents: "{ hi: \"world\" }"
-  selections:
-    - anchor: {line: 0, character: 7}
-      active: {line: 0, character: 7}
-  marks: {}
-finalState:
-  documentContents: "{ hi }"
-  selections:
-    - anchor: {line: 0, character: 4}
-      active: {line: 0, character: 4}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: outside, modifier: {type: containingScope, scopeType: value, includeSiblings: false}, isImplicit: false}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/ruby/chuckValue2.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/ruby/chuckValue2.yml
deleted file mode 100644
index 67ba6f805c..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/ruby/chuckValue2.yml
+++ /dev/null
@@ -1,20 +0,0 @@
-languageId: ruby
-command:
-  version: 1
-  spokenForm: chuck value
-  action: remove
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: value, includeSiblings: false}
-initialState:
-  documentContents: "{ hi => \"world\" }"
-  selections:
-    - anchor: {line: 0, character: 9}
-      active: {line: 0, character: 9}
-  marks: {}
-finalState:
-  documentContents: "{ hi }"
-  selections:
-    - anchor: {line: 0, character: 4}
-      active: {line: 0, character: 4}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: outside, modifier: {type: containingScope, scopeType: value, includeSiblings: false}, isImplicit: false}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/ruby/chuckValue3.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/ruby/chuckValue3.yml
deleted file mode 100644
index 13f7d57167..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/ruby/chuckValue3.yml
+++ /dev/null
@@ -1,20 +0,0 @@
-languageId: ruby
-command:
-  version: 1
-  spokenForm: chuck value
-  action: remove
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: value, includeSiblings: false}
-initialState:
-  documentContents: "{ \"hi\": \"world\" }"
-  selections:
-    - anchor: {line: 0, character: 8}
-      active: {line: 0, character: 8}
-  marks: {}
-finalState:
-  documentContents: "{ \"hi\" }"
-  selections:
-    - anchor: {line: 0, character: 6}
-      active: {line: 0, character: 6}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: outside, modifier: {type: containingScope, scopeType: value, includeSiblings: false}, isImplicit: false}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/ruby/chuckValue5.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/ruby/chuckValue5.yml
deleted file mode 100644
index 4d568296fb..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/ruby/chuckValue5.yml
+++ /dev/null
@@ -1,20 +0,0 @@
-languageId: ruby
-command:
-  version: 1
-  spokenForm: chuck value
-  action: remove
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: value, includeSiblings: false}
-initialState:
-  documentContents: a = 10
-  selections:
-    - anchor: {line: 0, character: 5}
-      active: {line: 0, character: 5}
-  marks: {}
-finalState:
-  documentContents: a
-  selections:
-    - anchor: {line: 0, character: 1}
-      active: {line: 0, character: 1}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: outside, modifier: {type: containingScope, scopeType: value, includeSiblings: false}, isImplicit: false}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/ruby/chuckValue6.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/ruby/chuckValue6.yml
deleted file mode 100644
index 5db4c231ec..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/ruby/chuckValue6.yml
+++ /dev/null
@@ -1,20 +0,0 @@
-languageId: ruby
-command:
-  version: 1
-  spokenForm: chuck value
-  action: remove
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: value, includeSiblings: false}
-initialState:
-  documentContents: a += 1
-  selections:
-    - anchor: {line: 0, character: 5}
-      active: {line: 0, character: 5}
-  marks: {}
-finalState:
-  documentContents: a
-  selections:
-    - anchor: {line: 0, character: 1}
-      active: {line: 0, character: 1}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: outside, modifier: {type: containingScope, scopeType: value, includeSiblings: false}, isImplicit: false}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/ruby/clearState.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/ruby/clearState.yml
deleted file mode 100644
index 8298544501..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/ruby/clearState.yml
+++ /dev/null
@@ -1,20 +0,0 @@
-languageId: ruby
-command:
-  version: 1
-  spokenForm: clear state
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: statement, includeSiblings: false}
-initialState:
-  documentContents: foo = bar("bongo")
-  selections:
-    - anchor: {line: 0, character: 13}
-      active: {line: 0, character: 13}
-  marks: {}
-finalState:
-  documentContents: ""
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: containingScope, scopeType: statement, includeSiblings: false}, isImplicit: false}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/ruby/clearState2.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/ruby/clearState2.yml
deleted file mode 100644
index d52feaa679..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/ruby/clearState2.yml
+++ /dev/null
@@ -1,20 +0,0 @@
-languageId: ruby
-command:
-  version: 1
-  spokenForm: clear state
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: statement, includeSiblings: false}
-initialState:
-  documentContents: bar("bongo")
-  selections:
-    - anchor: {line: 0, character: 7}
-      active: {line: 0, character: 7}
-  marks: {}
-finalState:
-  documentContents: ""
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: containingScope, scopeType: statement, includeSiblings: false}, isImplicit: false}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/rust/changeArgAir.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/rust/changeArgAir.yml
deleted file mode 100644
index 734d6f7f9d..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/rust/changeArgAir.yml
+++ /dev/null
@@ -1,29 +0,0 @@
-languageId: rust
-command:
-  spokenForm: change arg air
-  version: 2
-  targets:
-    - type: primitive
-      mark: {type: decoratedSymbol, symbolColor: default, character: a}
-      modifiers:
-        - type: containingScope
-          scopeType: {type: argumentOrParameter}
-  usePrePhraseSnapshot: true
-  action: {name: clearAndSetSelection}
-initialState:
-  documentContents: |
-    fn foo(x: &'a mut u32) -> &'static mut u16 {}
-  selections:
-    - anchor: {line: 0, character: 45}
-      active: {line: 0, character: 45}
-  marks:
-    default.a:
-      start: {line: 0, character: 12}
-      end: {line: 0, character: 13}
-finalState:
-  documentContents: |
-    fn foo() -> &'static mut u16 {}
-  selections:
-    - anchor: {line: 0, character: 7}
-      active: {line: 0, character: 7}
-fullTargets: [{type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: a}, modifiers: [{type: containingScope, scopeType: {type: argumentOrParameter}}]}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/rust/changeArgBlueAir.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/rust/changeArgBlueAir.yml
deleted file mode 100644
index ce6041d11c..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/rust/changeArgBlueAir.yml
+++ /dev/null
@@ -1,29 +0,0 @@
-languageId: rust
-command:
-  spokenForm: change arg blue air
-  version: 2
-  targets:
-    - type: primitive
-      mark: {type: decoratedSymbol, symbolColor: blue, character: a}
-      modifiers:
-        - type: containingScope
-          scopeType: {type: argumentOrParameter}
-  usePrePhraseSnapshot: true
-  action: {name: clearAndSetSelection}
-initialState:
-  documentContents: |
-    struct S<'a, 'b: 'a, T>;
-  selections:
-    - anchor: {line: 1, character: 0}
-      active: {line: 1, character: 0}
-  marks:
-    blue.a:
-      start: {line: 0, character: 18}
-      end: {line: 0, character: 19}
-finalState:
-  documentContents: |
-    struct S<'a, , T>;
-  selections:
-    - anchor: {line: 0, character: 13}
-      active: {line: 0, character: 13}
-fullTargets: [{type: primitive, mark: {type: decoratedSymbol, symbolColor: blue, character: a}, modifiers: [{type: containingScope, scopeType: {type: argumentOrParameter}}]}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/rust/changeArgEight.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/rust/changeArgEight.yml
deleted file mode 100644
index 74697f2324..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/rust/changeArgEight.yml
+++ /dev/null
@@ -1,33 +0,0 @@
-languageId: rust
-command:
-  spokenForm: change arg eight
-  version: 2
-  targets:
-    - type: primitive
-      mark: {type: decoratedSymbol, symbolColor: default, character: '8'}
-      modifiers:
-        - type: containingScope
-          scopeType: {type: argumentOrParameter}
-  usePrePhraseSnapshot: true
-  action: {name: clearAndSetSelection}
-initialState:
-  documentContents: |
-    enum E {
-        C(u8, u16, u32),
-    }
-  selections:
-    - anchor: {line: 3, character: 0}
-      active: {line: 3, character: 0}
-  marks:
-    default.8:
-      start: {line: 1, character: 6}
-      end: {line: 1, character: 8}
-finalState:
-  documentContents: |
-    enum E {
-        C(, u16, u32),
-    }
-  selections:
-    - anchor: {line: 1, character: 6}
-      active: {line: 1, character: 6}
-fullTargets: [{type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: '8'}, modifiers: [{type: containingScope, scopeType: {type: argumentOrParameter}}]}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/rust/changeArgSun.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/rust/changeArgSun.yml
deleted file mode 100644
index ae304f5e56..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/rust/changeArgSun.yml
+++ /dev/null
@@ -1,33 +0,0 @@
-languageId: rust
-command:
-  spokenForm: change arg sun
-  version: 2
-  targets:
-    - type: primitive
-      mark: {type: decoratedSymbol, symbolColor: default, character: s}
-      modifiers:
-        - type: containingScope
-          scopeType: {type: argumentOrParameter}
-  usePrePhraseSnapshot: true
-  action: {name: clearAndSetSelection}
-initialState:
-  documentContents: >-
-    fn some_function<T: Display + Clone, U: Clone + Debug>(t: &T, u: &U) -> i32
-    {
-
-    }
-  selections:
-    - anchor: {line: 1, character: 1}
-      active: {line: 1, character: 1}
-  marks:
-    default.s:
-      start: {line: 0, character: 20}
-      end: {line: 0, character: 27}
-finalState:
-  documentContents: |-
-    fn some_function<, U: Clone + Debug>(t: &T, u: &U) -> i32 {
-    }
-  selections:
-    - anchor: {line: 0, character: 17}
-      active: {line: 0, character: 17}
-fullTargets: [{type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: s}, modifiers: [{type: containingScope, scopeType: {type: argumentOrParameter}}]}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/rust/changeArgTrap.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/rust/changeArgTrap.yml
deleted file mode 100644
index 0d92ea7181..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/rust/changeArgTrap.yml
+++ /dev/null
@@ -1,29 +0,0 @@
-languageId: rust
-command:
-  spokenForm: change arg trap
-  version: 2
-  targets:
-    - type: primitive
-      mark: {type: decoratedSymbol, symbolColor: default, character: t}
-      modifiers:
-        - type: containingScope
-          scopeType: {type: argumentOrParameter}
-  usePrePhraseSnapshot: true
-  action: {name: clearAndSetSelection}
-initialState:
-  documentContents: |
-    struct S<'a, 'b: 'a, T> {};
-  selections:
-    - anchor: {line: 1, character: 0}
-      active: {line: 1, character: 0}
-  marks:
-    default.t:
-      start: {line: 0, character: 21}
-      end: {line: 0, character: 22}
-finalState:
-  documentContents: |
-    struct S<'a, 'b: 'a, > {};
-  selections:
-    - anchor: {line: 0, character: 21}
-      active: {line: 0, character: 21}
-fullTargets: [{type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: t}, modifiers: [{type: containingScope, scopeType: {type: argumentOrParameter}}]}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/rust/changeArgTrapAndBlueTrap.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/rust/changeArgTrapAndBlueTrap.yml
deleted file mode 100644
index 5830d4fbcf..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/rust/changeArgTrapAndBlueTrap.yml
+++ /dev/null
@@ -1,44 +0,0 @@
-languageId: rust
-command:
-  spokenForm: change arg trap and blue trap
-  version: 2
-  targets:
-    - type: list
-      elements:
-        - type: primitive
-          mark: {type: decoratedSymbol, symbolColor: default, character: t}
-          modifiers:
-            - type: containingScope
-              scopeType: {type: argumentOrParameter}
-        - type: primitive
-          mark: {type: decoratedSymbol, symbolColor: blue, character: t}
-  usePrePhraseSnapshot: true
-  action: {name: clearAndSetSelection}
-initialState:
-  documentContents: |
-    enum Maybe<T> {
-        Just(T),
-        Nothing,
-    }
-  selections:
-    - anchor: {line: 4, character: 0}
-      active: {line: 4, character: 0}
-  marks:
-    default.t:
-      start: {line: 1, character: 9}
-      end: {line: 1, character: 10}
-    blue.t:
-      start: {line: 0, character: 11}
-      end: {line: 0, character: 12}
-finalState:
-  documentContents: |
-    enum Maybe<> {
-        Just(),
-        Nothing,
-    }
-  selections:
-    - anchor: {line: 0, character: 11}
-      active: {line: 0, character: 11}
-    - anchor: {line: 1, character: 9}
-      active: {line: 1, character: 9}
-fullTargets: [{type: list, elements: [{type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: t}, modifiers: [&ref_0 {type: containingScope, scopeType: {type: argumentOrParameter}}]}, {type: primitive, mark: {type: decoratedSymbol, symbolColor: blue, character: t}, modifiers: [*ref_0]}]}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/rust/changeCallSun.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/rust/changeCallSun.yml
deleted file mode 100644
index 2496ca5935..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/rust/changeCallSun.yml
+++ /dev/null
@@ -1,30 +0,0 @@
-languageId: rust
-command:
-  spokenForm: change call sun
-  version: 2
-  targets:
-    - type: primitive
-      mark: {type: decoratedSymbol, symbolColor: default, character: s}
-      modifiers:
-        - type: containingScope
-          scopeType: {type: functionCall}
-  usePrePhraseSnapshot: true
-  action: {name: clearAndSetSelection}
-initialState:
-  documentContents: |-
-    let user = User {
-        name: ""
-    }
-  selections:
-    - anchor: {line: 2, character: 1}
-      active: {line: 2, character: 1}
-  marks:
-    default.s:
-      start: {line: 0, character: 11}
-      end: {line: 0, character: 15}
-finalState:
-  documentContents: "let user = "
-  selections:
-    - anchor: {line: 0, character: 11}
-      active: {line: 0, character: 11}
-fullTargets: [{type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: s}, modifiers: [{type: containingScope, scopeType: {type: functionCall}}]}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/rust/changeClass.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/rust/changeClass.yml
deleted file mode 100644
index ca3c89f2be..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/rust/changeClass.yml
+++ /dev/null
@@ -1,23 +0,0 @@
-languageId: rust
-command:
-  version: 1
-  spokenForm: change class
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: class, includeSiblings: false}
-initialState:
-  documentContents: |-
-    struct Point<T> {
-        a: T
-    }
-  selections:
-    - anchor: {line: 0, character: 1}
-      active: {line: 0, character: 1}
-  marks: {}
-finalState:
-  documentContents: ""
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: containingScope, scopeType: class, includeSiblings: false}, isImplicit: false}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/rust/changeClassName.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/rust/changeClassName.yml
deleted file mode 100644
index 5ab715764a..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/rust/changeClassName.yml
+++ /dev/null
@@ -1,23 +0,0 @@
-languageId: rust
-command:
-  spokenForm: change class name
-  version: 2
-  targets:
-    - type: primitive
-      modifiers:
-        - type: containingScope
-          scopeType: {type: className}
-  usePrePhraseSnapshot: true
-  action: {name: clearAndSetSelection}
-initialState:
-  documentContents: struct Some {}
-  selections:
-    - anchor: {line: 0, character: 13}
-      active: {line: 0, character: 13}
-  marks: {}
-finalState:
-  documentContents: struct  {}
-  selections:
-    - anchor: {line: 0, character: 7}
-      active: {line: 0, character: 7}
-fullTargets: [{type: primitive, mark: {type: cursor}, modifiers: [{type: containingScope, scopeType: {type: className}}]}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/rust/changeFunkName.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/rust/changeFunkName.yml
deleted file mode 100644
index 2dbf658b05..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/rust/changeFunkName.yml
+++ /dev/null
@@ -1,23 +0,0 @@
-languageId: rust
-command:
-  spokenForm: change funk name
-  version: 2
-  targets:
-    - type: primitive
-      modifiers:
-        - type: containingScope
-          scopeType: {type: functionName}
-  usePrePhraseSnapshot: true
-  action: {name: clearAndSetSelection}
-initialState:
-  documentContents: fn main() {}
-  selections:
-    - anchor: {line: 0, character: 11}
-      active: {line: 0, character: 11}
-  marks: {}
-finalState:
-  documentContents: fn () {}
-  selections:
-    - anchor: {line: 0, character: 3}
-      active: {line: 0, character: 3}
-fullTargets: [{type: primitive, mark: {type: cursor}, modifiers: [{type: containingScope, scopeType: {type: functionName}}]}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/rust/changeItemAir2.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/rust/changeItemAir2.yml
deleted file mode 100644
index c805db2c7c..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/rust/changeItemAir2.yml
+++ /dev/null
@@ -1,29 +0,0 @@
-languageId: rust
-command:
-  spokenForm: change item air
-  version: 3
-  targets:
-    - type: primitive
-      modifiers:
-        - type: containingScope
-          scopeType: {type: collectionItem}
-      mark: {type: decoratedSymbol, symbolColor: default, character: a}
-  usePrePhraseSnapshot: true
-  action: {name: clearAndSetSelection}
-initialState:
-  documentContents: |
-    type T = (&'static str, &'static str);
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-  marks:
-    default.a:
-      start: {line: 0, character: 12}
-      end: {line: 0, character: 18}
-finalState:
-  documentContents: |
-    type T = (, &'static str);
-  selections:
-    - anchor: {line: 0, character: 10}
-      active: {line: 0, character: 10}
-fullTargets: [{type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: a}, modifiers: [{type: containingScope, scopeType: {type: collectionItem}}]}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/rust/changeItemNear.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/rust/changeItemNear.yml
deleted file mode 100644
index 56363b494d..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/rust/changeItemNear.yml
+++ /dev/null
@@ -1,29 +0,0 @@
-languageId: rust
-command:
-  spokenForm: change item near
-  version: 2
-  targets:
-    - type: primitive
-      mark: {type: decoratedSymbol, symbolColor: default, character: 'n'}
-      modifiers:
-        - type: containingScope
-          scopeType: {type: collectionItem}
-  usePrePhraseSnapshot: true
-  action: {name: clearAndSetSelection}
-initialState:
-  documentContents: |
-    let x = [None, Some(1)];
-  selections:
-    - anchor: {line: 0, character: 24}
-      active: {line: 0, character: 24}
-  marks:
-    default.n:
-      start: {line: 0, character: 9}
-      end: {line: 0, character: 13}
-finalState:
-  documentContents: |
-    let x = [, Some(1)];
-  selections:
-    - anchor: {line: 0, character: 9}
-      active: {line: 0, character: 9}
-fullTargets: [{type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: 'n'}, modifiers: [{type: containingScope, scopeType: {type: collectionItem}}]}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/rust/changeItemOne.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/rust/changeItemOne.yml
deleted file mode 100644
index 4aab11ebb2..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/rust/changeItemOne.yml
+++ /dev/null
@@ -1,29 +0,0 @@
-languageId: rust
-command:
-  spokenForm: change item one
-  version: 2
-  targets:
-    - type: primitive
-      mark: {type: decoratedSymbol, symbolColor: default, character: '1'}
-      modifiers:
-        - type: containingScope
-          scopeType: {type: collectionItem}
-  usePrePhraseSnapshot: true
-  action: {name: clearAndSetSelection}
-initialState:
-  documentContents: |
-    let x = [None, Some(1)];
-  selections:
-    - anchor: {line: 0, character: 24}
-      active: {line: 0, character: 24}
-  marks:
-    default.1:
-      start: {line: 0, character: 20}
-      end: {line: 0, character: 21}
-finalState:
-  documentContents: |
-    let x = [None, ];
-  selections:
-    - anchor: {line: 0, character: 15}
-      active: {line: 0, character: 15}
-fullTargets: [{type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: '1'}, modifiers: [{type: containingScope, scopeType: {type: collectionItem}}]}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/rust/changeKeyDrum.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/rust/changeKeyDrum.yml
deleted file mode 100644
index 873e42b7e9..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/rust/changeKeyDrum.yml
+++ /dev/null
@@ -1,31 +0,0 @@
-languageId: rust
-command:
-  spokenForm: change key drum
-  version: 2
-  targets:
-    - type: primitive
-      mark: {type: decoratedSymbol, symbolColor: default, character: d}
-      modifiers:
-        - type: containingScope
-          scopeType: {type: collectionKey}
-  usePrePhraseSnapshot: true
-  action: {name: clearAndSetSelection}
-initialState:
-  documentContents: |
-    if let User { first_name: "John", last_name: "Doe" } = user {
-    }
-  selections:
-    - anchor: {line: 2, character: 0}
-      active: {line: 2, character: 0}
-  marks:
-    default.d:
-      start: {line: 0, character: 46}
-      end: {line: 0, character: 49}
-finalState:
-  documentContents: |
-    if let User { first_name: "John", : "Doe" } = user {
-    }
-  selections:
-    - anchor: {line: 0, character: 34}
-      active: {line: 0, character: 34}
-fullTargets: [{type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: d}, modifiers: [{type: containingScope, scopeType: {type: collectionKey}}]}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/rust/changeKeyJury.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/rust/changeKeyJury.yml
deleted file mode 100644
index cb11bfd058..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/rust/changeKeyJury.yml
+++ /dev/null
@@ -1,31 +0,0 @@
-languageId: rust
-command:
-  spokenForm: change key jury
-  version: 2
-  targets:
-    - type: primitive
-      mark: {type: decoratedSymbol, symbolColor: default, character: j}
-      modifiers:
-        - type: containingScope
-          scopeType: {type: collectionKey}
-  usePrePhraseSnapshot: true
-  action: {name: clearAndSetSelection}
-initialState:
-  documentContents: |
-    if let User { first_name: "John", last_name: "Doe" } = user {
-    }
-  selections:
-    - anchor: {line: 2, character: 0}
-      active: {line: 2, character: 0}
-  marks:
-    default.j:
-      start: {line: 0, character: 27}
-      end: {line: 0, character: 31}
-finalState:
-  documentContents: |
-    if let User { : "John", last_name: "Doe" } = user {
-    }
-  selections:
-    - anchor: {line: 0, character: 14}
-      active: {line: 0, character: 14}
-fullTargets: [{type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: j}, modifiers: [{type: containingScope, scopeType: {type: collectionKey}}]}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/rust/changeLambda.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/rust/changeLambda.yml
deleted file mode 100644
index b506eda143..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/rust/changeLambda.yml
+++ /dev/null
@@ -1,25 +0,0 @@
-languageId: rust
-command:
-  version: 1
-  spokenForm: change lambda
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: anonymousFunction, includeSiblings: false}
-initialState:
-  documentContents: |-
-    let expensive_closure = |num| {
-        println!("calculating slowly...");
-        thread::sleep(Duration::from_secs(2));
-        num
-    };
-  selections:
-    - anchor: {line: 2, character: 7}
-      active: {line: 2, character: 7}
-  marks: {}
-finalState:
-  documentContents: let expensive_closure = ;
-  selections:
-    - anchor: {line: 0, character: 24}
-      active: {line: 0, character: 24}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: containingScope, scopeType: anonymousFunction, includeSiblings: false}, isImplicit: false}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/rust/changeName.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/rust/changeName.yml
deleted file mode 100644
index fd0d318ada..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/rust/changeName.yml
+++ /dev/null
@@ -1,29 +0,0 @@
-languageId: rust
-command:
-  spokenForm: change name
-  version: 2
-  targets:
-    - type: primitive
-      modifiers:
-        - type: containingScope
-          scopeType: {type: name}
-  usePrePhraseSnapshot: true
-  action: {name: clearAndSetSelection}
-initialState:
-  documentContents: |
-    fn main() -> Result<(), Error> {
-        
-    }
-  selections:
-    - anchor: {line: 1, character: 4}
-      active: {line: 1, character: 4}
-  marks: {}
-finalState:
-  documentContents: |
-    fn () -> Result<(), Error> {
-        
-    }
-  selections:
-    - anchor: {line: 0, character: 3}
-      active: {line: 0, character: 3}
-fullTargets: [{type: primitive, mark: {type: cursor}, modifiers: [{type: containingScope, scopeType: {type: name}}]}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/rust/changeName2.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/rust/changeName2.yml
deleted file mode 100644
index cf4b153da7..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/rust/changeName2.yml
+++ /dev/null
@@ -1,37 +0,0 @@
-languageId: rust
-command:
-  spokenForm: change name
-  version: 2
-  targets:
-    - type: primitive
-      modifiers:
-        - type: containingScope
-          scopeType: {type: name}
-  usePrePhraseSnapshot: true
-  action: {name: clearAndSetSelection}
-initialState:
-  documentContents: |
-    struct S {
-        v: u32,
-    }
-
-    fn main() {
-        let S { v } = S { v: 32 };
-    }
-  selections:
-    - anchor: {line: 5, character: 18}
-      active: {line: 5, character: 18}
-  marks: {}
-finalState:
-  documentContents: |
-    struct S {
-        v: u32,
-    }
-
-    fn main() {
-        let  = S { v: 32 };
-    }
-  selections:
-    - anchor: {line: 5, character: 8}
-      active: {line: 5, character: 8}
-fullTargets: [{type: primitive, mark: {type: cursor}, modifiers: [{type: containingScope, scopeType: {type: name}}]}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/rust/changeNameDrum.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/rust/changeNameDrum.yml
deleted file mode 100644
index a1a52cc61d..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/rust/changeNameDrum.yml
+++ /dev/null
@@ -1,35 +0,0 @@
-languageId: rust
-command:
-  spokenForm: change name drum
-  version: 2
-  targets:
-    - type: primitive
-      mark: {type: decoratedSymbol, symbolColor: default, character: d}
-      modifiers:
-        - type: containingScope
-          scopeType: {type: name}
-  usePrePhraseSnapshot: true
-  action: {name: clearAndSetSelection}
-initialState:
-  documentContents: |
-    fn some_function<T, U>(t: &T, u: &U) -> i32
-        where T: Display + Clone,
-              U: Clone + Debug
-    {}
-  selections:
-    - anchor: {line: 4, character: 0}
-      active: {line: 4, character: 0}
-  marks:
-    default.d:
-      start: {line: 1, character: 13}
-      end: {line: 1, character: 20}
-finalState:
-  documentContents: |
-    fn some_function<T, U>(t: &T, u: &U) -> i32
-        where : Display + Clone,
-              U: Clone + Debug
-    {}
-  selections:
-    - anchor: {line: 1, character: 10}
-      active: {line: 1, character: 10}
-fullTargets: [{type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: d}, modifiers: [{type: containingScope, scopeType: {type: name}}]}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/rust/changeNameDrum2.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/rust/changeNameDrum2.yml
deleted file mode 100644
index b845de40a4..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/rust/changeNameDrum2.yml
+++ /dev/null
@@ -1,35 +0,0 @@
-languageId: rust
-command:
-  spokenForm: change name drum
-  version: 2
-  targets:
-    - type: primitive
-      mark: {type: decoratedSymbol, symbolColor: default, character: d}
-      modifiers:
-        - type: containingScope
-          scopeType: {type: name}
-  usePrePhraseSnapshot: true
-  action: {name: clearAndSetSelection}
-initialState:
-  documentContents: |
-    let user = User {
-        first_name: "John",
-        last_name: "Doe",
-    };
-  selections:
-    - anchor: {line: 3, character: 2}
-      active: {line: 3, character: 2}
-  marks:
-    default.d:
-      start: {line: 2, character: 16}
-      end: {line: 2, character: 19}
-finalState:
-  documentContents: |
-    let user = User {
-        first_name: "John",
-        : "Doe",
-    };
-  selections:
-    - anchor: {line: 2, character: 4}
-      active: {line: 2, character: 4}
-fullTargets: [{type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: d}, modifiers: [{type: containingScope, scopeType: {type: name}}]}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/rust/changeNameDrum3.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/rust/changeNameDrum3.yml
deleted file mode 100644
index 1fe54fc98f..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/rust/changeNameDrum3.yml
+++ /dev/null
@@ -1,33 +0,0 @@
-languageId: rust
-command:
-  spokenForm: change name drum
-  version: 2
-  targets:
-    - type: primitive
-      mark: {type: decoratedSymbol, symbolColor: default, character: d}
-      modifiers:
-        - type: containingScope
-          scopeType: {type: name}
-  usePrePhraseSnapshot: true
-  action: {name: clearAndSetSelection}
-initialState:
-  documentContents: |
-    match user {
-        User { first_name: "John", last_name: "Doe" } => {},
-    }
-  selections:
-    - anchor: {line: 3, character: 0}
-      active: {line: 3, character: 0}
-  marks:
-    default.d:
-      start: {line: 1, character: 43}
-      end: {line: 1, character: 46}
-finalState:
-  documentContents: |
-    match user {
-        User { first_name: "John", : "Doe" } => {},
-    }
-  selections:
-    - anchor: {line: 1, character: 31}
-      active: {line: 1, character: 31}
-fullTargets: [{type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: d}, modifiers: [{type: containingScope, scopeType: {type: name}}]}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/rust/changeNameEach.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/rust/changeNameEach.yml
deleted file mode 100644
index 74800d79f4..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/rust/changeNameEach.yml
+++ /dev/null
@@ -1,35 +0,0 @@
-languageId: rust
-command:
-  spokenForm: change name each
-  version: 2
-  targets:
-    - type: primitive
-      mark: {type: decoratedSymbol, symbolColor: default, character: e}
-      modifiers:
-        - type: containingScope
-          scopeType: {type: name}
-  usePrePhraseSnapshot: true
-  action: {name: clearAndSetSelection}
-initialState:
-  documentContents: |
-    enum IpAddr {
-        V4(u8, u8, u8, u8),
-        V6(String),
-    }
-  selections:
-    - anchor: {line: 4, character: 0}
-      active: {line: 4, character: 0}
-  marks:
-    default.e:
-      start: {line: 0, character: 0}
-      end: {line: 0, character: 4}
-finalState:
-  documentContents: |
-    enum  {
-        V4(u8, u8, u8, u8),
-        V6(String),
-    }
-  selections:
-    - anchor: {line: 0, character: 5}
-      active: {line: 0, character: 5}
-fullTargets: [{type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: e}, modifiers: [{type: containingScope, scopeType: {type: name}}]}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/rust/changeNameFine.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/rust/changeNameFine.yml
deleted file mode 100644
index f969a66551..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/rust/changeNameFine.yml
+++ /dev/null
@@ -1,27 +0,0 @@
-languageId: rust
-command:
-  spokenForm: change name fine
-  version: 2
-  targets:
-    - type: primitive
-      mark: {type: decoratedSymbol, symbolColor: default, character: f}
-      modifiers:
-        - type: containingScope
-          scopeType: {type: name}
-  usePrePhraseSnapshot: true
-  action: {name: clearAndSetSelection}
-initialState:
-  documentContents: fn main() {}
-  selections:
-    - anchor: {line: 0, character: 11}
-      active: {line: 0, character: 11}
-  marks:
-    default.f:
-      start: {line: 0, character: 0}
-      end: {line: 0, character: 2}
-finalState:
-  documentContents: fn () {}
-  selections:
-    - anchor: {line: 0, character: 3}
-      active: {line: 0, character: 3}
-fullTargets: [{type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: f}, modifiers: [{type: containingScope, scopeType: {type: name}}]}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/rust/changeNameFine2.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/rust/changeNameFine2.yml
deleted file mode 100644
index dcfaa3b463..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/rust/changeNameFine2.yml
+++ /dev/null
@@ -1,31 +0,0 @@
-languageId: rust
-command:
-  spokenForm: change name fine
-  version: 2
-  targets:
-    - type: primitive
-      mark: {type: decoratedSymbol, symbolColor: default, character: f}
-      modifiers:
-        - type: containingScope
-          scopeType: {type: name}
-  usePrePhraseSnapshot: true
-  action: {name: clearAndSetSelection}
-initialState:
-  documentContents: |
-    #[cfg_attr(feature = "serde")]
-    struct Test
-  selections:
-    - anchor: {line: 2, character: 0}
-      active: {line: 2, character: 0}
-  marks:
-    default.f:
-      start: {line: 0, character: 11}
-      end: {line: 0, character: 18}
-finalState:
-  documentContents: |
-    #[cfg_attr( = "serde")]
-    struct Test
-  selections:
-    - anchor: {line: 0, character: 11}
-      active: {line: 0, character: 11}
-fullTargets: [{type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: f}, modifiers: [{type: containingScope, scopeType: {type: name}}]}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/rust/changeNameJury.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/rust/changeNameJury.yml
deleted file mode 100644
index 4396794e34..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/rust/changeNameJury.yml
+++ /dev/null
@@ -1,33 +0,0 @@
-languageId: rust
-command:
-  spokenForm: change name jury
-  version: 2
-  targets:
-    - type: primitive
-      mark: {type: decoratedSymbol, symbolColor: default, character: j}
-      modifiers:
-        - type: containingScope
-          scopeType: {type: name}
-  usePrePhraseSnapshot: true
-  action: {name: clearAndSetSelection}
-initialState:
-  documentContents: |
-    match user {
-        User { first_name: "John", last_name: "Doe" } => {},
-    }
-  selections:
-    - anchor: {line: 3, character: 0}
-      active: {line: 3, character: 0}
-  marks:
-    default.j:
-      start: {line: 1, character: 24}
-      end: {line: 1, character: 28}
-finalState:
-  documentContents: |
-    match user {
-        User { : "John", last_name: "Doe" } => {},
-    }
-  selections:
-    - anchor: {line: 1, character: 11}
-      active: {line: 1, character: 11}
-fullTargets: [{type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: j}, modifiers: [{type: containingScope, scopeType: {type: name}}]}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/rust/changeNameLook.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/rust/changeNameLook.yml
deleted file mode 100644
index caf5fb68c5..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/rust/changeNameLook.yml
+++ /dev/null
@@ -1,33 +0,0 @@
-languageId: rust
-command:
-  spokenForm: change name look
-  version: 2
-  targets:
-    - type: primitive
-      mark: {type: decoratedSymbol, symbolColor: default, character: l}
-      modifiers:
-        - type: containingScope
-          scopeType: {type: name}
-  usePrePhraseSnapshot: true
-  action: {name: clearAndSetSelection}
-initialState:
-  documentContents: |
-    match user {
-        User { first_name: "John", last_name: "Doe" } => {},
-    }
-  selections:
-    - anchor: {line: 3, character: 0}
-      active: {line: 3, character: 0}
-  marks:
-    default.l:
-      start: {line: 1, character: 31}
-      end: {line: 1, character: 40}
-finalState:
-  documentContents: |
-    match user {
-        User { first_name: "John", : "Doe" } => {},
-    }
-  selections:
-    - anchor: {line: 1, character: 31}
-      active: {line: 1, character: 31}
-fullTargets: [{type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: l}, modifiers: [{type: containingScope, scopeType: {type: name}}]}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/rust/changeNameNear.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/rust/changeNameNear.yml
deleted file mode 100644
index 3d2686785e..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/rust/changeNameNear.yml
+++ /dev/null
@@ -1,35 +0,0 @@
-languageId: rust
-command:
-  spokenForm: change name near
-  version: 2
-  targets:
-    - type: primitive
-      mark: {type: decoratedSymbol, symbolColor: default, character: 'n'}
-      modifiers:
-        - type: containingScope
-          scopeType: {type: name}
-  usePrePhraseSnapshot: true
-  action: {name: clearAndSetSelection}
-initialState:
-  documentContents: |
-    enum Maybe<T> {
-        Just(T),
-        Nothing,
-    }
-  selections:
-    - anchor: {line: 4, character: 0}
-      active: {line: 4, character: 0}
-  marks:
-    default.n:
-      start: {line: 0, character: 0}
-      end: {line: 0, character: 4}
-finalState:
-  documentContents: |
-    enum <T> {
-        Just(T),
-        Nothing,
-    }
-  selections:
-    - anchor: {line: 0, character: 5}
-      active: {line: 0, character: 5}
-fullTargets: [{type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: 'n'}, modifiers: [{type: containingScope, scopeType: {type: name}}]}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/rust/changeNameOdd.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/rust/changeNameOdd.yml
deleted file mode 100644
index d1de18c859..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/rust/changeNameOdd.yml
+++ /dev/null
@@ -1,29 +0,0 @@
-languageId: rust
-command:
-  spokenForm: change name odd
-  version: 2
-  targets:
-    - type: primitive
-      mark: {type: decoratedSymbol, symbolColor: default, character: o}
-      modifiers:
-        - type: containingScope
-          scopeType: {type: name}
-  usePrePhraseSnapshot: true
-  action: {name: clearAndSetSelection}
-initialState:
-  documentContents: |
-    const SOME: usize = 0;
-  selections:
-    - anchor: {line: 1, character: 0}
-      active: {line: 1, character: 0}
-  marks:
-    default.o:
-      start: {line: 0, character: 6}
-      end: {line: 0, character: 10}
-finalState:
-  documentContents: |
-    const : usize = 0;
-  selections:
-    - anchor: {line: 0, character: 6}
-      active: {line: 0, character: 6}
-fullTargets: [{type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: o}, modifiers: [{type: containingScope, scopeType: {type: name}}]}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/rust/changeNameOdd2.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/rust/changeNameOdd2.yml
deleted file mode 100644
index fe9fbfefda..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/rust/changeNameOdd2.yml
+++ /dev/null
@@ -1,27 +0,0 @@
-languageId: rust
-command:
-  spokenForm: change name odd
-  version: 2
-  targets:
-    - type: primitive
-      mark: {type: decoratedSymbol, symbolColor: default, character: o}
-      modifiers:
-        - type: containingScope
-          scopeType: {type: name}
-  usePrePhraseSnapshot: true
-  action: {name: clearAndSetSelection}
-initialState:
-  documentContents: struct Some {}
-  selections:
-    - anchor: {line: 0, character: 13}
-      active: {line: 0, character: 13}
-  marks:
-    default.o:
-      start: {line: 0, character: 7}
-      end: {line: 0, character: 11}
-finalState:
-  documentContents: struct  {}
-  selections:
-    - anchor: {line: 0, character: 7}
-      active: {line: 0, character: 7}
-fullTargets: [{type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: o}, modifiers: [{type: containingScope, scopeType: {type: name}}]}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/rust/changeNameOdd3.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/rust/changeNameOdd3.yml
deleted file mode 100644
index 321b070484..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/rust/changeNameOdd3.yml
+++ /dev/null
@@ -1,35 +0,0 @@
-languageId: rust
-command:
-  spokenForm: change name odd
-  version: 2
-  targets:
-    - type: primitive
-      mark: {type: decoratedSymbol, symbolColor: default, character: o}
-      modifiers:
-        - type: containingScope
-          scopeType: {type: name}
-  usePrePhraseSnapshot: true
-  action: {name: clearAndSetSelection}
-initialState:
-  documentContents: |
-    enum Maybe<T> {
-        Just(T),
-        Nothing,
-    }
-  selections:
-    - anchor: {line: 4, character: 0}
-      active: {line: 4, character: 0}
-  marks:
-    default.o:
-      start: {line: 2, character: 4}
-      end: {line: 2, character: 11}
-finalState:
-  documentContents: |
-    enum Maybe<T> {
-        Just(T),
-        ,
-    }
-  selections:
-    - anchor: {line: 2, character: 4}
-      active: {line: 2, character: 4}
-fullTargets: [{type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: o}, modifiers: [{type: containingScope, scopeType: {type: name}}]}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/rust/changeNameSun.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/rust/changeNameSun.yml
deleted file mode 100644
index b1851ee925..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/rust/changeNameSun.yml
+++ /dev/null
@@ -1,27 +0,0 @@
-languageId: rust
-command:
-  spokenForm: change name sun
-  version: 2
-  targets:
-    - type: primitive
-      mark: {type: decoratedSymbol, symbolColor: default, character: s}
-      modifiers:
-        - type: containingScope
-          scopeType: {type: name}
-  usePrePhraseSnapshot: true
-  action: {name: clearAndSetSelection}
-initialState:
-  documentContents: enum Some {}
-  selections:
-    - anchor: {line: 0, character: 12}
-      active: {line: 0, character: 12}
-  marks:
-    default.s:
-      start: {line: 0, character: 5}
-      end: {line: 0, character: 9}
-finalState:
-  documentContents: enum  {}
-  selections:
-    - anchor: {line: 0, character: 5}
-      active: {line: 0, character: 5}
-fullTargets: [{type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: s}, modifiers: [{type: containingScope, scopeType: {type: name}}]}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/rust/changeNameSun2.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/rust/changeNameSun2.yml
deleted file mode 100644
index 8a143c188b..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/rust/changeNameSun2.yml
+++ /dev/null
@@ -1,33 +0,0 @@
-languageId: rust
-command:
-  spokenForm: change name sun
-  version: 2
-  targets:
-    - type: primitive
-      mark: {type: decoratedSymbol, symbolColor: default, character: s}
-      modifiers:
-        - type: containingScope
-          scopeType: {type: name}
-  usePrePhraseSnapshot: true
-  action: {name: clearAndSetSelection}
-initialState:
-  documentContents: >
-    fn some_function<T: Display + Clone, U: Clone + Debug>(t: &T, u: &U) -> i32
-    {
-
-    }
-  selections:
-    - anchor: {line: 2, character: 0}
-      active: {line: 2, character: 0}
-  marks:
-    default.s:
-      start: {line: 0, character: 20}
-      end: {line: 0, character: 27}
-finalState:
-  documentContents: |
-    fn some_function<: Display + Clone, U: Clone + Debug>(t: &T, u: &U) -> i32 {
-    }
-  selections:
-    - anchor: {line: 0, character: 17}
-      active: {line: 0, character: 17}
-fullTargets: [{type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: s}, modifiers: [{type: containingScope, scopeType: {type: name}}]}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/rust/changeNameTrap.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/rust/changeNameTrap.yml
deleted file mode 100644
index 337b41a2e8..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/rust/changeNameTrap.yml
+++ /dev/null
@@ -1,35 +0,0 @@
-languageId: rust
-command:
-  spokenForm: change name trap
-  version: 2
-  targets:
-    - type: primitive
-      mark: {type: decoratedSymbol, symbolColor: default, character: t}
-      modifiers:
-        - type: containingScope
-          scopeType: {type: name}
-  usePrePhraseSnapshot: true
-  action: {name: clearAndSetSelection}
-initialState:
-  documentContents: |
-    enum Maybe<T> {
-        Just(T),
-        Nothing,
-    }
-  selections:
-    - anchor: {line: 4, character: 0}
-      active: {line: 4, character: 0}
-  marks:
-    default.t:
-      start: {line: 1, character: 9}
-      end: {line: 1, character: 10}
-finalState:
-  documentContents: |
-    enum Maybe<T> {
-        (T),
-        Nothing,
-    }
-  selections:
-    - anchor: {line: 1, character: 4}
-      active: {line: 1, character: 4}
-fullTargets: [{type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: t}, modifiers: [{type: containingScope, scopeType: {type: name}}]}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/rust/changeRound.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/rust/changeRound.yml
deleted file mode 100644
index 29e786f658..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/rust/changeRound.yml
+++ /dev/null
@@ -1,25 +0,0 @@
-languageId: rust
-command:
-  spokenForm: change round
-  version: 2
-  targets:
-    - type: primitive
-      modifiers:
-        - type: containingScope
-          scopeType: {type: surroundingPair, delimiter: parentheses}
-  usePrePhraseSnapshot: true
-  action: {name: clearAndSetSelection}
-initialState:
-  documentContents: |
-    "hello (there)";
-  selections:
-    - anchor: {line: 0, character: 8}
-      active: {line: 0, character: 8}
-  marks: {}
-finalState:
-  documentContents: |
-    "hello ";
-  selections:
-    - anchor: {line: 0, character: 7}
-      active: {line: 0, character: 7}
-fullTargets: [{type: primitive, mark: {type: cursor}, modifiers: [{type: containingScope, scopeType: {type: surroundingPair, delimiter: parentheses}}]}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/rust/changeState.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/rust/changeState.yml
deleted file mode 100644
index 76692ef40f..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/rust/changeState.yml
+++ /dev/null
@@ -1,25 +0,0 @@
-languageId: rust
-command:
-  version: 1
-  spokenForm: change state
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: statement, includeSiblings: false}
-initialState:
-  documentContents: |-
-    let expensive_closure = |num| {
-        println!("calculating slowly...");
-        thread::sleep(Duration::from_secs(2));
-        num
-    };
-  selections:
-    - anchor: {line: 0, character: 2}
-      active: {line: 0, character: 2}
-  marks: {}
-finalState:
-  documentContents: ""
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: containingScope, scopeType: statement, includeSiblings: false}, isImplicit: false}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/rust/changeState2.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/rust/changeState2.yml
deleted file mode 100644
index 3251b5ebbd..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/rust/changeState2.yml
+++ /dev/null
@@ -1,33 +0,0 @@
-languageId: rust
-command:
-  spokenForm: change state
-  version: 2
-  targets:
-    - type: primitive
-      modifiers:
-        - type: containingScope
-          scopeType: {type: statement}
-  usePrePhraseSnapshot: true
-  action: {name: clearAndSetSelection}
-initialState:
-  documentContents: |
-    let expensive_closure = |num| {
-        println!("calculating slowly...");
-        thread::sleep(Duration::from_secs(2));
-        num
-    };
-  selections:
-    - anchor: {line: 1, character: 15}
-      active: {line: 1, character: 15}
-  marks: {}
-finalState:
-  documentContents: |
-    let expensive_closure = |num| {
-        
-        thread::sleep(Duration::from_secs(2));
-        num
-    };
-  selections:
-    - anchor: {line: 1, character: 4}
-      active: {line: 1, character: 4}
-fullTargets: [{type: primitive, mark: {type: cursor}, modifiers: [{type: containingScope, scopeType: {type: statement}}]}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/rust/changeState3.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/rust/changeState3.yml
deleted file mode 100644
index 4fe0fd4afd..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/rust/changeState3.yml
+++ /dev/null
@@ -1,25 +0,0 @@
-languageId: rust
-command:
-  spokenForm: change state
-  version: 2
-  targets:
-    - type: primitive
-      modifiers:
-        - type: containingScope
-          scopeType: {type: statement}
-  usePrePhraseSnapshot: true
-  action: {name: clearAndSetSelection}
-initialState:
-  documentContents: |
-    let x = vec![1, 2, 3];
-  selections:
-    - anchor: {line: 0, character: 10}
-      active: {line: 0, character: 10}
-  marks: {}
-finalState:
-  documentContents: |+
-
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-fullTargets: [{type: primitive, mark: {type: cursor}, modifiers: [{type: containingScope, scopeType: {type: statement}}]}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/rust/changeSubject.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/rust/changeSubject.yml
deleted file mode 100644
index 0515ce2dc6..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/rust/changeSubject.yml
+++ /dev/null
@@ -1,31 +0,0 @@
-languageId: rust
-command:
-  spokenForm: change subject
-  version: 2
-  targets:
-    - type: primitive
-      modifiers:
-        - type: containingScope
-          scopeType: {type: switchStatementSubject}
-  usePrePhraseSnapshot: true
-  action: {name: clearAndSetSelection}
-initialState:
-  documentContents: |
-    match user {
-        User { first_name: "John" } => {},
-        User { first_name } if first_name.starts_with("P") => {}
-    }
-  selections:
-    - anchor: {line: 2, character: 27}
-      active: {line: 2, character: 54}
-  marks: {}
-finalState:
-  documentContents: |
-    match  {
-        User { first_name: "John" } => {},
-        User { first_name } if first_name.starts_with("P") => {}
-    }
-  selections:
-    - anchor: {line: 0, character: 6}
-      active: {line: 0, character: 6}
-fullTargets: [{type: primitive, mark: {type: cursor}, modifiers: [{type: containingScope, scopeType: {type: switchStatementSubject}}]}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/rust/changeTypeAir.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/rust/changeTypeAir.yml
deleted file mode 100644
index 68b52675b9..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/rust/changeTypeAir.yml
+++ /dev/null
@@ -1,31 +0,0 @@
-languageId: rust
-command:
-  spokenForm: change type air
-  version: 2
-  targets:
-    - type: primitive
-      mark: {type: decoratedSymbol, symbolColor: default, character: a}
-      modifiers:
-        - type: containingScope
-          scopeType: {type: type}
-  usePrePhraseSnapshot: true
-  action: {name: clearAndSetSelection}
-initialState:
-  documentContents: |
-    impl Trait for Result<Option<u32>, Box<dyn std::error::Error>> {
-        
-    }
-  selections:
-    - anchor: {line: 2, character: 1}
-      active: {line: 2, character: 1}
-  marks:
-    default.a:
-      start: {line: 0, character: 5}
-      end: {line: 0, character: 10}
-finalState:
-  documentContents: |+
-
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-fullTargets: [{type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: a}, modifiers: [{type: containingScope, scopeType: {type: type}}]}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/rust/changeTypeEach.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/rust/changeTypeEach.yml
deleted file mode 100644
index a839f291e2..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/rust/changeTypeEach.yml
+++ /dev/null
@@ -1,29 +0,0 @@
-languageId: rust
-command:
-  spokenForm: change type each
-  version: 2
-  targets:
-    - type: primitive
-      mark: {type: decoratedSymbol, symbolColor: default, character: e}
-      modifiers:
-        - type: containingScope
-          scopeType: {type: type}
-  usePrePhraseSnapshot: true
-  action: {name: clearAndSetSelection}
-initialState:
-  documentContents: |
-    struct User {}
-  selections:
-    - anchor: {line: 0, character: 14}
-      active: {line: 0, character: 14}
-  marks:
-    default.e:
-      start: {line: 0, character: 7}
-      end: {line: 0, character: 11}
-finalState:
-  documentContents: |+
-
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-fullTargets: [{type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: e}, modifiers: [{type: containingScope, scopeType: {type: type}}]}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/rust/changeTypeLook.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/rust/changeTypeLook.yml
deleted file mode 100644
index fb71e1aee8..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/rust/changeTypeLook.yml
+++ /dev/null
@@ -1,33 +0,0 @@
-languageId: rust
-command:
-  spokenForm: change type look
-  version: 2
-  targets:
-    - type: primitive
-      mark: {type: decoratedSymbol, symbolColor: default, character: l}
-      modifiers:
-        - type: containingScope
-          scopeType: {type: type}
-  usePrePhraseSnapshot: true
-  action: {name: clearAndSetSelection}
-initialState:
-  documentContents: |
-    impl Trait for Result<Option<u32>, Box<dyn std::error::Error>> {
-        
-    }
-  selections:
-    - anchor: {line: 2, character: 1}
-      active: {line: 2, character: 1}
-  marks:
-    default.l:
-      start: {line: 0, character: 15}
-      end: {line: 0, character: 21}
-finalState:
-  documentContents: |
-    impl Trait for  {
-        
-    }
-  selections:
-    - anchor: {line: 0, character: 15}
-      active: {line: 0, character: 15}
-fullTargets: [{type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: l}, modifiers: [{type: containingScope, scopeType: {type: type}}]}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/rust/changeTypeOdd.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/rust/changeTypeOdd.yml
deleted file mode 100644
index 41c002bfc9..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/rust/changeTypeOdd.yml
+++ /dev/null
@@ -1,33 +0,0 @@
-languageId: rust
-command:
-  spokenForm: change type odd
-  version: 2
-  targets:
-    - type: primitive
-      mark: {type: decoratedSymbol, symbolColor: default, character: o}
-      modifiers:
-        - type: containingScope
-          scopeType: {type: type}
-  usePrePhraseSnapshot: true
-  action: {name: clearAndSetSelection}
-initialState:
-  documentContents: |
-    struct S {
-        n: Option<u64>,
-    }
-  selections:
-    - anchor: {line: 3, character: 0}
-      active: {line: 3, character: 0}
-  marks:
-    default.o:
-      start: {line: 1, character: 7}
-      end: {line: 1, character: 13}
-finalState:
-  documentContents: |
-    struct S {
-        n: ,
-    }
-  selections:
-    - anchor: {line: 1, character: 7}
-      active: {line: 1, character: 7}
-fullTargets: [{type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: o}, modifiers: [{type: containingScope, scopeType: {type: type}}]}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/rust/changeTypePlex.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/rust/changeTypePlex.yml
deleted file mode 100644
index 652985664d..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/rust/changeTypePlex.yml
+++ /dev/null
@@ -1,27 +0,0 @@
-languageId: rust
-command:
-  spokenForm: change type plex
-  version: 2
-  targets:
-    - type: primitive
-      mark: {type: decoratedSymbol, symbolColor: default, character: x}
-      modifiers:
-        - type: containingScope
-          scopeType: {type: type}
-  usePrePhraseSnapshot: true
-  action: {name: clearAndSetSelection}
-initialState:
-  documentContents: "let x: u32 = 1;"
-  selections:
-    - anchor: {line: 0, character: 15}
-      active: {line: 0, character: 15}
-  marks:
-    default.x:
-      start: {line: 0, character: 4}
-      end: {line: 0, character: 5}
-finalState:
-  documentContents: "let x:  = 1;"
-  selections:
-    - anchor: {line: 0, character: 7}
-      active: {line: 0, character: 7}
-fullTargets: [{type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: x}, modifiers: [{type: containingScope, scopeType: {type: type}}]}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/rust/changeTypePlex2.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/rust/changeTypePlex2.yml
deleted file mode 100644
index f7fd476a5f..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/rust/changeTypePlex2.yml
+++ /dev/null
@@ -1,29 +0,0 @@
-languageId: rust
-command:
-  spokenForm: change type plex
-  version: 2
-  targets:
-    - type: primitive
-      mark: {type: decoratedSymbol, symbolColor: default, character: x}
-      modifiers:
-        - type: containingScope
-          scopeType: {type: type}
-  usePrePhraseSnapshot: true
-  action: {name: clearAndSetSelection}
-initialState:
-  documentContents: |
-    const X: [u8; 2] = [0, 0];
-  selections:
-    - anchor: {line: 1, character: 0}
-      active: {line: 1, character: 0}
-  marks:
-    default.x:
-      start: {line: 0, character: 6}
-      end: {line: 0, character: 7}
-finalState:
-  documentContents: |
-    const X:  = [0, 0];
-  selections:
-    - anchor: {line: 0, character: 9}
-      active: {line: 0, character: 9}
-fullTargets: [{type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: x}, modifiers: [{type: containingScope, scopeType: {type: type}}]}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/rust/changeTypeSun.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/rust/changeTypeSun.yml
deleted file mode 100644
index 2ba3d2aaff..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/rust/changeTypeSun.yml
+++ /dev/null
@@ -1,33 +0,0 @@
-languageId: rust
-command:
-  spokenForm: change type sun
-  version: 2
-  targets:
-    - type: primitive
-      mark: {type: decoratedSymbol, symbolColor: default, character: s}
-      modifiers:
-        - type: containingScope
-          scopeType: {type: type}
-  usePrePhraseSnapshot: true
-  action: {name: clearAndSetSelection}
-initialState:
-  documentContents: |
-    fn main() -> Result<(), Error> {
-        
-    }
-  selections:
-    - anchor: {line: 2, character: 1}
-      active: {line: 2, character: 1}
-  marks:
-    default.s:
-      start: {line: 0, character: 13}
-      end: {line: 0, character: 19}
-finalState:
-  documentContents: |
-    fn main() ->  {
-        
-    }
-  selections:
-    - anchor: {line: 0, character: 13}
-      active: {line: 0, character: 13}
-fullTargets: [{type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: s}, modifiers: [{type: containingScope, scopeType: {type: type}}]}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/rust/changeTypeSun2.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/rust/changeTypeSun2.yml
deleted file mode 100644
index f99cdb9dec..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/rust/changeTypeSun2.yml
+++ /dev/null
@@ -1,29 +0,0 @@
-languageId: rust
-command:
-  spokenForm: change type sun
-  version: 2
-  targets:
-    - type: primitive
-      mark: {type: decoratedSymbol, symbolColor: default, character: s}
-      modifiers:
-        - type: containingScope
-          scopeType: {type: type}
-  usePrePhraseSnapshot: true
-  action: {name: clearAndSetSelection}
-initialState:
-  documentContents: |
-    fn foo(x: &'a mut u32) -> &'static mut u16 {}
-  selections:
-    - anchor: {line: 0, character: 45}
-      active: {line: 0, character: 45}
-  marks:
-    default.s:
-      start: {line: 0, character: 28}
-      end: {line: 0, character: 34}
-finalState:
-  documentContents: |
-    fn foo(x: &'a mut u32) ->  {}
-  selections:
-    - anchor: {line: 0, character: 26}
-      active: {line: 0, character: 26}
-fullTargets: [{type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: s}, modifiers: [{type: containingScope, scopeType: {type: type}}]}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/rust/changeTypeTrap.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/rust/changeTypeTrap.yml
deleted file mode 100644
index 974344edc9..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/rust/changeTypeTrap.yml
+++ /dev/null
@@ -1,33 +0,0 @@
-languageId: rust
-command:
-  spokenForm: change type trap
-  version: 2
-  targets:
-    - type: primitive
-      mark: {type: decoratedSymbol, symbolColor: default, character: t}
-      modifiers:
-        - type: containingScope
-          scopeType: {type: type}
-  usePrePhraseSnapshot: true
-  action: {name: clearAndSetSelection}
-initialState:
-  documentContents: >
-    fn some_function<T: Display + Clone, U: Clone + Debug>(t: &T, u: &U) -> i32
-    {
-
-    }
-  selections:
-    - anchor: {line: 2, character: 0}
-      active: {line: 2, character: 0}
-  marks:
-    default.t:
-      start: {line: 0, character: 17}
-      end: {line: 0, character: 18}
-finalState:
-  documentContents: |
-    fn some_function<T: , U: Clone + Debug>(t: &T, u: &U) -> i32 {
-    }
-  selections:
-    - anchor: {line: 0, character: 20}
-      active: {line: 0, character: 20}
-fullTargets: [{type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: t}, modifiers: [{type: containingScope, scopeType: {type: type}}]}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/rust/changeTypeTrap3.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/rust/changeTypeTrap3.yml
deleted file mode 100644
index 7052d2abe3..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/rust/changeTypeTrap3.yml
+++ /dev/null
@@ -1,35 +0,0 @@
-languageId: rust
-command:
-  spokenForm: change type trap
-  version: 2
-  targets:
-    - type: primitive
-      mark: {type: decoratedSymbol, symbolColor: default, character: t}
-      modifiers:
-        - type: containingScope
-          scopeType: {type: type}
-  usePrePhraseSnapshot: true
-  action: {name: clearAndSetSelection}
-initialState:
-  documentContents: |
-    fn some_function<T, U>(t: &T, u: &U) -> i32
-        where T: Display + Clone,
-              U: Clone + Debug
-    {}
-  selections:
-    - anchor: {line: 4, character: 0}
-      active: {line: 4, character: 0}
-  marks:
-    default.t:
-      start: {line: 1, character: 10}
-      end: {line: 1, character: 11}
-finalState:
-  documentContents: |
-    fn some_function<T, U>(t: &T, u: &U) -> i32
-        where T: ,
-              U: Clone + Debug
-    {}
-  selections:
-    - anchor: {line: 1, character: 13}
-      active: {line: 1, character: 13}
-fullTargets: [{type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: t}, modifiers: [{type: containingScope, scopeType: {type: type}}]}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/rust/changeTypeUrge.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/rust/changeTypeUrge.yml
deleted file mode 100644
index 99f9d393a7..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/rust/changeTypeUrge.yml
+++ /dev/null
@@ -1,29 +0,0 @@
-languageId: rust
-command:
-  spokenForm: change type urge
-  version: 2
-  targets:
-    - type: primitive
-      mark: {type: decoratedSymbol, symbolColor: default, character: u}
-      modifiers:
-        - type: containingScope
-          scopeType: {type: type}
-  usePrePhraseSnapshot: true
-  action: {name: clearAndSetSelection}
-initialState:
-  documentContents: |
-    const X: [u8; 2] = [0, 0];
-  selections:
-    - anchor: {line: 1, character: 0}
-      active: {line: 1, character: 0}
-  marks:
-    default.u:
-      start: {line: 0, character: 10}
-      end: {line: 0, character: 12}
-finalState:
-  documentContents: |
-    const X: [; 2] = [0, 0];
-  selections:
-    - anchor: {line: 0, character: 10}
-      active: {line: 0, character: 10}
-fullTargets: [{type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: u}, modifiers: [{type: containingScope, scopeType: {type: type}}]}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/rust/changeValueCap.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/rust/changeValueCap.yml
deleted file mode 100644
index acd7bfe8ea..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/rust/changeValueCap.yml
+++ /dev/null
@@ -1,29 +0,0 @@
-languageId: rust
-command:
-  spokenForm: change value cap
-  version: 2
-  targets:
-    - type: primitive
-      mark: {type: decoratedSymbol, symbolColor: default, character: c}
-      modifiers:
-        - type: containingScope
-          scopeType: {type: value}
-  usePrePhraseSnapshot: true
-  action: {name: clearAndSetSelection}
-initialState:
-  documentContents: |
-    const X: [Option<u8>; 2] = [None, None];
-  selections:
-    - anchor: {line: 1, character: 0}
-      active: {line: 1, character: 0}
-  marks:
-    default.c:
-      start: {line: 0, character: 0}
-      end: {line: 0, character: 5}
-finalState:
-  documentContents: |
-    const X: [Option<u8>; 2] = ;
-  selections:
-    - anchor: {line: 0, character: 27}
-      active: {line: 0, character: 27}
-fullTargets: [{type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: c}, modifiers: [{type: containingScope, scopeType: {type: value}}]}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/rust/changeValueEach.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/rust/changeValueEach.yml
deleted file mode 100644
index bcd1db0b32..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/rust/changeValueEach.yml
+++ /dev/null
@@ -1,31 +0,0 @@
-languageId: rust
-command:
-  spokenForm: change value each
-  version: 2
-  targets:
-    - type: primitive
-      mark: {type: decoratedSymbol, symbolColor: default, character: e}
-      modifiers:
-        - type: containingScope
-          scopeType: {type: value}
-  usePrePhraseSnapshot: true
-  action: {name: clearAndSetSelection}
-initialState:
-  documentContents: |
-    #[cfg_attr(feature = "serde")]
-    struct Test
-  selections:
-    - anchor: {line: 2, character: 0}
-      active: {line: 2, character: 0}
-  marks:
-    default.e:
-      start: {line: 0, character: 22}
-      end: {line: 0, character: 27}
-finalState:
-  documentContents: |
-    #[cfg_attr(feature = )]
-    struct Test
-  selections:
-    - anchor: {line: 0, character: 21}
-      active: {line: 0, character: 21}
-fullTargets: [{type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: e}, modifiers: [{type: containingScope, scopeType: {type: value}}]}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/rust/changeValueFine.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/rust/changeValueFine.yml
deleted file mode 100644
index 30531c2316..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/rust/changeValueFine.yml
+++ /dev/null
@@ -1,35 +0,0 @@
-languageId: rust
-command:
-  spokenForm: change value fine
-  version: 2
-  targets:
-    - type: primitive
-      mark: {type: decoratedSymbol, symbolColor: default, character: f}
-      modifiers:
-        - type: containingScope
-          scopeType: {type: value}
-  usePrePhraseSnapshot: true
-  action: {name: clearAndSetSelection}
-initialState:
-  documentContents: |
-    let user = User {
-        first_name: "John",
-        last_name: "Doe",
-    };
-  selections:
-    - anchor: {line: 3, character: 2}
-      active: {line: 3, character: 2}
-  marks:
-    default.f:
-      start: {line: 1, character: 4}
-      end: {line: 1, character: 14}
-finalState:
-  documentContents: |
-    let user = User {
-        first_name: ,
-        last_name: "Doe",
-    };
-  selections:
-    - anchor: {line: 1, character: 16}
-      active: {line: 1, character: 16}
-fullTargets: [{type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: f}, modifiers: [{type: containingScope, scopeType: {type: value}}]}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/rust/changeValueFine2.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/rust/changeValueFine2.yml
deleted file mode 100644
index 314a022cd4..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/rust/changeValueFine2.yml
+++ /dev/null
@@ -1,33 +0,0 @@
-languageId: rust
-command:
-  spokenForm: change value fine
-  version: 2
-  targets:
-    - type: primitive
-      mark: {type: decoratedSymbol, symbolColor: default, character: f}
-      modifiers:
-        - type: containingScope
-          scopeType: {type: value}
-  usePrePhraseSnapshot: true
-  action: {name: clearAndSetSelection}
-initialState:
-  documentContents: |
-    match user {
-        User { first_name: "John", last_name: "Doe" } => {},
-    }
-  selections:
-    - anchor: {line: 3, character: 0}
-      active: {line: 3, character: 0}
-  marks:
-    default.f:
-      start: {line: 1, character: 11}
-      end: {line: 1, character: 21}
-finalState:
-  documentContents: |
-    match user {
-        User { first_name: , last_name: "Doe" } => {},
-    }
-  selections:
-    - anchor: {line: 1, character: 23}
-      active: {line: 1, character: 23}
-fullTargets: [{type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: f}, modifiers: [{type: containingScope, scopeType: {type: value}}]}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/rust/changeValueLook.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/rust/changeValueLook.yml
deleted file mode 100644
index 776fa4ebc3..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/rust/changeValueLook.yml
+++ /dev/null
@@ -1,33 +0,0 @@
-languageId: rust
-command:
-  spokenForm: change value look
-  version: 2
-  targets:
-    - type: primitive
-      mark: {type: decoratedSymbol, symbolColor: default, character: l}
-      modifiers:
-        - type: containingScope
-          scopeType: {type: value}
-  usePrePhraseSnapshot: true
-  action: {name: clearAndSetSelection}
-initialState:
-  documentContents: |
-    match user {
-        User { first_name: "John", last_name: "Doe" } => {},
-    }
-  selections:
-    - anchor: {line: 3, character: 0}
-      active: {line: 3, character: 0}
-  marks:
-    default.l:
-      start: {line: 1, character: 31}
-      end: {line: 1, character: 40}
-finalState:
-  documentContents: |
-    match user {
-        User { first_name: "John", last_name:  } => {},
-    }
-  selections:
-    - anchor: {line: 1, character: 42}
-      active: {line: 1, character: 42}
-fullTargets: [{type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: l}, modifiers: [{type: containingScope, scopeType: {type: value}}]}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/rust/changeValueNear.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/rust/changeValueNear.yml
deleted file mode 100644
index c2392d4f82..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/rust/changeValueNear.yml
+++ /dev/null
@@ -1,29 +0,0 @@
-languageId: rust
-command:
-  spokenForm: change value near
-  version: 2
-  targets:
-    - type: primitive
-      mark: {type: decoratedSymbol, symbolColor: default, character: 'n'}
-      modifiers:
-        - type: containingScope
-          scopeType: {type: value}
-  usePrePhraseSnapshot: true
-  action: {name: clearAndSetSelection}
-initialState:
-  documentContents: |
-    let x = [None, Some(1)];
-  selections:
-    - anchor: {line: 0, character: 24}
-      active: {line: 0, character: 24}
-  marks:
-    default.n:
-      start: {line: 0, character: 9}
-      end: {line: 0, character: 13}
-finalState:
-  documentContents: |
-    let x = ;
-  selections:
-    - anchor: {line: 0, character: 8}
-      active: {line: 0, character: 8}
-fullTargets: [{type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: 'n'}, modifiers: [{type: containingScope, scopeType: {type: value}}]}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/rust/changeValueZero.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/rust/changeValueZero.yml
deleted file mode 100644
index f9f9d31d3b..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/rust/changeValueZero.yml
+++ /dev/null
@@ -1,29 +0,0 @@
-languageId: rust
-command:
-  spokenForm: change value zero
-  version: 2
-  targets:
-    - type: primitive
-      mark: {type: decoratedSymbol, symbolColor: default, character: '0'}
-      modifiers:
-        - type: containingScope
-          scopeType: {type: value}
-  usePrePhraseSnapshot: true
-  action: {name: clearAndSetSelection}
-initialState:
-  documentContents: |
-    let x: u32 = 0;
-  selections:
-    - anchor: {line: 0, character: 15}
-      active: {line: 0, character: 15}
-  marks:
-    default.0:
-      start: {line: 0, character: 13}
-      end: {line: 0, character: 14}
-finalState:
-  documentContents: |
-    let x: u32 = ;
-  selections:
-    - anchor: {line: 0, character: 13}
-      active: {line: 0, character: 13}
-fullTargets: [{type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: '0'}, modifiers: [{type: containingScope, scopeType: {type: value}}]}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/rust/chuckArg.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/rust/chuckArg.yml
deleted file mode 100644
index 3904f88a2f..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/rust/chuckArg.yml
+++ /dev/null
@@ -1,26 +0,0 @@
-languageId: rust
-command:
-  version: 0
-  spokenForm: chuck arg
-  action: remove
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: argumentOrParameter, includeSiblings: false}
-initialState:
-  documentContents: |-
-    fn add(x: i32, y: i32) -> {
-        add(x, 30);
-    }
-  selections:
-    - anchor: {line: 0, character: 11}
-      active: {line: 0, character: 11}
-  marks: {}
-finalState:
-  documentContents: |-
-    fn add(y: i32) -> {
-        add(x, 30);
-    }
-  selections:
-    - anchor: {line: 0, character: 7}
-      active: {line: 0, character: 7}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: outside, modifier: {type: containingScope, scopeType: argumentOrParameter, includeSiblings: false}, isImplicit: false}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/rust/chuckArg2.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/rust/chuckArg2.yml
deleted file mode 100644
index 118d1aa4db..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/rust/chuckArg2.yml
+++ /dev/null
@@ -1,26 +0,0 @@
-languageId: rust
-command:
-  version: 0
-  spokenForm: chuck arg
-  action: remove
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: argumentOrParameter, includeSiblings: false}
-initialState:
-  documentContents: |-
-    fn add(x: i32, y: i32) -> {
-        add(x, 30);
-    }
-  selections:
-    - anchor: {line: 1, character: 9}
-      active: {line: 1, character: 9}
-  marks: {}
-finalState:
-  documentContents: |-
-    fn add(x: i32, y: i32) -> {
-        add(30);
-    }
-  selections:
-    - anchor: {line: 1, character: 8}
-      active: {line: 1, character: 8}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: outside, modifier: {type: containingScope, scopeType: argumentOrParameter, includeSiblings: false}, isImplicit: false}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/rust/chuckArgAir.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/rust/chuckArgAir.yml
deleted file mode 100644
index 99358b2014..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/rust/chuckArgAir.yml
+++ /dev/null
@@ -1,29 +0,0 @@
-languageId: rust
-command:
-  spokenForm: chuck arg air
-  version: 2
-  targets:
-    - type: primitive
-      mark: {type: decoratedSymbol, symbolColor: default, character: a}
-      modifiers:
-        - type: containingScope
-          scopeType: {type: argumentOrParameter}
-  usePrePhraseSnapshot: true
-  action: {name: remove}
-initialState:
-  documentContents: |
-    struct S<'a, 'b: 'a, T>;
-  selections:
-    - anchor: {line: 1, character: 0}
-      active: {line: 1, character: 0}
-  marks:
-    default.a:
-      start: {line: 0, character: 10}
-      end: {line: 0, character: 11}
-finalState:
-  documentContents: |
-    struct S<'b: 'a, T>;
-  selections:
-    - anchor: {line: 1, character: 0}
-      active: {line: 1, character: 0}
-fullTargets: [{type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: a}, modifiers: [{type: containingScope, scopeType: {type: argumentOrParameter}}]}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/rust/chuckArgBlueAir.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/rust/chuckArgBlueAir.yml
deleted file mode 100644
index b43208df4b..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/rust/chuckArgBlueAir.yml
+++ /dev/null
@@ -1,29 +0,0 @@
-languageId: rust
-command:
-  spokenForm: chuck arg blue air
-  version: 2
-  targets:
-    - type: primitive
-      mark: {type: decoratedSymbol, symbolColor: blue, character: a}
-      modifiers:
-        - type: containingScope
-          scopeType: {type: argumentOrParameter}
-  usePrePhraseSnapshot: true
-  action: {name: remove}
-initialState:
-  documentContents: |
-    struct S<'a, 'b: 'a, T>;
-  selections:
-    - anchor: {line: 1, character: 0}
-      active: {line: 1, character: 0}
-  marks:
-    blue.a:
-      start: {line: 0, character: 18}
-      end: {line: 0, character: 19}
-finalState:
-  documentContents: |
-    struct S<'a, T>;
-  selections:
-    - anchor: {line: 1, character: 0}
-      active: {line: 1, character: 0}
-fullTargets: [{type: primitive, mark: {type: decoratedSymbol, symbolColor: blue, character: a}, modifiers: [{type: containingScope, scopeType: {type: argumentOrParameter}}]}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/rust/chuckArgDrum.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/rust/chuckArgDrum.yml
deleted file mode 100644
index ce048ea356..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/rust/chuckArgDrum.yml
+++ /dev/null
@@ -1,31 +0,0 @@
-languageId: rust
-command:
-  spokenForm: chuck arg drum
-  version: 2
-  targets:
-    - type: primitive
-      mark: {type: decoratedSymbol, symbolColor: default, character: d}
-      modifiers:
-        - type: containingScope
-          scopeType: {type: argumentOrParameter}
-  usePrePhraseSnapshot: true
-  action: {name: remove}
-initialState:
-  documentContents: |
-    #[derive(Debug)]
-    sturct S {}
-  selections:
-    - anchor: {line: 2, character: 0}
-      active: {line: 2, character: 0}
-  marks:
-    default.d:
-      start: {line: 0, character: 9}
-      end: {line: 0, character: 14}
-finalState:
-  documentContents: |
-    #[derive()]
-    sturct S {}
-  selections:
-    - anchor: {line: 2, character: 0}
-      active: {line: 2, character: 0}
-fullTargets: [{type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: d}, modifiers: [{type: containingScope, scopeType: {type: argumentOrParameter}}]}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/rust/chuckArgEight2.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/rust/chuckArgEight2.yml
deleted file mode 100644
index 806fae6f2c..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/rust/chuckArgEight2.yml
+++ /dev/null
@@ -1,33 +0,0 @@
-languageId: rust
-command:
-  spokenForm: chuck arg eight
-  version: 2
-  targets:
-    - type: primitive
-      mark: {type: decoratedSymbol, symbolColor: default, character: '8'}
-      modifiers:
-        - type: containingScope
-          scopeType: {type: argumentOrParameter}
-  usePrePhraseSnapshot: true
-  action: {name: remove}
-initialState:
-  documentContents: |
-    enum E {
-        C(u8, u16, u32),
-    }
-  selections:
-    - anchor: {line: 3, character: 0}
-      active: {line: 3, character: 0}
-  marks:
-    default.8:
-      start: {line: 1, character: 6}
-      end: {line: 1, character: 8}
-finalState:
-  documentContents: |
-    enum E {
-        C(u16, u32),
-    }
-  selections:
-    - anchor: {line: 3, character: 0}
-      active: {line: 3, character: 0}
-fullTargets: [{type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: '8'}, modifiers: [{type: containingScope, scopeType: {type: argumentOrParameter}}]}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/rust/chuckArgOne.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/rust/chuckArgOne.yml
deleted file mode 100644
index 34f78934ce..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/rust/chuckArgOne.yml
+++ /dev/null
@@ -1,33 +0,0 @@
-languageId: rust
-command:
-  spokenForm: chuck arg one
-  version: 2
-  targets:
-    - type: primitive
-      mark: {type: decoratedSymbol, symbolColor: default, character: '1'}
-      modifiers:
-        - type: containingScope
-          scopeType: {type: argumentOrParameter}
-  usePrePhraseSnapshot: true
-  action: {name: remove}
-initialState:
-  documentContents: |
-    enum E {
-        C(u8, u16, u32),
-    }
-  selections:
-    - anchor: {line: 3, character: 0}
-      active: {line: 3, character: 0}
-  marks:
-    default.1:
-      start: {line: 1, character: 10}
-      end: {line: 1, character: 13}
-finalState:
-  documentContents: |
-    enum E {
-        C(u8, u32),
-    }
-  selections:
-    - anchor: {line: 3, character: 0}
-      active: {line: 3, character: 0}
-fullTargets: [{type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: '1'}, modifiers: [{type: containingScope, scopeType: {type: argumentOrParameter}}]}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/rust/chuckArgSun.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/rust/chuckArgSun.yml
deleted file mode 100644
index 5edb6c2667..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/rust/chuckArgSun.yml
+++ /dev/null
@@ -1,29 +0,0 @@
-languageId: rust
-command:
-  spokenForm: chuck arg sun
-  version: 2
-  targets:
-    - type: primitive
-      mark: {type: decoratedSymbol, symbolColor: default, character: s}
-      modifiers:
-        - type: containingScope
-          scopeType: {type: argumentOrParameter}
-  usePrePhraseSnapshot: true
-  action: {name: remove}
-initialState:
-  documentContents: |
-    fn method(&mut self) {}
-  selections:
-    - anchor: {line: 1, character: 0}
-      active: {line: 1, character: 0}
-  marks:
-    default.s:
-      start: {line: 0, character: 15}
-      end: {line: 0, character: 19}
-finalState:
-  documentContents: |
-    fn method() {}
-  selections:
-    - anchor: {line: 1, character: 0}
-      active: {line: 1, character: 0}
-fullTargets: [{type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: s}, modifiers: [{type: containingScope, scopeType: {type: argumentOrParameter}}]}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/rust/chuckArgSun2.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/rust/chuckArgSun2.yml
deleted file mode 100644
index 16a0982ab5..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/rust/chuckArgSun2.yml
+++ /dev/null
@@ -1,33 +0,0 @@
-languageId: rust
-command:
-  spokenForm: chuck arg sun
-  version: 2
-  targets:
-    - type: primitive
-      mark: {type: decoratedSymbol, symbolColor: default, character: s}
-      modifiers:
-        - type: containingScope
-          scopeType: {type: argumentOrParameter}
-  usePrePhraseSnapshot: true
-  action: {name: remove}
-initialState:
-  documentContents: >-
-    fn some_function<T: Display + Clone, U: Clone + Debug>(t: &T, u: &U) -> i32
-    {
-
-    }
-  selections:
-    - anchor: {line: 1, character: 1}
-      active: {line: 1, character: 1}
-  marks:
-    default.s:
-      start: {line: 0, character: 20}
-      end: {line: 0, character: 27}
-finalState:
-  documentContents: |-
-    fn some_function<U: Clone + Debug>(t: &T, u: &U) -> i32 {
-    }
-  selections:
-    - anchor: {line: 1, character: 1}
-      active: {line: 1, character: 1}
-fullTargets: [{type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: s}, modifiers: [{type: containingScope, scopeType: {type: argumentOrParameter}}]}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/rust/chuckArgThree.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/rust/chuckArgThree.yml
deleted file mode 100644
index 0819ecab1e..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/rust/chuckArgThree.yml
+++ /dev/null
@@ -1,33 +0,0 @@
-languageId: rust
-command:
-  spokenForm: chuck arg three
-  version: 2
-  targets:
-    - type: primitive
-      mark: {type: decoratedSymbol, symbolColor: default, character: '3'}
-      modifiers:
-        - type: containingScope
-          scopeType: {type: argumentOrParameter}
-  usePrePhraseSnapshot: true
-  action: {name: remove}
-initialState:
-  documentContents: |
-    enum E {
-        C(u8, u16, u32),
-    }
-  selections:
-    - anchor: {line: 3, character: 0}
-      active: {line: 3, character: 0}
-  marks:
-    default.3:
-      start: {line: 1, character: 15}
-      end: {line: 1, character: 18}
-finalState:
-  documentContents: |
-    enum E {
-        C(u8, u16),
-    }
-  selections:
-    - anchor: {line: 3, character: 0}
-      active: {line: 3, character: 0}
-fullTargets: [{type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: '3'}, modifiers: [{type: containingScope, scopeType: {type: argumentOrParameter}}]}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/rust/chuckArgTrap.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/rust/chuckArgTrap.yml
deleted file mode 100644
index fd78f6c32b..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/rust/chuckArgTrap.yml
+++ /dev/null
@@ -1,29 +0,0 @@
-languageId: rust
-command:
-  spokenForm: chuck arg trap
-  version: 2
-  targets:
-    - type: primitive
-      mark: {type: decoratedSymbol, symbolColor: default, character: t}
-      modifiers:
-        - type: containingScope
-          scopeType: {type: argumentOrParameter}
-  usePrePhraseSnapshot: true
-  action: {name: remove}
-initialState:
-  documentContents: |
-    struct S<'a, 'b: 'a, T> {};
-  selections:
-    - anchor: {line: 1, character: 0}
-      active: {line: 1, character: 0}
-  marks:
-    default.t:
-      start: {line: 0, character: 21}
-      end: {line: 0, character: 22}
-finalState:
-  documentContents: |
-    struct S<'a, 'b: 'a> {};
-  selections:
-    - anchor: {line: 1, character: 0}
-      active: {line: 1, character: 0}
-fullTargets: [{type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: t}, modifiers: [{type: containingScope, scopeType: {type: argumentOrParameter}}]}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/rust/chuckArgTrap2.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/rust/chuckArgTrap2.yml
deleted file mode 100644
index d3ee524951..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/rust/chuckArgTrap2.yml
+++ /dev/null
@@ -1,35 +0,0 @@
-languageId: rust
-command:
-  spokenForm: chuck arg trap
-  version: 2
-  targets:
-    - type: primitive
-      mark: {type: decoratedSymbol, symbolColor: default, character: t}
-      modifiers:
-        - type: containingScope
-          scopeType: {type: argumentOrParameter}
-  usePrePhraseSnapshot: true
-  action: {name: remove}
-initialState:
-  documentContents: |
-    enum Maybe<T> {
-        Just(T),
-        Nothing,
-    }
-  selections:
-    - anchor: {line: 4, character: 0}
-      active: {line: 4, character: 0}
-  marks:
-    default.t:
-      start: {line: 1, character: 9}
-      end: {line: 1, character: 10}
-finalState:
-  documentContents: |
-    enum Maybe<T> {
-        Just(),
-        Nothing,
-    }
-  selections:
-    - anchor: {line: 4, character: 0}
-      active: {line: 4, character: 0}
-fullTargets: [{type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: t}, modifiers: [{type: containingScope, scopeType: {type: argumentOrParameter}}]}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/rust/chuckAttributeDrum.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/rust/chuckAttributeDrum.yml
deleted file mode 100644
index 2c839d1a79..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/rust/chuckAttributeDrum.yml
+++ /dev/null
@@ -1,30 +0,0 @@
-languageId: rust
-command:
-  spokenForm: chuck attribute drum
-  version: 2
-  targets:
-    - type: primitive
-      mark: {type: decoratedSymbol, symbolColor: default, character: d}
-      modifiers:
-        - type: containingScope
-          scopeType: {type: attribute}
-  usePrePhraseSnapshot: true
-  action: {name: remove}
-initialState:
-  documentContents: |
-    #[derive(Debug)]
-    struct S {}
-  selections:
-    - anchor: {line: 1, character: 11}
-      active: {line: 1, character: 11}
-  marks:
-    default.d:
-      start: {line: 0, character: 2}
-      end: {line: 0, character: 8}
-finalState:
-  documentContents: |
-    struct S {}
-  selections:
-    - anchor: {line: 0, character: 11}
-      active: {line: 0, character: 11}
-fullTargets: [{type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: d}, modifiers: [{type: containingScope, scopeType: {type: attribute}}]}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/rust/chuckAttributeMade.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/rust/chuckAttributeMade.yml
deleted file mode 100644
index 0a7eaaa15e..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/rust/chuckAttributeMade.yml
+++ /dev/null
@@ -1,27 +0,0 @@
-languageId: rust
-command:
-  spokenForm: chuck attribute made
-  version: 2
-  targets:
-    - type: primitive
-      mark: {type: decoratedSymbol, symbolColor: default, character: m}
-      modifiers:
-        - type: containingScope
-          scopeType: {type: attribute}
-  usePrePhraseSnapshot: true
-  action: {name: remove}
-initialState:
-  documentContents: "fn foo(x: &mut u32) {}"
-  selections:
-    - anchor: {line: 0, character: 21}
-      active: {line: 0, character: 21}
-  marks:
-    default.m:
-      start: {line: 0, character: 11}
-      end: {line: 0, character: 14}
-finalState:
-  documentContents: "fn foo(x: &u32) {}"
-  selections:
-    - anchor: {line: 0, character: 17}
-      active: {line: 0, character: 17}
-fullTargets: [{type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: m}, modifiers: [{type: containingScope, scopeType: {type: attribute}}]}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/rust/chuckAttributeMade2.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/rust/chuckAttributeMade2.yml
deleted file mode 100644
index 2a7ae0e535..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/rust/chuckAttributeMade2.yml
+++ /dev/null
@@ -1,35 +0,0 @@
-languageId: rust
-command:
-  spokenForm: chuck attribute made
-  version: 2
-  targets:
-    - type: primitive
-      mark: {type: decoratedSymbol, symbolColor: default, character: m}
-      modifiers:
-        - type: containingScope
-          scopeType: {type: attribute}
-  usePrePhraseSnapshot: true
-  action: {name: remove}
-initialState:
-  documentContents: |-
-    fn f() {
-        let x = vec![];
-        let y = &mut x;
-    }
-  selections:
-    - anchor: {line: 2, character: 19}
-      active: {line: 2, character: 19}
-  marks:
-    default.m:
-      start: {line: 2, character: 13}
-      end: {line: 2, character: 16}
-finalState:
-  documentContents: |-
-    fn f() {
-        let x = vec![];
-        let y = &x;
-    }
-  selections:
-    - anchor: {line: 2, character: 15}
-      active: {line: 2, character: 15}
-fullTargets: [{type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: m}, modifiers: [{type: containingScope, scopeType: {type: attribute}}]}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/rust/chuckCall.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/rust/chuckCall.yml
deleted file mode 100644
index 573c6007af..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/rust/chuckCall.yml
+++ /dev/null
@@ -1,20 +0,0 @@
-languageId: rust
-command:
-  version: 1
-  spokenForm: chuck call
-  action: remove
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: functionCall, includeSiblings: false}
-initialState:
-  documentContents: println!("hello world")
-  selections:
-    - anchor: {line: 0, character: 5}
-      active: {line: 0, character: 5}
-  marks: {}
-finalState:
-  documentContents: ""
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: outside, modifier: {type: containingScope, scopeType: functionCall, includeSiblings: false}, isImplicit: false}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/rust/chuckCall2.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/rust/chuckCall2.yml
deleted file mode 100644
index 7a6c3f5af3..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/rust/chuckCall2.yml
+++ /dev/null
@@ -1,20 +0,0 @@
-languageId: rust
-command:
-  version: 1
-  spokenForm: chuck call
-  action: remove
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: functionCall, includeSiblings: false}
-initialState:
-  documentContents: something(1)
-  selections:
-    - anchor: {line: 0, character: 4}
-      active: {line: 0, character: 4}
-  marks: {}
-finalState:
-  documentContents: ""
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: outside, modifier: {type: containingScope, scopeType: functionCall, includeSiblings: false}, isImplicit: false}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/rust/chuckCallNear.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/rust/chuckCallNear.yml
deleted file mode 100644
index 6d5251327e..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/rust/chuckCallNear.yml
+++ /dev/null
@@ -1,29 +0,0 @@
-languageId: rust
-command:
-  spokenForm: chuck call near
-  version: 2
-  targets:
-    - type: primitive
-      mark: {type: decoratedSymbol, symbolColor: default, character: 'n'}
-      modifiers:
-        - type: containingScope
-          scopeType: {type: functionCall}
-  usePrePhraseSnapshot: true
-  action: {name: remove}
-initialState:
-  documentContents: |
-    let user = User::new();
-  selections:
-    - anchor: {line: 1, character: 0}
-      active: {line: 1, character: 0}
-  marks:
-    default.n:
-      start: {line: 0, character: 17}
-      end: {line: 0, character: 20}
-finalState:
-  documentContents: |
-    let user =;
-  selections:
-    - anchor: {line: 1, character: 0}
-      active: {line: 1, character: 0}
-fullTargets: [{type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: 'n'}, modifiers: [{type: containingScope, scopeType: {type: functionCall}}]}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/rust/chuckClassName.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/rust/chuckClassName.yml
deleted file mode 100644
index 30741cb31c..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/rust/chuckClassName.yml
+++ /dev/null
@@ -1,23 +0,0 @@
-languageId: rust
-command:
-  spokenForm: chuck class name
-  version: 2
-  targets:
-    - type: primitive
-      modifiers:
-        - type: containingScope
-          scopeType: {type: className}
-  usePrePhraseSnapshot: true
-  action: {name: remove}
-initialState:
-  documentContents: struct Some {}
-  selections:
-    - anchor: {line: 0, character: 13}
-      active: {line: 0, character: 13}
-  marks: {}
-finalState:
-  documentContents: struct {}
-  selections:
-    - anchor: {line: 0, character: 8}
-      active: {line: 0, character: 8}
-fullTargets: [{type: primitive, mark: {type: cursor}, modifiers: [{type: containingScope, scopeType: {type: className}}]}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/rust/chuckComment.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/rust/chuckComment.yml
deleted file mode 100644
index 6785029a94..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/rust/chuckComment.yml
+++ /dev/null
@@ -1,20 +0,0 @@
-languageId: rust
-command:
-  version: 1
-  spokenForm: chuck comment
-  action: remove
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: comment, includeSiblings: false}
-initialState:
-  documentContents: // a comment
-  selections:
-    - anchor: {line: 0, character: 11}
-      active: {line: 0, character: 11}
-  marks: {}
-finalState:
-  documentContents: ""
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: outside, modifier: {type: containingScope, scopeType: comment, includeSiblings: false}, isImplicit: false}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/rust/chuckComment2.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/rust/chuckComment2.yml
deleted file mode 100644
index 3ec11acf43..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/rust/chuckComment2.yml
+++ /dev/null
@@ -1,25 +0,0 @@
-languageId: rust
-command:
-  version: 1
-  spokenForm: chuck comment
-  action: remove
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: comment, includeSiblings: false}
-initialState:
-  documentContents: |-
-    /*
-    multi
-    line
-    commment
-    */
-  selections:
-    - anchor: {line: 3, character: 7}
-      active: {line: 3, character: 7}
-  marks: {}
-finalState:
-  documentContents: ""
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: outside, modifier: {type: containingScope, scopeType: comment, includeSiblings: false}, isImplicit: false}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/rust/chuckCondition.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/rust/chuckCondition.yml
deleted file mode 100644
index c69ebf5785..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/rust/chuckCondition.yml
+++ /dev/null
@@ -1,31 +0,0 @@
-languageId: rust
-command:
-  spokenForm: chuck condition
-  version: 2
-  targets:
-    - type: primitive
-      modifiers:
-        - type: containingScope
-          scopeType: {type: condition}
-  usePrePhraseSnapshot: true
-  action: {name: remove}
-initialState:
-  documentContents: |
-    match user {
-        User { first_name: "John" } => {},
-        User { first_name } if first_name.starts_with("P") => {}
-    }
-  selections:
-    - anchor: {line: 2, character: 27}
-      active: {line: 2, character: 54}
-  marks: {}
-finalState:
-  documentContents: |
-    match user {
-        User { first_name: "John" } => {},
-        User { first_name } => {}
-    }
-  selections:
-    - anchor: {line: 2, character: 23}
-      active: {line: 2, character: 23}
-fullTargets: [{type: primitive, mark: {type: cursor}, modifiers: [{type: containingScope, scopeType: {type: ifStatement}}]}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/rust/chuckFunkMade.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/rust/chuckFunkMade.yml
deleted file mode 100644
index 9c9439b668..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/rust/chuckFunkMade.yml
+++ /dev/null
@@ -1,28 +0,0 @@
-languageId: rust
-command:
-  version: 1
-  spokenForm: chuck funk made
-  action: remove
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: namedFunction, includeSiblings: false}
-      mark: {type: decoratedSymbol, symbolColor: default, character: m}
-initialState:
-  documentContents: |
-    fn main() {
-        println!("Hello, world!");
-    }
-  selections:
-    - anchor: {line: 3, character: 0}
-      active: {line: 3, character: 0}
-  marks:
-    default.m:
-      start: {line: 0, character: 3}
-      end: {line: 0, character: 7}
-finalState:
-  documentContents: |+
-
-  selections:
-    - anchor: {line: 1, character: 0}
-      active: {line: 1, character: 0}
-fullTargets: [{type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: m}, selectionType: token, position: contents, insideOutsideType: outside, modifier: {type: containingScope, scopeType: namedFunction, includeSiblings: false}, isImplicit: false}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/rust/chuckFunkNameFine.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/rust/chuckFunkNameFine.yml
deleted file mode 100644
index 132e5347eb..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/rust/chuckFunkNameFine.yml
+++ /dev/null
@@ -1,30 +0,0 @@
-languageId: rust
-command:
-  version: 1
-  spokenForm: chuck funk name fine
-  action: remove
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: functionName, includeSiblings: false}
-      mark: {type: decoratedSymbol, symbolColor: default, character: f}
-initialState:
-  documentContents: |-
-    fn main() {
-        println!("Hello, world!");
-    }
-  selections:
-    - anchor: {line: 2, character: 1}
-      active: {line: 2, character: 1}
-  marks:
-    default.f:
-      start: {line: 0, character: 0}
-      end: {line: 0, character: 2}
-finalState:
-  documentContents: |-
-    fn() {
-        println!("Hello, world!");
-    }
-  selections:
-    - anchor: {line: 2, character: 1}
-      active: {line: 2, character: 1}
-fullTargets: [{type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: f}, selectionType: token, position: contents, insideOutsideType: outside, modifier: {type: containingScope, scopeType: functionName, includeSiblings: false}, isImplicit: false}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/rust/chuckItemOne.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/rust/chuckItemOne.yml
deleted file mode 100644
index c736c58102..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/rust/chuckItemOne.yml
+++ /dev/null
@@ -1,29 +0,0 @@
-languageId: rust
-command:
-  spokenForm: chuck item one
-  version: 2
-  targets:
-    - type: primitive
-      mark: {type: decoratedSymbol, symbolColor: default, character: '1'}
-      modifiers:
-        - type: containingScope
-          scopeType: {type: collectionItem}
-  usePrePhraseSnapshot: true
-  action: {name: remove}
-initialState:
-  documentContents: |
-    let x = [1, 2];
-  selections:
-    - anchor: {line: 0, character: 10}
-      active: {line: 0, character: 10}
-  marks:
-    default.1:
-      start: {line: 0, character: 9}
-      end: {line: 0, character: 10}
-finalState:
-  documentContents: |
-    let x = [2];
-  selections:
-    - anchor: {line: 0, character: 9}
-      active: {line: 0, character: 9}
-fullTargets: [{type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: '1'}, modifiers: [{type: containingScope, scopeType: {type: collectionItem}}]}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/rust/chuckItemOne2.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/rust/chuckItemOne2.yml
deleted file mode 100644
index 2ba8a1ef02..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/rust/chuckItemOne2.yml
+++ /dev/null
@@ -1,29 +0,0 @@
-languageId: rust
-command:
-  spokenForm: chuck item one
-  version: 2
-  targets:
-    - type: primitive
-      mark: {type: decoratedSymbol, symbolColor: default, character: '1'}
-      modifiers:
-        - type: containingScope
-          scopeType: {type: collectionItem}
-  usePrePhraseSnapshot: true
-  action: {name: remove}
-initialState:
-  documentContents: |
-    let x = [1];
-  selections:
-    - anchor: {line: 0, character: 10}
-      active: {line: 0, character: 10}
-  marks:
-    default.1:
-      start: {line: 0, character: 9}
-      end: {line: 0, character: 10}
-finalState:
-  documentContents: |
-    let x = [];
-  selections:
-    - anchor: {line: 0, character: 9}
-      active: {line: 0, character: 9}
-fullTargets: [{type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: '1'}, modifiers: [{type: containingScope, scopeType: {type: collectionItem}}]}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/rust/chuckItemSit2.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/rust/chuckItemSit2.yml
deleted file mode 100644
index 061b525878..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/rust/chuckItemSit2.yml
+++ /dev/null
@@ -1,29 +0,0 @@
-languageId: rust
-command:
-  spokenForm: chuck item sit
-  version: 3
-  targets:
-    - type: primitive
-      modifiers:
-        - type: containingScope
-          scopeType: {type: collectionItem}
-      mark: {type: decoratedSymbol, symbolColor: default, character: i}
-  usePrePhraseSnapshot: true
-  action: {name: remove}
-initialState:
-  documentContents: |
-    type T = (&'static str, &'static str);
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-  marks:
-    default.i:
-      start: {line: 0, character: 26}
-      end: {line: 0, character: 32}
-finalState:
-  documentContents: |
-    type T = (&'static str);
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-fullTargets: [{type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: i}, modifiers: [{type: containingScope, scopeType: {type: collectionItem}}]}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/rust/chuckItemTwo.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/rust/chuckItemTwo.yml
deleted file mode 100644
index d858d7d334..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/rust/chuckItemTwo.yml
+++ /dev/null
@@ -1,29 +0,0 @@
-languageId: rust
-command:
-  spokenForm: chuck item two
-  version: 2
-  targets:
-    - type: primitive
-      mark: {type: decoratedSymbol, symbolColor: default, character: '2'}
-      modifiers:
-        - type: containingScope
-          scopeType: {type: collectionItem}
-  usePrePhraseSnapshot: true
-  action: {name: remove}
-initialState:
-  documentContents: |
-    let x = [1, 2];
-  selections:
-    - anchor: {line: 0, character: 10}
-      active: {line: 0, character: 10}
-  marks:
-    default.2:
-      start: {line: 0, character: 12}
-      end: {line: 0, character: 13}
-finalState:
-  documentContents: |
-    let x = [1];
-  selections:
-    - anchor: {line: 0, character: 10}
-      active: {line: 0, character: 10}
-fullTargets: [{type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: '2'}, modifiers: [{type: containingScope, scopeType: {type: collectionItem}}]}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/rust/chuckItemVest.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/rust/chuckItemVest.yml
deleted file mode 100644
index 92cc4715bb..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/rust/chuckItemVest.yml
+++ /dev/null
@@ -1,34 +0,0 @@
-languageId: rust
-command:
-  spokenForm: chuck item vest
-  version: 2
-  targets:
-    - type: primitive
-      mark: {type: decoratedSymbol, symbolColor: default, character: v}
-      modifiers:
-        - type: containingScope
-          scopeType: {type: collectionItem}
-  usePrePhraseSnapshot: true
-  action: {name: remove}
-initialState:
-  documentContents: |
-    enum IpAddr {
-        V4(u8, u8, u8, u8),
-        V6(String),
-    }
-  selections:
-    - anchor: {line: 4, character: 0}
-      active: {line: 4, character: 0}
-  marks:
-    default.v:
-      start: {line: 1, character: 4}
-      end: {line: 1, character: 6}
-finalState:
-  documentContents: |
-    enum IpAddr {
-        V6(String),
-    }
-  selections:
-    - anchor: {line: 3, character: 0}
-      active: {line: 3, character: 0}
-fullTargets: [{type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: v}, modifiers: [{type: containingScope, scopeType: {type: collectionItem}}]}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/rust/chuckKeyAir.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/rust/chuckKeyAir.yml
deleted file mode 100644
index 73a1d67496..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/rust/chuckKeyAir.yml
+++ /dev/null
@@ -1,35 +0,0 @@
-languageId: rust
-command:
-  spokenForm: chuck key air
-  version: 2
-  targets:
-    - type: primitive
-      mark: {type: decoratedSymbol, symbolColor: default, character: a}
-      modifiers:
-        - type: containingScope
-          scopeType: {type: collectionKey}
-  usePrePhraseSnapshot: true
-  action: {name: remove}
-initialState:
-  documentContents: |
-    let user = User {
-        first_name: "John",
-        last_name: last_name,
-    }
-  selections:
-    - anchor: {line: 4, character: 0}
-      active: {line: 4, character: 0}
-  marks:
-    default.a:
-      start: {line: 2, character: 15}
-      end: {line: 2, character: 24}
-finalState:
-  documentContents: |
-    let user = User {
-        first_name: "John",
-        last_name,
-    }
-  selections:
-    - anchor: {line: 4, character: 0}
-      active: {line: 4, character: 0}
-fullTargets: [{type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: a}, modifiers: [{type: containingScope, scopeType: {type: collectionKey}}]}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/rust/chuckKeyLook.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/rust/chuckKeyLook.yml
deleted file mode 100644
index 24c3ed8595..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/rust/chuckKeyLook.yml
+++ /dev/null
@@ -1,35 +0,0 @@
-languageId: rust
-command:
-  spokenForm: chuck key look
-  version: 2
-  targets:
-    - type: primitive
-      mark: {type: decoratedSymbol, symbolColor: default, character: l}
-      modifiers:
-        - type: containingScope
-          scopeType: {type: collectionKey}
-  usePrePhraseSnapshot: true
-  action: {name: remove}
-initialState:
-  documentContents: |
-    let user = User {
-        first_name: "John",
-        last_name: last_name,
-    }
-  selections:
-    - anchor: {line: 4, character: 0}
-      active: {line: 4, character: 0}
-  marks:
-    default.l:
-      start: {line: 2, character: 4}
-      end: {line: 2, character: 13}
-finalState:
-  documentContents: |
-    let user = User {
-        first_name: "John",
-        last_name,
-    }
-  selections:
-    - anchor: {line: 4, character: 0}
-      active: {line: 4, character: 0}
-fullTargets: [{type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: l}, modifiers: [{type: containingScope, scopeType: {type: collectionKey}}]}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/rust/chuckListOne.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/rust/chuckListOne.yml
deleted file mode 100644
index cc86217ef5..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/rust/chuckListOne.yml
+++ /dev/null
@@ -1,24 +0,0 @@
-languageId: rust
-command:
-  version: 1
-  spokenForm: chuck list one
-  action: remove
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: list, includeSiblings: false}
-      mark: {type: decoratedSymbol, symbolColor: default, character: '1'}
-initialState:
-  documentContents: let x = [1, 2, 3];
-  selections:
-    - anchor: {line: 0, character: 18}
-      active: {line: 0, character: 18}
-  marks:
-    default.1:
-      start: {line: 0, character: 9}
-      end: {line: 0, character: 10}
-finalState:
-  documentContents: let x =;
-  selections:
-    - anchor: {line: 0, character: 8}
-      active: {line: 0, character: 8}
-fullTargets: [{type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: '1'}, selectionType: token, position: contents, insideOutsideType: outside, modifier: {type: containingScope, scopeType: list, includeSiblings: false}, isImplicit: false}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/rust/chuckName.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/rust/chuckName.yml
deleted file mode 100644
index 283b52b446..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/rust/chuckName.yml
+++ /dev/null
@@ -1,20 +0,0 @@
-languageId: rust
-command:
-  version: 1
-  spokenForm: chuck name
-  action: remove
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: name, includeSiblings: false}
-initialState:
-  documentContents: "let mut array: [i32; 3] = [0; 3];"
-  selections:
-    - anchor: {line: 0, character: 5}
-      active: {line: 0, character: 5}
-  marks: {}
-finalState:
-  documentContents: "let mut: [i32; 3] = [0; 3];"
-  selections:
-    - anchor: {line: 0, character: 5}
-      active: {line: 0, character: 5}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: outside, modifier: {type: containingScope, scopeType: name, includeSiblings: false}, isImplicit: false}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/rust/chuckName2.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/rust/chuckName2.yml
deleted file mode 100644
index 98af96ec89..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/rust/chuckName2.yml
+++ /dev/null
@@ -1,29 +0,0 @@
-languageId: rust
-command:
-  spokenForm: chuck name
-  version: 2
-  targets:
-    - type: primitive
-      modifiers:
-        - type: containingScope
-          scopeType: {type: name}
-  usePrePhraseSnapshot: true
-  action: {name: remove}
-initialState:
-  documentContents: |
-    fn main() -> Result<(), Error> {
-        
-    }
-  selections:
-    - anchor: {line: 1, character: 4}
-      active: {line: 1, character: 4}
-  marks: {}
-finalState:
-  documentContents: |
-    fn() -> Result<(), Error> {
-        
-    }
-  selections:
-    - anchor: {line: 1, character: 4}
-      active: {line: 1, character: 4}
-fullTargets: [{type: primitive, mark: {type: cursor}, modifiers: [{type: containingScope, scopeType: {type: name}}]}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/rust/chuckNameFine.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/rust/chuckNameFine.yml
deleted file mode 100644
index a6d5b9376f..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/rust/chuckNameFine.yml
+++ /dev/null
@@ -1,33 +0,0 @@
-languageId: rust
-command:
-  spokenForm: chuck name fine
-  version: 2
-  targets:
-    - type: primitive
-      mark: {type: decoratedSymbol, symbolColor: default, character: f}
-      modifiers:
-        - type: containingScope
-          scopeType: {type: name}
-  usePrePhraseSnapshot: true
-  action: {name: remove}
-initialState:
-  documentContents: |
-    match user {
-        User { first_name: "John", last_name: last_name } => {}
-    }
-  selections:
-    - anchor: {line: 0, character: 10}
-      active: {line: 0, character: 10}
-  marks:
-    default.f:
-      start: {line: 1, character: 11}
-      end: {line: 1, character: 21}
-finalState:
-  documentContents: |
-    match user {
-        User { "John", last_name: last_name } => {}
-    }
-  selections:
-    - anchor: {line: 0, character: 10}
-      active: {line: 0, character: 10}
-fullTargets: [{type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: f}, modifiers: [{type: containingScope, scopeType: {type: name}}]}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/rust/chuckNameJury.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/rust/chuckNameJury.yml
deleted file mode 100644
index 4561c03bcd..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/rust/chuckNameJury.yml
+++ /dev/null
@@ -1,33 +0,0 @@
-languageId: rust
-command:
-  spokenForm: chuck name jury
-  version: 2
-  targets:
-    - type: primitive
-      mark: {type: decoratedSymbol, symbolColor: default, character: j}
-      modifiers:
-        - type: containingScope
-          scopeType: {type: name}
-  usePrePhraseSnapshot: true
-  action: {name: remove}
-initialState:
-  documentContents: |
-    match user {
-        User { first_name: "John", last_name: last_name } => {}
-    }
-  selections:
-    - anchor: {line: 0, character: 10}
-      active: {line: 0, character: 10}
-  marks:
-    default.j:
-      start: {line: 1, character: 24}
-      end: {line: 1, character: 28}
-finalState:
-  documentContents: |
-    match user {
-        User { "John", last_name: last_name } => {}
-    }
-  selections:
-    - anchor: {line: 0, character: 10}
-      active: {line: 0, character: 10}
-fullTargets: [{type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: j}, modifiers: [{type: containingScope, scopeType: {type: name}}]}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/rust/chuckState.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/rust/chuckState.yml
deleted file mode 100644
index bc77c6b100..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/rust/chuckState.yml
+++ /dev/null
@@ -1,25 +0,0 @@
-languageId: rust
-command:
-  spokenForm: chuck state
-  version: 2
-  targets:
-    - type: primitive
-      modifiers:
-        - type: containingScope
-          scopeType: {type: statement}
-  usePrePhraseSnapshot: true
-  action: {name: remove}
-initialState:
-  documentContents: |
-    let x = vec![1, 2, 3];
-  selections:
-    - anchor: {line: 0, character: 10}
-      active: {line: 0, character: 10}
-  marks: {}
-finalState:
-  documentContents: |+
-
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-fullTargets: [{type: primitive, mark: {type: cursor}, modifiers: [{type: containingScope, scopeType: {type: statement}}]}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/rust/chuckString.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/rust/chuckString.yml
deleted file mode 100644
index 8983313bde..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/rust/chuckString.yml
+++ /dev/null
@@ -1,26 +0,0 @@
-languageId: rust
-command:
-  version: 1
-  spokenForm: chuck string
-  action: remove
-  targets:
-    - type: primitive
-      modifier: {type: surroundingPair, delimiter: string}
-initialState:
-  documentContents: |-
-    fn main() {
-        println!("Hello, world!");
-    }
-  selections:
-    - anchor: {line: 1, character: 25}
-      active: {line: 1, character: 25}
-  marks: {}
-finalState:
-  documentContents: |-
-    fn main() {
-        println!();
-    }
-  selections:
-    - anchor: {line: 1, character: 13}
-      active: {line: 1, character: 13}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: outside, modifier: {type: surroundingPair, delimiter: string}, isImplicit: false}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/rust/chuckTypeAir.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/rust/chuckTypeAir.yml
deleted file mode 100644
index d9e55f0fd9..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/rust/chuckTypeAir.yml
+++ /dev/null
@@ -1,43 +0,0 @@
-languageId: rust
-command:
-  spokenForm: chuck type air
-  version: 2
-  targets:
-    - type: primitive
-      mark: {type: decoratedSymbol, symbolColor: default, character: a}
-      modifiers:
-        - type: containingScope
-          scopeType: {type: type}
-  usePrePhraseSnapshot: true
-  action: {name: remove}
-initialState:
-  documentContents: |
-    trait T {
-        fn f();
-    }
-
-    impl T for Option<u32> {
-        fn f() {
-            unimplemented!()
-        }
-    }
-  selections:
-    - anchor: {line: 8, character: 0}
-      active: {line: 8, character: 0}
-  marks:
-    default.a:
-      start: {line: 0, character: 0}
-      end: {line: 0, character: 5}
-finalState:
-  documentContents: |
-
-
-    impl T for Option<u32> {
-        fn f() {
-            unimplemented!()
-        }
-    }
-  selections:
-    - anchor: {line: 6, character: 0}
-      active: {line: 6, character: 0}
-fullTargets: [{type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: a}, modifiers: [{type: containingScope, scopeType: {type: type}}]}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/rust/chuckTypeLook.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/rust/chuckTypeLook.yml
deleted file mode 100644
index d26710ca76..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/rust/chuckTypeLook.yml
+++ /dev/null
@@ -1,42 +0,0 @@
-languageId: rust
-command:
-  version: 1
-  spokenForm: chuck type look
-  action: remove
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: type, includeSiblings: false}
-      mark: {type: decoratedSymbol, symbolColor: default, character: l}
-initialState:
-  documentContents: |
-
-    fn build_user(email: String, username: String) -> User {
-        User {
-            email: email,
-            username: username,
-            active: true,
-            sign_in_count: 1,
-        }
-    }
-  selections:
-    - anchor: {line: 8, character: 1}
-      active: {line: 8, character: 1}
-  marks:
-    default.l:
-      start: {line: 1, character: 14}
-      end: {line: 1, character: 19}
-finalState:
-  documentContents: |
-
-    fn build_user(email, username: String) -> User {
-        User {
-            email: email,
-            username: username,
-            active: true,
-            sign_in_count: 1,
-        }
-    }
-  selections:
-    - anchor: {line: 8, character: 1}
-      active: {line: 8, character: 1}
-fullTargets: [{type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: l}, selectionType: token, position: contents, insideOutsideType: outside, modifier: {type: containingScope, scopeType: type, includeSiblings: false}, isImplicit: false}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/rust/chuckTypeMade.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/rust/chuckTypeMade.yml
deleted file mode 100644
index 19c04cf9ea..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/rust/chuckTypeMade.yml
+++ /dev/null
@@ -1,41 +0,0 @@
-languageId: rust
-command:
-  spokenForm: chuck type made
-  version: 2
-  targets:
-    - type: primitive
-      mark: {type: decoratedSymbol, symbolColor: default, character: m}
-      modifiers:
-        - type: containingScope
-          scopeType: {type: type}
-  usePrePhraseSnapshot: true
-  action: {name: remove}
-initialState:
-  documentContents: |
-    trait T {
-        fn f();
-    }
-
-    impl T for Option<u32> {
-        fn f() {
-            unimplemented!()
-        }
-    }
-  selections:
-    - anchor: {line: 8, character: 0}
-      active: {line: 8, character: 0}
-  marks:
-    default.m:
-      start: {line: 4, character: 0}
-      end: {line: 4, character: 4}
-finalState:
-  documentContents: |+
-    trait T {
-        fn f();
-    }
-
-
-  selections:
-    - anchor: {line: 4, character: 0}
-      active: {line: 4, character: 0}
-fullTargets: [{type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: m}, modifiers: [{type: containingScope, scopeType: {type: type}}]}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/rust/chuckTypeOdd.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/rust/chuckTypeOdd.yml
deleted file mode 100644
index e00244103d..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/rust/chuckTypeOdd.yml
+++ /dev/null
@@ -1,33 +0,0 @@
-languageId: rust
-command:
-  spokenForm: chuck type odd
-  version: 2
-  targets:
-    - type: primitive
-      mark: {type: decoratedSymbol, symbolColor: default, character: o}
-      modifiers:
-        - type: containingScope
-          scopeType: {type: type}
-  usePrePhraseSnapshot: true
-  action: {name: remove}
-initialState:
-  documentContents: |
-    struct S {
-        n: Option<u64>,
-    }
-  selections:
-    - anchor: {line: 3, character: 0}
-      active: {line: 3, character: 0}
-  marks:
-    default.o:
-      start: {line: 1, character: 7}
-      end: {line: 1, character: 13}
-finalState:
-  documentContents: |
-    struct S {
-        n,
-    }
-  selections:
-    - anchor: {line: 3, character: 0}
-      active: {line: 3, character: 0}
-fullTargets: [{type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: o}, modifiers: [{type: containingScope, scopeType: {type: type}}]}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/rust/chuckTypeOdd2.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/rust/chuckTypeOdd2.yml
deleted file mode 100644
index 68f25bfecc..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/rust/chuckTypeOdd2.yml
+++ /dev/null
@@ -1,45 +0,0 @@
-languageId: rust
-command:
-  spokenForm: chuck type odd
-  version: 2
-  targets:
-    - type: primitive
-      mark: {type: decoratedSymbol, symbolColor: default, character: o}
-      modifiers:
-        - type: containingScope
-          scopeType: {type: type}
-  usePrePhraseSnapshot: true
-  action: {name: remove}
-initialState:
-  documentContents: |
-    trait T {
-        fn f();
-    }
-
-    impl T for Option<u32> {
-        fn f() {
-            unimplemented!()
-        }
-    }
-  selections:
-    - anchor: {line: 8, character: 0}
-      active: {line: 8, character: 0}
-  marks:
-    default.o:
-      start: {line: 4, character: 11}
-      end: {line: 4, character: 17}
-finalState:
-  documentContents: |
-    trait T {
-        fn f();
-    }
-
-    impl T for {
-        fn f() {
-            unimplemented!()
-        }
-    }
-  selections:
-    - anchor: {line: 8, character: 0}
-      active: {line: 8, character: 0}
-fullTargets: [{type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: o}, modifiers: [{type: containingScope, scopeType: {type: type}}]}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/rust/chuckTypePlex.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/rust/chuckTypePlex.yml
deleted file mode 100644
index 7c6bc0bdac..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/rust/chuckTypePlex.yml
+++ /dev/null
@@ -1,27 +0,0 @@
-languageId: rust
-command:
-  spokenForm: chuck type plex
-  version: 2
-  targets:
-    - type: primitive
-      mark: {type: decoratedSymbol, symbolColor: default, character: x}
-      modifiers:
-        - type: containingScope
-          scopeType: {type: type}
-  usePrePhraseSnapshot: true
-  action: {name: remove}
-initialState:
-  documentContents: "let x: u32 = 1;"
-  selections:
-    - anchor: {line: 0, character: 15}
-      active: {line: 0, character: 15}
-  marks:
-    default.x:
-      start: {line: 0, character: 4}
-      end: {line: 0, character: 5}
-finalState:
-  documentContents: let x = 1;
-  selections:
-    - anchor: {line: 0, character: 10}
-      active: {line: 0, character: 10}
-fullTargets: [{type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: x}, modifiers: [{type: containingScope, scopeType: {type: type}}]}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/rust/chuckTypePlex2.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/rust/chuckTypePlex2.yml
deleted file mode 100644
index 8245138331..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/rust/chuckTypePlex2.yml
+++ /dev/null
@@ -1,29 +0,0 @@
-languageId: rust
-command:
-  spokenForm: chuck type plex
-  version: 2
-  targets:
-    - type: primitive
-      mark: {type: decoratedSymbol, symbolColor: default, character: x}
-      modifiers:
-        - type: containingScope
-          scopeType: {type: type}
-  usePrePhraseSnapshot: true
-  action: {name: remove}
-initialState:
-  documentContents: |
-    const X: [u8; 2] = [0, 0];
-  selections:
-    - anchor: {line: 1, character: 0}
-      active: {line: 1, character: 0}
-  marks:
-    default.x:
-      start: {line: 0, character: 6}
-      end: {line: 0, character: 7}
-finalState:
-  documentContents: |
-    const X = [0, 0];
-  selections:
-    - anchor: {line: 1, character: 0}
-      active: {line: 1, character: 0}
-fullTargets: [{type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: x}, modifiers: [{type: containingScope, scopeType: {type: type}}]}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/rust/chuckTypeSun.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/rust/chuckTypeSun.yml
deleted file mode 100644
index d984c20841..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/rust/chuckTypeSun.yml
+++ /dev/null
@@ -1,33 +0,0 @@
-languageId: rust
-command:
-  spokenForm: chuck type sun
-  version: 2
-  targets:
-    - type: primitive
-      mark: {type: decoratedSymbol, symbolColor: default, character: s}
-      modifiers:
-        - type: containingScope
-          scopeType: {type: type}
-  usePrePhraseSnapshot: true
-  action: {name: remove}
-initialState:
-  documentContents: |
-    fn main() -> Result<(), Error> {
-        
-    }
-  selections:
-    - anchor: {line: 2, character: 1}
-      active: {line: 2, character: 1}
-  marks:
-    default.s:
-      start: {line: 0, character: 13}
-      end: {line: 0, character: 19}
-finalState:
-  documentContents: |
-    fn main() {
-        
-    }
-  selections:
-    - anchor: {line: 2, character: 1}
-      active: {line: 2, character: 1}
-fullTargets: [{type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: s}, modifiers: [{type: containingScope, scopeType: {type: type}}]}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/rust/chuckTypeYank.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/rust/chuckTypeYank.yml
deleted file mode 100644
index a450d268db..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/rust/chuckTypeYank.yml
+++ /dev/null
@@ -1,30 +0,0 @@
-languageId: rust
-command:
-  version: 1
-  spokenForm: chuck type yank
-  action: remove
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: type, includeSiblings: false}
-      mark: {type: decoratedSymbol, symbolColor: default, character: 'y'}
-initialState:
-  documentContents: |
-    fn main() {
-        let y: f32 = 3.0; // f32
-    }
-  selections:
-    - anchor: {line: 2, character: 1}
-      active: {line: 2, character: 1}
-  marks:
-    default.y:
-      start: {line: 1, character: 8}
-      end: {line: 1, character: 9}
-finalState:
-  documentContents: |
-    fn main() {
-        let y = 3.0; // f32
-    }
-  selections:
-    - anchor: {line: 2, character: 1}
-      active: {line: 2, character: 1}
-fullTargets: [{type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: 'y'}, selectionType: token, position: contents, insideOutsideType: outside, modifier: {type: containingScope, scopeType: type, includeSiblings: false}, isImplicit: false}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/rust/chuckValueFine.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/rust/chuckValueFine.yml
deleted file mode 100644
index 9b19ff2097..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/rust/chuckValueFine.yml
+++ /dev/null
@@ -1,35 +0,0 @@
-languageId: rust
-command:
-  spokenForm: chuck value fine
-  version: 2
-  targets:
-    - type: primitive
-      mark: {type: decoratedSymbol, symbolColor: default, character: f}
-      modifiers:
-        - type: containingScope
-          scopeType: {type: value}
-  usePrePhraseSnapshot: true
-  action: {name: remove}
-initialState:
-  documentContents: |
-    let user = User {
-        first_name: "John",
-        last_name: "Doe",
-    };
-  selections:
-    - anchor: {line: 3, character: 2}
-      active: {line: 3, character: 2}
-  marks:
-    default.f:
-      start: {line: 1, character: 4}
-      end: {line: 1, character: 14}
-finalState:
-  documentContents: |
-    let user = User {
-        first_name,
-        last_name: "Doe",
-    };
-  selections:
-    - anchor: {line: 3, character: 2}
-      active: {line: 3, character: 2}
-fullTargets: [{type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: f}, modifiers: [{type: containingScope, scopeType: {type: value}}]}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/rust/chuckValueNear.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/rust/chuckValueNear.yml
deleted file mode 100644
index ad94ec5285..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/rust/chuckValueNear.yml
+++ /dev/null
@@ -1,29 +0,0 @@
-languageId: rust
-command:
-  spokenForm: chuck value near
-  version: 2
-  targets:
-    - type: primitive
-      mark: {type: decoratedSymbol, symbolColor: default, character: 'n'}
-      modifiers:
-        - type: containingScope
-          scopeType: {type: value}
-  usePrePhraseSnapshot: true
-  action: {name: remove}
-initialState:
-  documentContents: |
-    let x = [None, Some(1)];
-  selections:
-    - anchor: {line: 0, character: 24}
-      active: {line: 0, character: 24}
-  marks:
-    default.n:
-      start: {line: 0, character: 9}
-      end: {line: 0, character: 13}
-finalState:
-  documentContents: |
-    let x;
-  selections:
-    - anchor: {line: 0, character: 6}
-      active: {line: 0, character: 6}
-fullTargets: [{type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: 'n'}, modifiers: [{type: containingScope, scopeType: {type: value}}]}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/rust/chuckValueZero.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/rust/chuckValueZero.yml
deleted file mode 100644
index e535748a6c..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/rust/chuckValueZero.yml
+++ /dev/null
@@ -1,29 +0,0 @@
-languageId: rust
-command:
-  spokenForm: chuck value zero
-  version: 2
-  targets:
-    - type: primitive
-      mark: {type: decoratedSymbol, symbolColor: default, character: '0'}
-      modifiers:
-        - type: containingScope
-          scopeType: {type: value}
-  usePrePhraseSnapshot: true
-  action: {name: remove}
-initialState:
-  documentContents: |
-    let x: u32 = 0;
-  selections:
-    - anchor: {line: 0, character: 15}
-      active: {line: 0, character: 15}
-  marks:
-    default.0:
-      start: {line: 0, character: 13}
-      end: {line: 0, character: 14}
-finalState:
-  documentContents: |
-    let x: u32;
-  selections:
-    - anchor: {line: 0, character: 11}
-      active: {line: 0, character: 11}
-fullTargets: [{type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: '0'}, modifiers: [{type: containingScope, scopeType: {type: value}}]}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/rust/clearArgue.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/rust/clearArgue.yml
deleted file mode 100644
index e9fe704c1d..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/rust/clearArgue.yml
+++ /dev/null
@@ -1,23 +0,0 @@
-languageId: rust
-command:
-  version: 3
-  spokenForm: clear argue
-  action: {name: clearAndSetSelection}
-  targets:
-    - type: primitive
-      modifiers:
-        - type: containingScope
-          scopeType: {type: argumentOrParameter}
-  usePrePhraseSnapshot: true
-initialState:
-  documentContents: "fn do_something(foo: (u8, u16)) {}"
-  selections:
-    - anchor: {line: 0, character: 22}
-      active: {line: 0, character: 22}
-  marks: {}
-finalState:
-  documentContents: fn do_something() {}
-  selections:
-    - anchor: {line: 0, character: 16}
-      active: {line: 0, character: 16}
-fullTargets: [{type: primitive, mark: {type: cursor}, modifiers: [{type: containingScope, scopeType: {type: argumentOrParameter}}]}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/rust/clearBranch.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/rust/clearBranch.yml
deleted file mode 100644
index 54d5816017..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/rust/clearBranch.yml
+++ /dev/null
@@ -1,31 +0,0 @@
-languageId: rust
-command:
-  spokenForm: clear branch
-  version: 3
-  targets:
-    - type: primitive
-      modifiers:
-        - type: containingScope
-          scopeType: {type: branch}
-  usePrePhraseSnapshot: true
-  action: {name: clearAndSetSelection}
-initialState:
-  documentContents: |-
-    match user {
-        User { first_name: "John" } => {},
-        User { first_name } if first_name.starts_with("P") => {}
-    }
-  selections:
-    - anchor: {line: 1, character: 26}
-      active: {line: 1, character: 26}
-  marks: {}
-finalState:
-  documentContents: |-
-    match user {
-        
-        User { first_name } if first_name.starts_with("P") => {}
-    }
-  selections:
-    - anchor: {line: 1, character: 4}
-      active: {line: 1, character: 4}
-fullTargets: [{type: primitive, mark: {type: cursor}, modifiers: [{type: containingScope, scopeType: {type: branch}}]}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/rust/clearBranch2.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/rust/clearBranch2.yml
deleted file mode 100644
index 5259c23179..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/rust/clearBranch2.yml
+++ /dev/null
@@ -1,31 +0,0 @@
-languageId: rust
-command:
-  spokenForm: clear branch
-  version: 3
-  targets:
-    - type: primitive
-      modifiers:
-        - type: containingScope
-          scopeType: {type: branch}
-  usePrePhraseSnapshot: true
-  action: {name: clearAndSetSelection}
-initialState:
-  documentContents: |-
-    match user {
-        User { first_name: "John" } => {},
-        User { first_name } if first_name.starts_with("P") => {}
-    }
-  selections:
-    - anchor: {line: 2, character: 30}
-      active: {line: 2, character: 30}
-  marks: {}
-finalState:
-  documentContents: |-
-    match user {
-        User { first_name: "John" } => {},
-        
-    }
-  selections:
-    - anchor: {line: 2, character: 4}
-      active: {line: 2, character: 4}
-fullTargets: [{type: primitive, mark: {type: cursor}, modifiers: [{type: containingScope, scopeType: {type: branch}}]}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/rust/clearBranch3.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/rust/clearBranch3.yml
deleted file mode 100644
index 4ad8fc27c7..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/rust/clearBranch3.yml
+++ /dev/null
@@ -1,35 +0,0 @@
-languageId: rust
-command:
-  version: 3
-  spokenForm: clear branch
-  action: {name: clearAndSetSelection}
-  targets:
-    - type: primitive
-      modifiers:
-        - type: containingScope
-          scopeType: {type: branch}
-  usePrePhraseSnapshot: true
-initialState:
-  documentContents: |-
-    if n < 0 {
-        print!("{} is negative", n);
-    } else if n > 0 {
-        print!("{} is positive", n);
-    } else {
-        print!("{} is zero", n);
-    }
-  selections:
-    - anchor: {line: 1, character: 4}
-      active: {line: 1, character: 4}
-  marks: {}
-finalState:
-  documentContents: |2-
-     else if n > 0 {
-        print!("{} is positive", n);
-    } else {
-        print!("{} is zero", n);
-    }
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-fullTargets: [{type: primitive, mark: {type: cursor}, modifiers: [{type: containingScope, scopeType: {type: branch}}]}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/rust/clearBranch4.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/rust/clearBranch4.yml
deleted file mode 100644
index 74778e30c7..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/rust/clearBranch4.yml
+++ /dev/null
@@ -1,35 +0,0 @@
-languageId: rust
-command:
-  version: 3
-  spokenForm: clear branch
-  action: {name: clearAndSetSelection}
-  targets:
-    - type: primitive
-      modifiers:
-        - type: containingScope
-          scopeType: {type: branch}
-  usePrePhraseSnapshot: false
-initialState:
-  documentContents: |-
-    if n < 0 {
-        print!("{} is negative", n);
-    } else if n > 0 {
-        print!("{} is positive", n);
-    } else {
-        print!("{} is zero", n);
-    }
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-  marks: {}
-finalState:
-  documentContents: |2-
-     else if n > 0 {
-        print!("{} is positive", n);
-    } else {
-        print!("{} is zero", n);
-    }
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-fullTargets: [{type: primitive, mark: {type: cursor}, modifiers: [{type: containingScope, scopeType: {type: branch}}]}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/rust/clearBranch5.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/rust/clearBranch5.yml
deleted file mode 100644
index 1e79138130..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/rust/clearBranch5.yml
+++ /dev/null
@@ -1,35 +0,0 @@
-languageId: rust
-command:
-  version: 3
-  spokenForm: clear branch
-  action: {name: clearAndSetSelection}
-  targets:
-    - type: primitive
-      modifiers:
-        - type: containingScope
-          scopeType: {type: branch}
-  usePrePhraseSnapshot: false
-initialState:
-  documentContents: |-
-    if n < 0 {
-        print!("{} is negative", n);
-    } else if n > 0 {
-        print!("{} is positive", n);
-    } else {
-        print!("{} is zero", n);
-    }
-  selections:
-    - anchor: {line: 2, character: 2}
-      active: {line: 2, character: 2}
-  marks: {}
-finalState:
-  documentContents: |-
-    if n < 0 {
-        print!("{} is negative", n);
-    } else  else {
-        print!("{} is zero", n);
-    }
-  selections:
-    - anchor: {line: 2, character: 7}
-      active: {line: 2, character: 7}
-fullTargets: [{type: primitive, mark: {type: cursor}, modifiers: [{type: containingScope, scopeType: {type: branch}}]}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/rust/clearBranch6.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/rust/clearBranch6.yml
deleted file mode 100644
index 21c4a5a23f..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/rust/clearBranch6.yml
+++ /dev/null
@@ -1,35 +0,0 @@
-languageId: rust
-command:
-  version: 3
-  spokenForm: clear branch
-  action: {name: clearAndSetSelection}
-  targets:
-    - type: primitive
-      modifiers:
-        - type: containingScope
-          scopeType: {type: branch}
-  usePrePhraseSnapshot: false
-initialState:
-  documentContents: |-
-    if n < 0 {
-        print!("{} is negative", n);
-    } else if n > 0 {
-        print!("{} is positive", n);
-    } else {
-        print!("{} is zero", n);
-    }
-  selections:
-    - anchor: {line: 3, character: 4}
-      active: {line: 3, character: 4}
-  marks: {}
-finalState:
-  documentContents: |-
-    if n < 0 {
-        print!("{} is negative", n);
-    } else  else {
-        print!("{} is zero", n);
-    }
-  selections:
-    - anchor: {line: 2, character: 7}
-      active: {line: 2, character: 7}
-fullTargets: [{type: primitive, mark: {type: cursor}, modifiers: [{type: containingScope, scopeType: {type: branch}}]}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/rust/clearBranch7.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/rust/clearBranch7.yml
deleted file mode 100644
index 4b99499150..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/rust/clearBranch7.yml
+++ /dev/null
@@ -1,35 +0,0 @@
-languageId: rust
-command:
-  version: 3
-  spokenForm: clear branch
-  action: {name: clearAndSetSelection}
-  targets:
-    - type: primitive
-      modifiers:
-        - type: containingScope
-          scopeType: {type: branch}
-  usePrePhraseSnapshot: false
-initialState:
-  documentContents: |-
-    if n < 0 {
-        print!("{} is negative", n);
-    } else if n > 0 {
-        print!("{} is positive", n);
-    } else {
-        print!("{} is zero", n);
-    }
-  selections:
-    - anchor: {line: 5, character: 4}
-      active: {line: 5, character: 4}
-  marks: {}
-finalState:
-  documentContents: |-
-    if n < 0 {
-        print!("{} is negative", n);
-    } else if n > 0 {
-        print!("{} is positive", n);
-    } 
-  selections:
-    - anchor: {line: 4, character: 2}
-      active: {line: 4, character: 2}
-fullTargets: [{type: primitive, mark: {type: cursor}, modifiers: [{type: containingScope, scopeType: {type: branch}}]}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/rust/clearBranch8.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/rust/clearBranch8.yml
deleted file mode 100644
index dcf31d0dce..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/rust/clearBranch8.yml
+++ /dev/null
@@ -1,35 +0,0 @@
-languageId: rust
-command:
-  version: 3
-  spokenForm: clear branch
-  action: {name: clearAndSetSelection}
-  targets:
-    - type: primitive
-      modifiers:
-        - type: containingScope
-          scopeType: {type: branch}
-  usePrePhraseSnapshot: false
-initialState:
-  documentContents: |-
-    if n < 0 {
-        print!("{} is negative", n);
-    } else if n > 0 {
-        print!("{} is positive", n);
-    } else {
-        print!("{} is zero", n);
-    }
-  selections:
-    - anchor: {line: 4, character: 2}
-      active: {line: 4, character: 2}
-  marks: {}
-finalState:
-  documentContents: |-
-    if n < 0 {
-        print!("{} is negative", n);
-    } else if n > 0 {
-        print!("{} is positive", n);
-    } 
-  selections:
-    - anchor: {line: 4, character: 2}
-      active: {line: 4, character: 2}
-fullTargets: [{type: primitive, mark: {type: cursor}, modifiers: [{type: containingScope, scopeType: {type: branch}}]}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/rust/clearCondition.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/rust/clearCondition.yml
deleted file mode 100644
index 03920d31c5..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/rust/clearCondition.yml
+++ /dev/null
@@ -1,31 +0,0 @@
-languageId: rust
-command:
-  spokenForm: clear condition
-  version: 3
-  targets:
-    - type: primitive
-      modifiers:
-        - type: containingScope
-          scopeType: {type: condition}
-  usePrePhraseSnapshot: true
-  action: {name: clearAndSetSelection}
-initialState:
-  documentContents: |-
-    match user {
-      User { first_name: "John" } => {},
-      User { first_name } if first_name.starts_with("P") => {}
-    }
-  selections:
-    - anchor: {line: 2, character: 57}
-      active: {line: 2, character: 57}
-  marks: {}
-finalState:
-  documentContents: |-
-    match user {
-      User { first_name: "John" } => {},
-      User { first_name } if  => {}
-    }
-  selections:
-    - anchor: {line: 2, character: 25}
-      active: {line: 2, character: 25}
-fullTargets: [{type: primitive, mark: {type: cursor}, modifiers: [{type: containingScope, scopeType: {type: condition}}]}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/rust/clearCondition2.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/rust/clearCondition2.yml
deleted file mode 100644
index 160336eaba..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/rust/clearCondition2.yml
+++ /dev/null
@@ -1,33 +0,0 @@
-languageId: rust
-command:
-  version: 3
-  spokenForm: clear condition
-  action: {name: clearAndSetSelection}
-  targets:
-    - type: primitive
-      modifiers:
-        - type: containingScope
-          scopeType: {type: condition}
-  usePrePhraseSnapshot: true
-initialState:
-  documentContents: |-
-    if n < 0 {
-      print!("{} is negative", n);
-    } else if n > 0 {
-      print!("{} is positive", n);
-    }
-  selections:
-    - anchor: {line: 1, character: 2}
-      active: {line: 1, character: 2}
-  marks: {}
-finalState:
-  documentContents: |-
-    if  {
-      print!("{} is negative", n);
-    } else if n > 0 {
-      print!("{} is positive", n);
-    }
-  selections:
-    - anchor: {line: 0, character: 3}
-      active: {line: 0, character: 3}
-fullTargets: [{type: primitive, mark: {type: cursor}, modifiers: [{type: containingScope, scopeType: {type: condition}}]}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/rust/clearCondition3.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/rust/clearCondition3.yml
deleted file mode 100644
index 1f48ca4e1b..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/rust/clearCondition3.yml
+++ /dev/null
@@ -1,33 +0,0 @@
-languageId: rust
-command:
-  version: 3
-  spokenForm: clear condition
-  action: {name: clearAndSetSelection}
-  targets:
-    - type: primitive
-      modifiers:
-        - type: containingScope
-          scopeType: {type: condition}
-  usePrePhraseSnapshot: false
-initialState:
-  documentContents: |-
-    if n < 0 {
-      print!("{} is negative", n);
-    } else if n > 0 {
-      print!("{} is positive", n);
-    }
-  selections:
-    - anchor: {line: 3, character: 2}
-      active: {line: 3, character: 2}
-  marks: {}
-finalState:
-  documentContents: |-
-    if n < 0 {
-      print!("{} is negative", n);
-    } else if  {
-      print!("{} is positive", n);
-    }
-  selections:
-    - anchor: {line: 2, character: 10}
-      active: {line: 2, character: 10}
-fullTargets: [{type: primitive, mark: {type: cursor}, modifiers: [{type: containingScope, scopeType: {type: condition}}]}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/rust/clearCondition4.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/rust/clearCondition4.yml
deleted file mode 100644
index dda63f755b..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/rust/clearCondition4.yml
+++ /dev/null
@@ -1,33 +0,0 @@
-languageId: rust
-command:
-  version: 3
-  spokenForm: clear condition
-  action: {name: clearAndSetSelection}
-  targets:
-    - type: primitive
-      modifiers:
-        - type: containingScope
-          scopeType: {type: condition}
-  usePrePhraseSnapshot: false
-initialState:
-  documentContents: |-
-    let foo = if n < 0 {
-      print!("{} is negative", n);
-    } else if n > 0 {
-      print!("{} is positive", n);
-    }
-  selections:
-    - anchor: {line: 1, character: 2}
-      active: {line: 1, character: 2}
-  marks: {}
-finalState:
-  documentContents: |-
-    let foo = if  {
-      print!("{} is negative", n);
-    } else if n > 0 {
-      print!("{} is positive", n);
-    }
-  selections:
-    - anchor: {line: 0, character: 13}
-      active: {line: 0, character: 13}
-fullTargets: [{type: primitive, mark: {type: cursor}, modifiers: [{type: containingScope, scopeType: {type: condition}}]}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/rust/clearCondition5.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/rust/clearCondition5.yml
deleted file mode 100644
index 16c09c26e8..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/rust/clearCondition5.yml
+++ /dev/null
@@ -1,33 +0,0 @@
-languageId: rust
-command:
-  version: 3
-  spokenForm: clear condition
-  action: {name: clearAndSetSelection}
-  targets:
-    - type: primitive
-      modifiers:
-        - type: containingScope
-          scopeType: {type: condition}
-  usePrePhraseSnapshot: false
-initialState:
-  documentContents: |-
-    let foo = if n < 0 {
-      print!("{} is negative", n);
-    } else if n > 0 {
-      print!("{} is positive", n);
-    }
-  selections:
-    - anchor: {line: 3, character: 2}
-      active: {line: 3, character: 2}
-  marks: {}
-finalState:
-  documentContents: |-
-    let foo = if n < 0 {
-      print!("{} is negative", n);
-    } else if  {
-      print!("{} is positive", n);
-    }
-  selections:
-    - anchor: {line: 2, character: 10}
-      active: {line: 2, character: 10}
-fullTargets: [{type: primitive, mark: {type: cursor}, modifiers: [{type: containingScope, scopeType: {type: condition}}]}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/rust/clearCondition6.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/rust/clearCondition6.yml
deleted file mode 100644
index 9f95f7b348..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/rust/clearCondition6.yml
+++ /dev/null
@@ -1,29 +0,0 @@
-languageId: rust
-command:
-  version: 3
-  spokenForm: clear condition
-  action: {name: clearAndSetSelection}
-  targets:
-    - type: primitive
-      modifiers:
-        - type: containingScope
-          scopeType: {type: condition}
-  usePrePhraseSnapshot: true
-initialState:
-  documentContents: |-
-    if let Some(i) = number {
-      println!("Matched {:?}!", i);
-    }
-  selections:
-    - anchor: {line: 1, character: 2}
-      active: {line: 1, character: 2}
-  marks: {}
-finalState:
-  documentContents: |-
-    if  {
-      println!("Matched {:?}!", i);
-    }
-  selections:
-    - anchor: {line: 0, character: 3}
-      active: {line: 0, character: 3}
-fullTargets: [{type: primitive, mark: {type: cursor}, modifiers: [{type: containingScope, scopeType: {type: condition}}]}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/rust/clearCondition7.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/rust/clearCondition7.yml
deleted file mode 100644
index dc3afe9426..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/rust/clearCondition7.yml
+++ /dev/null
@@ -1,29 +0,0 @@
-languageId: rust
-command:
-  version: 3
-  spokenForm: clear condition
-  action: {name: clearAndSetSelection}
-  targets:
-    - type: primitive
-      modifiers:
-        - type: containingScope
-          scopeType: {type: condition}
-  usePrePhraseSnapshot: true
-initialState:
-  documentContents: |-
-    while let Some(i) = number {
-      println!("Matched {:?}!", i);
-    }
-  selections:
-    - anchor: {line: 1, character: 2}
-      active: {line: 1, character: 2}
-  marks: {}
-finalState:
-  documentContents: |-
-    while  {
-      println!("Matched {:?}!", i);
-    }
-  selections:
-    - anchor: {line: 0, character: 6}
-      active: {line: 0, character: 6}
-fullTargets: [{type: primitive, mark: {type: cursor}, modifiers: [{type: containingScope, scopeType: {type: condition}}]}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/rust/clearCondition8.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/rust/clearCondition8.yml
deleted file mode 100644
index 375c2e9b41..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/rust/clearCondition8.yml
+++ /dev/null
@@ -1,29 +0,0 @@
-languageId: rust
-command:
-  version: 3
-  spokenForm: clear condition
-  action: {name: clearAndSetSelection}
-  targets:
-    - type: primitive
-      modifiers:
-        - type: containingScope
-          scopeType: {type: condition}
-  usePrePhraseSnapshot: true
-initialState:
-  documentContents: |-
-    while n < 101 {
-      n += 1;
-    }
-  selections:
-    - anchor: {line: 1, character: 2}
-      active: {line: 1, character: 2}
-  marks: {}
-finalState:
-  documentContents: |-
-    while  {
-      n += 1;
-    }
-  selections:
-    - anchor: {line: 0, character: 6}
-      active: {line: 0, character: 6}
-fullTargets: [{type: primitive, mark: {type: cursor}, modifiers: [{type: containingScope, scopeType: {type: condition}}]}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/rust/clearName.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/rust/clearName.yml
deleted file mode 100644
index b038ac892c..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/rust/clearName.yml
+++ /dev/null
@@ -1,29 +0,0 @@
-languageId: rust
-command:
-  spokenForm: clear name
-  version: 3
-  targets:
-    - type: primitive
-      modifiers:
-        - type: containingScope
-          scopeType: {type: name}
-  usePrePhraseSnapshot: true
-  action: {name: clearAndSetSelection}
-initialState:
-  documentContents: |
-    enum Foo {
-        Baz { a: int, b: String }
-    }
-  selections:
-    - anchor: {line: 1, character: 8}
-      active: {line: 1, character: 8}
-  marks: {}
-finalState:
-  documentContents: |
-    enum Foo {
-         { a: int, b: String }
-    }
-  selections:
-    - anchor: {line: 1, character: 4}
-      active: {line: 1, character: 4}
-fullTargets: [{type: primitive, mark: {type: cursor}, modifiers: [{type: containingScope, scopeType: {type: name}}]}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/rust/clearName2.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/rust/clearName2.yml
deleted file mode 100644
index a50c880744..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/rust/clearName2.yml
+++ /dev/null
@@ -1,29 +0,0 @@
-languageId: rust
-command:
-  spokenForm: clear name
-  version: 3
-  targets:
-    - type: primitive
-      modifiers:
-        - type: containingScope
-          scopeType: {type: name}
-  usePrePhraseSnapshot: false
-  action: {name: clearAndSetSelection}
-initialState:
-  documentContents: |
-    enum Foo {
-        Baz { a: int, b: String }
-    }
-  selections:
-    - anchor: {line: 1, character: 13}
-      active: {line: 1, character: 13}
-  marks: {}
-finalState:
-  documentContents: |
-    enum Foo {
-        Baz { : int, b: String }
-    }
-  selections:
-    - anchor: {line: 1, character: 10}
-      active: {line: 1, character: 10}
-fullTargets: [{type: primitive, mark: {type: cursor}, modifiers: [{type: containingScope, scopeType: {type: name}}]}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/rust/clearState.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/rust/clearState.yml
deleted file mode 100644
index 3947fd2b70..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/rust/clearState.yml
+++ /dev/null
@@ -1,29 +0,0 @@
-languageId: rust
-command:
-  spokenForm: clear state
-  version: 2
-  targets:
-    - type: primitive
-      modifiers:
-        - type: containingScope
-          scopeType: {type: statement}
-  usePrePhraseSnapshot: true
-  action: {name: clearAndSetSelection}
-initialState:
-  documentContents: |-
-    fn foo() {
-        if true { println!("5") } else { println!("6") }
-    }
-  selections:
-    - anchor: {line: 1, character: 23}
-      active: {line: 1, character: 23}
-  marks: {}
-finalState:
-  documentContents: |-
-    fn foo() {
-        if true {  } else { println!("6") }
-    }
-  selections:
-    - anchor: {line: 1, character: 14}
-      active: {line: 1, character: 14}
-fullTargets: [{type: primitive, mark: {type: cursor}, modifiers: [{type: containingScope, scopeType: {type: statement}}]}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/rust/clearState2.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/rust/clearState2.yml
deleted file mode 100644
index dd3added39..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/rust/clearState2.yml
+++ /dev/null
@@ -1,29 +0,0 @@
-languageId: rust
-command:
-  spokenForm: clear state
-  version: 2
-  targets:
-    - type: primitive
-      modifiers:
-        - type: containingScope
-          scopeType: {type: statement}
-  usePrePhraseSnapshot: false
-  action: {name: clearAndSetSelection}
-initialState:
-  documentContents: |-
-    fn foo() {
-        if true { println!("5") } else { println!("6") }
-    }
-  selections:
-    - anchor: {line: 1, character: 7}
-      active: {line: 1, character: 7}
-  marks: {}
-finalState:
-  documentContents: |-
-    fn foo() {
-        
-    }
-  selections:
-    - anchor: {line: 1, character: 4}
-      active: {line: 1, character: 4}
-fullTargets: [{type: primitive, mark: {type: cursor}, modifiers: [{type: containingScope, scopeType: {type: statement}}]}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/rust/clearState3.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/rust/clearState3.yml
deleted file mode 100644
index aa52e0f259..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/rust/clearState3.yml
+++ /dev/null
@@ -1,26 +0,0 @@
-languageId: rust
-command:
-  spokenForm: clear state
-  version: 2
-  targets:
-    - type: primitive
-      modifiers:
-        - type: containingScope
-          scopeType: {type: statement}
-  usePrePhraseSnapshot: false
-  action: {name: clearAndSetSelection}
-initialState:
-  documentContents: |-
-    fn foo() {
-        if true { println!("5") } else { println!("6") }
-    }
-  selections:
-    - anchor: {line: 0, character: 3}
-      active: {line: 0, character: 3}
-  marks: {}
-finalState:
-  documentContents: ""
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-fullTargets: [{type: primitive, mark: {type: cursor}, modifiers: [{type: containingScope, scopeType: {type: statement}}]}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/rust/clearState4.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/rust/clearState4.yml
deleted file mode 100644
index dd839363f0..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/rust/clearState4.yml
+++ /dev/null
@@ -1,29 +0,0 @@
-languageId: rust
-command:
-  spokenForm: clear state
-  version: 2
-  targets:
-    - type: primitive
-      modifiers:
-        - type: containingScope
-          scopeType: {type: statement}
-  usePrePhraseSnapshot: false
-  action: {name: clearAndSetSelection}
-initialState:
-  documentContents: |-
-    fn foo() {
-        foo("bar");
-    }
-  selections:
-    - anchor: {line: 1, character: 8}
-      active: {line: 1, character: 8}
-  marks: {}
-finalState:
-  documentContents: |-
-    fn foo() {
-        
-    }
-  selections:
-    - anchor: {line: 1, character: 4}
-      active: {line: 1, character: 4}
-fullTargets: [{type: primitive, mark: {type: cursor}, modifiers: [{type: containingScope, scopeType: {type: statement}}]}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/rust/clearValue.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/rust/clearValue.yml
deleted file mode 100644
index dd802fc9f1..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/rust/clearValue.yml
+++ /dev/null
@@ -1,29 +0,0 @@
-languageId: rust
-command:
-  spokenForm: clear value
-  version: 2
-  targets:
-    - type: primitive
-      modifiers:
-        - type: containingScope
-          scopeType: {type: value}
-  usePrePhraseSnapshot: true
-  action: {name: clearAndSetSelection}
-initialState:
-  documentContents: |-
-    fn foo() -> i32 {
-        return 3;
-    }
-  selections:
-    - anchor: {line: 1, character: 4}
-      active: {line: 1, character: 4}
-  marks: {}
-finalState:
-  documentContents: |-
-    fn foo() -> i32 {
-        return ;
-    }
-  selections:
-    - anchor: {line: 1, character: 11}
-      active: {line: 1, character: 11}
-fullTargets: [{type: primitive, mark: {type: cursor}, modifiers: [{type: containingScope, scopeType: {type: value}}]}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/rust/clearValue2.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/rust/clearValue2.yml
deleted file mode 100644
index 7bf0e70a3d..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/rust/clearValue2.yml
+++ /dev/null
@@ -1,29 +0,0 @@
-languageId: rust
-command:
-  spokenForm: clear value
-  version: 2
-  targets:
-    - type: primitive
-      modifiers:
-        - type: containingScope
-          scopeType: {type: value}
-  usePrePhraseSnapshot: true
-  action: {name: clearAndSetSelection}
-initialState:
-  documentContents: |-
-    fn foo() -> i32 {
-        return 3;
-    }
-  selections:
-    - anchor: {line: 1, character: 11}
-      active: {line: 1, character: 11}
-  marks: {}
-finalState:
-  documentContents: |-
-    fn foo() -> i32 {
-        return ;
-    }
-  selections:
-    - anchor: {line: 1, character: 11}
-      active: {line: 1, character: 11}
-fullTargets: [{type: primitive, mark: {type: cursor}, modifiers: [{type: containingScope, scopeType: {type: value}}]}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/rust/clearValue3.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/rust/clearValue3.yml
deleted file mode 100644
index d5643a9e03..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/rust/clearValue3.yml
+++ /dev/null
@@ -1,31 +0,0 @@
-languageId: rust
-command:
-  spokenForm: clear value
-  version: 2
-  targets:
-    - type: primitive
-      modifiers:
-        - type: containingScope
-          scopeType: {type: value}
-  usePrePhraseSnapshot: true
-  action: {name: clearAndSetSelection}
-initialState:
-  documentContents: |-
-    fn foo() -> i32 {
-        println!("hello")
-        return 3;
-    }
-  selections:
-    - anchor: {line: 1, character: 13}
-      active: {line: 1, character: 13}
-  marks: {}
-finalState:
-  documentContents: |-
-    fn foo() -> i32 {
-        println!("hello")
-        return ;
-    }
-  selections:
-    - anchor: {line: 2, character: 11}
-      active: {line: 2, character: 11}
-fullTargets: [{type: primitive, mark: {type: cursor}, modifiers: [{type: containingScope, scopeType: {type: value}}]}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/rust/clearValue4.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/rust/clearValue4.yml
deleted file mode 100644
index e78ede6e95..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/rust/clearValue4.yml
+++ /dev/null
@@ -1,29 +0,0 @@
-languageId: rust
-command:
-  spokenForm: clear value
-  version: 2
-  targets:
-    - type: primitive
-      modifiers:
-        - type: containingScope
-          scopeType: {type: value}
-  usePrePhraseSnapshot: true
-  action: {name: clearAndSetSelection}
-initialState:
-  documentContents: |-
-    fn foo() -> i32 {
-        return 3
-    }
-  selections:
-    - anchor: {line: 1, character: 11}
-      active: {line: 1, character: 11}
-  marks: {}
-finalState:
-  documentContents: |-
-    fn foo() -> i32 {
-        return 
-    }
-  selections:
-    - anchor: {line: 1, character: 11}
-      active: {line: 1, character: 11}
-fullTargets: [{type: primitive, mark: {type: cursor}, modifiers: [{type: containingScope, scopeType: {type: value}}]}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/rust/clearValue5.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/rust/clearValue5.yml
deleted file mode 100644
index 0f764ec294..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/rust/clearValue5.yml
+++ /dev/null
@@ -1,29 +0,0 @@
-languageId: rust
-command:
-  spokenForm: clear value
-  version: 2
-  targets:
-    - type: primitive
-      modifiers:
-        - type: containingScope
-          scopeType: {type: value}
-  usePrePhraseSnapshot: true
-  action: {name: clearAndSetSelection}
-initialState:
-  documentContents: |-
-    fn foo() -> i32 {
-        return 3
-    }
-  selections:
-    - anchor: {line: 1, character: 4}
-      active: {line: 1, character: 4}
-  marks: {}
-finalState:
-  documentContents: |-
-    fn foo() -> i32 {
-        return 
-    }
-  selections:
-    - anchor: {line: 1, character: 11}
-      active: {line: 1, character: 11}
-fullTargets: [{type: primitive, mark: {type: cursor}, modifiers: [{type: containingScope, scopeType: {type: value}}]}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/rust/clearValue6.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/rust/clearValue6.yml
deleted file mode 100644
index 62b979d78c..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/rust/clearValue6.yml
+++ /dev/null
@@ -1,31 +0,0 @@
-languageId: rust
-command:
-  spokenForm: clear value
-  version: 2
-  targets:
-    - type: primitive
-      modifiers:
-        - type: containingScope
-          scopeType: {type: value}
-  usePrePhraseSnapshot: true
-  action: {name: clearAndSetSelection}
-initialState:
-  documentContents: |-
-    fn foo() -> i32 {
-        println!("hello")
-        return 3
-    }
-  selections:
-    - anchor: {line: 1, character: 14}
-      active: {line: 1, character: 14}
-  marks: {}
-finalState:
-  documentContents: |-
-    fn foo() -> i32 {
-        println!("hello")
-        return 
-    }
-  selections:
-    - anchor: {line: 2, character: 11}
-      active: {line: 2, character: 11}
-fullTargets: [{type: primitive, mark: {type: cursor}, modifiers: [{type: containingScope, scopeType: {type: value}}]}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/rust/clearValue7.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/rust/clearValue7.yml
deleted file mode 100644
index 3e0fb06a80..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/rust/clearValue7.yml
+++ /dev/null
@@ -1,29 +0,0 @@
-languageId: rust
-command:
-  spokenForm: clear value
-  version: 2
-  targets:
-    - type: primitive
-      modifiers:
-        - type: containingScope
-          scopeType: {type: value}
-  usePrePhraseSnapshot: true
-  action: {name: clearAndSetSelection}
-initialState:
-  documentContents: |-
-    fn foo() -> i32 {
-        "whatever"
-    }
-  selections:
-    - anchor: {line: 1, character: 5}
-      active: {line: 1, character: 5}
-  marks: {}
-finalState:
-  documentContents: |-
-    fn foo() -> i32 {
-        
-    }
-  selections:
-    - anchor: {line: 1, character: 4}
-      active: {line: 1, character: 4}
-fullTargets: [{type: primitive, mark: {type: cursor}, modifiers: [{type: containingScope, scopeType: {type: value}}]}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/rust/clearValue8.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/rust/clearValue8.yml
deleted file mode 100644
index 5ab5a8257a..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/rust/clearValue8.yml
+++ /dev/null
@@ -1,37 +0,0 @@
-languageId: rust
-command:
-  spokenForm: clear value
-  version: 2
-  targets:
-    - type: primitive
-      modifiers:
-        - type: containingScope
-          scopeType: {type: value}
-  usePrePhraseSnapshot: true
-  action: {name: clearAndSetSelection}
-initialState:
-  documentContents: |-
-    fn foo() -> i32 {
-        if a > b {
-            println!("hello")
-            return "hello";
-        }
-        "whatever"
-    }
-  selections:
-    - anchor: {line: 2, character: 18}
-      active: {line: 2, character: 18}
-  marks: {}
-finalState:
-  documentContents: |-
-    fn foo() -> i32 {
-        if a > b {
-            println!("hello")
-            return ;
-        }
-        "whatever"
-    }
-  selections:
-    - anchor: {line: 3, character: 15}
-      active: {line: 3, character: 15}
-fullTargets: [{type: primitive, mark: {type: cursor}, modifiers: [{type: containingScope, scopeType: {type: value}}]}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/rust/clearValue9.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/rust/clearValue9.yml
deleted file mode 100644
index 9a94a713dd..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/rust/clearValue9.yml
+++ /dev/null
@@ -1,35 +0,0 @@
-languageId: rust
-command:
-  spokenForm: clear value
-  version: 2
-  targets:
-    - type: primitive
-      modifiers:
-        - type: containingScope
-          scopeType: {type: value}
-  usePrePhraseSnapshot: true
-  action: {name: clearAndSetSelection}
-initialState:
-  documentContents: |-
-    fn foo() -> i32 {
-        if a > b {
-            println!("hello")
-        }
-        "whatever"
-    }
-  selections:
-    - anchor: {line: 2, character: 18}
-      active: {line: 2, character: 18}
-  marks: {}
-finalState:
-  documentContents: |-
-    fn foo() -> i32 {
-        if a > b {
-            println!("hello")
-        }
-        
-    }
-  selections:
-    - anchor: {line: 4, character: 4}
-      active: {line: 4, character: 4}
-fullTargets: [{type: primitive, mark: {type: cursor}, modifiers: [{type: containingScope, scopeType: {type: value}}]}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/rust/ditchBranch.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/rust/ditchBranch.yml
deleted file mode 100644
index e84fe2bfd6..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/rust/ditchBranch.yml
+++ /dev/null
@@ -1,35 +0,0 @@
-languageId: rust
-command:
-  version: 3
-  spokenForm: ditch branch
-  action: {name: remove}
-  targets:
-    - type: primitive
-      modifiers:
-        - type: containingScope
-          scopeType: {type: branch}
-  usePrePhraseSnapshot: true
-initialState:
-  documentContents: |-
-    if n < 0 {
-        print!("{} is negative", n);
-    } else if n > 0 {
-        print!("{} is positive", n);
-    } else {
-        print!("{} is zero", n);
-    }
-  selections:
-    - anchor: {line: 1, character: 4}
-      active: {line: 1, character: 4}
-  marks: {}
-finalState:
-  documentContents: |-
-    if n > 0 {
-        print!("{} is positive", n);
-    } else {
-        print!("{} is zero", n);
-    }
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-fullTargets: [{type: primitive, mark: {type: cursor}, modifiers: [{type: containingScope, scopeType: {type: branch}}]}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/rust/ditchBranch2.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/rust/ditchBranch2.yml
deleted file mode 100644
index 0c2458ccf6..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/rust/ditchBranch2.yml
+++ /dev/null
@@ -1,35 +0,0 @@
-languageId: rust
-command:
-  version: 3
-  spokenForm: ditch branch
-  action: {name: remove}
-  targets:
-    - type: primitive
-      modifiers:
-        - type: containingScope
-          scopeType: {type: branch}
-  usePrePhraseSnapshot: false
-initialState:
-  documentContents: |-
-    if n < 0 {
-        print!("{} is negative", n);
-    } else if n > 0 {
-        print!("{} is positive", n);
-    } else {
-        print!("{} is zero", n);
-    }
-  selections:
-    - anchor: {line: 3, character: 4}
-      active: {line: 3, character: 4}
-  marks: {}
-finalState:
-  documentContents: |-
-    if n < 0 {
-        print!("{} is negative", n);
-    }  else {
-        print!("{} is zero", n);
-    }
-  selections:
-    - anchor: {line: 2, character: 2}
-      active: {line: 2, character: 2}
-fullTargets: [{type: primitive, mark: {type: cursor}, modifiers: [{type: containingScope, scopeType: {type: branch}}]}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/rust/ditchBranch3.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/rust/ditchBranch3.yml
deleted file mode 100644
index d095ae17a1..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/rust/ditchBranch3.yml
+++ /dev/null
@@ -1,35 +0,0 @@
-languageId: rust
-command:
-  version: 3
-  spokenForm: ditch branch
-  action: {name: remove}
-  targets:
-    - type: primitive
-      modifiers:
-        - type: containingScope
-          scopeType: {type: branch}
-  usePrePhraseSnapshot: false
-initialState:
-  documentContents: |-
-    if n < 0 {
-        print!("{} is negative", n);
-    } else if n > 0 {
-        print!("{} is positive", n);
-    } else {
-        print!("{} is zero", n);
-    }
-  selections:
-    - anchor: {line: 5, character: 4}
-      active: {line: 5, character: 4}
-  marks: {}
-finalState:
-  documentContents: |-
-    if n < 0 {
-        print!("{} is negative", n);
-    } else if n > 0 {
-        print!("{} is positive", n);
-    }
-  selections:
-    - anchor: {line: 4, character: 1}
-      active: {line: 4, character: 1}
-fullTargets: [{type: primitive, mark: {type: cursor}, modifiers: [{type: containingScope, scopeType: {type: branch}}]}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/scala/chuckArgFine.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/scala/chuckArgFine.yml
deleted file mode 100644
index b5b7f71ba8..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/scala/chuckArgFine.yml
+++ /dev/null
@@ -1,26 +0,0 @@
-languageId: scala
-command:
-  version: 1
-  spokenForm: chuck arg fine
-  action: remove
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: argumentOrParameter, includeSiblings: false}
-      mark: {type: decoratedSymbol, symbolColor: default, character: f}
-initialState:
-  documentContents: |
-    class ExampleClass(foo: Int, bar: Int) {}
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-  marks:
-    default.f:
-      start: {line: 0, character: 19}
-      end: {line: 0, character: 22}
-finalState:
-  documentContents: |
-    class ExampleClass(bar: Int) {}
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-fullTargets: [{type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: f}, selectionType: token, position: contents, insideOutsideType: outside, modifier: {type: containingScope, scopeType: argumentOrParameter, includeSiblings: false}, isImplicit: false}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/scala/chuckArgFine2.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/scala/chuckArgFine2.yml
deleted file mode 100644
index 3d2c8fb1f5..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/scala/chuckArgFine2.yml
+++ /dev/null
@@ -1,30 +0,0 @@
-languageId: scala
-command:
-  version: 1
-  spokenForm: chuck arg fine
-  action: remove
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: argumentOrParameter, includeSiblings: false}
-      mark: {type: decoratedSymbol, symbolColor: default, character: f}
-initialState:
-  documentContents: |
-    class ExampleClass() {
-      def example(foo: Int, bar: Int) = foo + bar
-    }
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-  marks:
-    default.f:
-      start: {line: 1, character: 14}
-      end: {line: 1, character: 17}
-finalState:
-  documentContents: |
-    class ExampleClass() {
-      def example(bar: Int) = foo + bar
-    }
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-fullTargets: [{type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: f}, selectionType: token, position: contents, insideOutsideType: outside, modifier: {type: containingScope, scopeType: argumentOrParameter, includeSiblings: false}, isImplicit: false}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/scala/chuckArgFine3.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/scala/chuckArgFine3.yml
deleted file mode 100644
index c2313ea9dd..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/scala/chuckArgFine3.yml
+++ /dev/null
@@ -1,30 +0,0 @@
-languageId: scala
-command:
-  version: 1
-  spokenForm: chuck arg fine
-  action: remove
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: argumentOrParameter, includeSiblings: false}
-      mark: {type: decoratedSymbol, symbolColor: default, character: f}
-initialState:
-  documentContents: |
-    class ExampleClass() {
-      example(foo, bar)
-    }
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-  marks:
-    default.f:
-      start: {line: 1, character: 10}
-      end: {line: 1, character: 13}
-finalState:
-  documentContents: |
-    class ExampleClass() {
-      example(bar)
-    }
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-fullTargets: [{type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: f}, selectionType: token, position: contents, insideOutsideType: outside, modifier: {type: containingScope, scopeType: argumentOrParameter, includeSiblings: false}, isImplicit: false}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/scala/chuckBranchSun.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/scala/chuckBranchSun.yml
deleted file mode 100644
index c0d512905e..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/scala/chuckBranchSun.yml
+++ /dev/null
@@ -1,39 +0,0 @@
-languageId: scala
-command:
-  spokenForm: chuck branch sun
-  version: 2
-  targets:
-    - type: primitive
-      mark: {type: decoratedSymbol, symbolColor: default, character: s}
-      modifiers:
-        - type: containingScope
-          scopeType: {type: branch}
-  usePrePhraseSnapshot: true
-  action: {name: remove}
-initialState:
-  documentContents: |
-    def matchTest(x: Int): String = x match {
-      case 0 => "zero"
-      case 1 => "one"
-      case 2 => "two"
-      case _ => "other"
-    }
-  selections:
-    - anchor: {line: 3, character: 2}
-      active: {line: 4, character: 2}
-  marks:
-    default.s:
-      start: {line: 2, character: 2}
-      end: {line: 2, character: 6}
-finalState:
-  documentContents: |
-    def matchTest(x: Int): String = x match {
-      case 0 => "zero"
-
-      case 2 => "two"
-      case _ => "other"
-    }
-  selections:
-    - anchor: {line: 3, character: 2}
-      active: {line: 4, character: 2}
-fullTargets: [{type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: s}, modifiers: [{type: containingScope, scopeType: {type: branch}}]}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/scala/chuckConditionFine.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/scala/chuckConditionFine.yml
deleted file mode 100644
index a9bea5b247..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/scala/chuckConditionFine.yml
+++ /dev/null
@@ -1,30 +0,0 @@
-languageId: scala
-command:
-  version: 1
-  spokenForm: chuck condition fine
-  action: remove
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: condition, includeSiblings: false}
-      mark: {type: decoratedSymbol, symbolColor: default, character: f}
-initialState:
-  documentContents: |-
-    class Example() {
-      if (1 + 2 == 3) println("wow")
-    }
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-  marks:
-    default.f:
-      start: {line: 1, character: 2}
-      end: {line: 1, character: 4}
-finalState:
-  documentContents: |-
-    class Example() {
-      if () println("wow")
-    }
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-fullTargets: [{type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: f}, selectionType: token, position: contents, insideOutsideType: outside, modifier: {type: containingScope, scopeType: condition, includeSiblings: false}, isImplicit: false}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/scala/chuckTypeBat.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/scala/chuckTypeBat.yml
deleted file mode 100644
index 030f1cfd75..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/scala/chuckTypeBat.yml
+++ /dev/null
@@ -1,30 +0,0 @@
-languageId: scala
-command:
-  version: 1
-  spokenForm: chuck type bat
-  action: remove
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: type, includeSiblings: false}
-      mark: {type: decoratedSymbol, symbolColor: default, character: b}
-initialState:
-  documentContents: |-
-    class Example(foo: String) {
-      def str(bar: String): String = foo + bar
-    }
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-  marks:
-    default.b:
-      start: {line: 1, character: 10}
-      end: {line: 1, character: 13}
-finalState:
-  documentContents: |-
-    class Example(foo: String) {
-      def str(bar): String = foo + bar
-    }
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-fullTargets: [{type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: b}, selectionType: token, position: contents, insideOutsideType: outside, modifier: {type: containingScope, scopeType: type, includeSiblings: false}, isImplicit: false}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/scala/chuckTypeFine.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/scala/chuckTypeFine.yml
deleted file mode 100644
index 7522c41f6a..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/scala/chuckTypeFine.yml
+++ /dev/null
@@ -1,30 +0,0 @@
-languageId: scala
-command:
-  version: 1
-  spokenForm: chuck type fine
-  action: remove
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: type, includeSiblings: false}
-      mark: {type: decoratedSymbol, symbolColor: default, character: f}
-initialState:
-  documentContents: |-
-    class Example(foo: String) {
-      def str(bar: String): String = foo + bar
-    }
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-  marks:
-    default.f:
-      start: {line: 1, character: 33}
-      end: {line: 1, character: 36}
-finalState:
-  documentContents: |-
-    class Example(foo: String) {
-      def str(bar: String) = foo + bar
-    }
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-fullTargets: [{type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: f}, selectionType: token, position: contents, insideOutsideType: outside, modifier: {type: containingScope, scopeType: type, includeSiblings: false}, isImplicit: false}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/scala/chuckTypeFine2.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/scala/chuckTypeFine2.yml
deleted file mode 100644
index fa5c166ffc..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/scala/chuckTypeFine2.yml
+++ /dev/null
@@ -1,30 +0,0 @@
-languageId: scala
-command:
-  version: 1
-  spokenForm: chuck type fine
-  action: remove
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: type, includeSiblings: false}
-      mark: {type: decoratedSymbol, symbolColor: default, character: f}
-initialState:
-  documentContents: |
-    class TypesAhoy() {
-      def example(foo: List[String]): List[String] = foo
-    }
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-  marks:
-    default.f:
-      start: {line: 1, character: 14}
-      end: {line: 1, character: 17}
-finalState:
-  documentContents: |
-    class TypesAhoy() {
-      def example(foo): List[String] = foo
-    }
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-fullTargets: [{type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: f}, selectionType: token, position: contents, insideOutsideType: outside, modifier: {type: containingScope, scopeType: type, includeSiblings: false}, isImplicit: false}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/scala/chuckTypeFine3.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/scala/chuckTypeFine3.yml
deleted file mode 100644
index 5aa43e1c08..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/scala/chuckTypeFine3.yml
+++ /dev/null
@@ -1,26 +0,0 @@
-languageId: scala
-command:
-  version: 1
-  spokenForm: chuck type fine
-  action: remove
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: type, includeSiblings: false}
-      mark: {type: decoratedSymbol, symbolColor: default, character: f}
-initialState:
-  documentContents: |
-    class TypesAhoy(foo: String) {}
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-  marks:
-    default.f:
-      start: {line: 0, character: 16}
-      end: {line: 0, character: 19}
-finalState:
-  documentContents: |
-    class TypesAhoy(foo) {}
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-fullTargets: [{type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: f}, selectionType: token, position: contents, insideOutsideType: outside, modifier: {type: containingScope, scopeType: type, includeSiblings: false}, isImplicit: false}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/scala/chuckTypeLook.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/scala/chuckTypeLook.yml
deleted file mode 100644
index dd1f2bffa4..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/scala/chuckTypeLook.yml
+++ /dev/null
@@ -1,26 +0,0 @@
-languageId: scala
-command:
-  version: 1
-  spokenForm: chuck type look
-  action: remove
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: type, includeSiblings: false}
-      mark: {type: decoratedSymbol, symbolColor: default, character: l}
-initialState:
-  documentContents: |
-    class TypesAhoy(foo: List[String]) {}
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-  marks:
-    default.l:
-      start: {line: 0, character: 21}
-      end: {line: 0, character: 25}
-finalState:
-  documentContents: |
-    class TypesAhoy(foo) {}
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-fullTargets: [{type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: l}, selectionType: token, position: contents, insideOutsideType: outside, modifier: {type: containingScope, scopeType: type, includeSiblings: false}, isImplicit: false}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/scala/chuckTypeLook2.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/scala/chuckTypeLook2.yml
deleted file mode 100644
index dca9d6ab08..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/scala/chuckTypeLook2.yml
+++ /dev/null
@@ -1,30 +0,0 @@
-languageId: scala
-command:
-  version: 1
-  spokenForm: chuck type look
-  action: remove
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: type, includeSiblings: false}
-      mark: {type: decoratedSymbol, symbolColor: default, character: l}
-initialState:
-  documentContents: |
-    class TypesAhoy() {
-      def example(foo: List[String]): List[String] = foo
-    }
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-  marks:
-    default.l:
-      start: {line: 1, character: 19}
-      end: {line: 1, character: 23}
-finalState:
-  documentContents: |
-    class TypesAhoy() {
-      def example(foo): List[String] = foo
-    }
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-fullTargets: [{type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: l}, selectionType: token, position: contents, insideOutsideType: outside, modifier: {type: containingScope, scopeType: type, includeSiblings: false}, isImplicit: false}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/scala/chuckTypeLook3.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/scala/chuckTypeLook3.yml
deleted file mode 100644
index e1b3e834c3..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/scala/chuckTypeLook3.yml
+++ /dev/null
@@ -1,30 +0,0 @@
-languageId: scala
-command:
-  version: 1
-  spokenForm: chuck type look
-  action: remove
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: type, includeSiblings: false}
-      mark: {type: decoratedSymbol, symbolColor: default, character: l}
-initialState:
-  documentContents: |
-    class TypesAhoy() {
-      val foo: List[String] = List("foo")
-    }
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-  marks:
-    default.l:
-      start: {line: 1, character: 11}
-      end: {line: 1, character: 15}
-finalState:
-  documentContents: |
-    class TypesAhoy() {
-      val foo = List("foo")
-    }
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-fullTargets: [{type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: l}, selectionType: token, position: contents, insideOutsideType: outside, modifier: {type: containingScope, scopeType: type, includeSiblings: false}, isImplicit: false}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/scala/chuckTypeOdd.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/scala/chuckTypeOdd.yml
deleted file mode 100644
index 616a41c8c3..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/scala/chuckTypeOdd.yml
+++ /dev/null
@@ -1,30 +0,0 @@
-languageId: scala
-command:
-  version: 1
-  spokenForm: chuck type odd
-  action: remove
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: type, includeSiblings: false}
-      mark: {type: decoratedSymbol, symbolColor: default, character: o}
-initialState:
-  documentContents: |-
-    class Example(foo: String) {
-      def str(bar: String): String = foo + bar
-    }
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-  marks:
-    default.o:
-      start: {line: 0, character: 14}
-      end: {line: 0, character: 17}
-finalState:
-  documentContents: |-
-    class Example(foo) {
-      def str(bar: String): String = foo + bar
-    }
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-fullTargets: [{type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: o}, selectionType: token, position: contents, insideOutsideType: outside, modifier: {type: containingScope, scopeType: type, includeSiblings: false}, isImplicit: false}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/scala/chuckTypeOdd2.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/scala/chuckTypeOdd2.yml
deleted file mode 100644
index d8a6e0b64c..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/scala/chuckTypeOdd2.yml
+++ /dev/null
@@ -1,30 +0,0 @@
-languageId: scala
-command:
-  version: 1
-  spokenForm: chuck type odd
-  action: remove
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: type, includeSiblings: false}
-      mark: {type: decoratedSymbol, symbolColor: default, character: o}
-initialState:
-  documentContents: |
-    class TypesAhoy() {
-      def example(foo: List[String]): List[String] = foo
-    }
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-  marks:
-    default.o:
-      start: {line: 1, character: 49}
-      end: {line: 1, character: 52}
-finalState:
-  documentContents: |
-    class TypesAhoy() {
-      def example(foo: List[String]) = foo
-    }
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-fullTargets: [{type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: o}, selectionType: token, position: contents, insideOutsideType: outside, modifier: {type: containingScope, scopeType: type, includeSiblings: false}, isImplicit: false}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/scala/chuckTypeOdd3.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/scala/chuckTypeOdd3.yml
deleted file mode 100644
index 5f76e4da17..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/scala/chuckTypeOdd3.yml
+++ /dev/null
@@ -1,34 +0,0 @@
-languageId: scala
-command:
-  version: 1
-  spokenForm: chuck type odd
-  action: remove
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: type, includeSiblings: false}
-      mark: {type: decoratedSymbol, symbolColor: default, character: o}
-initialState:
-  documentContents: |
-    class TypesAhoy() {
-      f match {
-        case foo: Foo => 12
-      }
-    }
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-  marks:
-    default.o:
-      start: {line: 2, character: 9}
-      end: {line: 2, character: 12}
-finalState:
-  documentContents: |
-    class TypesAhoy() {
-      f match {
-        case foo => 12
-      }
-    }
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-fullTargets: [{type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: o}, selectionType: token, position: contents, insideOutsideType: outside, modifier: {type: containingScope, scopeType: type, includeSiblings: false}, isImplicit: false}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/scala/chuckTypeRed.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/scala/chuckTypeRed.yml
deleted file mode 100644
index 4e678a008c..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/scala/chuckTypeRed.yml
+++ /dev/null
@@ -1,30 +0,0 @@
-languageId: scala
-command:
-  version: 1
-  spokenForm: chuck type red
-  action: remove
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: type, includeSiblings: false}
-      mark: {type: decoratedSymbol, symbolColor: default, character: r}
-initialState:
-  documentContents: |
-    class TypesAhoy() {
-      def example(foo: List[String]): List[String] = foo
-    }
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-  marks:
-    default.r:
-      start: {line: 1, character: 24}
-      end: {line: 1, character: 30}
-finalState:
-  documentContents: |
-    class TypesAhoy() {
-      def example(foo): List[String] = foo
-    }
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-fullTargets: [{type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: r}, selectionType: token, position: contents, insideOutsideType: outside, modifier: {type: containingScope, scopeType: type, includeSiblings: false}, isImplicit: false}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/scala/chuckTypeRed2.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/scala/chuckTypeRed2.yml
deleted file mode 100644
index e38c3d47b5..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/scala/chuckTypeRed2.yml
+++ /dev/null
@@ -1,30 +0,0 @@
-languageId: scala
-command:
-  version: 1
-  spokenForm: chuck type red
-  action: remove
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: type, includeSiblings: false}
-      mark: {type: decoratedSymbol, symbolColor: default, character: r}
-initialState:
-  documentContents: |
-    class TypesAhoy() {
-      val foo: List[String] = List("foo")
-    }
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-  marks:
-    default.r:
-      start: {line: 1, character: 16}
-      end: {line: 1, character: 22}
-finalState:
-  documentContents: |
-    class TypesAhoy() {
-      val foo = List("foo")
-    }
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-fullTargets: [{type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: r}, selectionType: token, position: contents, insideOutsideType: outside, modifier: {type: containingScope, scopeType: type, includeSiblings: false}, isImplicit: false}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/scala/chuckTypeSit.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/scala/chuckTypeSit.yml
deleted file mode 100644
index cef7127c6c..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/scala/chuckTypeSit.yml
+++ /dev/null
@@ -1,30 +0,0 @@
-languageId: scala
-command:
-  version: 1
-  spokenForm: chuck type sit
-  action: remove
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: type, includeSiblings: false}
-      mark: {type: decoratedSymbol, symbolColor: default, character: i}
-initialState:
-  documentContents: |
-    class TypesAhoy() {
-      def example(foo: List[String]): List[String] = foo
-    }
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-  marks:
-    default.i:
-      start: {line: 1, character: 34}
-      end: {line: 1, character: 38}
-finalState:
-  documentContents: |
-    class TypesAhoy() {
-      def example(foo: List[String]) = foo
-    }
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-fullTargets: [{type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: i}, selectionType: token, position: contents, insideOutsideType: outside, modifier: {type: containingScope, scopeType: type, includeSiblings: false}, isImplicit: false}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/scala/chuckTypeSit2.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/scala/chuckTypeSit2.yml
deleted file mode 100644
index 49611610dc..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/scala/chuckTypeSit2.yml
+++ /dev/null
@@ -1,30 +0,0 @@
-languageId: scala
-command:
-  version: 1
-  spokenForm: chuck type sit
-  action: remove
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: type, includeSiblings: false}
-      mark: {type: decoratedSymbol, symbolColor: default, character: i}
-initialState:
-  documentContents: |
-    class TypesAhoy() {
-      def foo = (x: Int) => x + 1
-    }
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-  marks:
-    default.i:
-      start: {line: 1, character: 16}
-      end: {line: 1, character: 19}
-finalState:
-  documentContents: |
-    class TypesAhoy() {
-      def foo = (x) => x + 1
-    }
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-fullTargets: [{type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: i}, selectionType: token, position: contents, insideOutsideType: outside, modifier: {type: containingScope, scopeType: type, includeSiblings: false}, isImplicit: false}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/scala/chuckTypeSun.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/scala/chuckTypeSun.yml
deleted file mode 100644
index 2d889dd80d..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/scala/chuckTypeSun.yml
+++ /dev/null
@@ -1,26 +0,0 @@
-languageId: scala
-command:
-  version: 1
-  spokenForm: chuck type sun
-  action: remove
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: type, includeSiblings: false}
-      mark: {type: decoratedSymbol, symbolColor: default, character: s}
-initialState:
-  documentContents: |
-    class TypesAhoy(foo: String) {}
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-  marks:
-    default.s:
-      start: {line: 0, character: 21}
-      end: {line: 0, character: 27}
-finalState:
-  documentContents: |
-    class TypesAhoy(foo) {}
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-fullTargets: [{type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: s}, selectionType: token, position: contents, insideOutsideType: outside, modifier: {type: containingScope, scopeType: type, includeSiblings: false}, isImplicit: false}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/scala/chuckTypeSun2.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/scala/chuckTypeSun2.yml
deleted file mode 100644
index cd4f43e623..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/scala/chuckTypeSun2.yml
+++ /dev/null
@@ -1,26 +0,0 @@
-languageId: scala
-command:
-  version: 1
-  spokenForm: chuck type sun
-  action: remove
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: type, includeSiblings: false}
-      mark: {type: decoratedSymbol, symbolColor: default, character: s}
-initialState:
-  documentContents: |
-    class TypesAhoy(foo: List[String]) {}
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-  marks:
-    default.s:
-      start: {line: 0, character: 26}
-      end: {line: 0, character: 32}
-finalState:
-  documentContents: |
-    class TypesAhoy(foo) {}
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-fullTargets: [{type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: s}, selectionType: token, position: contents, insideOutsideType: outside, modifier: {type: containingScope, scopeType: type, includeSiblings: false}, isImplicit: false}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/scala/chuckTypeSun3.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/scala/chuckTypeSun3.yml
deleted file mode 100644
index 5eb4e0b721..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/scala/chuckTypeSun3.yml
+++ /dev/null
@@ -1,30 +0,0 @@
-languageId: scala
-command:
-  version: 1
-  spokenForm: chuck type sun
-  action: remove
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: type, includeSiblings: false}
-      mark: {type: decoratedSymbol, symbolColor: default, character: s}
-initialState:
-  documentContents: |
-    class TypesAhoy() {
-      def example(foo: String): String = "example"
-    }
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-  marks:
-    default.s:
-      start: {line: 1, character: 19}
-      end: {line: 1, character: 25}
-finalState:
-  documentContents: |
-    class TypesAhoy() {
-      def example(foo): String = "example"
-    }
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-fullTargets: [{type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: s}, selectionType: token, position: contents, insideOutsideType: outside, modifier: {type: containingScope, scopeType: type, includeSiblings: false}, isImplicit: false}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/scala/chuckTypeSun4.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/scala/chuckTypeSun4.yml
deleted file mode 100644
index f8c7dfbaac..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/scala/chuckTypeSun4.yml
+++ /dev/null
@@ -1,30 +0,0 @@
-languageId: scala
-command:
-  version: 1
-  spokenForm: chuck type sun
-  action: remove
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: type, includeSiblings: false}
-      mark: {type: decoratedSymbol, symbolColor: default, character: s}
-initialState:
-  documentContents: |
-    class TypesAhoy() {
-      def example(foo: List[String]): List[String] = foo
-    }
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-  marks:
-    default.s:
-      start: {line: 1, character: 39}
-      end: {line: 1, character: 45}
-finalState:
-  documentContents: |
-    class TypesAhoy() {
-      def example(foo: List[String]) = foo
-    }
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-fullTargets: [{type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: s}, selectionType: token, position: contents, insideOutsideType: outside, modifier: {type: containingScope, scopeType: type, includeSiblings: false}, isImplicit: false}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/scala/chuckTypeSun5.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/scala/chuckTypeSun5.yml
deleted file mode 100644
index cae1e8724d..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/scala/chuckTypeSun5.yml
+++ /dev/null
@@ -1,30 +0,0 @@
-languageId: scala
-command:
-  version: 1
-  spokenForm: chuck type sun
-  action: remove
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: type, includeSiblings: false}
-      mark: {type: decoratedSymbol, symbolColor: default, character: s}
-initialState:
-  documentContents: |
-    class TypesAhoy() {
-      val foo: String = "foo"
-    }
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-  marks:
-    default.s:
-      start: {line: 1, character: 11}
-      end: {line: 1, character: 17}
-finalState:
-  documentContents: |
-    class TypesAhoy() {
-      val foo = "foo"
-    }
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-fullTargets: [{type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: s}, selectionType: token, position: contents, insideOutsideType: outside, modifier: {type: containingScope, scopeType: type, includeSiblings: false}, isImplicit: false}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/scala/chuckTypeTrap.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/scala/chuckTypeTrap.yml
deleted file mode 100644
index e59e4919c4..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/scala/chuckTypeTrap.yml
+++ /dev/null
@@ -1,30 +0,0 @@
-languageId: scala
-command:
-  version: 1
-  spokenForm: chuck type trap
-  action: remove
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: type, includeSiblings: false}
-      mark: {type: decoratedSymbol, symbolColor: default, character: t}
-initialState:
-  documentContents: |
-    class TypesAhoy() {
-      def example(foo: String): String = "example"
-    }
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-  marks:
-    default.t:
-      start: {line: 1, character: 28}
-      end: {line: 1, character: 34}
-finalState:
-  documentContents: |
-    class TypesAhoy() {
-      def example(foo: String) = "example"
-    }
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-fullTargets: [{type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: t}, selectionType: token, position: contents, insideOutsideType: outside, modifier: {type: containingScope, scopeType: type, includeSiblings: false}, isImplicit: false}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/scala/chuckValue.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/scala/chuckValue.yml
deleted file mode 100644
index ceeb5eacb6..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/scala/chuckValue.yml
+++ /dev/null
@@ -1,22 +0,0 @@
-languageId: scala
-command:
-  version: 1
-  spokenForm: chuck value
-  action: remove
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: value, includeSiblings: false}
-initialState:
-  documentContents: |
-    type Vector = (Int, Int)
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-  marks: {}
-finalState:
-  documentContents: |
-    type Vector
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: outside, modifier: {type: containingScope, scopeType: value, includeSiblings: false}, isImplicit: false}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/scala/chuckValueOdd.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/scala/chuckValueOdd.yml
deleted file mode 100644
index e1acd16151..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/scala/chuckValueOdd.yml
+++ /dev/null
@@ -1,26 +0,0 @@
-languageId: scala
-command:
-  version: 1
-  spokenForm: chuck value odd
-  action: remove
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: value, includeSiblings: false}
-      mark: {type: decoratedSymbol, symbolColor: default, character: o}
-initialState:
-  documentContents: |
-    class Example(foo: String = "foo") {}
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-  marks:
-    default.o:
-      start: {line: 0, character: 29}
-      end: {line: 0, character: 32}
-finalState:
-  documentContents: |
-    class Example(foo: String) {}
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-fullTargets: [{type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: o}, selectionType: token, position: contents, insideOutsideType: outside, modifier: {type: containingScope, scopeType: value, includeSiblings: false}, isImplicit: false}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/scala/chuckValueRed.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/scala/chuckValueRed.yml
deleted file mode 100644
index b2511b67a7..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/scala/chuckValueRed.yml
+++ /dev/null
@@ -1,30 +0,0 @@
-languageId: scala
-command:
-  version: 1
-  spokenForm: chuck value red
-  action: remove
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: value, includeSiblings: false}
-      mark: {type: decoratedSymbol, symbolColor: default, character: r}
-initialState:
-  documentContents: |
-    class Example() {
-      val bar = "bar" + "smang"
-    }
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-  marks:
-    default.r:
-      start: {line: 1, character: 13}
-      end: {line: 1, character: 16}
-finalState:
-  documentContents: |
-    class Example() {
-      val bar
-    }
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-fullTargets: [{type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: r}, selectionType: token, position: contents, insideOutsideType: outside, modifier: {type: containingScope, scopeType: value, includeSiblings: false}, isImplicit: false}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/scala/chuckValueSit.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/scala/chuckValueSit.yml
deleted file mode 100644
index 56c40dad00..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/scala/chuckValueSit.yml
+++ /dev/null
@@ -1,30 +0,0 @@
-languageId: scala
-command:
-  version: 1
-  spokenForm: chuck value sit
-  action: remove
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: value, includeSiblings: false}
-      mark: {type: decoratedSymbol, symbolColor: default, character: i}
-initialState:
-  documentContents: |
-    class Example() {
-      val bling = "blang"
-    }
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-  marks:
-    default.i:
-      start: {line: 1, character: 6}
-      end: {line: 1, character: 11}
-finalState:
-  documentContents: |
-    class Example() {
-      val bling
-    }
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-fullTargets: [{type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: i}, selectionType: token, position: contents, insideOutsideType: outside, modifier: {type: containingScope, scopeType: value, includeSiblings: false}, isImplicit: false}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/scala/clearArgFine.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/scala/clearArgFine.yml
deleted file mode 100644
index faa63000dd..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/scala/clearArgFine.yml
+++ /dev/null
@@ -1,26 +0,0 @@
-languageId: scala
-command:
-  version: 1
-  spokenForm: clear arg fine
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: argumentOrParameter, includeSiblings: false}
-      mark: {type: decoratedSymbol, symbolColor: default, character: f}
-initialState:
-  documentContents: |
-    class ExampleClass(foo: Int, bar: Int) {}
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-  marks:
-    default.f:
-      start: {line: 0, character: 19}
-      end: {line: 0, character: 22}
-finalState:
-  documentContents: |
-    class ExampleClass(, bar: Int) {}
-  selections:
-    - anchor: {line: 0, character: 19}
-      active: {line: 0, character: 19}
-fullTargets: [{type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: f}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: containingScope, scopeType: argumentOrParameter, includeSiblings: false}, isImplicit: false}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/scala/clearArgFine2.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/scala/clearArgFine2.yml
deleted file mode 100644
index 8dbdc5433f..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/scala/clearArgFine2.yml
+++ /dev/null
@@ -1,30 +0,0 @@
-languageId: scala
-command:
-  version: 1
-  spokenForm: clear arg fine
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: argumentOrParameter, includeSiblings: false}
-      mark: {type: decoratedSymbol, symbolColor: default, character: f}
-initialState:
-  documentContents: |
-    class ExampleClass() {
-      def example(foo: Int, bar: Int) = foo + bar
-    }
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-  marks:
-    default.f:
-      start: {line: 1, character: 14}
-      end: {line: 1, character: 17}
-finalState:
-  documentContents: |
-    class ExampleClass() {
-      def example(, bar: Int) = foo + bar
-    }
-  selections:
-    - anchor: {line: 1, character: 14}
-      active: {line: 1, character: 14}
-fullTargets: [{type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: f}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: containingScope, scopeType: argumentOrParameter, includeSiblings: false}, isImplicit: false}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/scala/clearArgFine3.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/scala/clearArgFine3.yml
deleted file mode 100644
index a3774422f2..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/scala/clearArgFine3.yml
+++ /dev/null
@@ -1,30 +0,0 @@
-languageId: scala
-command:
-  version: 1
-  spokenForm: clear arg fine
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: argumentOrParameter, includeSiblings: false}
-      mark: {type: decoratedSymbol, symbolColor: default, character: f}
-initialState:
-  documentContents: |
-    class ExampleClass() {
-      example(foo, bar)
-    }
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-  marks:
-    default.f:
-      start: {line: 1, character: 10}
-      end: {line: 1, character: 13}
-finalState:
-  documentContents: |
-    class ExampleClass() {
-      example(, bar)
-    }
-  selections:
-    - anchor: {line: 1, character: 10}
-      active: {line: 1, character: 10}
-fullTargets: [{type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: f}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: containingScope, scopeType: argumentOrParameter, includeSiblings: false}, isImplicit: false}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/scala/clearBranch.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/scala/clearBranch.yml
deleted file mode 100644
index 9946de07a9..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/scala/clearBranch.yml
+++ /dev/null
@@ -1,31 +0,0 @@
-languageId: scala
-command:
-  version: 3
-  spokenForm: clear branch
-  action: {name: clearAndSetSelection}
-  targets:
-    - type: primitive
-      modifiers:
-        - type: containingScope
-          scopeType: {type: branch}
-  usePrePhraseSnapshot: true
-initialState:
-  documentContents: |-
-    def matchTest(x: Int): String = x match {
-      case 0 => "zero"
-      case _ => "other"
-    }
-  selections:
-    - anchor: {line: 1, character: 2}
-      active: {line: 1, character: 2}
-  marks: {}
-finalState:
-  documentContents: |-
-    def matchTest(x: Int): String = x match {
-      
-      case _ => "other"
-    }
-  selections:
-    - anchor: {line: 1, character: 2}
-      active: {line: 1, character: 2}
-fullTargets: [{type: primitive, mark: {type: cursor}, modifiers: [{type: containingScope, scopeType: {type: branch}}]}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/scala/clearCallMade.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/scala/clearCallMade.yml
deleted file mode 100644
index ec29141edc..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/scala/clearCallMade.yml
+++ /dev/null
@@ -1,32 +0,0 @@
-languageId: scala
-command:
-  version: 0
-  spokenForm: clear call made
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: functionCall, includeSiblings: false}
-      mark: {type: decoratedSymbol, symbolColor: default, character: m}
-initialState:
-  documentContents: |-
-    object Example {
-      val numbers = List(1,2,3,4)
-      numbers.map(_ + 1)
-    }
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-  marks:
-    default.m:
-      start: {line: 2, character: 10}
-      end: {line: 2, character: 13}
-finalState:
-  documentContents: |-
-    object Example {
-      val numbers = List(1,2,3,4)
-      
-    }
-  selections:
-    - anchor: {line: 2, character: 2}
-      active: {line: 2, character: 2}
-fullTargets: [{type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: m}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: containingScope, scopeType: functionCall, includeSiblings: false}, isImplicit: false}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/scala/clearClass.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/scala/clearClass.yml
deleted file mode 100644
index 5305cc1c75..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/scala/clearClass.yml
+++ /dev/null
@@ -1,22 +0,0 @@
-languageId: scala
-command:
-  version: 0
-  spokenForm: clear class
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: class, includeSiblings: false}
-initialState:
-  documentContents: |
-    class ExampleClass() {}
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-  marks: {}
-finalState:
-  documentContents: |+
-
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: containingScope, scopeType: class, includeSiblings: false}, isImplicit: false}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/scala/clearClass2.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/scala/clearClass2.yml
deleted file mode 100644
index c3c2fe0d82..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/scala/clearClass2.yml
+++ /dev/null
@@ -1,22 +0,0 @@
-languageId: scala
-command:
-  version: 0
-  spokenForm: clear class
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: class, includeSiblings: false}
-initialState:
-  documentContents: |
-    object ExampleClass {}
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-  marks: {}
-finalState:
-  documentContents: |+
-
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: containingScope, scopeType: class, includeSiblings: false}, isImplicit: false}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/scala/clearClass3.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/scala/clearClass3.yml
deleted file mode 100644
index f1d9249be8..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/scala/clearClass3.yml
+++ /dev/null
@@ -1,23 +0,0 @@
-languageId: scala
-command:
-  version: 0
-  spokenForm: clear class
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: class, includeSiblings: false}
-initialState:
-  documentContents: |-
-    trait Greeter {
-      def greet(name: String): Unit
-    }
-  selections:
-    - anchor: {line: 1, character: 0}
-      active: {line: 1, character: 0}
-  marks: {}
-finalState:
-  documentContents: ""
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: containingScope, scopeType: class, includeSiblings: false}, isImplicit: false}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/scala/clearClass4.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/scala/clearClass4.yml
deleted file mode 100644
index 8cd5eec25c..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/scala/clearClass4.yml
+++ /dev/null
@@ -1,20 +0,0 @@
-languageId: scala
-command:
-  version: 0
-  spokenForm: clear class
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: class, includeSiblings: false}
-initialState:
-  documentContents: case class Example()
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-  marks: {}
-finalState:
-  documentContents: ""
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: containingScope, scopeType: class, includeSiblings: false}, isImplicit: false}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/scala/clearClassName.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/scala/clearClassName.yml
deleted file mode 100644
index 863e6c683a..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/scala/clearClassName.yml
+++ /dev/null
@@ -1,22 +0,0 @@
-languageId: scala
-command:
-  version: 0
-  spokenForm: clear class name
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: className, includeSiblings: false}
-initialState:
-  documentContents: |
-    class ExampleClass() {}
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-  marks: {}
-finalState:
-  documentContents: |
-    class () {}
-  selections:
-    - anchor: {line: 0, character: 6}
-      active: {line: 0, character: 6}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: containingScope, scopeType: className, includeSiblings: false}, isImplicit: false}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/scala/clearClassName2.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/scala/clearClassName2.yml
deleted file mode 100644
index f089534be4..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/scala/clearClassName2.yml
+++ /dev/null
@@ -1,22 +0,0 @@
-languageId: scala
-command:
-  version: 0
-  spokenForm: clear class name
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: className, includeSiblings: false}
-initialState:
-  documentContents: |
-    object ExampleClass {}
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-  marks: {}
-finalState:
-  documentContents: |
-    object  {}
-  selections:
-    - anchor: {line: 0, character: 7}
-      active: {line: 0, character: 7}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: containingScope, scopeType: className, includeSiblings: false}, isImplicit: false}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/scala/clearClassName3.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/scala/clearClassName3.yml
deleted file mode 100644
index a9726bf983..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/scala/clearClassName3.yml
+++ /dev/null
@@ -1,26 +0,0 @@
-languageId: scala
-command:
-  version: 0
-  spokenForm: clear class name
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: className, includeSiblings: false}
-initialState:
-  documentContents: |-
-    trait Greeter {
-      def greet(name: String): Unit
-    }
-  selections:
-    - anchor: {line: 1, character: 0}
-      active: {line: 1, character: 0}
-  marks: {}
-finalState:
-  documentContents: |-
-    trait  {
-      def greet(name: String): Unit
-    }
-  selections:
-    - anchor: {line: 0, character: 6}
-      active: {line: 0, character: 6}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: containingScope, scopeType: className, includeSiblings: false}, isImplicit: false}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/scala/clearClassName4.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/scala/clearClassName4.yml
deleted file mode 100644
index bdc1f301cd..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/scala/clearClassName4.yml
+++ /dev/null
@@ -1,20 +0,0 @@
-languageId: scala
-command:
-  version: 0
-  spokenForm: clear class name
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: className, includeSiblings: false}
-initialState:
-  documentContents: case class Example()
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-  marks: {}
-finalState:
-  documentContents: case class ()
-  selections:
-    - anchor: {line: 0, character: 11}
-      active: {line: 0, character: 11}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: containingScope, scopeType: className, includeSiblings: false}, isImplicit: false}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/scala/clearComment.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/scala/clearComment.yml
deleted file mode 100644
index 6c88482e46..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/scala/clearComment.yml
+++ /dev/null
@@ -1,20 +0,0 @@
-languageId: scala
-command:
-  version: 0
-  spokenForm: clear comment
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: comment, includeSiblings: false}
-initialState:
-  documentContents: // this is a line comment
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-  marks: {}
-finalState:
-  documentContents: ""
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: containingScope, scopeType: comment, includeSiblings: false}, isImplicit: false}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/scala/clearComment2.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/scala/clearComment2.yml
deleted file mode 100644
index d36b143ae9..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/scala/clearComment2.yml
+++ /dev/null
@@ -1,23 +0,0 @@
-languageId: scala
-command:
-  version: 0
-  spokenForm: clear comment
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: comment, includeSiblings: false}
-initialState:
-  documentContents: |-
-    /*
-      block comment
-    */
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-  marks: {}
-finalState:
-  documentContents: ""
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: containingScope, scopeType: comment, includeSiblings: false}, isImplicit: false}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/scala/clearConditionEquals.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/scala/clearConditionEquals.yml
deleted file mode 100644
index ccc136578f..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/scala/clearConditionEquals.yml
+++ /dev/null
@@ -1,30 +0,0 @@
-languageId: scala
-command:
-  version: 1
-  spokenForm: clear condition equals
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: condition, includeSiblings: false}
-      mark: {type: decoratedSymbol, symbolColor: default, character: '='}
-initialState:
-  documentContents: |
-    class Example() {
-      if (1 + 2 == 3) println("wow")
-    }
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-  marks:
-    default.=:
-      start: {line: 1, character: 12}
-      end: {line: 1, character: 14}
-finalState:
-  documentContents: |
-    class Example() {
-      if () println("wow")
-    }
-  selections:
-    - anchor: {line: 1, character: 6}
-      active: {line: 1, character: 6}
-fullTargets: [{type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: '='}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: containingScope, scopeType: condition, includeSiblings: false}, isImplicit: false}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/scala/clearConditionFine.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/scala/clearConditionFine.yml
deleted file mode 100644
index 34b406e6ee..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/scala/clearConditionFine.yml
+++ /dev/null
@@ -1,30 +0,0 @@
-languageId: scala
-command:
-  version: 1
-  spokenForm: clear condition fine
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: condition, includeSiblings: false}
-      mark: {type: decoratedSymbol, symbolColor: default, character: f}
-initialState:
-  documentContents: |-
-    class Example() {
-      if (1 + 2 == 3) println("wow")
-    }
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-  marks:
-    default.f:
-      start: {line: 1, character: 2}
-      end: {line: 1, character: 4}
-finalState:
-  documentContents: |-
-    class Example() {
-      if () println("wow")
-    }
-  selections:
-    - anchor: {line: 1, character: 6}
-      active: {line: 1, character: 6}
-fullTargets: [{type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: f}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: containingScope, scopeType: condition, includeSiblings: false}, isImplicit: false}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/scala/clearFunkFour.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/scala/clearFunkFour.yml
deleted file mode 100644
index 08d0fcf8a5..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/scala/clearFunkFour.yml
+++ /dev/null
@@ -1,30 +0,0 @@
-languageId: scala
-command:
-  version: 1
-  spokenForm: clear funk four
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: namedFunction, includeSiblings: false}
-      mark: {type: decoratedSymbol, symbolColor: default, character: '4'}
-initialState:
-  documentContents: |
-    class ExampleClass() {
-      def foo() = 42
-    }
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-  marks:
-    default.4:
-      start: {line: 1, character: 14}
-      end: {line: 1, character: 16}
-finalState:
-  documentContents: |
-    class ExampleClass() {
-      
-    }
-  selections:
-    - anchor: {line: 1, character: 2}
-      active: {line: 1, character: 2}
-fullTargets: [{type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: '4'}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: containingScope, scopeType: namedFunction, includeSiblings: false}, isImplicit: false}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/scala/clearFunkNameFour.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/scala/clearFunkNameFour.yml
deleted file mode 100644
index 035b813318..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/scala/clearFunkNameFour.yml
+++ /dev/null
@@ -1,30 +0,0 @@
-languageId: scala
-command:
-  version: 1
-  spokenForm: clear funk name four
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: functionName, includeSiblings: false}
-      mark: {type: decoratedSymbol, symbolColor: default, character: '4'}
-initialState:
-  documentContents: |
-    class ExampleClass() {
-      def foo() = 42
-    }
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-  marks:
-    default.4:
-      start: {line: 1, character: 14}
-      end: {line: 1, character: 16}
-finalState:
-  documentContents: |
-    class ExampleClass() {
-      def () = 42
-    }
-  selections:
-    - anchor: {line: 1, character: 6}
-      active: {line: 1, character: 6}
-fullTargets: [{type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: '4'}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: containingScope, scopeType: functionName, includeSiblings: false}, isImplicit: false}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/scala/clearIfState.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/scala/clearIfState.yml
deleted file mode 100644
index 4a0e6ab755..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/scala/clearIfState.yml
+++ /dev/null
@@ -1,20 +0,0 @@
-languageId: scala
-command:
-  version: 0
-  spokenForm: clear if state
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: ifStatement, includeSiblings: false}
-initialState:
-  documentContents: val test = if (true) true else false
-  selections:
-    - anchor: {line: 0, character: 12}
-      active: {line: 0, character: 12}
-  marks: {}
-finalState:
-  documentContents: "val test = "
-  selections:
-    - anchor: {line: 0, character: 11}
-      active: {line: 0, character: 11}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: containingScope, scopeType: ifStatement, includeSiblings: false}, isImplicit: false}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/scala/clearIfState2.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/scala/clearIfState2.yml
deleted file mode 100644
index 3dfe96d4c2..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/scala/clearIfState2.yml
+++ /dev/null
@@ -1,25 +0,0 @@
-languageId: scala
-command:
-  version: 0
-  spokenForm: clear if state
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: ifStatement, includeSiblings: false}
-initialState:
-  documentContents: |-
-    val test = if (true) {
-      true
-    } else {
-      false
-    }
-  selections:
-    - anchor: {line: 0, character: 12}
-      active: {line: 0, character: 12}
-  marks: {}
-finalState:
-  documentContents: "val test = "
-  selections:
-    - anchor: {line: 0, character: 11}
-      active: {line: 0, character: 11}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: containingScope, scopeType: ifStatement, includeSiblings: false}, isImplicit: false}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/scala/clearLambdaPlus.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/scala/clearLambdaPlus.yml
deleted file mode 100644
index b53ff32aa0..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/scala/clearLambdaPlus.yml
+++ /dev/null
@@ -1,30 +0,0 @@
-languageId: scala
-command:
-  version: 0
-  spokenForm: clear lambda plus
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: anonymousFunction, includeSiblings: false}
-      mark: {type: decoratedSymbol, symbolColor: default, character: +}
-initialState:
-  documentContents: |-
-    class ExampleClass() {
-      val example = List(1,2,3,4).map(x => x + 1)
-    }
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-  marks:
-    default.+:
-      start: {line: 1, character: 41}
-      end: {line: 1, character: 42}
-finalState:
-  documentContents: |-
-    class ExampleClass() {
-      val example = List(1,2,3,4).map()
-    }
-  selections:
-    - anchor: {line: 1, character: 34}
-      active: {line: 1, character: 34}
-fullTargets: [{type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: +}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: containingScope, scopeType: anonymousFunction, includeSiblings: false}, isImplicit: false}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/scala/clearLambdaPlus2.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/scala/clearLambdaPlus2.yml
deleted file mode 100644
index 3117e19ae0..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/scala/clearLambdaPlus2.yml
+++ /dev/null
@@ -1,30 +0,0 @@
-languageId: scala
-command:
-  version: 0
-  spokenForm: clear lambda plus
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: anonymousFunction, includeSiblings: false}
-      mark: {type: decoratedSymbol, symbolColor: default, character: +}
-initialState:
-  documentContents: |-
-    class ExampleClass() {
-      val example = List(1,2,3,4).map((x: Int) => x + 1)
-    }
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-  marks:
-    default.+:
-      start: {line: 1, character: 48}
-      end: {line: 1, character: 49}
-finalState:
-  documentContents: |-
-    class ExampleClass() {
-      val example = List(1,2,3,4).map()
-    }
-  selections:
-    - anchor: {line: 1, character: 34}
-      active: {line: 1, character: 34}
-fullTargets: [{type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: +}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: containingScope, scopeType: anonymousFunction, includeSiblings: false}, isImplicit: false}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/scala/clearLambdaPlus3.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/scala/clearLambdaPlus3.yml
deleted file mode 100644
index 036a18df02..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/scala/clearLambdaPlus3.yml
+++ /dev/null
@@ -1,32 +0,0 @@
-languageId: scala
-command:
-  version: 0
-  spokenForm: clear lambda plus
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: anonymousFunction, includeSiblings: false}
-      mark: {type: decoratedSymbol, symbolColor: default, character: +}
-initialState:
-  documentContents: |-
-    class ExampleClass() {
-      val example = List(1,2,3,4).map((x: Int) => {
-        x + 1
-      })
-    }
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-  marks:
-    default.+:
-      start: {line: 2, character: 6}
-      end: {line: 2, character: 7}
-finalState:
-  documentContents: |-
-    class ExampleClass() {
-      val example = List(1,2,3,4).map()
-    }
-  selections:
-    - anchor: {line: 1, character: 34}
-      active: {line: 1, character: 34}
-fullTargets: [{type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: +}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: containingScope, scopeType: anonymousFunction, includeSiblings: false}, isImplicit: false}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/scala/clearName.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/scala/clearName.yml
deleted file mode 100644
index ac356ec01c..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/scala/clearName.yml
+++ /dev/null
@@ -1,22 +0,0 @@
-languageId: scala
-command:
-  version: 1
-  spokenForm: clear name
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: name, includeSiblings: false}
-initialState:
-  documentContents: |
-    class ExampleClass() {}
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-  marks: {}
-finalState:
-  documentContents: |
-    class () {}
-  selections:
-    - anchor: {line: 0, character: 6}
-      active: {line: 0, character: 6}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: containingScope, scopeType: name, includeSiblings: false}, isImplicit: false}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/scala/clearNameFour.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/scala/clearNameFour.yml
deleted file mode 100644
index f63a4135f0..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/scala/clearNameFour.yml
+++ /dev/null
@@ -1,30 +0,0 @@
-languageId: scala
-command:
-  version: 1
-  spokenForm: clear name four
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: name, includeSiblings: false}
-      mark: {type: decoratedSymbol, symbolColor: default, character: '4'}
-initialState:
-  documentContents: |
-    class ExampleClass() {
-      def foo() = 42
-    }
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-  marks:
-    default.4:
-      start: {line: 1, character: 14}
-      end: {line: 1, character: 16}
-finalState:
-  documentContents: |
-    class ExampleClass() {
-      def () = 42
-    }
-  selections:
-    - anchor: {line: 1, character: 6}
-      active: {line: 1, character: 6}
-fullTargets: [{type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: '4'}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: containingScope, scopeType: name, includeSiblings: false}, isImplicit: false}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/scala/clearNameFour2.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/scala/clearNameFour2.yml
deleted file mode 100644
index b1eea4df00..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/scala/clearNameFour2.yml
+++ /dev/null
@@ -1,30 +0,0 @@
-languageId: scala
-command:
-  version: 1
-  spokenForm: clear name four
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: name, includeSiblings: false}
-      mark: {type: decoratedSymbol, symbolColor: default, character: '4'}
-initialState:
-  documentContents: |
-    class ExampleClass() {
-      val foo = 42
-    }
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-  marks:
-    default.4:
-      start: {line: 1, character: 12}
-      end: {line: 1, character: 14}
-finalState:
-  documentContents: |
-    class ExampleClass() {
-      val  = 42
-    }
-  selections:
-    - anchor: {line: 1, character: 6}
-      active: {line: 1, character: 6}
-fullTargets: [{type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: '4'}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: containingScope, scopeType: name, includeSiblings: false}, isImplicit: false}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/scala/clearRoundWhale.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/scala/clearRoundWhale.yml
deleted file mode 100644
index 874ef59730..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/scala/clearRoundWhale.yml
+++ /dev/null
@@ -1,30 +0,0 @@
-languageId: scala
-command:
-  version: 1
-  spokenForm: clear round whale
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: surroundingPair, delimiter: parentheses}
-      mark: {type: decoratedSymbol, symbolColor: default, character: w}
-initialState:
-  documentContents: |
-    class Example() {
-      val example = "some (wrapped text) to test"
-    }
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-  marks:
-    default.w:
-      start: {line: 1, character: 23}
-      end: {line: 1, character: 30}
-finalState:
-  documentContents: |
-    class Example() {
-      val example = "some  to test"
-    }
-  selections:
-    - anchor: {line: 1, character: 22}
-      active: {line: 1, character: 22}
-fullTargets: [{type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: w}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: surroundingPair, delimiter: parentheses}, isImplicit: false}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/scala/clearRoundWhale2.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/scala/clearRoundWhale2.yml
deleted file mode 100644
index 44acec1338..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/scala/clearRoundWhale2.yml
+++ /dev/null
@@ -1,35 +0,0 @@
-languageId: scala
-command:
-  version: 1
-  spokenForm: clear round whale
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: surroundingPair, delimiter: parentheses}
-      mark: {type: decoratedSymbol, symbolColor: default, character: w}
-initialState:
-  documentContents: |
-    class Example() {
-      val example = """
-      some (wrapped 
-      text) to test
-      """
-    }
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-  marks:
-    default.w:
-      start: {line: 2, character: 8}
-      end: {line: 2, character: 15}
-finalState:
-  documentContents: |
-    class Example() {
-      val example = """
-      some  to test
-      """
-    }
-  selections:
-    - anchor: {line: 2, character: 7}
-      active: {line: 2, character: 7}
-fullTargets: [{type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: w}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: surroundingPair, delimiter: parentheses}, isImplicit: false}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/scala/clearString.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/scala/clearString.yml
deleted file mode 100644
index 58cbe95e51..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/scala/clearString.yml
+++ /dev/null
@@ -1,26 +0,0 @@
-languageId: scala
-command:
-  version: 0
-  spokenForm: clear string
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: string, includeSiblings: false}
-initialState:
-  documentContents: |
-    class ExampleClass() {
-      val string = "example string"
-    }
-  selections:
-    - anchor: {line: 1, character: 24}
-      active: {line: 1, character: 24}
-  marks: {}
-finalState:
-  documentContents: |
-    class ExampleClass() {
-      val string = 
-    }
-  selections:
-    - anchor: {line: 1, character: 15}
-      active: {line: 1, character: 15}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: containingScope, scopeType: string, includeSiblings: false}, isImplicit: false}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/scala/clearString2.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/scala/clearString2.yml
deleted file mode 100644
index ab2efbebaa..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/scala/clearString2.yml
+++ /dev/null
@@ -1,26 +0,0 @@
-languageId: scala
-command:
-  version: 0
-  spokenForm: clear string
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: string, includeSiblings: false}
-initialState:
-  documentContents: |
-    val string = """
-    multi
-    line
-    string
-    """
-  selections:
-    - anchor: {line: 0, character: 16}
-      active: {line: 0, character: 16}
-  marks: {}
-finalState:
-  documentContents: |
-    val string = 
-  selections:
-    - anchor: {line: 0, character: 13}
-      active: {line: 0, character: 13}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: containingScope, scopeType: string, includeSiblings: false}, isImplicit: false}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/scala/clearStringOdd.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/scala/clearStringOdd.yml
deleted file mode 100644
index 5348dc33e0..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/scala/clearStringOdd.yml
+++ /dev/null
@@ -1,30 +0,0 @@
-languageId: scala
-command:
-  version: 0
-  spokenForm: clear string odd
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: string, includeSiblings: false}
-      mark: {type: decoratedSymbol, symbolColor: default, character: o}
-initialState:
-  documentContents: |
-    class ExampleClass() {
-      val example = f"formatted ${1} string"
-    }
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-  marks:
-    default.o:
-      start: {line: 1, character: 18}
-      end: {line: 1, character: 27}
-finalState:
-  documentContents: |
-    class ExampleClass() {
-      val example = 
-    }
-  selections:
-    - anchor: {line: 1, character: 16}
-      active: {line: 1, character: 16}
-fullTargets: [{type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: o}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: containingScope, scopeType: string, includeSiblings: false}, isImplicit: false}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/scala/clearSubject.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/scala/clearSubject.yml
deleted file mode 100644
index e23d880ea8..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/scala/clearSubject.yml
+++ /dev/null
@@ -1,29 +0,0 @@
-languageId: scala
-command:
-  spokenForm: clear subject
-  version: 3
-  targets:
-    - type: primitive
-      modifiers:
-        - type: containingScope
-          scopeType: {type: switchStatementSubject}
-  usePrePhraseSnapshot: true
-  action: {name: clearAndSetSelection}
-initialState:
-  documentContents: |
-    def matchTest(x: Int): String = x match {
-      case 0 => "zero"
-    }
-  selections:
-    - anchor: {line: 1, character: 15}
-      active: {line: 1, character: 15}
-  marks: {}
-finalState:
-  documentContents: |
-    def matchTest(x: Int): String =  match {
-      case 0 => "zero"
-    }
-  selections:
-    - anchor: {line: 0, character: 32}
-      active: {line: 0, character: 32}
-fullTargets: [{type: primitive, mark: {type: cursor}, modifiers: [{type: containingScope, scopeType: {type: switchStatementSubject}}]}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/scala/clearType.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/scala/clearType.yml
deleted file mode 100644
index 2d1e41ba5d..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/scala/clearType.yml
+++ /dev/null
@@ -1,22 +0,0 @@
-languageId: scala
-command:
-  version: 1
-  spokenForm: clear type
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: type, includeSiblings: false}
-initialState:
-  documentContents: |
-    type Vector = (Int, Int)
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-  marks: {}
-finalState:
-  documentContents: |+
-
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: containingScope, scopeType: type, includeSiblings: false}, isImplicit: false}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/scala/clearTypeBat.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/scala/clearTypeBat.yml
deleted file mode 100644
index b9501d2716..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/scala/clearTypeBat.yml
+++ /dev/null
@@ -1,30 +0,0 @@
-languageId: scala
-command:
-  version: 1
-  spokenForm: clear type bat
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: type, includeSiblings: false}
-      mark: {type: decoratedSymbol, symbolColor: default, character: b}
-initialState:
-  documentContents: |-
-    class Example(foo: String) {
-      def str(bar: String): String = foo + bar
-    }
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-  marks:
-    default.b:
-      start: {line: 1, character: 10}
-      end: {line: 1, character: 13}
-finalState:
-  documentContents: |-
-    class Example(foo: String) {
-      def str(bar: ): String = foo + bar
-    }
-  selections:
-    - anchor: {line: 1, character: 15}
-      active: {line: 1, character: 15}
-fullTargets: [{type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: b}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: containingScope, scopeType: type, includeSiblings: false}, isImplicit: false}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/scala/clearTypeComma.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/scala/clearTypeComma.yml
deleted file mode 100644
index 7acd3b0ef9..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/scala/clearTypeComma.yml
+++ /dev/null
@@ -1,26 +0,0 @@
-languageId: scala
-command:
-  version: 1
-  spokenForm: clear type comma
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: type, includeSiblings: false}
-      mark: {type: decoratedSymbol, symbolColor: default, character: ','}
-initialState:
-  documentContents: |
-    type Vector = (Int, Int)
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-  marks:
-    default.,:
-      start: {line: 0, character: 18}
-      end: {line: 0, character: 19}
-finalState:
-  documentContents: |+
-
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-fullTargets: [{type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: ','}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: containingScope, scopeType: type, includeSiblings: false}, isImplicit: false}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/scala/clearTypeFine.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/scala/clearTypeFine.yml
deleted file mode 100644
index 8c80a595b1..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/scala/clearTypeFine.yml
+++ /dev/null
@@ -1,30 +0,0 @@
-languageId: scala
-command:
-  version: 1
-  spokenForm: clear type fine
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: type, includeSiblings: false}
-      mark: {type: decoratedSymbol, symbolColor: default, character: f}
-initialState:
-  documentContents: |-
-    class Example(foo: String) {
-      def str(bar: String): String = foo + bar
-    }
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-  marks:
-    default.f:
-      start: {line: 1, character: 33}
-      end: {line: 1, character: 36}
-finalState:
-  documentContents: |-
-    class Example(foo: String) {
-      def str(bar: String):  = foo + bar
-    }
-  selections:
-    - anchor: {line: 1, character: 24}
-      active: {line: 1, character: 24}
-fullTargets: [{type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: f}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: containingScope, scopeType: type, includeSiblings: false}, isImplicit: false}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/scala/clearTypeFine2.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/scala/clearTypeFine2.yml
deleted file mode 100644
index a29dd82aa3..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/scala/clearTypeFine2.yml
+++ /dev/null
@@ -1,30 +0,0 @@
-languageId: scala
-command:
-  version: 1
-  spokenForm: clear type fine
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: type, includeSiblings: false}
-      mark: {type: decoratedSymbol, symbolColor: default, character: f}
-initialState:
-  documentContents: |
-    class TypesAhoy() {
-      def example(foo: List[String]): List[String] = foo
-    }
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-  marks:
-    default.f:
-      start: {line: 1, character: 14}
-      end: {line: 1, character: 17}
-finalState:
-  documentContents: |
-    class TypesAhoy() {
-      def example(foo: ): List[String] = foo
-    }
-  selections:
-    - anchor: {line: 1, character: 19}
-      active: {line: 1, character: 19}
-fullTargets: [{type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: f}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: containingScope, scopeType: type, includeSiblings: false}, isImplicit: false}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/scala/clearTypeFine3.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/scala/clearTypeFine3.yml
deleted file mode 100644
index dd88c79f60..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/scala/clearTypeFine3.yml
+++ /dev/null
@@ -1,26 +0,0 @@
-languageId: scala
-command:
-  version: 1
-  spokenForm: clear type fine
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: type, includeSiblings: false}
-      mark: {type: decoratedSymbol, symbolColor: default, character: f}
-initialState:
-  documentContents: |
-    class TypesAhoy(foo: String) {}
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-  marks:
-    default.f:
-      start: {line: 0, character: 16}
-      end: {line: 0, character: 19}
-finalState:
-  documentContents: |
-    class TypesAhoy(foo: ) {}
-  selections:
-    - anchor: {line: 0, character: 21}
-      active: {line: 0, character: 21}
-fullTargets: [{type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: f}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: containingScope, scopeType: type, includeSiblings: false}, isImplicit: false}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/scala/clearTypeLook.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/scala/clearTypeLook.yml
deleted file mode 100644
index daf7110fb0..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/scala/clearTypeLook.yml
+++ /dev/null
@@ -1,26 +0,0 @@
-languageId: scala
-command:
-  version: 1
-  spokenForm: clear type look
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: type, includeSiblings: false}
-      mark: {type: decoratedSymbol, symbolColor: default, character: l}
-initialState:
-  documentContents: |
-    class TypesAhoy(foo: List[String]) {}
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-  marks:
-    default.l:
-      start: {line: 0, character: 21}
-      end: {line: 0, character: 25}
-finalState:
-  documentContents: |
-    class TypesAhoy(foo: ) {}
-  selections:
-    - anchor: {line: 0, character: 21}
-      active: {line: 0, character: 21}
-fullTargets: [{type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: l}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: containingScope, scopeType: type, includeSiblings: false}, isImplicit: false}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/scala/clearTypeLook2.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/scala/clearTypeLook2.yml
deleted file mode 100644
index 8d2d59ba3d..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/scala/clearTypeLook2.yml
+++ /dev/null
@@ -1,30 +0,0 @@
-languageId: scala
-command:
-  version: 1
-  spokenForm: clear type look
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: type, includeSiblings: false}
-      mark: {type: decoratedSymbol, symbolColor: default, character: l}
-initialState:
-  documentContents: |
-    class TypesAhoy() {
-      def example(foo: List[String]): List[String] = foo
-    }
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-  marks:
-    default.l:
-      start: {line: 1, character: 19}
-      end: {line: 1, character: 23}
-finalState:
-  documentContents: |
-    class TypesAhoy() {
-      def example(foo: ): List[String] = foo
-    }
-  selections:
-    - anchor: {line: 1, character: 19}
-      active: {line: 1, character: 19}
-fullTargets: [{type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: l}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: containingScope, scopeType: type, includeSiblings: false}, isImplicit: false}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/scala/clearTypeLook3.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/scala/clearTypeLook3.yml
deleted file mode 100644
index 6fdfa6ba89..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/scala/clearTypeLook3.yml
+++ /dev/null
@@ -1,30 +0,0 @@
-languageId: scala
-command:
-  version: 1
-  spokenForm: clear type look
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: type, includeSiblings: false}
-      mark: {type: decoratedSymbol, symbolColor: default, character: l}
-initialState:
-  documentContents: |
-    class TypesAhoy() {
-      val foo: List[String] = List("foo")
-    }
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-  marks:
-    default.l:
-      start: {line: 1, character: 11}
-      end: {line: 1, character: 15}
-finalState:
-  documentContents: |
-    class TypesAhoy() {
-      val foo:  = List("foo")
-    }
-  selections:
-    - anchor: {line: 1, character: 11}
-      active: {line: 1, character: 11}
-fullTargets: [{type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: l}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: containingScope, scopeType: type, includeSiblings: false}, isImplicit: false}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/scala/clearTypeOdd.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/scala/clearTypeOdd.yml
deleted file mode 100644
index d85645bdb7..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/scala/clearTypeOdd.yml
+++ /dev/null
@@ -1,30 +0,0 @@
-languageId: scala
-command:
-  version: 1
-  spokenForm: clear type odd
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: type, includeSiblings: false}
-      mark: {type: decoratedSymbol, symbolColor: default, character: o}
-initialState:
-  documentContents: |-
-    class Example(foo: String) {
-      def str(bar: String): String = foo + bar
-    }
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-  marks:
-    default.o:
-      start: {line: 0, character: 14}
-      end: {line: 0, character: 17}
-finalState:
-  documentContents: |-
-    class Example(foo: ) {
-      def str(bar: String): String = foo + bar
-    }
-  selections:
-    - anchor: {line: 0, character: 19}
-      active: {line: 0, character: 19}
-fullTargets: [{type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: o}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: containingScope, scopeType: type, includeSiblings: false}, isImplicit: false}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/scala/clearTypeOdd2.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/scala/clearTypeOdd2.yml
deleted file mode 100644
index fa5ca4894e..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/scala/clearTypeOdd2.yml
+++ /dev/null
@@ -1,30 +0,0 @@
-languageId: scala
-command:
-  version: 1
-  spokenForm: clear type odd
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: type, includeSiblings: false}
-      mark: {type: decoratedSymbol, symbolColor: default, character: o}
-initialState:
-  documentContents: |
-    class TypesAhoy() {
-      def example(foo: List[String]): List[String] = foo
-    }
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-  marks:
-    default.o:
-      start: {line: 1, character: 49}
-      end: {line: 1, character: 52}
-finalState:
-  documentContents: |
-    class TypesAhoy() {
-      def example(foo: List[String]):  = foo
-    }
-  selections:
-    - anchor: {line: 1, character: 34}
-      active: {line: 1, character: 34}
-fullTargets: [{type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: o}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: containingScope, scopeType: type, includeSiblings: false}, isImplicit: false}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/scala/clearTypeOdd3.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/scala/clearTypeOdd3.yml
deleted file mode 100644
index 12f06f09a3..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/scala/clearTypeOdd3.yml
+++ /dev/null
@@ -1,34 +0,0 @@
-languageId: scala
-command:
-  version: 1
-  spokenForm: clear type odd
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: type, includeSiblings: false}
-      mark: {type: decoratedSymbol, symbolColor: default, character: o}
-initialState:
-  documentContents: |
-    class TypesAhoy() {
-      f match {
-        case foo: Foo => 12
-      }
-    }
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-  marks:
-    default.o:
-      start: {line: 2, character: 9}
-      end: {line: 2, character: 12}
-finalState:
-  documentContents: |
-    class TypesAhoy() {
-      f match {
-        case foo:  => 12
-      }
-    }
-  selections:
-    - anchor: {line: 2, character: 14}
-      active: {line: 2, character: 14}
-fullTargets: [{type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: o}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: containingScope, scopeType: type, includeSiblings: false}, isImplicit: false}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/scala/clearTypeRed.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/scala/clearTypeRed.yml
deleted file mode 100644
index 367f36fa6a..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/scala/clearTypeRed.yml
+++ /dev/null
@@ -1,30 +0,0 @@
-languageId: scala
-command:
-  version: 1
-  spokenForm: clear type red
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: type, includeSiblings: false}
-      mark: {type: decoratedSymbol, symbolColor: default, character: r}
-initialState:
-  documentContents: |
-    class TypesAhoy() {
-      def example(foo: List[String]): List[String] = foo
-    }
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-  marks:
-    default.r:
-      start: {line: 1, character: 24}
-      end: {line: 1, character: 30}
-finalState:
-  documentContents: |
-    class TypesAhoy() {
-      def example(foo: ): List[String] = foo
-    }
-  selections:
-    - anchor: {line: 1, character: 19}
-      active: {line: 1, character: 19}
-fullTargets: [{type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: r}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: containingScope, scopeType: type, includeSiblings: false}, isImplicit: false}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/scala/clearTypeRed2.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/scala/clearTypeRed2.yml
deleted file mode 100644
index 11216c5e45..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/scala/clearTypeRed2.yml
+++ /dev/null
@@ -1,30 +0,0 @@
-languageId: scala
-command:
-  version: 1
-  spokenForm: clear type red
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: type, includeSiblings: false}
-      mark: {type: decoratedSymbol, symbolColor: default, character: r}
-initialState:
-  documentContents: |
-    class TypesAhoy() {
-      val foo: List[String] = List("foo")
-    }
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-  marks:
-    default.r:
-      start: {line: 1, character: 16}
-      end: {line: 1, character: 22}
-finalState:
-  documentContents: |
-    class TypesAhoy() {
-      val foo:  = List("foo")
-    }
-  selections:
-    - anchor: {line: 1, character: 11}
-      active: {line: 1, character: 11}
-fullTargets: [{type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: r}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: containingScope, scopeType: type, includeSiblings: false}, isImplicit: false}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/scala/clearTypeSit.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/scala/clearTypeSit.yml
deleted file mode 100644
index 464fde138f..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/scala/clearTypeSit.yml
+++ /dev/null
@@ -1,30 +0,0 @@
-languageId: scala
-command:
-  version: 1
-  spokenForm: clear type sit
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: type, includeSiblings: false}
-      mark: {type: decoratedSymbol, symbolColor: default, character: i}
-initialState:
-  documentContents: |
-    class TypesAhoy() {
-      def example(foo: List[String]): List[String] = foo
-    }
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-  marks:
-    default.i:
-      start: {line: 1, character: 34}
-      end: {line: 1, character: 38}
-finalState:
-  documentContents: |
-    class TypesAhoy() {
-      def example(foo: List[String]):  = foo
-    }
-  selections:
-    - anchor: {line: 1, character: 34}
-      active: {line: 1, character: 34}
-fullTargets: [{type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: i}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: containingScope, scopeType: type, includeSiblings: false}, isImplicit: false}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/scala/clearTypeSit2.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/scala/clearTypeSit2.yml
deleted file mode 100644
index 1834808071..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/scala/clearTypeSit2.yml
+++ /dev/null
@@ -1,30 +0,0 @@
-languageId: scala
-command:
-  version: 1
-  spokenForm: clear type sit
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: type, includeSiblings: false}
-      mark: {type: decoratedSymbol, symbolColor: default, character: i}
-initialState:
-  documentContents: |
-    class TypesAhoy() {
-      def foo = (x: Int) => x + 1
-    }
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-  marks:
-    default.i:
-      start: {line: 1, character: 16}
-      end: {line: 1, character: 19}
-finalState:
-  documentContents: |
-    class TypesAhoy() {
-      def foo = (x: ) => x + 1
-    }
-  selections:
-    - anchor: {line: 1, character: 16}
-      active: {line: 1, character: 16}
-fullTargets: [{type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: i}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: containingScope, scopeType: type, includeSiblings: false}, isImplicit: false}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/scala/clearTypeSun.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/scala/clearTypeSun.yml
deleted file mode 100644
index 77d73f3d66..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/scala/clearTypeSun.yml
+++ /dev/null
@@ -1,26 +0,0 @@
-languageId: scala
-command:
-  version: 1
-  spokenForm: clear type sun
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: type, includeSiblings: false}
-      mark: {type: decoratedSymbol, symbolColor: default, character: s}
-initialState:
-  documentContents: |
-    class TypesAhoy(foo: String) {}
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-  marks:
-    default.s:
-      start: {line: 0, character: 21}
-      end: {line: 0, character: 27}
-finalState:
-  documentContents: |
-    class TypesAhoy(foo: ) {}
-  selections:
-    - anchor: {line: 0, character: 21}
-      active: {line: 0, character: 21}
-fullTargets: [{type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: s}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: containingScope, scopeType: type, includeSiblings: false}, isImplicit: false}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/scala/clearTypeSun2.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/scala/clearTypeSun2.yml
deleted file mode 100644
index 355b238fca..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/scala/clearTypeSun2.yml
+++ /dev/null
@@ -1,26 +0,0 @@
-languageId: scala
-command:
-  version: 1
-  spokenForm: clear type sun
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: type, includeSiblings: false}
-      mark: {type: decoratedSymbol, symbolColor: default, character: s}
-initialState:
-  documentContents: |
-    class TypesAhoy(foo: List[String]) {}
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-  marks:
-    default.s:
-      start: {line: 0, character: 26}
-      end: {line: 0, character: 32}
-finalState:
-  documentContents: |
-    class TypesAhoy(foo: ) {}
-  selections:
-    - anchor: {line: 0, character: 21}
-      active: {line: 0, character: 21}
-fullTargets: [{type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: s}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: containingScope, scopeType: type, includeSiblings: false}, isImplicit: false}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/scala/clearTypeSun3.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/scala/clearTypeSun3.yml
deleted file mode 100644
index befcb66615..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/scala/clearTypeSun3.yml
+++ /dev/null
@@ -1,30 +0,0 @@
-languageId: scala
-command:
-  version: 1
-  spokenForm: clear type sun
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: type, includeSiblings: false}
-      mark: {type: decoratedSymbol, symbolColor: default, character: s}
-initialState:
-  documentContents: |
-    class TypesAhoy() {
-      def example(foo: String): String = "example"
-    }
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-  marks:
-    default.s:
-      start: {line: 1, character: 19}
-      end: {line: 1, character: 25}
-finalState:
-  documentContents: |
-    class TypesAhoy() {
-      def example(foo: ): String = "example"
-    }
-  selections:
-    - anchor: {line: 1, character: 19}
-      active: {line: 1, character: 19}
-fullTargets: [{type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: s}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: containingScope, scopeType: type, includeSiblings: false}, isImplicit: false}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/scala/clearTypeSun4.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/scala/clearTypeSun4.yml
deleted file mode 100644
index b7737bc9df..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/scala/clearTypeSun4.yml
+++ /dev/null
@@ -1,30 +0,0 @@
-languageId: scala
-command:
-  version: 1
-  spokenForm: clear type sun
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: type, includeSiblings: false}
-      mark: {type: decoratedSymbol, symbolColor: default, character: s}
-initialState:
-  documentContents: |
-    class TypesAhoy() {
-      def example(foo: List[String]): List[String] = foo
-    }
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-  marks:
-    default.s:
-      start: {line: 1, character: 39}
-      end: {line: 1, character: 45}
-finalState:
-  documentContents: |
-    class TypesAhoy() {
-      def example(foo: List[String]):  = foo
-    }
-  selections:
-    - anchor: {line: 1, character: 34}
-      active: {line: 1, character: 34}
-fullTargets: [{type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: s}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: containingScope, scopeType: type, includeSiblings: false}, isImplicit: false}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/scala/clearTypeSun5.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/scala/clearTypeSun5.yml
deleted file mode 100644
index 86d5fb9567..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/scala/clearTypeSun5.yml
+++ /dev/null
@@ -1,30 +0,0 @@
-languageId: scala
-command:
-  version: 1
-  spokenForm: clear type sun
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: type, includeSiblings: false}
-      mark: {type: decoratedSymbol, symbolColor: default, character: s}
-initialState:
-  documentContents: |
-    class TypesAhoy() {
-      val foo: String = "foo"
-    }
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-  marks:
-    default.s:
-      start: {line: 1, character: 11}
-      end: {line: 1, character: 17}
-finalState:
-  documentContents: |
-    class TypesAhoy() {
-      val foo:  = "foo"
-    }
-  selections:
-    - anchor: {line: 1, character: 11}
-      active: {line: 1, character: 11}
-fullTargets: [{type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: s}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: containingScope, scopeType: type, includeSiblings: false}, isImplicit: false}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/scala/clearTypeTrap.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/scala/clearTypeTrap.yml
deleted file mode 100644
index 821523a6b7..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/scala/clearTypeTrap.yml
+++ /dev/null
@@ -1,30 +0,0 @@
-languageId: scala
-command:
-  version: 1
-  spokenForm: clear type trap
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: type, includeSiblings: false}
-      mark: {type: decoratedSymbol, symbolColor: default, character: t}
-initialState:
-  documentContents: |
-    class TypesAhoy() {
-      def example(foo: String): String = "example"
-    }
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-  marks:
-    default.t:
-      start: {line: 1, character: 28}
-      end: {line: 1, character: 34}
-finalState:
-  documentContents: |
-    class TypesAhoy() {
-      def example(foo: String):  = "example"
-    }
-  selections:
-    - anchor: {line: 1, character: 28}
-      active: {line: 1, character: 28}
-fullTargets: [{type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: t}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: containingScope, scopeType: type, includeSiblings: false}, isImplicit: false}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/scala/clearValue.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/scala/clearValue.yml
deleted file mode 100644
index 58361edb60..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/scala/clearValue.yml
+++ /dev/null
@@ -1,22 +0,0 @@
-languageId: scala
-command:
-  version: 1
-  spokenForm: clear value
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: value, includeSiblings: false}
-initialState:
-  documentContents: |
-    type Vector = (Int, Int)
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-  marks: {}
-finalState:
-  documentContents: |
-    type Vector = 
-  selections:
-    - anchor: {line: 0, character: 14}
-      active: {line: 0, character: 14}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: containingScope, scopeType: value, includeSiblings: false}, isImplicit: false}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/scala/clearValueOdd.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/scala/clearValueOdd.yml
deleted file mode 100644
index bb1752d61b..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/scala/clearValueOdd.yml
+++ /dev/null
@@ -1,26 +0,0 @@
-languageId: scala
-command:
-  version: 1
-  spokenForm: clear value odd
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: value, includeSiblings: false}
-      mark: {type: decoratedSymbol, symbolColor: default, character: o}
-initialState:
-  documentContents: |
-    class Example(foo: String = "foo") {}
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-  marks:
-    default.o:
-      start: {line: 0, character: 29}
-      end: {line: 0, character: 32}
-finalState:
-  documentContents: |
-    class Example(foo: String = ) {}
-  selections:
-    - anchor: {line: 0, character: 28}
-      active: {line: 0, character: 28}
-fullTargets: [{type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: o}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: containingScope, scopeType: value, includeSiblings: false}, isImplicit: false}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/scala/clearValueRed.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/scala/clearValueRed.yml
deleted file mode 100644
index 768e038ebb..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/scala/clearValueRed.yml
+++ /dev/null
@@ -1,30 +0,0 @@
-languageId: scala
-command:
-  version: 1
-  spokenForm: clear value red
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: value, includeSiblings: false}
-      mark: {type: decoratedSymbol, symbolColor: default, character: r}
-initialState:
-  documentContents: |
-    class Example() {
-      val bar = "bar" + "smang"
-    }
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-  marks:
-    default.r:
-      start: {line: 1, character: 13}
-      end: {line: 1, character: 16}
-finalState:
-  documentContents: |
-    class Example() {
-      val bar = 
-    }
-  selections:
-    - anchor: {line: 1, character: 12}
-      active: {line: 1, character: 12}
-fullTargets: [{type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: r}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: containingScope, scopeType: value, includeSiblings: false}, isImplicit: false}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/scala/clearValueSit.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/scala/clearValueSit.yml
deleted file mode 100644
index 781cf88497..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/scala/clearValueSit.yml
+++ /dev/null
@@ -1,30 +0,0 @@
-languageId: scala
-command:
-  version: 1
-  spokenForm: clear value sit
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: value, includeSiblings: false}
-      mark: {type: decoratedSymbol, symbolColor: default, character: i}
-initialState:
-  documentContents: |
-    class Example() {
-      val bling = "blang"
-    }
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-  marks:
-    default.i:
-      start: {line: 1, character: 6}
-      end: {line: 1, character: 11}
-finalState:
-  documentContents: |
-    class Example() {
-      val bling = 
-    }
-  selections:
-    - anchor: {line: 1, character: 14}
-      active: {line: 1, character: 14}
-fullTargets: [{type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: i}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: containingScope, scopeType: value, includeSiblings: false}, isImplicit: false}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/scss/changeArgue.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/scss/changeArgue.yml
deleted file mode 100644
index c5c7eb6b9b..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/scss/changeArgue.yml
+++ /dev/null
@@ -1,28 +0,0 @@
-languageId: scss
-command:
-  version: 1
-  spokenForm: change argue
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: argumentOrParameter, includeSiblings: false}
-initialState:
-  documentContents: |-
-
-    .double {
-      transform: translate(-50%, -50%);
-    }
-  selections:
-    - anchor: {line: 2, character: 25}
-      active: {line: 2, character: 25}
-  marks: {}
-finalState:
-  documentContents: |-
-
-    .double {
-      transform: translate(, -50%);
-    }
-  selections:
-    - anchor: {line: 2, character: 23}
-      active: {line: 2, character: 23}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: containingScope, scopeType: argumentOrParameter, includeSiblings: false}, isImplicit: false}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/scss/changeArgue2.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/scss/changeArgue2.yml
deleted file mode 100644
index 760f9a0907..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/scss/changeArgue2.yml
+++ /dev/null
@@ -1,26 +0,0 @@
-languageId: scss
-command:
-  version: 1
-  spokenForm: change argue
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: argumentOrParameter, includeSiblings: false}
-initialState:
-  documentContents: |-
-    @mixin replace-text($image, $color: red) {
-      text-align: left;
-    }
-  selections:
-    - anchor: {line: 0, character: 34}
-      active: {line: 0, character: 34}
-  marks: {}
-finalState:
-  documentContents: |-
-    @mixin replace-text($image, ) {
-      text-align: left;
-    }
-  selections:
-    - anchor: {line: 0, character: 28}
-      active: {line: 0, character: 28}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: containingScope, scopeType: argumentOrParameter, includeSiblings: false}, isImplicit: false}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/scss/changeArgue3.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/scss/changeArgue3.yml
deleted file mode 100644
index 5d0a598b89..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/scss/changeArgue3.yml
+++ /dev/null
@@ -1,26 +0,0 @@
-languageId: scss
-command:
-  version: 1
-  spokenForm: change argue
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: argumentOrParameter, includeSiblings: false}
-initialState:
-  documentContents: |-
-    @mixin replace-text($image, $color: red) {
-      text-align: left;
-    }
-  selections:
-    - anchor: {line: 0, character: 24}
-      active: {line: 0, character: 24}
-  marks: {}
-finalState:
-  documentContents: |-
-    @mixin replace-text(, $color: red) {
-      text-align: left;
-    }
-  selections:
-    - anchor: {line: 0, character: 20}
-      active: {line: 0, character: 20}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: containingScope, scopeType: argumentOrParameter, includeSiblings: false}, isImplicit: false}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/scss/changeArgue4.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/scss/changeArgue4.yml
deleted file mode 100644
index 6f42981af9..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/scss/changeArgue4.yml
+++ /dev/null
@@ -1,26 +0,0 @@
-languageId: scss
-command:
-  version: 1
-  spokenForm: change argue
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: argumentOrParameter, includeSiblings: false}
-initialState:
-  documentContents: |-
-    div {
-      clip-path: polygon(50% 0%, 60% 40%, 100% 50%, 60% 60%, 50% 100%, 40% 60%, 0% 50%, 40% 40%);
-    }
-  selections:
-    - anchor: {line: 1, character: 40}
-      active: {line: 1, character: 40}
-  marks: {}
-finalState:
-  documentContents: |-
-    div {
-      clip-path: polygon(50% 0%, 60% 40%, , 60% 60%, 50% 100%, 40% 60%, 0% 50%, 40% 40%);
-    }
-  selections:
-    - anchor: {line: 1, character: 38}
-      active: {line: 1, character: 38}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: containingScope, scopeType: argumentOrParameter, includeSiblings: false}, isImplicit: false}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/scss/changeArgue5.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/scss/changeArgue5.yml
deleted file mode 100644
index 1cfe3b5c45..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/scss/changeArgue5.yml
+++ /dev/null
@@ -1,28 +0,0 @@
-languageId: scss
-command:
-  version: 1
-  spokenForm: change argue
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: argumentOrParameter, includeSiblings: false}
-initialState:
-  documentContents: |-
-    a {
-      clip-path: polygon(50% 0%, 60% 40%, 100% 50%, 60% 60%, 50% 100%, 40% 60%, 0% 50%, 40% 40%);
-    }
-     
-  selections:
-    - anchor: {line: 1, character: 27}
-      active: {line: 1, character: 27}
-  marks: {}
-finalState:
-  documentContents: |-
-    a {
-      clip-path: polygon(, 60% 40%, 100% 50%, 60% 60%, 50% 100%, 40% 60%, 0% 50%, 40% 40%);
-    }
-     
-  selections:
-    - anchor: {line: 1, character: 21}
-      active: {line: 1, character: 21}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: containingScope, scopeType: argumentOrParameter, includeSiblings: false}, isImplicit: false}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/scss/changeArgue6.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/scss/changeArgue6.yml
deleted file mode 100644
index 6facd94946..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/scss/changeArgue6.yml
+++ /dev/null
@@ -1,26 +0,0 @@
-languageId: scss
-command:
-  version: 1
-  spokenForm: change argue
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: argumentOrParameter, includeSiblings: false}
-initialState:
-  documentContents: |-
-    @mixin foo($foo: 123) {
-
-    }
-  selections:
-    - anchor: {line: 0, character: 18}
-      active: {line: 0, character: 18}
-  marks: {}
-finalState:
-  documentContents: |-
-    @mixin foo() {
-
-    }
-  selections:
-    - anchor: {line: 0, character: 11}
-      active: {line: 0, character: 11}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: containingScope, scopeType: argumentOrParameter, includeSiblings: false}, isImplicit: false}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/scss/changeCallee.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/scss/changeCallee.yml
deleted file mode 100644
index 1e916545ed..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/scss/changeCallee.yml
+++ /dev/null
@@ -1,20 +0,0 @@
-languageId: scss
-command:
-  version: 1
-  spokenForm: change callee
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: functionCallee, includeSiblings: false}
-initialState:
-  documentContents: "margin-left: pow(4, 3)"
-  selections:
-    - anchor: {line: 0, character: 19}
-      active: {line: 0, character: 19}
-  marks: {}
-finalState:
-  documentContents: "margin-left: (4, 3)"
-  selections:
-    - anchor: {line: 0, character: 13}
-      active: {line: 0, character: 13}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: containingScope, scopeType: functionCallee, includeSiblings: false}, isImplicit: false}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/scss/changeComment.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/scss/changeComment.yml
deleted file mode 100644
index e52bd88ddb..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/scss/changeComment.yml
+++ /dev/null
@@ -1,20 +0,0 @@
-languageId: scss
-command:
-  version: 1
-  spokenForm: change comment
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: comment, includeSiblings: false}
-initialState:
-  documentContents: // comment
-  selections:
-    - anchor: {line: 0, character: 9}
-      active: {line: 0, character: 9}
-  marks: {}
-finalState:
-  documentContents: ""
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: containingScope, scopeType: comment, includeSiblings: false}, isImplicit: false}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/scss/changeComment2.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/scss/changeComment2.yml
deleted file mode 100644
index ba4efa74b6..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/scss/changeComment2.yml
+++ /dev/null
@@ -1,23 +0,0 @@
-languageId: scss
-command:
-  version: 1
-  spokenForm: change comment
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: comment, includeSiblings: false}
-initialState:
-  documentContents: |-
-    /*
-      hello
-    */
-  selections:
-    - anchor: {line: 1, character: 7}
-      active: {line: 1, character: 7}
-  marks: {}
-finalState:
-  documentContents: ""
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: containingScope, scopeType: comment, includeSiblings: false}, isImplicit: false}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/scss/changeEveryArgue.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/scss/changeEveryArgue.yml
deleted file mode 100644
index 09b3e8cad8..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/scss/changeEveryArgue.yml
+++ /dev/null
@@ -1,30 +0,0 @@
-languageId: scss
-command:
-  version: 1
-  spokenForm: change every argue
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: argumentOrParameter, includeSiblings: true}
-initialState:
-  documentContents: |-
-
-    .double {
-      transform: translate(-50%, -50%);
-    }
-  selections:
-    - anchor: {line: 2, character: 25}
-      active: {line: 2, character: 25}
-  marks: {}
-finalState:
-  documentContents: |-
-
-    .double {
-      transform: translate(, );
-    }
-  selections:
-    - anchor: {line: 2, character: 23}
-      active: {line: 2, character: 23}
-    - anchor: {line: 2, character: 25}
-      active: {line: 2, character: 25}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: containingScope, scopeType: argumentOrParameter, includeSiblings: true}, isImplicit: false}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/scss/changeEveryArgue2.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/scss/changeEveryArgue2.yml
deleted file mode 100644
index 20d1370916..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/scss/changeEveryArgue2.yml
+++ /dev/null
@@ -1,28 +0,0 @@
-languageId: scss
-command:
-  version: 1
-  spokenForm: change every argue
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: argumentOrParameter, includeSiblings: true}
-initialState:
-  documentContents: |-
-    div {
-      background: repeating-linear-gradient(red, orange 50px);
-    }
-  selections:
-    - anchor: {line: 1, character: 50}
-      active: {line: 1, character: 50}
-  marks: {}
-finalState:
-  documentContents: |-
-    div {
-      background: repeating-linear-gradient(, );
-    }
-  selections:
-    - anchor: {line: 1, character: 40}
-      active: {line: 1, character: 40}
-    - anchor: {line: 1, character: 42}
-      active: {line: 1, character: 42}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: containingScope, scopeType: argumentOrParameter, includeSiblings: true}, isImplicit: false}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/scss/changeEveryArgue3.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/scss/changeEveryArgue3.yml
deleted file mode 100644
index f6db85be03..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/scss/changeEveryArgue3.yml
+++ /dev/null
@@ -1,30 +0,0 @@
-languageId: scss
-command:
-  version: 1
-  spokenForm: change every argue
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: argumentOrParameter, includeSiblings: true}
-initialState:
-  documentContents: |-
-    a {
-      clip-path: ellipse(115px 55px at 50% 40%);
-    }
-     
-  selections:
-    - anchor: {line: 1, character: 25}
-      active: {line: 1, character: 25}
-  marks: {}
-finalState:
-  documentContents: |-
-    a {
-      clip-path: ellipse( at );
-    }
-     
-  selections:
-    - anchor: {line: 1, character: 21}
-      active: {line: 1, character: 21}
-    - anchor: {line: 1, character: 25}
-      active: {line: 1, character: 25}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: containingScope, scopeType: argumentOrParameter, includeSiblings: true}, isImplicit: false}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/scss/changeFirstWordLook.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/scss/changeFirstWordLook.yml
deleted file mode 100644
index eacf441066..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/scss/changeFirstWordLook.yml
+++ /dev/null
@@ -1,39 +0,0 @@
-languageId: scss
-command:
-  spokenForm: change first word look
-  version: 2
-  targets:
-    - type: primitive
-      mark: {type: decoratedSymbol, symbolColor: default, character: l}
-      modifiers:
-        - type: ordinalRange
-          scopeType: {type: word}
-          anchor: 0
-          active: 0
-          excludeAnchor: false
-          excludeActive: false
-  usePrePhraseSnapshot: true
-  action: {name: clearAndSetSelection}
-initialState:
-  documentContents: |2-
-     .long-bem-class-name {
-       height: 10px;
-     }
-     
-  selections:
-    - anchor: {line: 3, character: 1}
-      active: {line: 3, character: 1}
-  marks:
-    default.l:
-      start: {line: 0, character: 2}
-      end: {line: 0, character: 21}
-finalState:
-  documentContents: |2-
-     .-bem-class-name {
-       height: 10px;
-     }
-     
-  selections:
-    - anchor: {line: 0, character: 2}
-      active: {line: 0, character: 2}
-fullTargets: [{type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: l}, modifiers: [{type: ordinalRange, scopeType: {type: word}, anchor: 0, active: 0, excludeAnchor: false, excludeActive: false}]}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/scss/changeFunk.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/scss/changeFunk.yml
deleted file mode 100644
index 8e661a2e68..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/scss/changeFunk.yml
+++ /dev/null
@@ -1,27 +0,0 @@
-languageId: scss
-command:
-  version: 1
-  spokenForm: change funk
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: namedFunction, includeSiblings: false}
-initialState:
-  documentContents: |-
-    @function pow($base, $exponent) {
-      $result: 1;
-      @for $_ from 1 through $exponent {
-        $result: $result * $base;
-      }
-      @return $result;
-    }
-  selections:
-    - anchor: {line: 1, character: 13}
-      active: {line: 1, character: 13}
-  marks: {}
-finalState:
-  documentContents: ""
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: containingScope, scopeType: namedFunction, includeSiblings: false}, isImplicit: false}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/scss/changeFunk2.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/scss/changeFunk2.yml
deleted file mode 100644
index e8dc4ef8a9..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/scss/changeFunk2.yml
+++ /dev/null
@@ -1,29 +0,0 @@
-languageId: scss
-command:
-  version: 1
-  spokenForm: change funk
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: namedFunction, includeSiblings: false}
-initialState:
-  documentContents: |-
-    @mixin theme-colors($light-theme: true) {
-      @if $light-theme {
-        background-color: $light-background;
-        color: $light-text;
-      } @else {
-        background-color: $dark-background;
-        color: $dark-text;
-      }
-    }
-  selections:
-    - anchor: {line: 7, character: 3}
-      active: {line: 7, character: 3}
-  marks: {}
-finalState:
-  documentContents: ""
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: containingScope, scopeType: namedFunction, includeSiblings: false}, isImplicit: false}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/scss/changeItem.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/scss/changeItem.yml
deleted file mode 100644
index 81a3ec1e00..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/scss/changeItem.yml
+++ /dev/null
@@ -1,26 +0,0 @@
-languageId: scss
-command:
-  version: 1
-  spokenForm: change item
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: collectionItem, includeSiblings: false}
-initialState:
-  documentContents: |-
-    a {
-      width: calc(100% - 80px);
-    }
-  selections:
-    - anchor: {line: 1, character: 12}
-      active: {line: 1, character: 12}
-  marks: {}
-finalState:
-  documentContents: |-
-    a {
-      
-    }
-  selections:
-    - anchor: {line: 1, character: 2}
-      active: {line: 1, character: 2}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: containingScope, scopeType: collectionItem, includeSiblings: false}, isImplicit: false}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/scss/changeKey.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/scss/changeKey.yml
deleted file mode 100644
index 3a37b15293..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/scss/changeKey.yml
+++ /dev/null
@@ -1,26 +0,0 @@
-languageId: scss
-command:
-  version: 1
-  spokenForm: change key
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: collectionKey, includeSiblings: false}
-initialState:
-  documentContents: |
-    span[hello="Cleveland"][goodbye="Columbus"] { 
-      color: blue; 
-    }
-  selections:
-    - anchor: {line: 1, character: 4}
-      active: {line: 1, character: 4}
-  marks: {}
-finalState:
-  documentContents: |
-    span[hello="Cleveland"][goodbye="Columbus"] { 
-      : blue; 
-    }
-  selections:
-    - anchor: {line: 1, character: 2}
-      active: {line: 1, character: 2}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: containingScope, scopeType: collectionKey, includeSiblings: false}, isImplicit: false}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/scss/changeKey2.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/scss/changeKey2.yml
deleted file mode 100644
index 3bdbb5da54..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/scss/changeKey2.yml
+++ /dev/null
@@ -1,26 +0,0 @@
-languageId: scss
-command:
-  version: 1
-  spokenForm: change key
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: collectionKey, includeSiblings: false}
-initialState:
-  documentContents: |-
-    span[hello="Cleveland"][goodbye="Columbus"] {
-      color: blue;
-    }
-  selections:
-    - anchor: {line: 1, character: 12}
-      active: {line: 1, character: 12}
-  marks: {}
-finalState:
-  documentContents: |-
-    span[hello="Cleveland"][goodbye="Columbus"] {
-      : blue;
-    }
-  selections:
-    - anchor: {line: 1, character: 2}
-      active: {line: 1, character: 2}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: containingScope, scopeType: collectionKey, includeSiblings: false}, isImplicit: false}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/scss/changeLastWordLook.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/scss/changeLastWordLook.yml
deleted file mode 100644
index 251187dba2..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/scss/changeLastWordLook.yml
+++ /dev/null
@@ -1,39 +0,0 @@
-languageId: scss
-command:
-  spokenForm: change last word look
-  version: 2
-  targets:
-    - type: primitive
-      mark: {type: decoratedSymbol, symbolColor: default, character: l}
-      modifiers:
-        - type: ordinalRange
-          scopeType: {type: word}
-          anchor: -1
-          active: -1
-          excludeAnchor: false
-          excludeActive: false
-  usePrePhraseSnapshot: true
-  action: {name: clearAndSetSelection}
-initialState:
-  documentContents: |2-
-     .long-bem-class-name {
-       height: 10px;
-     }
-     
-  selections:
-    - anchor: {line: 3, character: 1}
-      active: {line: 3, character: 1}
-  marks:
-    default.l:
-      start: {line: 0, character: 2}
-      end: {line: 0, character: 21}
-finalState:
-  documentContents: |2-
-     .long-bem-class- {
-       height: 10px;
-     }
-     
-  selections:
-    - anchor: {line: 0, character: 17}
-      active: {line: 0, character: 17}
-fullTargets: [{type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: l}, modifiers: [{type: ordinalRange, scopeType: {type: word}, anchor: -1, active: -1, excludeAnchor: false, excludeActive: false}]}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/scss/changeLeadingLastWordLook.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/scss/changeLeadingLastWordLook.yml
deleted file mode 100644
index 32da32871e..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/scss/changeLeadingLastWordLook.yml
+++ /dev/null
@@ -1,40 +0,0 @@
-languageId: scss
-command:
-  spokenForm: change leading last word look
-  version: 2
-  targets:
-    - type: primitive
-      mark: {type: decoratedSymbol, symbolColor: default, character: l}
-      modifiers:
-        - {type: leading}
-        - type: ordinalRange
-          scopeType: {type: word}
-          anchor: -1
-          active: -1
-          excludeAnchor: false
-          excludeActive: false
-  usePrePhraseSnapshot: true
-  action: {name: clearAndSetSelection}
-initialState:
-  documentContents: |2-
-     .long-bem-class-name {
-       height: 10px;
-     }
-     
-  selections:
-    - anchor: {line: 3, character: 1}
-      active: {line: 3, character: 1}
-  marks:
-    default.l:
-      start: {line: 0, character: 2}
-      end: {line: 0, character: 21}
-finalState:
-  documentContents: |2-
-     .long-bem-classname {
-       height: 10px;
-     }
-     
-  selections:
-    - anchor: {line: 0, character: 16}
-      active: {line: 0, character: 16}
-fullTargets: [{type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: l}, modifiers: [{type: leading}, {type: ordinalRange, scopeType: {type: word}, anchor: -1, active: -1, excludeAnchor: false, excludeActive: false}]}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/scss/changeName.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/scss/changeName.yml
deleted file mode 100644
index d8341f7717..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/scss/changeName.yml
+++ /dev/null
@@ -1,28 +0,0 @@
-languageId: scss
-command:
-  version: 1
-  spokenForm: change name
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: name, includeSiblings: false}
-initialState:
-  documentContents: |-
-    a {
-      height: 10px;
-      color: red;
-    }
-  selections:
-    - anchor: {line: 1, character: 12}
-      active: {line: 1, character: 12}
-  marks: {}
-finalState:
-  documentContents: |-
-    a {
-      : 10px;
-      color: red;
-    }
-  selections:
-    - anchor: {line: 1, character: 2}
-      active: {line: 1, character: 2}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: containingScope, scopeType: name, includeSiblings: false}, isImplicit: false}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/scss/changeName2.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/scss/changeName2.yml
deleted file mode 100644
index d0c0427b8f..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/scss/changeName2.yml
+++ /dev/null
@@ -1,34 +0,0 @@
-languageId: scss
-command:
-  version: 1
-  spokenForm: change name
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: name, includeSiblings: false}
-initialState:
-  documentContents: |-
-    @function pow($base, $exponent) {
-      $result: 1;
-      @for $_ from 1 through $exponent {
-        $result: $result * $base;
-      }
-      @return $result;
-    }
-  selections:
-    - anchor: {line: 1, character: 13}
-      active: {line: 1, character: 13}
-  marks: {}
-finalState:
-  documentContents: |-
-    @function ($base, $exponent) {
-      $result: 1;
-      @for $_ from 1 through $exponent {
-        $result: $result * $base;
-      }
-      @return $result;
-    }
-  selections:
-    - anchor: {line: 0, character: 10}
-      active: {line: 0, character: 10}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: containingScope, scopeType: name, includeSiblings: false}, isImplicit: false}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/scss/changeName3.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/scss/changeName3.yml
deleted file mode 100644
index 6acfb445c9..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/scss/changeName3.yml
+++ /dev/null
@@ -1,26 +0,0 @@
-languageId: scss
-command:
-  version: 1
-  spokenForm: change name
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: name, includeSiblings: false}
-initialState:
-  documentContents: |
-    a {
-      margin: 10px 10px 10px 10px;
-    }
-  selections:
-    - anchor: {line: 1, character: 14}
-      active: {line: 1, character: 14}
-  marks: {}
-finalState:
-  documentContents: |
-    a {
-      : 10px 10px 10px 10px;
-    }
-  selections:
-    - anchor: {line: 1, character: 2}
-      active: {line: 1, character: 2}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: containingScope, scopeType: name, includeSiblings: false}, isImplicit: false}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/scss/changeName4.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/scss/changeName4.yml
deleted file mode 100644
index 8725ee094c..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/scss/changeName4.yml
+++ /dev/null
@@ -1,26 +0,0 @@
-languageId: scss
-command:
-  version: 1
-  spokenForm: change name
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: name, includeSiblings: false}
-initialState:
-  documentContents: |
-    @mixin move($left-start, $left-stop) {
-      transition: left ($left-stop - $left-start) * $transition-speed;
-    }
-  selections:
-    - anchor: {line: 1, character: 7}
-      active: {line: 1, character: 7}
-  marks: {}
-finalState:
-  documentContents: |
-    @mixin move($left-start, $left-stop) {
-      : left ($left-stop - $left-start) * $transition-speed;
-    }
-  selections:
-    - anchor: {line: 1, character: 2}
-      active: {line: 1, character: 2}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: containingScope, scopeType: name, includeSiblings: false}, isImplicit: false}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/scss/changeName5.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/scss/changeName5.yml
deleted file mode 100644
index 4bc485c0b0..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/scss/changeName5.yml
+++ /dev/null
@@ -1,26 +0,0 @@
-languageId: scss
-command:
-  version: 1
-  spokenForm: change name
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: name, includeSiblings: false}
-initialState:
-  documentContents: |-
-    @mixin move($left-start, $left-stop) {
-      transition: left ($left-stop - $left-start) * $transition-speed;
-    }
-  selections:
-    - anchor: {line: 0, character: 3}
-      active: {line: 0, character: 3}
-  marks: {}
-finalState:
-  documentContents: |-
-    @mixin ($left-start, $left-stop) {
-      transition: left ($left-stop - $left-start) * $transition-speed;
-    }
-  selections:
-    - anchor: {line: 0, character: 7}
-      active: {line: 0, character: 7}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: containingScope, scopeType: name, includeSiblings: false}, isImplicit: false}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/scss/changeName6.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/scss/changeName6.yml
deleted file mode 100644
index 7f1c3ff5a1..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/scss/changeName6.yml
+++ /dev/null
@@ -1,26 +0,0 @@
-languageId: scss
-command:
-  version: 1
-  spokenForm: change name
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: name, includeSiblings: false}
-initialState:
-  documentContents: |-
-    a[data-lang^="tel"] {
-      color: rgba(0, 255, 0, 0.5);
-    }
-  selections:
-    - anchor: {line: 0, character: 15}
-      active: {line: 0, character: 15}
-  marks: {}
-finalState:
-  documentContents: |-
-    a[^="tel"] {
-      color: rgba(0, 255, 0, 0.5);
-    }
-  selections:
-    - anchor: {line: 0, character: 2}
-      active: {line: 0, character: 2}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: containingScope, scopeType: name, includeSiblings: false}, isImplicit: false}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/scss/changeName7.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/scss/changeName7.yml
deleted file mode 100644
index eb8c5a2154..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/scss/changeName7.yml
+++ /dev/null
@@ -1,26 +0,0 @@
-languageId: css
-command:
-  version: 1
-  spokenForm: change name
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: name, includeSiblings: false}
-initialState:
-  documentContents: |-
-    a {
-      height: 10px;
-    }
-  selections:
-    - anchor: {line: 1, character: 5}
-      active: {line: 1, character: 5}
-  marks: {}
-finalState:
-  documentContents: |-
-    a {
-      : 10px;
-    }
-  selections:
-    - anchor: {line: 1, character: 2}
-      active: {line: 1, character: 2}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: containingScope, scopeType: name, includeSiblings: false}, isImplicit: false}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/scss/changeName8.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/scss/changeName8.yml
deleted file mode 100644
index 96de12fa5d..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/scss/changeName8.yml
+++ /dev/null
@@ -1,26 +0,0 @@
-languageId: scss
-command:
-  version: 1
-  spokenForm: change name
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: name, includeSiblings: false}
-initialState:
-  documentContents: |-
-    @mixin foo($foo: 123) {
-
-    }
-  selections:
-    - anchor: {line: 0, character: 13}
-      active: {line: 0, character: 13}
-  marks: {}
-finalState:
-  documentContents: |-
-    @mixin foo(: 123) {
-
-    }
-  selections:
-    - anchor: {line: 0, character: 11}
-      active: {line: 0, character: 11}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: containingScope, scopeType: name, includeSiblings: false}, isImplicit: false}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/scss/changeName9.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/scss/changeName9.yml
deleted file mode 100644
index d52dbede5e..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/scss/changeName9.yml
+++ /dev/null
@@ -1,26 +0,0 @@
-languageId: scss
-command:
-  version: 1
-  spokenForm: change name
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: name, includeSiblings: false}
-initialState:
-  documentContents: |-
-    @mixin foo($foo: 123) {
-
-    }
-  selections:
-    - anchor: {line: 0, character: 18}
-      active: {line: 0, character: 18}
-  marks: {}
-finalState:
-  documentContents: |-
-    @mixin foo(: 123) {
-
-    }
-  selections:
-    - anchor: {line: 0, character: 11}
-      active: {line: 0, character: 11}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: containingScope, scopeType: name, includeSiblings: false}, isImplicit: false}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/scss/changeRound.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/scss/changeRound.yml
deleted file mode 100644
index 75657e9178..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/scss/changeRound.yml
+++ /dev/null
@@ -1,26 +0,0 @@
-languageId: scss
-command:
-  version: 1
-  spokenForm: change round
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: surroundingPair, delimiter: parentheses}
-initialState:
-  documentContents: |-
-    a {
-      font-family: "hello (world)";
-    }
-  selections:
-    - anchor: {line: 1, character: 25}
-      active: {line: 1, character: 25}
-  marks: {}
-finalState:
-  documentContents: |-
-    a {
-      font-family: "hello ";
-    }
-  selections:
-    - anchor: {line: 1, character: 22}
-      active: {line: 1, character: 22}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: surroundingPair, delimiter: parentheses}, isImplicit: false}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/scss/changeSecondWordLook.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/scss/changeSecondWordLook.yml
deleted file mode 100644
index 583463607c..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/scss/changeSecondWordLook.yml
+++ /dev/null
@@ -1,39 +0,0 @@
-languageId: scss
-command:
-  spokenForm: change second word look
-  version: 2
-  targets:
-    - type: primitive
-      mark: {type: decoratedSymbol, symbolColor: default, character: l}
-      modifiers:
-        - type: ordinalRange
-          scopeType: {type: word}
-          anchor: 1
-          active: 1
-          excludeAnchor: false
-          excludeActive: false
-  usePrePhraseSnapshot: true
-  action: {name: clearAndSetSelection}
-initialState:
-  documentContents: |2-
-     .long-bem-class-name {
-       height: 10px;
-     }
-     
-  selections:
-    - anchor: {line: 3, character: 1}
-      active: {line: 3, character: 1}
-  marks:
-    default.l:
-      start: {line: 0, character: 2}
-      end: {line: 0, character: 21}
-finalState:
-  documentContents: |2-
-     .long--class-name {
-       height: 10px;
-     }
-     
-  selections:
-    - anchor: {line: 0, character: 7}
-      active: {line: 0, character: 7}
-fullTargets: [{type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: l}, modifiers: [{type: ordinalRange, scopeType: {type: word}, anchor: 1, active: 1, excludeAnchor: false, excludeActive: false}]}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/scss/changeSelector.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/scss/changeSelector.yml
deleted file mode 100644
index 9d69c2362f..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/scss/changeSelector.yml
+++ /dev/null
@@ -1,26 +0,0 @@
-languageId: scss
-command:
-  version: 1
-  spokenForm: change selector
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: selector, includeSiblings: false}
-initialState:
-  documentContents: |
-    span[hello="Cleveland"][goodbye="Columbus"] { 
-      color: blue; 
-    }
-  selections:
-    - anchor: {line: 1, character: 4}
-      active: {line: 1, character: 4}
-  marks: {}
-finalState:
-  documentContents: |2
-     { 
-      color: blue; 
-    }
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: containingScope, scopeType: selector, includeSiblings: false}, isImplicit: false}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/scss/changeSelector2.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/scss/changeSelector2.yml
deleted file mode 100644
index b0a30ff9ab..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/scss/changeSelector2.yml
+++ /dev/null
@@ -1,26 +0,0 @@
-languageId: scss
-command:
-  version: 1
-  spokenForm: change selector
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: selector, includeSiblings: false}
-initialState:
-  documentContents: |-
-    a.b ~ c.d {
-      
-    }
-  selections:
-    - anchor: {line: 1, character: 2}
-      active: {line: 1, character: 2}
-  marks: {}
-finalState:
-  documentContents: |2-
-     {
-      
-    }
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: containingScope, scopeType: selector, includeSiblings: false}, isImplicit: false}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/scss/changeSelector3.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/scss/changeSelector3.yml
deleted file mode 100644
index 28331c88bf..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/scss/changeSelector3.yml
+++ /dev/null
@@ -1,26 +0,0 @@
-languageId: scss
-command:
-  version: 1
-  spokenForm: change selector
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: selector, includeSiblings: false}
-initialState:
-  documentContents: |-
-    span[hello="Cleveland"][goodbye="Columbus"] {
-      color: blue;
-    }
-  selections:
-    - anchor: {line: 1, character: 11}
-      active: {line: 1, character: 11}
-  marks: {}
-finalState:
-  documentContents: |2-
-     {
-      color: blue;
-    }
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: containingScope, scopeType: selector, includeSiblings: false}, isImplicit: false}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/scss/changeState.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/scss/changeState.yml
deleted file mode 100644
index ed2b21243a..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/scss/changeState.yml
+++ /dev/null
@@ -1,22 +0,0 @@
-languageId: scss
-command:
-  version: 1
-  spokenForm: change state
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: statement, includeSiblings: false}
-initialState:
-  documentContents: |
-    @import "subs.css";
-  selections:
-    - anchor: {line: 0, character: 11}
-      active: {line: 0, character: 11}
-  marks: {}
-finalState:
-  documentContents: |+
-
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: containingScope, scopeType: statement, includeSiblings: false}, isImplicit: false}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/scss/changeState4.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/scss/changeState4.yml
deleted file mode 100644
index 7eaae39b71..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/scss/changeState4.yml
+++ /dev/null
@@ -1,26 +0,0 @@
-languageId: scss
-command:
-  version: 1
-  spokenForm: change state
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: statement, includeSiblings: false}
-initialState:
-  documentContents: |
-    a {
-      &:hover { cursor: pointer; }
-    }
-  selections:
-    - anchor: {line: 1, character: 11}
-      active: {line: 1, character: 11}
-  marks: {}
-finalState:
-  documentContents: |
-    a {
-      
-    }
-  selections:
-    - anchor: {line: 1, character: 2}
-      active: {line: 1, character: 2}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: containingScope, scopeType: statement, includeSiblings: false}, isImplicit: false}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/scss/changeState5.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/scss/changeState5.yml
deleted file mode 100644
index 77ce90ffbe..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/scss/changeState5.yml
+++ /dev/null
@@ -1,28 +0,0 @@
-languageId: scss
-command:
-  version: 1
-  spokenForm: change state
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: statement, includeSiblings: false}
-initialState:
-  documentContents: |-
-    div {
-      a {
-        width: calc(100% - 80px);
-      }
-    }
-  selections:
-    - anchor: {line: 2, character: 6}
-      active: {line: 2, character: 6}
-  marks: {}
-finalState:
-  documentContents: |-
-    div {
-      
-    }
-  selections:
-    - anchor: {line: 1, character: 2}
-      active: {line: 1, character: 2}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: containingScope, scopeType: statement, includeSiblings: false}, isImplicit: false}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/scss/changeState6.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/scss/changeState6.yml
deleted file mode 100644
index fc0a19e89d..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/scss/changeState6.yml
+++ /dev/null
@@ -1,23 +0,0 @@
-languageId: scss
-command:
-  version: 1
-  spokenForm: change state
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: statement, includeSiblings: false}
-initialState:
-  documentContents: |-
-    a {
-      width: calc(100% - 80px);
-    }
-  selections:
-    - anchor: {line: 1, character: 12}
-      active: {line: 1, character: 12}
-  marks: {}
-finalState:
-  documentContents: ""
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: containingScope, scopeType: statement, includeSiblings: false}, isImplicit: false}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/scss/changeStateAir.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/scss/changeStateAir.yml
deleted file mode 100644
index 252de30945..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/scss/changeStateAir.yml
+++ /dev/null
@@ -1,28 +0,0 @@
-languageId: scss
-command:
-  version: 1
-  spokenForm: change state air
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: statement, includeSiblings: false}
-      mark: {type: decoratedSymbol, symbolColor: default, character: a}
-initialState:
-  documentContents: |-
-    a {
-      height: 10px;
-      color: red;
-    }
-  selections:
-    - anchor: {line: 0, character: 3}
-      active: {line: 0, character: 3}
-  marks:
-    default.a:
-      start: {line: 0, character: 0}
-      end: {line: 0, character: 1}
-finalState:
-  documentContents: ""
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-fullTargets: [{type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: a}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: containingScope, scopeType: statement, includeSiblings: false}, isImplicit: false}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/scss/changeStateHarp.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/scss/changeStateHarp.yml
deleted file mode 100644
index 121c34ee8a..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/scss/changeStateHarp.yml
+++ /dev/null
@@ -1,28 +0,0 @@
-languageId: scss
-command:
-  version: 1
-  spokenForm: change state harp
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: statement, includeSiblings: false}
-      mark: {type: decoratedSymbol, symbolColor: default, character: h}
-initialState:
-  documentContents: |-
-    a .child-selector {
-      height: 10px;
-      color: red;
-    }
-  selections:
-    - anchor: {line: 2, character: 13}
-      active: {line: 2, character: 13}
-  marks:
-    default.h:
-      start: {line: 0, character: 3}
-      end: {line: 0, character: 17}
-finalState:
-  documentContents: ""
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-fullTargets: [{type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: h}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: containingScope, scopeType: statement, includeSiblings: false}, isImplicit: false}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/scss/changeTrailingFirstWordLook.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/scss/changeTrailingFirstWordLook.yml
deleted file mode 100644
index cd3d887a63..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/scss/changeTrailingFirstWordLook.yml
+++ /dev/null
@@ -1,40 +0,0 @@
-languageId: scss
-command:
-  spokenForm: change trailing first word look
-  version: 2
-  targets:
-    - type: primitive
-      mark: {type: decoratedSymbol, symbolColor: default, character: l}
-      modifiers:
-        - {type: trailing}
-        - type: ordinalRange
-          scopeType: {type: word}
-          anchor: 0
-          active: 0
-          excludeAnchor: false
-          excludeActive: false
-  usePrePhraseSnapshot: true
-  action: {name: clearAndSetSelection}
-initialState:
-  documentContents: |2-
-     .long-bem-class-name {
-       height: 10px;
-     }
-     
-  selections:
-    - anchor: {line: 3, character: 1}
-      active: {line: 3, character: 1}
-  marks:
-    default.l:
-      start: {line: 0, character: 2}
-      end: {line: 0, character: 21}
-finalState:
-  documentContents: |2-
-     .longbem-class-name {
-       height: 10px;
-     }
-     
-  selections:
-    - anchor: {line: 0, character: 6}
-      active: {line: 0, character: 6}
-fullTargets: [{type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: l}, modifiers: [{type: trailing}, {type: ordinalRange, scopeType: {type: word}, anchor: 0, active: 0, excludeAnchor: false, excludeActive: false}]}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/scss/changeUnit.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/scss/changeUnit.yml
deleted file mode 100644
index 62e9b9f2da..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/scss/changeUnit.yml
+++ /dev/null
@@ -1,26 +0,0 @@
-languageId: css
-command:
-  version: 1
-  spokenForm: change unit
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: unit, includeSiblings: false}
-initialState:
-  documentContents: |2-
-     .child-selector {
-      height: 10vmax;
-    }
-  selections:
-    - anchor: {line: 1, character: 15}
-      active: {line: 1, character: 15}
-  marks: {}
-finalState:
-  documentContents: |2-
-     .child-selector {
-      height: 10;
-    }
-  selections:
-    - anchor: {line: 1, character: 12}
-      active: {line: 1, character: 12}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: containingScope, scopeType: unit, includeSiblings: false}, isImplicit: false}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/scss/changeUnit2.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/scss/changeUnit2.yml
deleted file mode 100644
index b509f60d6a..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/scss/changeUnit2.yml
+++ /dev/null
@@ -1,26 +0,0 @@
-languageId: css
-command:
-  version: 1
-  spokenForm: change unit
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: unit, includeSiblings: false}
-initialState:
-  documentContents: |2-
-     .child-selector {
-      height: 10rlh;
-    }
-  selections:
-    - anchor: {line: 1, character: 12}
-      active: {line: 1, character: 12}
-  marks: {}
-finalState:
-  documentContents: |2-
-     .child-selector {
-      height: 10;
-    }
-  selections:
-    - anchor: {line: 1, character: 12}
-      active: {line: 1, character: 12}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: containingScope, scopeType: unit, includeSiblings: false}, isImplicit: false}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/scss/changeUnitGust.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/scss/changeUnitGust.yml
deleted file mode 100644
index 3375bf2554..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/scss/changeUnitGust.yml
+++ /dev/null
@@ -1,30 +0,0 @@
-languageId: css
-command:
-  version: 1
-  spokenForm: change unit gust
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: unit, includeSiblings: false}
-      mark: {type: decoratedSymbol, symbolColor: default, character: g}
-initialState:
-  documentContents: |2-
-     .child-selector {
-      height: 10rem;
-    }
-  selections:
-    - anchor: {line: 2, character: 1}
-      active: {line: 2, character: 1}
-  marks:
-    default.g:
-      start: {line: 1, character: 2}
-      end: {line: 1, character: 8}
-finalState:
-  documentContents: |2-
-     .child-selector {
-      height: 10;
-    }
-  selections:
-    - anchor: {line: 1, character: 12}
-      active: {line: 1, character: 12}
-fullTargets: [{type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: g}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: containingScope, scopeType: unit, includeSiblings: false}, isImplicit: false}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/scss/changeUnitOne.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/scss/changeUnitOne.yml
deleted file mode 100644
index 8ea6326819..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/scss/changeUnitOne.yml
+++ /dev/null
@@ -1,30 +0,0 @@
-languageId: css
-command:
-  version: 1
-  spokenForm: change unit one
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: unit, includeSiblings: false}
-      mark: {type: decoratedSymbol, symbolColor: default, character: '1'}
-initialState:
-  documentContents: |2-
-     .child-selector {
-      height: 10Q;
-    }
-  selections:
-    - anchor: {line: 1, character: 2}
-      active: {line: 1, character: 2}
-  marks:
-    default.1:
-      start: {line: 1, character: 10}
-      end: {line: 1, character: 13}
-finalState:
-  documentContents: |2-
-     .child-selector {
-      height: 10;
-    }
-  selections:
-    - anchor: {line: 1, character: 12}
-      active: {line: 1, character: 12}
-fullTargets: [{type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: '1'}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: containingScope, scopeType: unit, includeSiblings: false}, isImplicit: false}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/scss/changeValue.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/scss/changeValue.yml
deleted file mode 100644
index 6b37bcc962..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/scss/changeValue.yml
+++ /dev/null
@@ -1,22 +0,0 @@
-languageId: scss
-command:
-  version: 1
-  spokenForm: change value
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: value, includeSiblings: false}
-initialState:
-  documentContents: |
-    @import "subs.css";
-  selections:
-    - anchor: {line: 0, character: 10}
-      active: {line: 0, character: 10}
-  marks: {}
-finalState:
-  documentContents: |
-    @import ;
-  selections:
-    - anchor: {line: 0, character: 8}
-      active: {line: 0, character: 8}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: containingScope, scopeType: value, includeSiblings: false}, isImplicit: false}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/scss/changeValue10.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/scss/changeValue10.yml
deleted file mode 100644
index 12f68a5de8..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/scss/changeValue10.yml
+++ /dev/null
@@ -1,26 +0,0 @@
-languageId: scss
-command:
-  version: 1
-  spokenForm: change value
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: value, includeSiblings: false}
-initialState:
-  documentContents: |
-    @mixin horizontal-list {
-      @include rtl(float, left, right);
-    }
-  selections:
-    - anchor: {line: 1, character: 8}
-      active: {line: 1, character: 8}
-  marks: {}
-finalState:
-  documentContents: |
-    @mixin horizontal-list {
-      @include ;
-    }
-  selections:
-    - anchor: {line: 1, character: 11}
-      active: {line: 1, character: 11}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: containingScope, scopeType: value, includeSiblings: false}, isImplicit: false}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/scss/changeValue11.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/scss/changeValue11.yml
deleted file mode 100644
index bdf5cfca55..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/scss/changeValue11.yml
+++ /dev/null
@@ -1,26 +0,0 @@
-languageId: scss
-command:
-  version: 1
-  spokenForm: change value
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: value, includeSiblings: false}
-initialState:
-  documentContents: |-
-    a[data-lang^="tel"] {
-      color: rgba(0, 255, 0, 0.5);
-    }
-  selections:
-    - anchor: {line: 0, character: 3}
-      active: {line: 0, character: 3}
-  marks: {}
-finalState:
-  documentContents: |-
-    a[data-lang^=] {
-      color: rgba(0, 255, 0, 0.5);
-    }
-  selections:
-    - anchor: {line: 0, character: 13}
-      active: {line: 0, character: 13}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: containingScope, scopeType: value, includeSiblings: false}, isImplicit: false}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/scss/changeValue12.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/scss/changeValue12.yml
deleted file mode 100644
index f2da638b55..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/scss/changeValue12.yml
+++ /dev/null
@@ -1,26 +0,0 @@
-languageId: scss
-command:
-  version: 1
-  spokenForm: change value
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: value, includeSiblings: false}
-initialState:
-  documentContents: |-
-    @mixin foo($foo: 123) {
-
-    }
-  selections:
-    - anchor: {line: 0, character: 13}
-      active: {line: 0, character: 13}
-  marks: {}
-finalState:
-  documentContents: |-
-    @mixin foo($foo: ) {
-
-    }
-  selections:
-    - anchor: {line: 0, character: 17}
-      active: {line: 0, character: 17}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: containingScope, scopeType: value, includeSiblings: false}, isImplicit: false}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/scss/changeValue13.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/scss/changeValue13.yml
deleted file mode 100644
index 05888a7c01..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/scss/changeValue13.yml
+++ /dev/null
@@ -1,26 +0,0 @@
-languageId: scss
-command:
-  version: 1
-  spokenForm: change value
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: value, includeSiblings: false}
-initialState:
-  documentContents: |-
-    @mixin foo($foo: 123) {
-
-    }
-  selections:
-    - anchor: {line: 0, character: 18}
-      active: {line: 0, character: 18}
-  marks: {}
-finalState:
-  documentContents: |-
-    @mixin foo($foo: ) {
-
-    }
-  selections:
-    - anchor: {line: 0, character: 17}
-      active: {line: 0, character: 17}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: containingScope, scopeType: value, includeSiblings: false}, isImplicit: false}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/scss/changeValue14.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/scss/changeValue14.yml
deleted file mode 100644
index ef80dffd32..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/scss/changeValue14.yml
+++ /dev/null
@@ -1,26 +0,0 @@
-languageId: scss
-command:
-  version: 1
-  spokenForm: change value
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: value, includeSiblings: false}
-initialState:
-  documentContents: |-
-    @mixin foo($foo: red) {
-
-    }
-  selections:
-    - anchor: {line: 0, character: 13}
-      active: {line: 0, character: 13}
-  marks: {}
-finalState:
-  documentContents: |-
-    @mixin foo($foo: ) {
-
-    }
-  selections:
-    - anchor: {line: 0, character: 17}
-      active: {line: 0, character: 17}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: containingScope, scopeType: value, includeSiblings: false}, isImplicit: false}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/scss/changeValue15.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/scss/changeValue15.yml
deleted file mode 100644
index 3e7c805bf4..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/scss/changeValue15.yml
+++ /dev/null
@@ -1,26 +0,0 @@
-languageId: scss
-command:
-  version: 1
-  spokenForm: change value
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: value, includeSiblings: false}
-initialState:
-  documentContents: |-
-    @mixin foo($foo: red) {
-
-    }
-  selections:
-    - anchor: {line: 0, character: 19}
-      active: {line: 0, character: 19}
-  marks: {}
-finalState:
-  documentContents: |-
-    @mixin foo($foo: ) {
-
-    }
-  selections:
-    - anchor: {line: 0, character: 17}
-      active: {line: 0, character: 17}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: containingScope, scopeType: value, includeSiblings: false}, isImplicit: false}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/scss/changeValue2.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/scss/changeValue2.yml
deleted file mode 100644
index d06410a489..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/scss/changeValue2.yml
+++ /dev/null
@@ -1,28 +0,0 @@
-languageId: scss
-command:
-  version: 1
-  spokenForm: change value
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: value, includeSiblings: false}
-initialState:
-  documentContents: |-
-    a {
-      height: 10px;
-      color: red;
-    }
-  selections:
-    - anchor: {line: 1, character: 12}
-      active: {line: 1, character: 12}
-  marks: {}
-finalState:
-  documentContents: |-
-    a {
-      height: ;
-      color: red;
-    }
-  selections:
-    - anchor: {line: 1, character: 10}
-      active: {line: 1, character: 10}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: containingScope, scopeType: value, includeSiblings: false}, isImplicit: false}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/scss/changeValue3.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/scss/changeValue3.yml
deleted file mode 100644
index 102c30917c..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/scss/changeValue3.yml
+++ /dev/null
@@ -1,34 +0,0 @@
-languageId: scss
-command:
-  version: 1
-  spokenForm: change value
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: value, includeSiblings: false}
-initialState:
-  documentContents: |-
-    @function pow($base, $exponent) {
-      $result: 1;
-      @for $_ from 1 through $exponent {
-        $result: $result * $base;
-      }
-      @return $result;
-    }
-  selections:
-    - anchor: {line: 5, character: 11}
-      active: {line: 5, character: 11}
-  marks: {}
-finalState:
-  documentContents: |-
-    @function pow($base, $exponent) {
-      $result: 1;
-      @for $_ from 1 through $exponent {
-        $result: $result * $base;
-      }
-      @return ;
-    }
-  selections:
-    - anchor: {line: 5, character: 10}
-      active: {line: 5, character: 10}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: containingScope, scopeType: value, includeSiblings: false}, isImplicit: false}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/scss/changeValue4.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/scss/changeValue4.yml
deleted file mode 100644
index bf3fe72de0..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/scss/changeValue4.yml
+++ /dev/null
@@ -1,26 +0,0 @@
-languageId: scss
-command:
-  version: 1
-  spokenForm: change value
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: value, includeSiblings: false}
-initialState:
-  documentContents: |
-    a {
-      margin: 10px 10px 10px 10px;
-    }
-  selections:
-    - anchor: {line: 1, character: 4}
-      active: {line: 1, character: 4}
-  marks: {}
-finalState:
-  documentContents: |
-    a {
-      margin: ;
-    }
-  selections:
-    - anchor: {line: 1, character: 10}
-      active: {line: 1, character: 10}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: containingScope, scopeType: value, includeSiblings: false}, isImplicit: false}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/scss/changeValue5.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/scss/changeValue5.yml
deleted file mode 100644
index 4e3b39545a..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/scss/changeValue5.yml
+++ /dev/null
@@ -1,26 +0,0 @@
-languageId: scss
-command:
-  version: 1
-  spokenForm: change value
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: value, includeSiblings: false}
-initialState:
-  documentContents: |
-    a {
-      height: $button-height;
-    }
-  selections:
-    - anchor: {line: 1, character: 5}
-      active: {line: 1, character: 5}
-  marks: {}
-finalState:
-  documentContents: |
-    a {
-      height: ;
-    }
-  selections:
-    - anchor: {line: 1, character: 10}
-      active: {line: 1, character: 10}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: containingScope, scopeType: value, includeSiblings: false}, isImplicit: false}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/scss/changeValue6.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/scss/changeValue6.yml
deleted file mode 100644
index 96efbf25b1..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/scss/changeValue6.yml
+++ /dev/null
@@ -1,26 +0,0 @@
-languageId: scss
-command:
-  version: 1
-  spokenForm: change value
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: value, includeSiblings: false}
-initialState:
-  documentContents: |
-    a {
-      background-image: url("/icons/mail.svg");
-    }
-  selections:
-    - anchor: {line: 1, character: 35}
-      active: {line: 1, character: 35}
-  marks: {}
-finalState:
-  documentContents: |
-    a {
-      background-image: ;
-    }
-  selections:
-    - anchor: {line: 1, character: 20}
-      active: {line: 1, character: 20}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: containingScope, scopeType: value, includeSiblings: false}, isImplicit: false}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/scss/changeValue7.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/scss/changeValue7.yml
deleted file mode 100644
index e7669dd08a..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/scss/changeValue7.yml
+++ /dev/null
@@ -1,26 +0,0 @@
-languageId: scss
-command:
-  version: 1
-  spokenForm: change value
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: value, includeSiblings: false}
-initialState:
-  documentContents: |
-    @mixin move($left-start, $left-stop) {
-      transition: left ($left-stop - $left-start) * $transition-speed;
-    }
-  selections:
-    - anchor: {line: 1, character: 11}
-      active: {line: 1, character: 11}
-  marks: {}
-finalState:
-  documentContents: |
-    @mixin move($left-start, $left-stop) {
-      transition: ;
-    }
-  selections:
-    - anchor: {line: 1, character: 14}
-      active: {line: 1, character: 14}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: containingScope, scopeType: value, includeSiblings: false}, isImplicit: false}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/scss/changeValue8.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/scss/changeValue8.yml
deleted file mode 100644
index a703bd0651..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/scss/changeValue8.yml
+++ /dev/null
@@ -1,26 +0,0 @@
-languageId: scss
-command:
-  version: 1
-  spokenForm: change value
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: value, includeSiblings: false}
-initialState:
-  documentContents: |
-    @mixin horizontal-list {
-      @include rtl(float, left, right);
-    }
-  selections:
-    - anchor: {line: 1, character: 13}
-      active: {line: 1, character: 13}
-  marks: {}
-finalState:
-  documentContents: |
-    @mixin horizontal-list {
-      @include ;
-    }
-  selections:
-    - anchor: {line: 1, character: 11}
-      active: {line: 1, character: 11}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: containingScope, scopeType: value, includeSiblings: false}, isImplicit: false}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/scss/changeValue9.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/scss/changeValue9.yml
deleted file mode 100644
index 0b26f03c28..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/scss/changeValue9.yml
+++ /dev/null
@@ -1,26 +0,0 @@
-languageId: scss
-command:
-  version: 1
-  spokenForm: change value
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: value, includeSiblings: false}
-initialState:
-  documentContents: |-
-    a[data-lang^="tel"] {
-      color: rgba(0, 255, 0, 0.5);
-    }
-  selections:
-    - anchor: {line: 0, character: 16}
-      active: {line: 0, character: 16}
-  marks: {}
-finalState:
-  documentContents: |-
-    a[data-lang^=] {
-      color: rgba(0, 255, 0, 0.5);
-    }
-  selections:
-    - anchor: {line: 0, character: 13}
-      active: {line: 0, character: 13}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: containingScope, scopeType: value, includeSiblings: false}, isImplicit: false}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/scss/chuckArgue.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/scss/chuckArgue.yml
deleted file mode 100644
index 8cbf4ce7cb..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/scss/chuckArgue.yml
+++ /dev/null
@@ -1,26 +0,0 @@
-languageId: scss
-command:
-  version: 1
-  spokenForm: chuck argue
-  action: remove
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: argumentOrParameter, includeSiblings: false}
-initialState:
-  documentContents: |
-    @function invert($color, $amount: 100%) {
-      $inverse: change-color($color, $hue: hue($color) + 180);
-    }
-  selections:
-    - anchor: {line: 0, character: 30}
-      active: {line: 0, character: 30}
-  marks: {}
-finalState:
-  documentContents: |
-    @function invert($color) {
-      $inverse: change-color($color, $hue: hue($color) + 180);
-    }
-  selections:
-    - anchor: {line: 0, character: 23}
-      active: {line: 0, character: 23}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: outside, modifier: {type: containingScope, scopeType: argumentOrParameter, includeSiblings: false}, isImplicit: false}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/scss/chuckArgue2.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/scss/chuckArgue2.yml
deleted file mode 100644
index 5882bae191..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/scss/chuckArgue2.yml
+++ /dev/null
@@ -1,26 +0,0 @@
-languageId: scss
-command:
-  version: 1
-  spokenForm: chuck argue
-  action: remove
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: argumentOrParameter, includeSiblings: false}
-initialState:
-  documentContents: |
-    @function invert($amount: 100%, $color) {
-      $inverse: change-color($color, $hue: hue($color) + 180);
-    }
-  selections:
-    - anchor: {line: 0, character: 36}
-      active: {line: 0, character: 36}
-  marks: {}
-finalState:
-  documentContents: |
-    @function invert($amount: 100%) {
-      $inverse: change-color($color, $hue: hue($color) + 180);
-    }
-  selections:
-    - anchor: {line: 0, character: 30}
-      active: {line: 0, character: 30}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: outside, modifier: {type: containingScope, scopeType: argumentOrParameter, includeSiblings: false}, isImplicit: false}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/scss/chuckArgue3.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/scss/chuckArgue3.yml
deleted file mode 100644
index 1f99a4bc6a..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/scss/chuckArgue3.yml
+++ /dev/null
@@ -1,26 +0,0 @@
-languageId: scss
-command:
-  version: 1
-  spokenForm: chuck argue
-  action: remove
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: argumentOrParameter, includeSiblings: false}
-initialState:
-  documentContents: |
-    @function invert($amount: 100%, $color) {
-      $inverse: change-color($color, $hue: hue($color) + 180);
-    }
-  selections:
-    - anchor: {line: 0, character: 22}
-      active: {line: 0, character: 22}
-  marks: {}
-finalState:
-  documentContents: |
-    @function invert($color) {
-      $inverse: change-color($color, $hue: hue($color) + 180);
-    }
-  selections:
-    - anchor: {line: 0, character: 17}
-      active: {line: 0, character: 17}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: outside, modifier: {type: containingScope, scopeType: argumentOrParameter, includeSiblings: false}, isImplicit: false}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/scss/chuckArgue4.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/scss/chuckArgue4.yml
deleted file mode 100644
index a1672aadbc..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/scss/chuckArgue4.yml
+++ /dev/null
@@ -1,26 +0,0 @@
-languageId: scss
-command:
-  version: 1
-  spokenForm: chuck argue
-  action: remove
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: argumentOrParameter, includeSiblings: false}
-initialState:
-  documentContents: |
-    @function invert($color, $amount: 100%) {
-      $inverse: change-color($color, $hue: hue($color) + 180);
-    }
-  selections:
-    - anchor: {line: 0, character: 18}
-      active: {line: 0, character: 18}
-  marks: {}
-finalState:
-  documentContents: |
-    @function invert($amount: 100%) {
-      $inverse: change-color($color, $hue: hue($color) + 180);
-    }
-  selections:
-    - anchor: {line: 0, character: 17}
-      active: {line: 0, character: 17}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: outside, modifier: {type: containingScope, scopeType: argumentOrParameter, includeSiblings: false}, isImplicit: false}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/scss/chuckArgue5.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/scss/chuckArgue5.yml
deleted file mode 100644
index a2de932f5b..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/scss/chuckArgue5.yml
+++ /dev/null
@@ -1,26 +0,0 @@
-languageId: scss
-command:
-  version: 1
-  spokenForm: chuck argue
-  action: remove
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: argumentOrParameter, includeSiblings: false}
-initialState:
-  documentContents: |-
-    .micro {
-      width: sum(50px, 30px, 100px);
-    }
-  selections:
-    - anchor: {line: 1, character: 14}
-      active: {line: 1, character: 14}
-  marks: {}
-finalState:
-  documentContents: |-
-    .micro {
-      width: sum(30px, 100px);
-    }
-  selections:
-    - anchor: {line: 1, character: 13}
-      active: {line: 1, character: 13}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: outside, modifier: {type: containingScope, scopeType: argumentOrParameter, includeSiblings: false}, isImplicit: false}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/scss/chuckArgue6.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/scss/chuckArgue6.yml
deleted file mode 100644
index b59fd332a0..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/scss/chuckArgue6.yml
+++ /dev/null
@@ -1,26 +0,0 @@
-languageId: scss
-command:
-  version: 1
-  spokenForm: chuck argue
-  action: remove
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: argumentOrParameter, includeSiblings: false}
-initialState:
-  documentContents: |-
-    .micro {
-      width: sum(50px, 30px, 100px);
-    }
-  selections:
-    - anchor: {line: 1, character: 27}
-      active: {line: 1, character: 27}
-  marks: {}
-finalState:
-  documentContents: |-
-    .micro {
-      width: sum(50px, 30px);
-    }
-  selections:
-    - anchor: {line: 1, character: 23}
-      active: {line: 1, character: 23}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: outside, modifier: {type: containingScope, scopeType: argumentOrParameter, includeSiblings: false}, isImplicit: false}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/scss/chuckArgue7.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/scss/chuckArgue7.yml
deleted file mode 100644
index f58ab88e2f..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/scss/chuckArgue7.yml
+++ /dev/null
@@ -1,26 +0,0 @@
-languageId: scss
-command:
-  version: 1
-  spokenForm: chuck argue
-  action: remove
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: argumentOrParameter, includeSiblings: false}
-initialState:
-  documentContents: |-
-    div {
-      background: repeating-linear-gradient(red, orange 50px);
-    }
-  selections:
-    - anchor: {line: 1, character: 48}
-      active: {line: 1, character: 48}
-  marks: {}
-finalState:
-  documentContents: |-
-    div {
-      background: repeating-linear-gradient(red);
-    }
-  selections:
-    - anchor: {line: 1, character: 43}
-      active: {line: 1, character: 43}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: outside, modifier: {type: containingScope, scopeType: argumentOrParameter, includeSiblings: false}, isImplicit: false}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/scss/chuckArgue8.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/scss/chuckArgue8.yml
deleted file mode 100644
index 66e2998316..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/scss/chuckArgue8.yml
+++ /dev/null
@@ -1,28 +0,0 @@
-languageId: scss
-command:
-  version: 1
-  spokenForm: chuck argue
-  action: remove
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: argumentOrParameter, includeSiblings: false}
-initialState:
-  documentContents: |-
-    a {
-      width: calc(100% - 80px);
-    }
-     
-  selections:
-    - anchor: {line: 1, character: 14}
-      active: {line: 1, character: 14}
-  marks: {}
-finalState:
-  documentContents: |-
-    a {
-      width: calc();
-    }
-     
-  selections:
-    - anchor: {line: 1, character: 14}
-      active: {line: 1, character: 14}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: outside, modifier: {type: containingScope, scopeType: argumentOrParameter, includeSiblings: false}, isImplicit: false}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/scss/chuckArgue9.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/scss/chuckArgue9.yml
deleted file mode 100644
index 002b949ee9..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/scss/chuckArgue9.yml
+++ /dev/null
@@ -1,28 +0,0 @@
-languageId: scss
-command:
-  version: 1
-  spokenForm: chuck argue
-  action: remove
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: argumentOrParameter, includeSiblings: false}
-initialState:
-  documentContents: |-
-    a {
-      clip-path: ellipse(115px 55px at 50% 40%);
-    }
-     
-  selections:
-    - anchor: {line: 1, character: 24}
-      active: {line: 1, character: 24}
-  marks: {}
-finalState:
-  documentContents: |-
-    a {
-      clip-path: ellipse(50% 40%);
-    }
-     
-  selections:
-    - anchor: {line: 1, character: 21}
-      active: {line: 1, character: 21}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: outside, modifier: {type: containingScope, scopeType: argumentOrParameter, includeSiblings: false}, isImplicit: false}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/scss/chuckEveryArgue.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/scss/chuckEveryArgue.yml
deleted file mode 100644
index 341d613182..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/scss/chuckEveryArgue.yml
+++ /dev/null
@@ -1,28 +0,0 @@
-languageId: scss
-command:
-  version: 1
-  spokenForm: chuck every argue
-  action: remove
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: argumentOrParameter, includeSiblings: true}
-initialState:
-  documentContents: |-
-    a {
-      clip-path: ellipse(115px 55px at 50% 40%);
-    }
-     
-  selections:
-    - anchor: {line: 1, character: 24}
-      active: {line: 1, character: 24}
-  marks: {}
-finalState:
-  documentContents: |-
-    a {
-      clip-path: ellipse();
-    }
-     
-  selections:
-    - anchor: {line: 1, character: 21}
-      active: {line: 1, character: 21}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: outside, modifier: {type: containingScope, scopeType: argumentOrParameter, includeSiblings: true}, isImplicit: false}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/scss/chuckFirstWordCap.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/scss/chuckFirstWordCap.yml
deleted file mode 100644
index d5fe470a77..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/scss/chuckFirstWordCap.yml
+++ /dev/null
@@ -1,37 +0,0 @@
-languageId: scss
-command:
-  spokenForm: chuck first word cap
-  version: 2
-  targets:
-    - type: primitive
-      mark: {type: decoratedSymbol, symbolColor: default, character: c}
-      modifiers:
-        - type: ordinalRange
-          scopeType: {type: word}
-          anchor: 0
-          active: 0
-          excludeAnchor: false
-          excludeActive: false
-  usePrePhraseSnapshot: true
-  action: {name: remove}
-initialState:
-  documentContents: |2-
-     .child-selector {
-       height: 10px;
-     }
-  selections:
-    - anchor: {line: 2, character: 2}
-      active: {line: 2, character: 2}
-  marks:
-    default.c:
-      start: {line: 0, character: 2}
-      end: {line: 0, character: 16}
-finalState:
-  documentContents: |2-
-     .selector {
-       height: 10px;
-     }
-  selections:
-    - anchor: {line: 2, character: 2}
-      active: {line: 2, character: 2}
-fullTargets: [{type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: c}, modifiers: [{type: ordinalRange, scopeType: {type: word}, anchor: 0, active: 0, excludeAnchor: false, excludeActive: false}]}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/scss/chuckLastWordCap.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/scss/chuckLastWordCap.yml
deleted file mode 100644
index aad1ef9300..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/scss/chuckLastWordCap.yml
+++ /dev/null
@@ -1,37 +0,0 @@
-languageId: scss
-command:
-  spokenForm: chuck last word cap
-  version: 2
-  targets:
-    - type: primitive
-      mark: {type: decoratedSymbol, symbolColor: default, character: c}
-      modifiers:
-        - type: ordinalRange
-          scopeType: {type: word}
-          anchor: -1
-          active: -1
-          excludeAnchor: false
-          excludeActive: false
-  usePrePhraseSnapshot: true
-  action: {name: remove}
-initialState:
-  documentContents: |2-
-     .child-selector {
-       height: 10px;
-     }
-  selections:
-    - anchor: {line: 2, character: 2}
-      active: {line: 2, character: 2}
-  marks:
-    default.c:
-      start: {line: 0, character: 2}
-      end: {line: 0, character: 16}
-finalState:
-  documentContents: |2-
-     .child {
-       height: 10px;
-     }
-  selections:
-    - anchor: {line: 2, character: 2}
-      active: {line: 2, character: 2}
-fullTargets: [{type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: c}, modifiers: [{type: ordinalRange, scopeType: {type: word}, anchor: -1, active: -1, excludeAnchor: false, excludeActive: false}]}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/scss/chuckState.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/scss/chuckState.yml
deleted file mode 100644
index 85b01cdd27..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/scss/chuckState.yml
+++ /dev/null
@@ -1,20 +0,0 @@
-languageId: scss
-command:
-  version: 1
-  spokenForm: chuck state
-  action: remove
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: statement, includeSiblings: false}
-initialState:
-  documentContents: "@namespace prefix \"XML-namespace-URL\";"
-  selections:
-    - anchor: {line: 0, character: 15}
-      active: {line: 0, character: 15}
-  marks: {}
-finalState:
-  documentContents: ""
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: outside, modifier: {type: containingScope, scopeType: statement, includeSiblings: false}, isImplicit: false}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/scss/chuckState2.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/scss/chuckState2.yml
deleted file mode 100644
index 2f9d28bdec..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/scss/chuckState2.yml
+++ /dev/null
@@ -1,26 +0,0 @@
-languageId: scss
-command:
-  version: 1
-  spokenForm: chuck state
-  action: remove
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: statement, includeSiblings: false}
-initialState:
-  documentContents: |
-    @keyframes important1 {
-      from { margin-top: 50px; }
-      50%  { margin-top: 150px !important; } /* ignored */
-      to   { margin-top: 100px; }
-    }
-  selections:
-    - anchor: {line: 0, character: 4}
-      active: {line: 0, character: 4}
-  marks: {}
-finalState:
-  documentContents: |+
-
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: outside, modifier: {type: containingScope, scopeType: statement, includeSiblings: false}, isImplicit: false}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/scss/chuckValue.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/scss/chuckValue.yml
deleted file mode 100644
index 9a44de97a1..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/scss/chuckValue.yml
+++ /dev/null
@@ -1,20 +0,0 @@
-languageId: scss
-command:
-  version: 1
-  spokenForm: chuck value
-  action: remove
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: value, includeSiblings: false}
-initialState:
-  documentContents: "@namespace prefix \"XML-namespace-URL\";"
-  selections:
-    - anchor: {line: 0, character: 16}
-      active: {line: 0, character: 16}
-  marks: {}
-finalState:
-  documentContents: "@namespace;"
-  selections:
-    - anchor: {line: 0, character: 10}
-      active: {line: 0, character: 10}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: outside, modifier: {type: containingScope, scopeType: value, includeSiblings: false}, isImplicit: false}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/scss/chuckValue2.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/scss/chuckValue2.yml
deleted file mode 100644
index ba271a8a4c..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/scss/chuckValue2.yml
+++ /dev/null
@@ -1,20 +0,0 @@
-languageId: scss
-command:
-  version: 1
-  spokenForm: chuck value
-  action: remove
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: value, includeSiblings: false}
-initialState:
-  documentContents: "@namespace url(http://www.w3.org/1999/xhtml);"
-  selections:
-    - anchor: {line: 0, character: 6}
-      active: {line: 0, character: 6}
-  marks: {}
-finalState:
-  documentContents: "@namespace;"
-  selections:
-    - anchor: {line: 0, character: 6}
-      active: {line: 0, character: 6}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: outside, modifier: {type: containingScope, scopeType: value, includeSiblings: false}, isImplicit: false}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/scss/chuckValue3.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/scss/chuckValue3.yml
deleted file mode 100644
index 372ec22c8e..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/scss/chuckValue3.yml
+++ /dev/null
@@ -1,26 +0,0 @@
-languageId: scss
-command:
-  version: 1
-  spokenForm: chuck value
-  action: remove
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: value, includeSiblings: false}
-initialState:
-  documentContents: |
-    a { 
-      margin-top: 150px !important; 
-    }
-  selections:
-    - anchor: {line: 1, character: 7}
-      active: {line: 1, character: 7}
-  marks: {}
-finalState:
-  documentContents: |
-    a { 
-      margin-top:; 
-    }
-  selections:
-    - anchor: {line: 1, character: 7}
-      active: {line: 1, character: 7}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: outside, modifier: {type: containingScope, scopeType: value, includeSiblings: false}, isImplicit: false}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/scss/moveFirstWordZipBeforeFineTakeFine.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/scss/moveFirstWordZipBeforeFineTakeFine.yml
deleted file mode 100644
index 657dcf4022..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/scss/moveFirstWordZipBeforeFineTakeFine.yml
+++ /dev/null
@@ -1,46 +0,0 @@
-languageId: scss
-command:
-  spokenForm: move first word zip before fine take fine
-  version: 2
-  targets:
-    - type: primitive
-      mark: {type: decoratedSymbol, symbolColor: default, character: z}
-      modifiers:
-        - type: ordinalRange
-          scopeType: {type: word}
-          anchor: 0
-          active: 0
-          excludeAnchor: false
-          excludeActive: false
-    - type: primitive
-      mark: {type: decoratedSymbol, symbolColor: default, character: f}
-      modifiers:
-        - {type: position, position: before}
-  usePrePhraseSnapshot: true
-  action: {name: moveToTarget}
-marksToCheck: [default.f]
-initialState:
-  documentContents: foo-bar baz-bongo
-  selections:
-    - anchor: {line: 0, character: 17}
-      active: {line: 0, character: 17}
-  marks:
-    default.z:
-      start: {line: 0, character: 8}
-      end: {line: 0, character: 17}
-    default.f:
-      start: {line: 0, character: 0}
-      end: {line: 0, character: 7}
-finalState:
-  documentContents: baz-foo-bar bongo
-  selections:
-    - anchor: {line: 0, character: 17}
-      active: {line: 0, character: 17}
-  marks:
-    default.z:
-      start: {line: 0, character: 12}
-      end: {line: 0, character: 17}
-    default.f:
-      start: {line: 0, character: 0}
-      end: {line: 0, character: 11}
-fullTargets: [{type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: z}, modifiers: [{type: ordinalRange, scopeType: {type: word}, anchor: 0, active: 0, excludeAnchor: false, excludeActive: false}]}, {type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: f}, modifiers: [{type: position, position: before}]}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/scss/moveFirstWordZipBeforeFineTakeZip.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/scss/moveFirstWordZipBeforeFineTakeZip.yml
deleted file mode 100644
index cd3f9480e9..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/scss/moveFirstWordZipBeforeFineTakeZip.yml
+++ /dev/null
@@ -1,46 +0,0 @@
-languageId: scss
-command:
-  spokenForm: move first word zip before fine take zip
-  version: 2
-  targets:
-    - type: primitive
-      mark: {type: decoratedSymbol, symbolColor: default, character: z}
-      modifiers:
-        - type: ordinalRange
-          scopeType: {type: word}
-          anchor: 0
-          active: 0
-          excludeAnchor: false
-          excludeActive: false
-    - type: primitive
-      mark: {type: decoratedSymbol, symbolColor: default, character: f}
-      modifiers:
-        - {type: position, position: before}
-  usePrePhraseSnapshot: true
-  action: {name: moveToTarget}
-marksToCheck: [default.z]
-initialState:
-  documentContents: foo-bar baz-bongo
-  selections:
-    - anchor: {line: 0, character: 17}
-      active: {line: 0, character: 17}
-  marks:
-    default.z:
-      start: {line: 0, character: 8}
-      end: {line: 0, character: 17}
-    default.f:
-      start: {line: 0, character: 0}
-      end: {line: 0, character: 7}
-finalState:
-  documentContents: baz-foo-bar bongo
-  selections:
-    - anchor: {line: 0, character: 17}
-      active: {line: 0, character: 17}
-  marks:
-    default.z:
-      start: {line: 0, character: 12}
-      end: {line: 0, character: 17}
-    default.f:
-      start: {line: 0, character: 0}
-      end: {line: 0, character: 11}
-fullTargets: [{type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: z}, modifiers: [{type: ordinalRange, scopeType: {type: word}, anchor: 0, active: 0, excludeAnchor: false, excludeActive: false}]}, {type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: f}, modifiers: [{type: position, position: before}]}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/scss/moveLastWordZipAfterFineTakeFine.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/scss/moveLastWordZipAfterFineTakeFine.yml
deleted file mode 100644
index 328662d650..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/scss/moveLastWordZipAfterFineTakeFine.yml
+++ /dev/null
@@ -1,46 +0,0 @@
-languageId: scss
-command:
-  spokenForm: move last word zip after fine take fine
-  version: 2
-  targets:
-    - type: primitive
-      mark: {type: decoratedSymbol, symbolColor: default, character: z}
-      modifiers:
-        - type: ordinalRange
-          scopeType: {type: word}
-          anchor: -1
-          active: -1
-          excludeAnchor: false
-          excludeActive: false
-    - type: primitive
-      mark: {type: decoratedSymbol, symbolColor: default, character: f}
-      modifiers:
-        - {type: position, position: after}
-  usePrePhraseSnapshot: true
-  action: {name: moveToTarget}
-marksToCheck: [default.f]
-initialState:
-  documentContents: foo-bar baz-bongo
-  selections:
-    - anchor: {line: 0, character: 17}
-      active: {line: 0, character: 17}
-  marks:
-    default.z:
-      start: {line: 0, character: 8}
-      end: {line: 0, character: 17}
-    default.f:
-      start: {line: 0, character: 0}
-      end: {line: 0, character: 7}
-finalState:
-  documentContents: foo-bar-bongo baz
-  selections:
-    - anchor: {line: 0, character: 17}
-      active: {line: 0, character: 17}
-  marks:
-    default.z:
-      start: {line: 0, character: 14}
-      end: {line: 0, character: 17}
-    default.f:
-      start: {line: 0, character: 0}
-      end: {line: 0, character: 13}
-fullTargets: [{type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: z}, modifiers: [{type: ordinalRange, scopeType: {type: word}, anchor: -1, active: -1, excludeAnchor: false, excludeActive: false}]}, {type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: f}, modifiers: [{type: position, position: after}]}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/scss/moveLastWordZipAfterFineTakeZip.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/scss/moveLastWordZipAfterFineTakeZip.yml
deleted file mode 100644
index a981c93dc1..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/scss/moveLastWordZipAfterFineTakeZip.yml
+++ /dev/null
@@ -1,46 +0,0 @@
-languageId: scss
-command:
-  spokenForm: move last word zip after fine take zip
-  version: 2
-  targets:
-    - type: primitive
-      mark: {type: decoratedSymbol, symbolColor: default, character: z}
-      modifiers:
-        - type: ordinalRange
-          scopeType: {type: word}
-          anchor: -1
-          active: -1
-          excludeAnchor: false
-          excludeActive: false
-    - type: primitive
-      mark: {type: decoratedSymbol, symbolColor: default, character: f}
-      modifiers:
-        - {type: position, position: after}
-  usePrePhraseSnapshot: true
-  action: {name: moveToTarget}
-marksToCheck: [default.z]
-initialState:
-  documentContents: foo-bar baz-bongo
-  selections:
-    - anchor: {line: 0, character: 17}
-      active: {line: 0, character: 17}
-  marks:
-    default.z:
-      start: {line: 0, character: 8}
-      end: {line: 0, character: 17}
-    default.f:
-      start: {line: 0, character: 0}
-      end: {line: 0, character: 7}
-finalState:
-  documentContents: foo-bar-bongo baz
-  selections:
-    - anchor: {line: 0, character: 17}
-      active: {line: 0, character: 17}
-  marks:
-    default.z:
-      start: {line: 0, character: 14}
-      end: {line: 0, character: 17}
-    default.f:
-      start: {line: 0, character: 0}
-      end: {line: 0, character: 13}
-fullTargets: [{type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: z}, modifiers: [{type: ordinalRange, scopeType: {type: word}, anchor: -1, active: -1, excludeAnchor: false, excludeActive: false}]}, {type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: f}, modifiers: [{type: position, position: after}]}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/scss/takeEveryToken.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/scss/takeEveryToken.yml
deleted file mode 100644
index c5ba3bea16..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/scss/takeEveryToken.yml
+++ /dev/null
@@ -1,29 +0,0 @@
-languageId: scss
-command:
-  spokenForm: take every token
-  version: 2
-  targets:
-    - type: primitive
-      modifiers:
-        - type: everyScope
-          scopeType: {type: token}
-  usePrePhraseSnapshot: true
-  action: {name: setSelection}
-initialState:
-  documentContents: .long-bem-class-name {}
-  selections:
-    - anchor: {line: 0, character: 2}
-      active: {line: 0, character: 2}
-  marks: {}
-finalState:
-  documentContents: .long-bem-class-name {}
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 1}
-    - anchor: {line: 0, character: 1}
-      active: {line: 0, character: 20}
-    - anchor: {line: 0, character: 21}
-      active: {line: 0, character: 22}
-    - anchor: {line: 0, character: 22}
-      active: {line: 0, character: 23}
-fullTargets: [{type: primitive, mark: {type: cursor}, modifiers: [{type: everyScope, scopeType: {type: token}}]}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/shellscript/changeThirdWordDash.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/shellscript/changeThirdWordDash.yml
deleted file mode 100644
index 42d6398299..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/shellscript/changeThirdWordDash.yml
+++ /dev/null
@@ -1,33 +0,0 @@
-languageId: shellscript
-command:
-  spokenForm: change third word dash
-  version: 2
-  targets:
-    - type: primitive
-      modifiers:
-        - type: ordinalRange
-          scopeType: {type: word}
-          anchor: 2
-          active: 2
-          excludeAnchor: false
-          excludeActive: false
-      mark: {type: decoratedSymbol, symbolColor: default, character: '-'}
-  usePrePhraseSnapshot: true
-  action: {name: clearAndSetSelection}
-initialState:
-  documentContents: |2
-     npm version patch --force --commit-hooks false --git-tag-version false
-  selections:
-    - anchor: {line: 1, character: 0}
-      active: {line: 1, character: 0}
-  marks:
-    default.-:
-      start: {line: 0, character: 48}
-      end: {line: 0, character: 65}
-finalState:
-  documentContents: |2
-     npm version patch --force --commit-hooks false --git-tag- false
-  selections:
-    - anchor: {line: 0, character: 58}
-      active: {line: 0, character: 58}
-fullTargets: [{type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: '-'}, modifiers: [{type: ordinalRange, scopeType: {type: word}, anchor: 2, active: 2, excludeAnchor: false, excludeActive: false}]}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/shellscript/chuckFirstWordBat.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/shellscript/chuckFirstWordBat.yml
deleted file mode 100644
index ba8f87d3a1..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/shellscript/chuckFirstWordBat.yml
+++ /dev/null
@@ -1,33 +0,0 @@
-languageId: shellscript
-command:
-  spokenForm: chuck first word bat
-  version: 2
-  targets:
-    - type: primitive
-      modifiers:
-        - type: ordinalRange
-          scopeType: {type: word}
-          anchor: 0
-          active: 0
-          excludeAnchor: false
-          excludeActive: false
-      mark: {type: decoratedSymbol, symbolColor: default, character: b}
-  usePrePhraseSnapshot: true
-  action: {name: remove}
-initialState:
-  documentContents: |2
-     npm version patch --foo-bar --force --commit-hooks false --git-tag-version false
-  selections:
-    - anchor: {line: 1, character: 0}
-      active: {line: 1, character: 0}
-  marks:
-    default.b:
-      start: {line: 0, character: 19}
-      end: {line: 0, character: 28}
-finalState:
-  documentContents: |2
-     npm version patch --bar --force --commit-hooks false --git-tag-version false
-  selections:
-    - anchor: {line: 1, character: 0}
-      active: {line: 1, character: 0}
-fullTargets: [{type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: b}, modifiers: [{type: ordinalRange, scopeType: {type: word}, anchor: 0, active: 0, excludeAnchor: false, excludeActive: false}]}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/shellscript/chuckSecondWordCap.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/shellscript/chuckSecondWordCap.yml
deleted file mode 100644
index 31b5675ea0..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/shellscript/chuckSecondWordCap.yml
+++ /dev/null
@@ -1,33 +0,0 @@
-languageId: shellscript
-command:
-  spokenForm: chuck second word cap
-  version: 2
-  targets:
-    - type: primitive
-      modifiers:
-        - type: ordinalRange
-          scopeType: {type: word}
-          anchor: 1
-          active: 1
-          excludeAnchor: false
-          excludeActive: false
-      mark: {type: decoratedSymbol, symbolColor: default, character: c}
-  usePrePhraseSnapshot: true
-  action: {name: remove}
-initialState:
-  documentContents: |2
-     npm version patch --force --commit-hooks false --git-tag-version false
-  selections:
-    - anchor: {line: 1, character: 0}
-      active: {line: 1, character: 0}
-  marks:
-    default.c:
-      start: {line: 0, character: 27}
-      end: {line: 0, character: 41}
-finalState:
-  documentContents: |2
-     npm version patch --force --commit false --git-tag-version false
-  selections:
-    - anchor: {line: 1, character: 0}
-      active: {line: 1, character: 0}
-fullTargets: [{type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: c}, modifiers: [{type: ordinalRange, scopeType: {type: word}, anchor: 1, active: 1, excludeAnchor: false, excludeActive: false}]}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/typescript/changeCallee.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/typescript/changeCallee.yml
deleted file mode 100644
index 8159b31d9c..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/typescript/changeCallee.yml
+++ /dev/null
@@ -1,20 +0,0 @@
-languageId: typescript
-command:
-  version: 1
-  spokenForm: change callee
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: functionCallee, includeSiblings: false}
-initialState:
-  documentContents: foo`hello ${bar}`;
-  selections:
-    - anchor: {line: 0, character: 10}
-      active: {line: 0, character: 10}
-  marks: {}
-finalState:
-  documentContents: "`hello ${bar}`;"
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: containingScope, scopeType: functionCallee, includeSiblings: false}, isImplicit: false}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/typescript/changeCallee3.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/typescript/changeCallee3.yml
deleted file mode 100644
index fcfa2326c6..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/typescript/changeCallee3.yml
+++ /dev/null
@@ -1,20 +0,0 @@
-languageId: typescript
-command:
-  version: 1
-  spokenForm: change callee
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: functionCallee, includeSiblings: false}
-initialState:
-  documentContents: eval(action)[0]()
-  selections:
-    - anchor: {line: 0, character: 16}
-      active: {line: 0, character: 16}
-  marks: {}
-finalState:
-  documentContents: ()
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: containingScope, scopeType: functionCallee, includeSiblings: false}, isImplicit: false}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/typescript/changeCallee4.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/typescript/changeCallee4.yml
deleted file mode 100644
index 730d26d670..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/typescript/changeCallee4.yml
+++ /dev/null
@@ -1,20 +0,0 @@
-languageId: typescript
-command:
-  version: 1
-  spokenForm: change callee
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: functionCallee, includeSiblings: false}
-initialState:
-  documentContents: object.method()
-  selections:
-    - anchor: {line: 0, character: 14}
-      active: {line: 0, character: 14}
-  marks: {}
-finalState:
-  documentContents: ()
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: containingScope, scopeType: functionCallee, includeSiblings: false}, isImplicit: false}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/typescript/changeCallee5.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/typescript/changeCallee5.yml
deleted file mode 100644
index f00098b65c..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/typescript/changeCallee5.yml
+++ /dev/null
@@ -1,20 +0,0 @@
-languageId: typescript
-command:
-  version: 1
-  spokenForm: change callee
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: functionCallee, includeSiblings: false}
-initialState:
-  documentContents: let test = new obj.Test()
-  selections:
-    - anchor: {line: 0, character: 24}
-      active: {line: 0, character: 24}
-  marks: {}
-finalState:
-  documentContents: let test = new ()
-  selections:
-    - anchor: {line: 0, character: 15}
-      active: {line: 0, character: 15}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: containingScope, scopeType: functionCallee, includeSiblings: false}, isImplicit: false}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/typescript/changeCallee6.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/typescript/changeCallee6.yml
deleted file mode 100644
index 76cf927e7b..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/typescript/changeCallee6.yml
+++ /dev/null
@@ -1,20 +0,0 @@
-languageId: typescript
-command:
-  version: 1
-  spokenForm: change callee
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: functionCallee, includeSiblings: false}
-initialState:
-  documentContents: let test = new obj.Tests[0]()
-  selections:
-    - anchor: {line: 0, character: 28}
-      active: {line: 0, character: 28}
-  marks: {}
-finalState:
-  documentContents: let test = new ()
-  selections:
-    - anchor: {line: 0, character: 15}
-      active: {line: 0, character: 15}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: containingScope, scopeType: functionCallee, includeSiblings: false}, isImplicit: false}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/typescript/changeCallee7.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/typescript/changeCallee7.yml
deleted file mode 100644
index 89c2d1c149..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/typescript/changeCallee7.yml
+++ /dev/null
@@ -1,20 +0,0 @@
-languageId: typescript
-command:
-  version: 1
-  spokenForm: change callee
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: functionCallee, includeSiblings: false}
-initialState:
-  documentContents: let test = new (foo[0])()
-  selections:
-    - anchor: {line: 0, character: 24}
-      active: {line: 0, character: 24}
-  marks: {}
-finalState:
-  documentContents: let test = new ()
-  selections:
-    - anchor: {line: 0, character: 15}
-      active: {line: 0, character: 15}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: containingScope, scopeType: functionCallee, includeSiblings: false}, isImplicit: false}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/typescript/changeCalleeParen.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/typescript/changeCalleeParen.yml
deleted file mode 100644
index 1e77c41735..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/typescript/changeCalleeParen.yml
+++ /dev/null
@@ -1,24 +0,0 @@
-languageId: typescript
-command:
-  version: 1
-  spokenForm: change callee paren
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: functionCallee, includeSiblings: false}
-      mark: {type: decoratedSymbol, symbolColor: default, character: (}
-initialState:
-  documentContents: test()
-  selections:
-    - anchor: {line: 0, character: 6}
-      active: {line: 0, character: 6}
-  marks:
-    default.(:
-      start: {line: 0, character: 4}
-      end: {line: 0, character: 5}
-finalState:
-  documentContents: ()
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-fullTargets: [{type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: (}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: containingScope, scopeType: functionCallee, includeSiblings: false}, isImplicit: false}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/typescript/changeCalleeParen2.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/typescript/changeCalleeParen2.yml
deleted file mode 100644
index 8cd20b698b..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/typescript/changeCalleeParen2.yml
+++ /dev/null
@@ -1,24 +0,0 @@
-languageId: typescript
-command:
-  version: 1
-  spokenForm: change callee paren
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: functionCallee, includeSiblings: false}
-      mark: {type: decoratedSymbol, symbolColor: default, character: (}
-initialState:
-  documentContents: test()()
-  selections:
-    - anchor: {line: 0, character: 7}
-      active: {line: 0, character: 7}
-  marks:
-    default.(:
-      start: {line: 0, character: 6}
-      end: {line: 0, character: 7}
-finalState:
-  documentContents: ()
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-fullTargets: [{type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: (}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: containingScope, scopeType: functionCallee, includeSiblings: false}, isImplicit: false}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/typescript/changeFunk.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/typescript/changeFunk.yml
deleted file mode 100644
index 7db790d53c..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/typescript/changeFunk.yml
+++ /dev/null
@@ -1,23 +0,0 @@
-languageId: typescript
-command:
-  version: 1
-  spokenForm: change funk
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: namedFunction, includeSiblings: false}
-initialState:
-  documentContents: |-
-    function* generator(i) {
-      yield i + 10;
-    }
-  selections:
-    - anchor: {line: 1, character: 15}
-      active: {line: 1, character: 15}
-  marks: {}
-finalState:
-  documentContents: ""
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: containingScope, scopeType: namedFunction, includeSiblings: false}, isImplicit: false}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/typescript/changeName.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/typescript/changeName.yml
deleted file mode 100644
index 740e9d388f..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/typescript/changeName.yml
+++ /dev/null
@@ -1,26 +0,0 @@
-languageId: typescript
-command:
-  version: 1
-  spokenForm: change name
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: name, includeSiblings: false}
-initialState:
-  documentContents: |-
-    function* generator(i) {
-      yield i + 10;
-    }
-  selections:
-    - anchor: {line: 1, character: 15}
-      active: {line: 1, character: 15}
-  marks: {}
-finalState:
-  documentContents: |-
-    function* (i) {
-      yield i + 10;
-    }
-  selections:
-    - anchor: {line: 0, character: 10}
-      active: {line: 0, character: 10}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: containingScope, scopeType: name, includeSiblings: false}, isImplicit: false}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/typescript/changeName2.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/typescript/changeName2.yml
deleted file mode 100644
index b72465ec0e..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/typescript/changeName2.yml
+++ /dev/null
@@ -1,20 +0,0 @@
-languageId: typescript
-command:
-  version: 1
-  spokenForm: change name
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: name, includeSiblings: false}
-initialState:
-  documentContents: this.leadingDelimiterRange_ = parameters.leadingDelimiterRange;
-  selections:
-    - anchor: {line: 0, character: 37}
-      active: {line: 0, character: 37}
-  marks: {}
-finalState:
-  documentContents: " = parameters.leadingDelimiterRange;"
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: containingScope, scopeType: name, includeSiblings: false}, isImplicit: false}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/typescript/changeName3.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/typescript/changeName3.yml
deleted file mode 100644
index c4b2367fc3..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/typescript/changeName3.yml
+++ /dev/null
@@ -1,20 +0,0 @@
-languageId: typescript
-command:
-  version: 1
-  spokenForm: change name
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: name, includeSiblings: false}
-initialState:
-  documentContents: leadingDelimiterRange_[0] = parameters.leadingDelimiterRange;
-  selections:
-    - anchor: {line: 0, character: 36}
-      active: {line: 0, character: 36}
-  marks: {}
-finalState:
-  documentContents: " = parameters.leadingDelimiterRange;"
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: containingScope, scopeType: name, includeSiblings: false}, isImplicit: false}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/typescript/changeName4.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/typescript/changeName4.yml
deleted file mode 100644
index 8679ea9b8c..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/typescript/changeName4.yml
+++ /dev/null
@@ -1,20 +0,0 @@
-languageId: typescript
-command:
-  version: 1
-  spokenForm: change name
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: name, includeSiblings: false}
-initialState:
-  documentContents: let name = parameters.leadingDelimiterRange;
-  selections:
-    - anchor: {line: 0, character: 26}
-      active: {line: 0, character: 26}
-  marks: {}
-finalState:
-  documentContents: let  = parameters.leadingDelimiterRange;
-  selections:
-    - anchor: {line: 0, character: 4}
-      active: {line: 0, character: 4}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: containingScope, scopeType: name, includeSiblings: false}, isImplicit: false}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/typescript/changeName5.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/typescript/changeName5.yml
deleted file mode 100644
index a623138f81..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/typescript/changeName5.yml
+++ /dev/null
@@ -1,20 +0,0 @@
-languageId: typescript
-command:
-  version: 1
-  spokenForm: change name
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: name, includeSiblings: false}
-initialState:
-  documentContents: foo().bar = parameters.leadingDelimiterRange;
-  selections:
-    - anchor: {line: 0, character: 25}
-      active: {line: 0, character: 26}
-  marks: {}
-finalState:
-  documentContents: " = parameters.leadingDelimiterRange;"
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: containingScope, scopeType: name, includeSiblings: false}, isImplicit: false}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/typescript/changeValue.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/typescript/changeValue.yml
deleted file mode 100644
index 62c0d091a4..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/typescript/changeValue.yml
+++ /dev/null
@@ -1,26 +0,0 @@
-languageId: typescript
-command:
-  version: 1
-  spokenForm: change value
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: value, includeSiblings: false}
-initialState:
-  documentContents: |-
-    function* generator(i) {
-      yield i + 10;
-    }
-  selections:
-    - anchor: {line: 1, character: 11}
-      active: {line: 1, character: 11}
-  marks: {}
-finalState:
-  documentContents: |-
-    function* generator(i) {
-      yield ;
-    }
-  selections:
-    - anchor: {line: 1, character: 8}
-      active: {line: 1, character: 8}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: containingScope, scopeType: value, includeSiblings: false}, isImplicit: false}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/typescript/chuckCoreElement.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/typescript/chuckCoreElement.yml
deleted file mode 100644
index a3bcf0da02..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/typescript/chuckCoreElement.yml
+++ /dev/null
@@ -1,27 +0,0 @@
-languageId: typescriptreact
-command:
-  spokenForm: chuck core element
-  version: 2
-  targets:
-    - type: primitive
-      modifiers:
-        - {type: interiorOnly}
-        - type: containingScope
-          scopeType: {type: xmlElement}
-  usePrePhraseSnapshot: true
-  action: {name: remove}
-initialState:
-  documentContents: |-
-    <div>
-        aaa
-    </div>
-  selections:
-    - anchor: {line: 1, character: 4}
-      active: {line: 1, character: 4}
-  marks: {}
-finalState:
-  documentContents: <div></div>
-  selections:
-    - anchor: {line: 0, character: 5}
-      active: {line: 0, character: 5}
-fullTargets: [{type: primitive, mark: {type: cursor}, modifiers: [{type: interiorOnly}, {type: containingScope, scopeType: {type: xmlElement}}]}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/typescript/chuckKey.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/typescript/chuckKey.yml
deleted file mode 100644
index 6daae3dcc8..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/typescript/chuckKey.yml
+++ /dev/null
@@ -1,26 +0,0 @@
-languageId: typescript
-command:
-  version: 1
-  spokenForm: chuck key
-  action: remove
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: collectionKey, includeSiblings: false}
-initialState:
-  documentContents: |-
-    {
-        foo: "bar"
-    }
-  selections:
-    - anchor: {line: 1, character: 5}
-      active: {line: 1, character: 5}
-  marks: {}
-finalState:
-  documentContents: |-
-    {
-        "bar"
-    }
-  selections:
-    - anchor: {line: 1, character: 4}
-      active: {line: 1, character: 4}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: outside, modifier: {type: containingScope, scopeType: collectionKey, includeSiblings: false}}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/typescript/chuckState.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/typescript/chuckState.yml
deleted file mode 100644
index 2d547cf5d9..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/typescript/chuckState.yml
+++ /dev/null
@@ -1,31 +0,0 @@
-languageId: typescript
-command:
-  spokenForm: chuck state
-  version: 3
-  targets:
-    - type: primitive
-      modifiers:
-        - type: containingScope
-          scopeType: {type: statement}
-  usePrePhraseSnapshot: true
-  action: {name: remove}
-initialState:
-  documentContents: |-
-    interface Foo {
-      bar: Bar;
-      baz: Baz;
-    }
-  selections:
-    - anchor: {line: 1, character: 2}
-      active: {line: 1, character: 2}
-  marks: {}
-finalState:
-  documentContents: |-
-    interface Foo {
-
-      baz: Baz;
-    }
-  selections:
-    - anchor: {line: 1, character: 0}
-      active: {line: 1, character: 0}
-fullTargets: [{type: primitive, mark: {type: cursor}, modifiers: [{type: containingScope, scopeType: {type: statement}}]}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/typescript/chuckState2.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/typescript/chuckState2.yml
deleted file mode 100644
index e70300cf68..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/typescript/chuckState2.yml
+++ /dev/null
@@ -1,29 +0,0 @@
-languageId: typescript
-command:
-  spokenForm: chuck state
-  version: 3
-  targets:
-    - type: primitive
-      modifiers:
-        - type: containingScope
-          scopeType: {type: statement}
-  usePrePhraseSnapshot: true
-  action: {name: remove}
-initialState:
-  documentContents: |-
-    class Foo {
-        private value: string;
-    }
-  selections:
-    - anchor: {line: 1, character: 4}
-      active: {line: 1, character: 4}
-  marks: {}
-finalState:
-  documentContents: |-
-    class Foo {
-
-    }
-  selections:
-    - anchor: {line: 1, character: 0}
-      active: {line: 1, character: 0}
-fullTargets: [{type: primitive, mark: {type: cursor}, modifiers: [{type: containingScope, scopeType: {type: statement}}]}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/typescript/chuckTypeRam.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/typescript/chuckTypeRam.yml
deleted file mode 100644
index e09ec83b56..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/typescript/chuckTypeRam.yml
+++ /dev/null
@@ -1,24 +0,0 @@
-languageId: typescript
-command:
-  version: 1
-  spokenForm: chuck type ram
-  action: remove
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: type, includeSiblings: false}
-      mark: {type: decoratedSymbol, symbolColor: default, character: r}
-initialState:
-  documentContents: "const hello: string = \"hello\";"
-  selections:
-    - anchor: {line: 0, character: 30}
-      active: {line: 0, character: 30}
-  marks:
-    default.r:
-      start: {line: 0, character: 13}
-      end: {line: 0, character: 19}
-finalState:
-  documentContents: const hello = "hello";
-  selections:
-    - anchor: {line: 0, character: 22}
-      active: {line: 0, character: 22}
-fullTargets: [{type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: r}, selectionType: token, position: contents, insideOutsideType: outside, modifier: {type: containingScope, scopeType: type, includeSiblings: false}}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/typescript/chuckTypeSoon.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/typescript/chuckTypeSoon.yml
deleted file mode 100644
index 5aedd928db..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/typescript/chuckTypeSoon.yml
+++ /dev/null
@@ -1,30 +0,0 @@
-languageId: typescript
-command:
-  version: 1
-  spokenForm: chuck type soon
-  action: remove
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: type, includeSiblings: false}
-      mark: {type: decoratedSymbol, symbolColor: default, character: s}
-initialState:
-  documentContents: |-
-    function myFunk (value: string): string {
-        return value;
-    }
-  selections:
-    - anchor: {line: 2, character: 1}
-      active: {line: 2, character: 1}
-  marks:
-    default.s:
-      start: {line: 0, character: 24}
-      end: {line: 0, character: 30}
-finalState:
-  documentContents: |-
-    function myFunk (value): string {
-        return value;
-    }
-  selections:
-    - anchor: {line: 2, character: 1}
-      active: {line: 2, character: 1}
-fullTargets: [{type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: s}, selectionType: token, position: contents, insideOutsideType: outside, modifier: {type: containingScope, scopeType: type, includeSiblings: false}}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/typescript/chuckTypeSoon2.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/typescript/chuckTypeSoon2.yml
deleted file mode 100644
index 902df979be..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/typescript/chuckTypeSoon2.yml
+++ /dev/null
@@ -1,30 +0,0 @@
-languageId: typescript
-command:
-  version: 1
-  spokenForm: chuck type soon
-  action: remove
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: type, includeSiblings: false}
-      mark: {type: decoratedSymbol, symbolColor: default, character: s}
-initialState:
-  documentContents: |-
-    interface MyType {
-        name: string;
-    }
-  selections:
-    - anchor: {line: 2, character: 1}
-      active: {line: 2, character: 1}
-  marks:
-    default.s:
-      start: {line: 1, character: 10}
-      end: {line: 1, character: 16}
-finalState:
-  documentContents: |-
-    interface MyType {
-        name;
-    }
-  selections:
-    - anchor: {line: 2, character: 1}
-      active: {line: 2, character: 1}
-fullTargets: [{type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: s}, selectionType: token, position: contents, insideOutsideType: outside, modifier: {type: containingScope, scopeType: type, includeSiblings: false}}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/typescript/chuckTypeTrap.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/typescript/chuckTypeTrap.yml
deleted file mode 100644
index 3c6329e0fd..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/typescript/chuckTypeTrap.yml
+++ /dev/null
@@ -1,30 +0,0 @@
-languageId: typescript
-command:
-  version: 1
-  spokenForm: chuck type trap
-  action: remove
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: type, includeSiblings: false}
-      mark: {type: decoratedSymbol, symbolColor: default, character: t}
-initialState:
-  documentContents: |-
-    function myFunk (value: string): string {
-        return value;
-    }
-  selections:
-    - anchor: {line: 2, character: 1}
-      active: {line: 2, character: 1}
-  marks:
-    default.t:
-      start: {line: 0, character: 33}
-      end: {line: 0, character: 39}
-finalState:
-  documentContents: |-
-    function myFunk (value: string) {
-        return value;
-    }
-  selections:
-    - anchor: {line: 2, character: 1}
-      active: {line: 2, character: 1}
-fullTargets: [{type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: t}, selectionType: token, position: contents, insideOutsideType: outside, modifier: {type: containingScope, scopeType: type, includeSiblings: false}}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/typescript/chuckTypeYank.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/typescript/chuckTypeYank.yml
deleted file mode 100644
index 3a559daa59..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/typescript/chuckTypeYank.yml
+++ /dev/null
@@ -1,27 +0,0 @@
-languageId: typescript
-command:
-  version: 1
-  spokenForm: chuck type yank
-  action: remove
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: type, includeSiblings: false}
-      mark: {type: decoratedSymbol, symbolColor: default, character: 'y'}
-initialState:
-  documentContents: |-
-    interface MyType {
-        name: string;
-    }
-  selections:
-    - anchor: {line: 2, character: 1}
-      active: {line: 2, character: 1}
-  marks:
-    default.y:
-      start: {line: 0, character: 10}
-      end: {line: 0, character: 16}
-finalState:
-  documentContents: ""
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-fullTargets: [{type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: 'y'}, selectionType: token, position: contents, insideOutsideType: outside, modifier: {type: containingScope, scopeType: type, includeSiblings: false}}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/typescript/chuckValue.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/typescript/chuckValue.yml
deleted file mode 100644
index bf8de79357..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/typescript/chuckValue.yml
+++ /dev/null
@@ -1,88 +0,0 @@
-languageId: typescript
-command:
-  version: 1
-  spokenForm: chuck value
-  action: remove
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: value, includeSiblings: false}
-initialState:
-  documentContents: |
-    a = 1;
-    a += 1;
-    a -= 1;
-    a *= 1;
-    a /= 1;
-    a %= 1;
-    a **= 1;
-    a &= 1;
-    a |= 1;
-    a ^= 1;
-    a <<= 1;
-    a >>= 1;
-  selections:
-    - anchor: {line: 11, character: 6}
-      active: {line: 11, character: 7}
-    - anchor: {line: 1, character: 5}
-      active: {line: 1, character: 6}
-    - anchor: {line: 2, character: 5}
-      active: {line: 2, character: 6}
-    - anchor: {line: 3, character: 5}
-      active: {line: 3, character: 6}
-    - anchor: {line: 4, character: 5}
-      active: {line: 4, character: 6}
-    - anchor: {line: 5, character: 5}
-      active: {line: 5, character: 6}
-    - anchor: {line: 6, character: 6}
-      active: {line: 6, character: 7}
-    - anchor: {line: 7, character: 5}
-      active: {line: 7, character: 6}
-    - anchor: {line: 8, character: 5}
-      active: {line: 8, character: 6}
-    - anchor: {line: 9, character: 5}
-      active: {line: 9, character: 6}
-    - anchor: {line: 10, character: 6}
-      active: {line: 10, character: 7}
-    - anchor: {line: 0, character: 4}
-      active: {line: 0, character: 5}
-  marks: {}
-finalState:
-  documentContents: |
-    a;
-    a;
-    a;
-    a;
-    a;
-    a;
-    a;
-    a;
-    a;
-    a;
-    a;
-    a;
-  selections:
-    - anchor: {line: 11, character: 1}
-      active: {line: 11, character: 1}
-    - anchor: {line: 1, character: 1}
-      active: {line: 1, character: 1}
-    - anchor: {line: 2, character: 1}
-      active: {line: 2, character: 1}
-    - anchor: {line: 3, character: 1}
-      active: {line: 3, character: 1}
-    - anchor: {line: 4, character: 1}
-      active: {line: 4, character: 1}
-    - anchor: {line: 5, character: 1}
-      active: {line: 5, character: 1}
-    - anchor: {line: 6, character: 1}
-      active: {line: 6, character: 1}
-    - anchor: {line: 7, character: 1}
-      active: {line: 7, character: 1}
-    - anchor: {line: 8, character: 1}
-      active: {line: 8, character: 1}
-    - anchor: {line: 9, character: 1}
-      active: {line: 9, character: 1}
-    - anchor: {line: 10, character: 1}
-      active: {line: 10, character: 1}
-    - anchor: {line: 0, character: 1}
-      active: {line: 0, character: 1}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: outside, modifier: {type: containingScope, scopeType: value, includeSiblings: false}, isImplicit: false}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/typescript/clearBranch.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/typescript/clearBranch.yml
deleted file mode 100644
index 309036f322..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/typescript/clearBranch.yml
+++ /dev/null
@@ -1,34 +0,0 @@
-languageId: typescript
-command:
-  version: 3
-  spokenForm: clear branch
-  action: {name: clearAndSetSelection}
-  targets:
-    - type: primitive
-      modifiers:
-        - type: containingScope
-          scopeType: {type: branch}
-  usePrePhraseSnapshot: true
-initialState:
-  documentContents: |-
-    switch (aaa) {
-      case 0:
-        break;
-      case 1:
-        break;
-    }
-  selections:
-    - anchor: {line: 1, character: 2}
-      active: {line: 1, character: 2}
-  marks: {}
-finalState:
-  documentContents: |-
-    switch (aaa) {
-      
-      case 1:
-        break;
-    }
-  selections:
-    - anchor: {line: 1, character: 2}
-      active: {line: 1, character: 2}
-fullTargets: [{type: primitive, mark: {type: cursor}, modifiers: [{type: containingScope, scopeType: {type: branch}}]}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/typescript/clearBranch10.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/typescript/clearBranch10.yml
deleted file mode 100644
index b1edcbf478..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/typescript/clearBranch10.yml
+++ /dev/null
@@ -1,23 +0,0 @@
-languageId: typescript
-command:
-  version: 3
-  spokenForm: clear branch
-  action: {name: clearAndSetSelection}
-  targets:
-    - type: primitive
-      modifiers:
-        - type: containingScope
-          scopeType: {type: branch}
-  usePrePhraseSnapshot: true
-initialState:
-  documentContents: "const aaa = bbb ? ccc : ddd;"
-  selections:
-    - anchor: {line: 0, character: 24}
-      active: {line: 0, character: 24}
-  marks: {}
-finalState:
-  documentContents: "const aaa = bbb ? ccc : ;"
-  selections:
-    - anchor: {line: 0, character: 24}
-      active: {line: 0, character: 24}
-fullTargets: [{type: primitive, mark: {type: cursor}, modifiers: [{type: containingScope, scopeType: {type: branch}}]}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/typescript/clearBranch11.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/typescript/clearBranch11.yml
deleted file mode 100644
index 33c1ab0425..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/typescript/clearBranch11.yml
+++ /dev/null
@@ -1,23 +0,0 @@
-languageId: typescript
-command:
-  version: 3
-  spokenForm: clear branch
-  action: {name: clearAndSetSelection}
-  targets:
-    - type: primitive
-      modifiers:
-        - type: containingScope
-          scopeType: {type: branch}
-  usePrePhraseSnapshot: false
-initialState:
-  documentContents: "const aaa = bbb ? ccc : ddd;"
-  selections:
-    - anchor: {line: 0, character: 18}
-      active: {line: 0, character: 18}
-  marks: {}
-finalState:
-  documentContents: "const aaa = bbb ?  : ddd;"
-  selections:
-    - anchor: {line: 0, character: 18}
-      active: {line: 0, character: 18}
-fullTargets: [{type: primitive, mark: {type: cursor}, modifiers: [{type: containingScope, scopeType: {type: branch}}]}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/typescript/clearBranch12.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/typescript/clearBranch12.yml
deleted file mode 100644
index 922dc1e8c4..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/typescript/clearBranch12.yml
+++ /dev/null
@@ -1,19 +0,0 @@
-languageId: typescript
-command:
-  version: 3
-  spokenForm: clear branch
-  action: {name: clearAndSetSelection}
-  targets:
-    - type: primitive
-      modifiers:
-        - type: containingScope
-          scopeType: {type: branch}
-  usePrePhraseSnapshot: false
-initialState:
-  documentContents: "const aaa = bbb ? ccc : ddd;"
-  selections:
-    - anchor: {line: 0, character: 12}
-      active: {line: 0, character: 12}
-  marks: {}
-thrownError: {name: NoContainingScopeError}
-fullTargets: [{type: primitive, mark: {type: cursor}, modifiers: [{type: containingScope, scopeType: {type: branch}}]}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/typescript/clearBranch2.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/typescript/clearBranch2.yml
deleted file mode 100644
index 8c680f69c6..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/typescript/clearBranch2.yml
+++ /dev/null
@@ -1,35 +0,0 @@
-languageId: typescript
-command:
-  version: 3
-  spokenForm: clear branch
-  action: {name: clearAndSetSelection}
-  targets:
-    - type: primitive
-      modifiers:
-        - type: containingScope
-          scopeType: {type: branch}
-  usePrePhraseSnapshot: true
-initialState:
-  documentContents: |-
-    if (true) {
-      const whatever = "hello";
-    } else if (false) {
-      const whatever = "hello";
-    } else {
-      const whatever = "hello";
-    }
-  selections:
-    - anchor: {line: 4, character: 2}
-      active: {line: 4, character: 2}
-  marks: {}
-finalState:
-  documentContents: |-
-    if (true) {
-      const whatever = "hello";
-    } else if (false) {
-      const whatever = "hello";
-    } 
-  selections:
-    - anchor: {line: 4, character: 2}
-      active: {line: 4, character: 2}
-fullTargets: [{type: primitive, mark: {type: cursor}, modifiers: [{type: containingScope, scopeType: {type: branch}}]}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/typescript/clearBranch3.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/typescript/clearBranch3.yml
deleted file mode 100644
index e8220c3958..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/typescript/clearBranch3.yml
+++ /dev/null
@@ -1,35 +0,0 @@
-languageId: typescript
-command:
-  version: 3
-  spokenForm: clear branch
-  action: {name: clearAndSetSelection}
-  targets:
-    - type: primitive
-      modifiers:
-        - type: containingScope
-          scopeType: {type: branch}
-  usePrePhraseSnapshot: true
-initialState:
-  documentContents: |-
-    if (true) {
-      const whatever = "hello";
-    } else if (false) {
-      const whatever = "hello";
-    } else {
-      const whatever = "hello";
-    }
-  selections:
-    - anchor: {line: 5, character: 2}
-      active: {line: 5, character: 2}
-  marks: {}
-finalState:
-  documentContents: |-
-    if (true) {
-      const whatever = "hello";
-    } else if (false) {
-      const whatever = "hello";
-    } 
-  selections:
-    - anchor: {line: 4, character: 2}
-      active: {line: 4, character: 2}
-fullTargets: [{type: primitive, mark: {type: cursor}, modifiers: [{type: containingScope, scopeType: {type: branch}}]}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/typescript/clearBranch4.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/typescript/clearBranch4.yml
deleted file mode 100644
index c84effc138..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/typescript/clearBranch4.yml
+++ /dev/null
@@ -1,35 +0,0 @@
-languageId: typescript
-command:
-  version: 3
-  spokenForm: clear branch
-  action: {name: clearAndSetSelection}
-  targets:
-    - type: primitive
-      modifiers:
-        - type: containingScope
-          scopeType: {type: branch}
-  usePrePhraseSnapshot: false
-initialState:
-  documentContents: |-
-    if (true) {
-      const whatever = "hello";
-    } else if (false) {
-      const whatever = "hello";
-    } else {
-      const whatever = "hello";
-    }
-  selections:
-    - anchor: {line: 3, character: 2}
-      active: {line: 3, character: 2}
-  marks: {}
-finalState:
-  documentContents: |-
-    if (true) {
-      const whatever = "hello";
-    } else  else {
-      const whatever = "hello";
-    }
-  selections:
-    - anchor: {line: 2, character: 7}
-      active: {line: 2, character: 7}
-fullTargets: [{type: primitive, mark: {type: cursor}, modifiers: [{type: containingScope, scopeType: {type: branch}}]}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/typescript/clearBranch5.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/typescript/clearBranch5.yml
deleted file mode 100644
index 9018394da9..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/typescript/clearBranch5.yml
+++ /dev/null
@@ -1,35 +0,0 @@
-languageId: typescript
-command:
-  version: 3
-  spokenForm: clear branch
-  action: {name: clearAndSetSelection}
-  targets:
-    - type: primitive
-      modifiers:
-        - type: containingScope
-          scopeType: {type: branch}
-  usePrePhraseSnapshot: true
-initialState:
-  documentContents: |-
-    if (true) {
-      const whatever = "hello";
-    } else if (false) {
-      const whatever = "hello";
-    } else {
-      const whatever = "hello";
-    }
-  selections:
-    - anchor: {line: 2, character: 2}
-      active: {line: 2, character: 2}
-  marks: {}
-finalState:
-  documentContents: |-
-    if (true) {
-      const whatever = "hello";
-    } else  else {
-      const whatever = "hello";
-    }
-  selections:
-    - anchor: {line: 2, character: 7}
-      active: {line: 2, character: 7}
-fullTargets: [{type: primitive, mark: {type: cursor}, modifiers: [{type: containingScope, scopeType: {type: branch}}]}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/typescript/clearBranch6.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/typescript/clearBranch6.yml
deleted file mode 100644
index 235673283d..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/typescript/clearBranch6.yml
+++ /dev/null
@@ -1,35 +0,0 @@
-languageId: typescript
-command:
-  version: 3
-  spokenForm: clear branch
-  action: {name: clearAndSetSelection}
-  targets:
-    - type: primitive
-      modifiers:
-        - type: containingScope
-          scopeType: {type: branch}
-  usePrePhraseSnapshot: true
-initialState:
-  documentContents: |-
-    if (true) {
-      const whatever = "hello";
-    } else if (false) {
-      const whatever = "hello";
-    } else {
-      const whatever = "hello";
-    }
-  selections:
-    - anchor: {line: 1, character: 2}
-      active: {line: 1, character: 2}
-  marks: {}
-finalState:
-  documentContents: |2-
-     else if (false) {
-      const whatever = "hello";
-    } else {
-      const whatever = "hello";
-    }
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-fullTargets: [{type: primitive, mark: {type: cursor}, modifiers: [{type: containingScope, scopeType: {type: branch}}]}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/typescript/clearBranch7.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/typescript/clearBranch7.yml
deleted file mode 100644
index 44bde8170d..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/typescript/clearBranch7.yml
+++ /dev/null
@@ -1,35 +0,0 @@
-languageId: typescript
-command:
-  version: 3
-  spokenForm: clear branch
-  action: {name: clearAndSetSelection}
-  targets:
-    - type: primitive
-      modifiers:
-        - type: containingScope
-          scopeType: {type: branch}
-  usePrePhraseSnapshot: true
-initialState:
-  documentContents: |-
-    try {
-      const aaa = "bbb";
-    } catch (err) {
-      const aaa = "bbb";
-    } finally {
-      const aaa = "bbb";
-    }
-  selections:
-    - anchor: {line: 3, character: 2}
-      active: {line: 3, character: 2}
-  marks: {}
-finalState:
-  documentContents: |-
-    try {
-      const aaa = "bbb";
-    }  finally {
-      const aaa = "bbb";
-    }
-  selections:
-    - anchor: {line: 2, character: 2}
-      active: {line: 2, character: 2}
-fullTargets: [{type: primitive, mark: {type: cursor}, modifiers: [{type: containingScope, scopeType: {type: branch}}]}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/typescript/clearBranch8.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/typescript/clearBranch8.yml
deleted file mode 100644
index 87a12bd47a..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/typescript/clearBranch8.yml
+++ /dev/null
@@ -1,35 +0,0 @@
-languageId: typescript
-command:
-  version: 3
-  spokenForm: clear branch
-  action: {name: clearAndSetSelection}
-  targets:
-    - type: primitive
-      modifiers:
-        - type: containingScope
-          scopeType: {type: branch}
-  usePrePhraseSnapshot: false
-initialState:
-  documentContents: |-
-    try {
-      const aaa = "bbb";
-    } catch (err) {
-      const aaa = "bbb";
-    } finally {
-      const aaa = "bbb";
-    }
-  selections:
-    - anchor: {line: 5, character: 2}
-      active: {line: 5, character: 2}
-  marks: {}
-finalState:
-  documentContents: |-
-    try {
-      const aaa = "bbb";
-    } catch (err) {
-      const aaa = "bbb";
-    } 
-  selections:
-    - anchor: {line: 4, character: 2}
-      active: {line: 4, character: 2}
-fullTargets: [{type: primitive, mark: {type: cursor}, modifiers: [{type: containingScope, scopeType: {type: branch}}]}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/typescript/clearBranch9.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/typescript/clearBranch9.yml
deleted file mode 100644
index 9264e16cf1..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/typescript/clearBranch9.yml
+++ /dev/null
@@ -1,35 +0,0 @@
-languageId: typescript
-command:
-  version: 3
-  spokenForm: clear branch
-  action: {name: clearAndSetSelection}
-  targets:
-    - type: primitive
-      modifiers:
-        - type: containingScope
-          scopeType: {type: branch}
-  usePrePhraseSnapshot: false
-initialState:
-  documentContents: |-
-    try {
-      const aaa = "bbb";
-    } catch (err) {
-      const aaa = "bbb";
-    } finally {
-      const aaa = "bbb";
-    }
-  selections:
-    - anchor: {line: 1, character: 2}
-      active: {line: 1, character: 2}
-  marks: {}
-finalState:
-  documentContents: |2-
-     catch (err) {
-      const aaa = "bbb";
-    } finally {
-      const aaa = "bbb";
-    }
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-fullTargets: [{type: primitive, mark: {type: cursor}, modifiers: [{type: containingScope, scopeType: {type: branch}}]}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/typescript/clearClass.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/typescript/clearClass.yml
deleted file mode 100644
index 1e1cf26881..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/typescript/clearClass.yml
+++ /dev/null
@@ -1,23 +0,0 @@
-languageId: typescript
-command:
-  spokenForm: clear class
-  version: 2
-  targets:
-    - type: primitive
-      modifiers:
-        - type: containingScope
-          scopeType: {type: class}
-  usePrePhraseSnapshot: true
-  action: {name: clearAndSetSelection}
-initialState:
-  documentContents: export abstract class Foo {}
-  selections:
-    - anchor: {line: 0, character: 27}
-      active: {line: 0, character: 27}
-  marks: {}
-finalState:
-  documentContents: ""
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-fullTargets: [{type: primitive, mark: {type: cursor}, modifiers: [{type: containingScope, scopeType: {type: class}}]}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/typescript/clearClass2.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/typescript/clearClass2.yml
deleted file mode 100644
index 23c3c93e5c..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/typescript/clearClass2.yml
+++ /dev/null
@@ -1,23 +0,0 @@
-languageId: typescript
-command:
-  spokenForm: clear class
-  version: 2
-  targets:
-    - type: primitive
-      modifiers:
-        - type: containingScope
-          scopeType: {type: class}
-  usePrePhraseSnapshot: true
-  action: {name: clearAndSetSelection}
-initialState:
-  documentContents: abstract class Foo {}
-  selections:
-    - anchor: {line: 0, character: 20}
-      active: {line: 0, character: 20}
-  marks: {}
-finalState:
-  documentContents: ""
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-fullTargets: [{type: primitive, mark: {type: cursor}, modifiers: [{type: containingScope, scopeType: {type: class}}]}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/typescript/clearClass3.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/typescript/clearClass3.yml
deleted file mode 100644
index 24d74d1509..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/typescript/clearClass3.yml
+++ /dev/null
@@ -1,23 +0,0 @@
-languageId: typescript
-command:
-  spokenForm: clear class
-  version: 2
-  targets:
-    - type: primitive
-      modifiers:
-        - type: containingScope
-          scopeType: {type: class}
-  usePrePhraseSnapshot: true
-  action: {name: clearAndSetSelection}
-initialState:
-  documentContents: class Foo {}
-  selections:
-    - anchor: {line: 0, character: 11}
-      active: {line: 0, character: 11}
-  marks: {}
-finalState:
-  documentContents: ""
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-fullTargets: [{type: primitive, mark: {type: cursor}, modifiers: [{type: containingScope, scopeType: {type: class}}]}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/typescript/clearClass4.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/typescript/clearClass4.yml
deleted file mode 100644
index 1c99685825..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/typescript/clearClass4.yml
+++ /dev/null
@@ -1,23 +0,0 @@
-languageId: typescript
-command:
-  spokenForm: clear class
-  version: 2
-  targets:
-    - type: primitive
-      modifiers:
-        - type: containingScope
-          scopeType: {type: class}
-  usePrePhraseSnapshot: true
-  action: {name: clearAndSetSelection}
-initialState:
-  documentContents: export class Foo {}
-  selections:
-    - anchor: {line: 0, character: 18}
-      active: {line: 0, character: 18}
-  marks: {}
-finalState:
-  documentContents: ""
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-fullTargets: [{type: primitive, mark: {type: cursor}, modifiers: [{type: containingScope, scopeType: {type: class}}]}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/typescript/clearCondition.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/typescript/clearCondition.yml
deleted file mode 100644
index c55faf0218..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/typescript/clearCondition.yml
+++ /dev/null
@@ -1,23 +0,0 @@
-languageId: typescript
-command:
-  spokenForm: clear condition
-  version: 2
-  targets:
-    - type: primitive
-      modifiers:
-        - type: containingScope
-          scopeType: {type: condition}
-  usePrePhraseSnapshot: true
-  action: {name: clearAndSetSelection}
-initialState:
-  documentContents: "(process.env._ || '').match() ? path1: path2;"
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-  marks: {}
-finalState:
-  documentContents: " ? path1: path2;"
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-fullTargets: [{type: primitive, mark: {type: cursor}, modifiers: [{type: containingScope, scopeType: {type: condition}}]}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/typescript/clearCondition2.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/typescript/clearCondition2.yml
deleted file mode 100644
index 32827c7a58..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/typescript/clearCondition2.yml
+++ /dev/null
@@ -1,27 +0,0 @@
-languageId: typescript
-command:
-  spokenForm: clear condition
-  version: 2
-  targets:
-    - type: primitive
-      modifiers:
-        - type: containingScope
-          scopeType: {type: condition}
-  usePrePhraseSnapshot: true
-  action: {name: clearAndSetSelection}
-initialState:
-  documentContents: |-
-    do {
-    } while (true);
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-  marks: {}
-finalState:
-  documentContents: |-
-    do {
-    } while ();
-  selections:
-    - anchor: {line: 1, character: 9}
-      active: {line: 1, character: 9}
-fullTargets: [{type: primitive, mark: {type: cursor}, modifiers: [{type: containingScope, scopeType: {type: condition}}]}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/typescript/clearCoreElement.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/typescript/clearCoreElement.yml
deleted file mode 100644
index aa8d5535e2..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/typescript/clearCoreElement.yml
+++ /dev/null
@@ -1,31 +0,0 @@
-languageId: typescriptreact
-command:
-  spokenForm: clear core element
-  version: 2
-  targets:
-    - type: primitive
-      modifiers:
-        - {type: interiorOnly}
-        - type: containingScope
-          scopeType: {type: xmlElement}
-  usePrePhraseSnapshot: true
-  action: {name: clearAndSetSelection}
-initialState:
-  documentContents: |-
-    <div>
-        aaa
-        <span>bbb</span>
-    </div>
-  selections:
-    - anchor: {line: 1, character: 4}
-      active: {line: 1, character: 4}
-  marks: {}
-finalState:
-  documentContents: |-
-    <div>
-        
-    </div>
-  selections:
-    - anchor: {line: 1, character: 4}
-      active: {line: 1, character: 4}
-fullTargets: [{type: primitive, mark: {type: cursor}, modifiers: [{type: interiorOnly}, {type: containingScope, scopeType: {type: xmlElement}}]}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/typescript/clearCoreElement2.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/typescript/clearCoreElement2.yml
deleted file mode 100644
index 70feb24d55..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/typescript/clearCoreElement2.yml
+++ /dev/null
@@ -1,30 +0,0 @@
-languageId: typescriptreact
-command:
-  spokenForm: clear core element
-  version: 2
-  targets:
-    - type: primitive
-      modifiers:
-        - {type: interiorOnly}
-        - type: containingScope
-          scopeType: {type: xmlElement}
-  usePrePhraseSnapshot: true
-  action: {name: clearAndSetSelection}
-initialState:
-  documentContents: |-
-    <div>
-        aaa
-    </div>
-  selections:
-    - anchor: {line: 1, character: 4}
-      active: {line: 1, character: 4}
-  marks: {}
-finalState:
-  documentContents: |-
-    <div>
-        
-    </div>
-  selections:
-    - anchor: {line: 1, character: 4}
-      active: {line: 1, character: 4}
-fullTargets: [{type: primitive, mark: {type: cursor}, modifiers: [{type: interiorOnly}, {type: containingScope, scopeType: {type: xmlElement}}]}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/typescript/clearFunk.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/typescript/clearFunk.yml
deleted file mode 100644
index 9ae563c70d..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/typescript/clearFunk.yml
+++ /dev/null
@@ -1,26 +0,0 @@
-languageId: typescript
-command:
-  version: 1
-  spokenForm: clear funk
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: namedFunction, includeSiblings: false}
-initialState:
-  documentContents: |
-    function bar() {
-      foo(function () {
-          
-      });
-    }
-  selections:
-    - anchor: {line: 2, character: 6}
-      active: {line: 2, character: 6}
-  marks: {}
-finalState:
-  documentContents: |+
-
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: containingScope, scopeType: namedFunction, includeSiblings: false}}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/typescript/clearFunk2.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/typescript/clearFunk2.yml
deleted file mode 100644
index e518c49eb6..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/typescript/clearFunk2.yml
+++ /dev/null
@@ -1,26 +0,0 @@
-languageId: typescript
-command:
-  version: 1
-  spokenForm: clear funk
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: namedFunction, includeSiblings: false}
-initialState:
-  documentContents: |
-    function bar() {
-      foo(() => {
-          
-      });
-    }
-  selections:
-    - anchor: {line: 2, character: 6}
-      active: {line: 2, character: 6}
-  marks: {}
-finalState:
-  documentContents: |+
-
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: containingScope, scopeType: namedFunction, includeSiblings: false}}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/typescript/clearFunk3.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/typescript/clearFunk3.yml
deleted file mode 100644
index 4b7d33ad83..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/typescript/clearFunk3.yml
+++ /dev/null
@@ -1,29 +0,0 @@
-languageId: typescript
-command:
-  spokenForm: clear funk
-  version: 3
-  targets:
-    - type: primitive
-      modifiers:
-        - type: containingScope
-          scopeType: {type: namedFunction}
-  usePrePhraseSnapshot: true
-  action: {name: clearAndSetSelection}
-initialState:
-  documentContents: |-
-    abstract class Foo {
-        protected abstract bar(): void;
-    }
-  selections:
-    - anchor: {line: 1, character: 26}
-      active: {line: 1, character: 26}
-  marks: {}
-finalState:
-  documentContents: |-
-    abstract class Foo {
-        
-    }
-  selections:
-    - anchor: {line: 1, character: 4}
-      active: {line: 1, character: 4}
-fullTargets: [{type: primitive, mark: {type: cursor}, modifiers: [{type: containingScope, scopeType: {type: namedFunction}}]}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/typescript/clearFunkName.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/typescript/clearFunkName.yml
deleted file mode 100644
index ad9c537626..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/typescript/clearFunkName.yml
+++ /dev/null
@@ -1,29 +0,0 @@
-languageId: typescript
-command:
-  spokenForm: clear funk name
-  version: 3
-  targets:
-    - type: primitive
-      modifiers:
-        - type: containingScope
-          scopeType: {type: functionName}
-  usePrePhraseSnapshot: true
-  action: {name: clearAndSetSelection}
-initialState:
-  documentContents: |-
-    abstract class Foo {
-        protected abstract bar(): void;
-      }
-  selections:
-    - anchor: {line: 1, character: 30}
-      active: {line: 1, character: 30}
-  marks: {}
-finalState:
-  documentContents: |-
-    abstract class Foo {
-        protected abstract (): void;
-      }
-  selections:
-    - anchor: {line: 1, character: 23}
-      active: {line: 1, character: 23}
-fullTargets: [{type: primitive, mark: {type: cursor}, modifiers: [{type: containingScope, scopeType: {type: functionName}}]}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/typescript/clearItem.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/typescript/clearItem.yml
deleted file mode 100644
index 3f5581e6cf..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/typescript/clearItem.yml
+++ /dev/null
@@ -1,23 +0,0 @@
-languageId: typescript
-command:
-  spokenForm: clear item
-  version: 3
-  targets:
-    - type: primitive
-      modifiers:
-        - type: containingScope
-          scopeType: {type: collectionItem}
-  usePrePhraseSnapshot: true
-  action: {name: clearAndSetSelection}
-initialState:
-  documentContents: "let foo: { a: string };"
-  selections:
-    - anchor: {line: 0, character: 11}
-      active: {line: 0, character: 11}
-  marks: {}
-finalState:
-  documentContents: "let foo: {  };"
-  selections:
-    - anchor: {line: 0, character: 11}
-      active: {line: 0, character: 11}
-fullTargets: [{type: primitive, mark: {type: cursor}, modifiers: [{type: containingScope, scopeType: {type: collectionItem}}]}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/typescript/clearItem2.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/typescript/clearItem2.yml
deleted file mode 100644
index 538bd17f56..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/typescript/clearItem2.yml
+++ /dev/null
@@ -1,23 +0,0 @@
-languageId: typescript
-command:
-  spokenForm: clear item
-  version: 3
-  targets:
-    - type: primitive
-      modifiers:
-        - type: containingScope
-          scopeType: {type: collectionItem}
-  usePrePhraseSnapshot: true
-  action: {name: clearAndSetSelection}
-initialState:
-  documentContents: "let foo: { a: string, b: string };"
-  selections:
-    - anchor: {line: 0, character: 11}
-      active: {line: 0, character: 11}
-  marks: {}
-finalState:
-  documentContents: "let foo: { , b: string };"
-  selections:
-    - anchor: {line: 0, character: 11}
-      active: {line: 0, character: 11}
-fullTargets: [{type: primitive, mark: {type: cursor}, modifiers: [{type: containingScope, scopeType: {type: collectionItem}}]}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/typescript/clearItem3.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/typescript/clearItem3.yml
deleted file mode 100644
index 01ac627e21..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/typescript/clearItem3.yml
+++ /dev/null
@@ -1,23 +0,0 @@
-languageId: typescript
-command:
-  spokenForm: clear item
-  version: 3
-  targets:
-    - type: primitive
-      modifiers:
-        - type: containingScope
-          scopeType: {type: collectionItem}
-  usePrePhraseSnapshot: true
-  action: {name: clearAndSetSelection}
-initialState:
-  documentContents: "let foo: { a: string, b: string };"
-  selections:
-    - anchor: {line: 0, character: 22}
-      active: {line: 0, character: 22}
-  marks: {}
-finalState:
-  documentContents: "let foo: { a: string,  };"
-  selections:
-    - anchor: {line: 0, character: 22}
-      active: {line: 0, character: 22}
-fullTargets: [{type: primitive, mark: {type: cursor}, modifiers: [{type: containingScope, scopeType: {type: collectionItem}}]}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/typescript/clearItemBrace.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/typescript/clearItemBrace.yml
deleted file mode 100644
index 760da6a33e..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/typescript/clearItemBrace.yml
+++ /dev/null
@@ -1,35 +0,0 @@
-languageId: typescript
-command:
-  spokenForm: clear item brace
-  version: 2
-  targets:
-    - type: primitive
-      mark: {type: decoratedSymbol, symbolColor: default, character: '{'}
-      modifiers:
-        - type: containingScope
-          scopeType: {type: collectionItem}
-  usePrePhraseSnapshot: true
-  action: {name: clearAndSetSelection}
-initialState:
-  documentContents: |-
-    [
-      {
-        foo: "bar",
-      },
-    ]
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-  marks:
-    default.{:
-      start: {line: 1, character: 2}
-      end: {line: 1, character: 3}
-finalState:
-  documentContents: |-
-    [
-      ,
-    ]
-  selections:
-    - anchor: {line: 1, character: 2}
-      active: {line: 1, character: 2}
-fullTargets: [{type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: '{'}, modifiers: [{type: containingScope, scopeType: {type: collectionItem}}]}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/typescript/clearKey.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/typescript/clearKey.yml
deleted file mode 100644
index 9cf1bce5cf..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/typescript/clearKey.yml
+++ /dev/null
@@ -1,26 +0,0 @@
-languageId: typescript
-command:
-  version: 1
-  spokenForm: clear key
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: collectionKey, includeSiblings: false}
-initialState:
-  documentContents: |-
-    {
-        foo: "bar"
-    }
-  selections:
-    - anchor: {line: 1, character: 10}
-      active: {line: 1, character: 10}
-  marks: {}
-finalState:
-  documentContents: |-
-    {
-        : "bar"
-    }
-  selections:
-    - anchor: {line: 1, character: 4}
-      active: {line: 1, character: 4}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: containingScope, scopeType: collectionKey, includeSiblings: false}}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/typescript/clearLambda.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/typescript/clearLambda.yml
deleted file mode 100644
index 06eaf05148..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/typescript/clearLambda.yml
+++ /dev/null
@@ -1,23 +0,0 @@
-languageId: typescript
-command:
-  version: 1
-  spokenForm: clear lambda
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: anonymousFunction, includeSiblings: false}
-initialState:
-  documentContents: |-
-    foo(() => {
-
-    })
-  selections:
-    - anchor: {line: 1, character: 0}
-      active: {line: 1, character: 0}
-  marks: {}
-finalState:
-  documentContents: foo()
-  selections:
-    - anchor: {line: 0, character: 4}
-      active: {line: 0, character: 4}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: containingScope, scopeType: anonymousFunction, includeSiblings: false}}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/typescript/clearLambda2.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/typescript/clearLambda2.yml
deleted file mode 100644
index fcf280b8da..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/typescript/clearLambda2.yml
+++ /dev/null
@@ -1,23 +0,0 @@
-languageId: typescript
-command:
-  version: 1
-  spokenForm: clear lambda
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: anonymousFunction, includeSiblings: false}
-initialState:
-  documentContents: |-
-    foo(function () {
-
-    })
-  selections:
-    - anchor: {line: 1, character: 0}
-      active: {line: 1, character: 0}
-  marks: {}
-finalState:
-  documentContents: foo()
-  selections:
-    - anchor: {line: 0, character: 4}
-      active: {line: 0, character: 4}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: containingScope, scopeType: anonymousFunction, includeSiblings: false}}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/typescript/clearLambda3.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/typescript/clearLambda3.yml
deleted file mode 100644
index deef1c81f2..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/typescript/clearLambda3.yml
+++ /dev/null
@@ -1,23 +0,0 @@
-languageId: typescript
-command:
-  version: 1
-  spokenForm: clear lambda
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: anonymousFunction, includeSiblings: false}
-initialState:
-  documentContents: |-
-    foo(async function () {
-
-    })
-  selections:
-    - anchor: {line: 1, character: 0}
-      active: {line: 1, character: 0}
-  marks: {}
-finalState:
-  documentContents: foo()
-  selections:
-    - anchor: {line: 0, character: 4}
-      active: {line: 0, character: 4}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: containingScope, scopeType: anonymousFunction, includeSiblings: false}}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/typescript/clearLambda4.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/typescript/clearLambda4.yml
deleted file mode 100644
index 1783c17afc..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/typescript/clearLambda4.yml
+++ /dev/null
@@ -1,23 +0,0 @@
-languageId: typescript
-command:
-  version: 1
-  spokenForm: clear lambda
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: anonymousFunction, includeSiblings: false}
-initialState:
-  documentContents: |-
-    foo(async () => {
-
-    })
-  selections:
-    - anchor: {line: 1, character: 0}
-      active: {line: 1, character: 0}
-  marks: {}
-finalState:
-  documentContents: foo()
-  selections:
-    - anchor: {line: 0, character: 4}
-      active: {line: 0, character: 4}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: containingScope, scopeType: anonymousFunction, includeSiblings: false}}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/typescript/clearName.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/typescript/clearName.yml
deleted file mode 100644
index 8fbaa6a53f..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/typescript/clearName.yml
+++ /dev/null
@@ -1,20 +0,0 @@
-languageId: typescript
-command:
-  version: 1
-  spokenForm: clear name
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: name, includeSiblings: false}
-initialState:
-  documentContents: a += "world";
-  selections:
-    - anchor: {line: 0, character: 6}
-      active: {line: 0, character: 6}
-  marks: {}
-finalState:
-  documentContents: " += \"world\";"
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: containingScope, scopeType: name, includeSiblings: false}, isImplicit: false}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/typescript/clearPair.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/typescript/clearPair.yml
deleted file mode 100644
index 411b4e6ac2..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/typescript/clearPair.yml
+++ /dev/null
@@ -1,23 +0,0 @@
-languageId: typescriptreact
-command:
-  spokenForm: clear pair
-  version: 3
-  targets:
-    - type: primitive
-      modifiers:
-        - type: containingScope
-          scopeType: {type: surroundingPair, delimiter: any}
-  usePrePhraseSnapshot: true
-  action: {name: clearAndSetSelection}
-initialState:
-  documentContents: <div>(category.count)</div>
-  selections:
-    - anchor: {line: 0, character: 14}
-      active: {line: 0, character: 14}
-  marks: {}
-finalState:
-  documentContents: <div></div>
-  selections:
-    - anchor: {line: 0, character: 5}
-      active: {line: 0, character: 5}
-fullTargets: [{type: primitive, mark: {type: cursor}, modifiers: [{type: containingScope, scopeType: {type: surroundingPair, delimiter: any}}]}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/typescript/clearState.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/typescript/clearState.yml
deleted file mode 100644
index 1513a3cc2b..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/typescript/clearState.yml
+++ /dev/null
@@ -1,31 +0,0 @@
-languageId: typescript
-command:
-  spokenForm: clear state
-  version: 3
-  targets:
-    - type: primitive
-      modifiers:
-        - type: containingScope
-          scopeType: {type: statement}
-  usePrePhraseSnapshot: true
-  action: {name: clearAndSetSelection}
-initialState:
-  documentContents: |-
-    interface Foo {
-      bar: Bar;
-      baz: Baz;
-    }
-  selections:
-    - anchor: {line: 1, character: 2}
-      active: {line: 1, character: 2}
-  marks: {}
-finalState:
-  documentContents: |-
-    interface Foo {
-      
-      baz: Baz;
-    }
-  selections:
-    - anchor: {line: 1, character: 2}
-      active: {line: 1, character: 2}
-fullTargets: [{type: primitive, mark: {type: cursor}, modifiers: [{type: containingScope, scopeType: {type: statement}}]}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/typescript/clearState2.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/typescript/clearState2.yml
deleted file mode 100644
index 8cc9ea330c..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/typescript/clearState2.yml
+++ /dev/null
@@ -1,29 +0,0 @@
-languageId: typescript
-command:
-  spokenForm: clear state
-  version: 3
-  targets:
-    - type: primitive
-      modifiers:
-        - type: containingScope
-          scopeType: {type: statement}
-  usePrePhraseSnapshot: true
-  action: {name: clearAndSetSelection}
-initialState:
-  documentContents: |-
-    type Foo = {
-      bar: string;
-    }
-  selections:
-    - anchor: {line: 1, character: 2}
-      active: {line: 1, character: 2}
-  marks: {}
-finalState:
-  documentContents: |-
-    type Foo = {
-      
-    }
-  selections:
-    - anchor: {line: 1, character: 2}
-      active: {line: 1, character: 2}
-fullTargets: [{type: primitive, mark: {type: cursor}, modifiers: [{type: containingScope, scopeType: {type: statement}}]}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/typescript/clearState3.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/typescript/clearState3.yml
deleted file mode 100644
index 5dca9db83d..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/typescript/clearState3.yml
+++ /dev/null
@@ -1,29 +0,0 @@
-languageId: typescript
-command:
-  spokenForm: clear state
-  version: 3
-  targets:
-    - type: primitive
-      modifiers:
-        - type: containingScope
-          scopeType: {type: statement}
-  usePrePhraseSnapshot: true
-  action: {name: clearAndSetSelection}
-initialState:
-  documentContents: |-
-    class Foo {
-        private value: string;
-    }
-  selections:
-    - anchor: {line: 1, character: 4}
-      active: {line: 1, character: 4}
-  marks: {}
-finalState:
-  documentContents: |-
-    class Foo {
-        
-    }
-  selections:
-    - anchor: {line: 1, character: 4}
-      active: {line: 1, character: 4}
-fullTargets: [{type: primitive, mark: {type: cursor}, modifiers: [{type: containingScope, scopeType: {type: statement}}]}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/typescript/clearState4.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/typescript/clearState4.yml
deleted file mode 100644
index 32bf452502..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/typescript/clearState4.yml
+++ /dev/null
@@ -1,23 +0,0 @@
-languageId: typescript
-command:
-  spokenForm: clear state
-  version: 3
-  targets:
-    - type: primitive
-      modifiers:
-        - type: containingScope
-          scopeType: {type: statement}
-  usePrePhraseSnapshot: true
-  action: {name: clearAndSetSelection}
-initialState:
-  documentContents: "let foo: { a: string };"
-  selections:
-    - anchor: {line: 0, character: 12}
-      active: {line: 0, character: 12}
-  marks: {}
-finalState:
-  documentContents: "let foo: {  };"
-  selections:
-    - anchor: {line: 0, character: 11}
-      active: {line: 0, character: 11}
-fullTargets: [{type: primitive, mark: {type: cursor}, modifiers: [{type: containingScope, scopeType: {type: statement}}]}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/typescript/clearState5.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/typescript/clearState5.yml
deleted file mode 100644
index bd8730b2db..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/typescript/clearState5.yml
+++ /dev/null
@@ -1,41 +0,0 @@
-languageId: typescript
-command:
-  spokenForm: clear state
-  version: 3
-  targets:
-    - type: primitive
-      modifiers:
-        - type: containingScope
-          scopeType: {type: statement}
-  usePrePhraseSnapshot: true
-  action: {name: clearAndSetSelection}
-initialState:
-  documentContents: |-
-    abstract class Foo {
-        value: string;
-        abstract bar(): void;
-        baz() { }
-    }
-  selections:
-    - anchor: {line: 1, character: 4}
-      active: {line: 1, character: 4}
-    - anchor: {line: 2, character: 4}
-      active: {line: 2, character: 4}
-    - anchor: {line: 3, character: 4}
-      active: {line: 3, character: 4}
-  marks: {}
-finalState:
-  documentContents: |-
-    abstract class Foo {
-        
-        
-        
-    }
-  selections:
-    - anchor: {line: 1, character: 4}
-      active: {line: 1, character: 4}
-    - anchor: {line: 2, character: 4}
-      active: {line: 2, character: 4}
-    - anchor: {line: 3, character: 4}
-      active: {line: 3, character: 4}
-fullTargets: [{type: primitive, mark: {type: cursor}, modifiers: [{type: containingScope, scopeType: {type: statement}}]}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/typescript/clearSubject.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/typescript/clearSubject.yml
deleted file mode 100644
index f0d5ce7cde..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/typescript/clearSubject.yml
+++ /dev/null
@@ -1,31 +0,0 @@
-languageId: typescript
-command:
-  version: 3
-  spokenForm: clear subject
-  action: {name: clearAndSetSelection}
-  targets:
-    - type: primitive
-      modifiers:
-        - type: containingScope
-          scopeType: {type: switchStatementSubject}
-  usePrePhraseSnapshot: true
-initialState:
-  documentContents: |-
-    switch(aaa) {
-      case 0:
-        break;
-    }
-  selections:
-    - anchor: {line: 2, character: 4}
-      active: {line: 2, character: 4}
-  marks: {}
-finalState:
-  documentContents: |-
-    switch() {
-      case 0:
-        break;
-    }
-  selections:
-    - anchor: {line: 0, character: 7}
-      active: {line: 0, character: 7}
-fullTargets: [{type: primitive, mark: {type: cursor}, modifiers: [{type: containingScope, scopeType: {type: switchStatementSubject}}]}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/typescript/clearSubject2.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/typescript/clearSubject2.yml
deleted file mode 100644
index d83bc83fed..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/typescript/clearSubject2.yml
+++ /dev/null
@@ -1,31 +0,0 @@
-languageId: typescript
-command:
-  version: 3
-  spokenForm: clear subject
-  action: {name: clearAndSetSelection}
-  targets:
-    - type: primitive
-      modifiers:
-        - type: containingScope
-          scopeType: {type: switchStatementSubject}
-  usePrePhraseSnapshot: true
-initialState:
-  documentContents: |-
-    switch(aaa + 1) {
-      case 0:
-        break;
-    }
-  selections:
-    - anchor: {line: 2, character: 4}
-      active: {line: 2, character: 4}
-  marks: {}
-finalState:
-  documentContents: |-
-    switch() {
-      case 0:
-        break;
-    }
-  selections:
-    - anchor: {line: 0, character: 7}
-      active: {line: 0, character: 7}
-fullTargets: [{type: primitive, mark: {type: cursor}, modifiers: [{type: containingScope, scopeType: {type: switchStatementSubject}}]}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/typescript/clearType.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/typescript/clearType.yml
deleted file mode 100644
index 1b4a831991..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/typescript/clearType.yml
+++ /dev/null
@@ -1,20 +0,0 @@
-languageId: typescript
-command:
-  version: 1
-  spokenForm: clear type
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: type, includeSiblings: false}
-initialState:
-  documentContents: "function whatever<T>(): string {}"
-  selections:
-    - anchor: {line: 0, character: 18}
-      active: {line: 0, character: 18}
-  marks: {}
-finalState:
-  documentContents: "function whatever<T>():  {}"
-  selections:
-    - anchor: {line: 0, character: 24}
-      active: {line: 0, character: 24}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: containingScope, scopeType: type, includeSiblings: false}}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/typescript/clearType2.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/typescript/clearType2.yml
deleted file mode 100644
index 3b7d6e9631..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/typescript/clearType2.yml
+++ /dev/null
@@ -1,20 +0,0 @@
-languageId: typescript
-command:
-  version: 1
-  spokenForm: clear type
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: type, includeSiblings: false}
-initialState:
-  documentContents: "const foo: string = new Bar()"
-  selections:
-    - anchor: {line: 0, character: 24}
-      active: {line: 0, character: 24}
-  marks: {}
-finalState:
-  documentContents: "const foo: string = new ()"
-  selections:
-    - anchor: {line: 0, character: 24}
-      active: {line: 0, character: 24}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: containingScope, scopeType: type, includeSiblings: false}}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/typescript/clearTypeAir.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/typescript/clearTypeAir.yml
deleted file mode 100644
index 2b83250765..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/typescript/clearTypeAir.yml
+++ /dev/null
@@ -1,24 +0,0 @@
-languageId: typescript
-command:
-  version: 1
-  spokenForm: clear type air
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: type, includeSiblings: false}
-      mark: {type: decoratedSymbol, symbolColor: default, character: a}
-initialState:
-  documentContents: "const foo: string = new Bar<number>(foo);"
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-  marks:
-    default.a:
-      start: {line: 0, character: 24}
-      end: {line: 0, character: 27}
-finalState:
-  documentContents: "const foo: string = new (foo);"
-  selections:
-    - anchor: {line: 0, character: 24}
-      active: {line: 0, character: 24}
-fullTargets: [{type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: a, usePrePhraseSnapshot: true}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: containingScope, scopeType: type, includeSiblings: false}}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/typescript/clearTypeBat.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/typescript/clearTypeBat.yml
deleted file mode 100644
index d85b033b9a..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/typescript/clearTypeBat.yml
+++ /dev/null
@@ -1,24 +0,0 @@
-languageId: typescript
-command:
-  version: 1
-  spokenForm: clear type bat
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: type, includeSiblings: false}
-      mark: {type: decoratedSymbol, symbolColor: default, character: b}
-initialState:
-  documentContents: "const foo: Bar<number> = bar<number>(foo);"
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-  marks:
-    default.b:
-      start: {line: 0, character: 25}
-      end: {line: 0, character: 28}
-finalState:
-  documentContents: "const foo:  = bar<number>(foo);"
-  selections:
-    - anchor: {line: 0, character: 11}
-      active: {line: 0, character: 11}
-fullTargets: [{type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: b, usePrePhraseSnapshot: true}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: containingScope, scopeType: type, includeSiblings: false}}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/typescript/clearTypeLangle.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/typescript/clearTypeLangle.yml
deleted file mode 100644
index 2d4b38ab8b..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/typescript/clearTypeLangle.yml
+++ /dev/null
@@ -1,24 +0,0 @@
-languageId: typescript
-command:
-  version: 1
-  spokenForm: clear type langle
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: type, includeSiblings: false}
-      mark: {type: decoratedSymbol, symbolColor: default, character: <}
-initialState:
-  documentContents: "const foo: string = new Bar<number>(foo);"
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-  marks:
-    default.<:
-      start: {line: 0, character: 27}
-      end: {line: 0, character: 28}
-finalState:
-  documentContents: "const foo: string = new (foo);"
-  selections:
-    - anchor: {line: 0, character: 24}
-      active: {line: 0, character: 24}
-fullTargets: [{type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: <, usePrePhraseSnapshot: true}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: containingScope, scopeType: type, includeSiblings: false}}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/typescript/clearTypeNear.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/typescript/clearTypeNear.yml
deleted file mode 100644
index 4844c4dff5..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/typescript/clearTypeNear.yml
+++ /dev/null
@@ -1,24 +0,0 @@
-languageId: typescript
-command:
-  version: 1
-  spokenForm: clear type near
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: type, includeSiblings: false}
-      mark: {type: decoratedSymbol, symbolColor: default, character: 'n'}
-initialState:
-  documentContents: "const foo: string = new Bar<number>(foo);"
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-  marks:
-    default.n:
-      start: {line: 0, character: 28}
-      end: {line: 0, character: 34}
-finalState:
-  documentContents: "const foo: string = new (foo);"
-  selections:
-    - anchor: {line: 0, character: 24}
-      active: {line: 0, character: 24}
-fullTargets: [{type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: 'n', usePrePhraseSnapshot: true}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: containingScope, scopeType: type, includeSiblings: false}}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/typescript/clearTypeNear2.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/typescript/clearTypeNear2.yml
deleted file mode 100644
index acf9ac6735..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/typescript/clearTypeNear2.yml
+++ /dev/null
@@ -1,24 +0,0 @@
-languageId: typescript
-command:
-  version: 1
-  spokenForm: clear type near
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: type, includeSiblings: false}
-      mark: {type: decoratedSymbol, symbolColor: default, character: 'n'}
-initialState:
-  documentContents: "const foo: string = bar<number>(foo);"
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-  marks:
-    default.n:
-      start: {line: 0, character: 24}
-      end: {line: 0, character: 30}
-finalState:
-  documentContents: "const foo:  = bar<number>(foo);"
-  selections:
-    - anchor: {line: 0, character: 11}
-      active: {line: 0, character: 11}
-fullTargets: [{type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: 'n', usePrePhraseSnapshot: true}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: containingScope, scopeType: type, includeSiblings: false}}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/typescript/clearTypeOx.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/typescript/clearTypeOx.yml
deleted file mode 100644
index 8c1c082a28..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/typescript/clearTypeOx.yml
+++ /dev/null
@@ -1,24 +0,0 @@
-languageId: typescript
-command:
-  version: 1
-  spokenForm: clear type ox
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: type, includeSiblings: false}
-      mark: {type: decoratedSymbol, symbolColor: default, character: o}
-initialState:
-  documentContents: "const foo: string = new Bar<number>(foo);"
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-  marks:
-    default.o:
-      start: {line: 0, character: 36}
-      end: {line: 0, character: 39}
-finalState:
-  documentContents: "const foo:  = new Bar<number>(foo);"
-  selections:
-    - anchor: {line: 0, character: 11}
-      active: {line: 0, character: 11}
-fullTargets: [{type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: o, usePrePhraseSnapshot: true}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: containingScope, scopeType: type, includeSiblings: false}}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/typescript/clearTypeOx2.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/typescript/clearTypeOx2.yml
deleted file mode 100644
index 3e176b95cf..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/typescript/clearTypeOx2.yml
+++ /dev/null
@@ -1,24 +0,0 @@
-languageId: typescript
-command:
-  version: 1
-  spokenForm: clear type ox
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: type, includeSiblings: false}
-      mark: {type: decoratedSymbol, symbolColor: default, character: o}
-initialState:
-  documentContents: "const foo: string = bar<number>(foo);"
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-  marks:
-    default.o:
-      start: {line: 0, character: 32}
-      end: {line: 0, character: 35}
-finalState:
-  documentContents: "const foo:  = bar<number>(foo);"
-  selections:
-    - anchor: {line: 0, character: 11}
-      active: {line: 0, character: 11}
-fullTargets: [{type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: o, usePrePhraseSnapshot: true}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: containingScope, scopeType: type, includeSiblings: false}}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/typescript/clearTypeUrge.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/typescript/clearTypeUrge.yml
deleted file mode 100644
index 5c270b0e85..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/typescript/clearTypeUrge.yml
+++ /dev/null
@@ -1,24 +0,0 @@
-languageId: typescript
-command:
-  version: 1
-  spokenForm: clear type urge
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: type, includeSiblings: false}
-      mark: {type: decoratedSymbol, symbolColor: default, character: u}
-initialState:
-  documentContents: "const foo: Bar<number> = new Bar<number>(foo);"
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-  marks:
-    default.u:
-      start: {line: 0, character: 15}
-      end: {line: 0, character: 21}
-finalState:
-  documentContents: "const foo:  = new Bar<number>(foo);"
-  selections:
-    - anchor: {line: 0, character: 11}
-      active: {line: 0, character: 11}
-fullTargets: [{type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: u, usePrePhraseSnapshot: true}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: containingScope, scopeType: type, includeSiblings: false}}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/typescript/clearTypeWhale.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/typescript/clearTypeWhale.yml
deleted file mode 100644
index bfe48d3ada..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/typescript/clearTypeWhale.yml
+++ /dev/null
@@ -1,24 +0,0 @@
-languageId: typescript
-command:
-  version: 1
-  spokenForm: clear type whale
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: type, includeSiblings: false}
-      mark: {type: decoratedSymbol, symbolColor: default, character: w}
-initialState:
-  documentContents: "const foo: string = new Bar<number>(foo);"
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-  marks:
-    default.w:
-      start: {line: 0, character: 20}
-      end: {line: 0, character: 23}
-finalState:
-  documentContents: "const foo:  = new Bar<number>(foo);"
-  selections:
-    - anchor: {line: 0, character: 11}
-      active: {line: 0, character: 11}
-fullTargets: [{type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: w, usePrePhraseSnapshot: true}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: containingScope, scopeType: type, includeSiblings: false}}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/typescript/clearTypeWrangle.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/typescript/clearTypeWrangle.yml
deleted file mode 100644
index 0446f1e84a..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/typescript/clearTypeWrangle.yml
+++ /dev/null
@@ -1,24 +0,0 @@
-languageId: typescript
-command:
-  version: 1
-  spokenForm: clear type wrangle
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: type, includeSiblings: false}
-      mark: {type: decoratedSymbol, symbolColor: default, character: '>'}
-initialState:
-  documentContents: "const foo: string = new Bar<number>(foo);"
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-  marks:
-    default.>:
-      start: {line: 0, character: 34}
-      end: {line: 0, character: 35}
-finalState:
-  documentContents: "const foo: string = new (foo);"
-  selections:
-    - anchor: {line: 0, character: 24}
-      active: {line: 0, character: 24}
-fullTargets: [{type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: '>', usePrePhraseSnapshot: true}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: containingScope, scopeType: type, includeSiblings: false}}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/typescript/clearValue.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/typescript/clearValue.yml
deleted file mode 100644
index 54d85f18ae..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/typescript/clearValue.yml
+++ /dev/null
@@ -1,20 +0,0 @@
-languageId: typescript
-command:
-  version: 1
-  spokenForm: clear value
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: value, includeSiblings: false}
-initialState:
-  documentContents: a += "world";
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-  marks: {}
-finalState:
-  documentContents: a += ;
-  selections:
-    - anchor: {line: 0, character: 5}
-      active: {line: 0, character: 5}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: containingScope, scopeType: value, includeSiblings: false}, isImplicit: false}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/typescript/ditchBranch.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/typescript/ditchBranch.yml
deleted file mode 100644
index 38b79cb7d3..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/typescript/ditchBranch.yml
+++ /dev/null
@@ -1,35 +0,0 @@
-languageId: typescript
-command:
-  version: 3
-  spokenForm: ditch branch
-  action: {name: remove}
-  targets:
-    - type: primitive
-      modifiers:
-        - type: containingScope
-          scopeType: {type: branch}
-  usePrePhraseSnapshot: true
-initialState:
-  documentContents: |-
-    if (true) {
-      const whatever = "hello";
-    } else if (false) {
-      const whatever = "hello";
-    } else {
-      const whatever = "hello";
-    }
-  selections:
-    - anchor: {line: 3, character: 2}
-      active: {line: 3, character: 2}
-  marks: {}
-finalState:
-  documentContents: |-
-    if (true) {
-      const whatever = "hello";
-    }  else {
-      const whatever = "hello";
-    }
-  selections:
-    - anchor: {line: 2, character: 2}
-      active: {line: 2, character: 2}
-fullTargets: [{type: primitive, mark: {type: cursor}, modifiers: [{type: containingScope, scopeType: {type: branch}}]}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/typescript/ditchBranch2.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/typescript/ditchBranch2.yml
deleted file mode 100644
index 89675611b9..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/typescript/ditchBranch2.yml
+++ /dev/null
@@ -1,35 +0,0 @@
-languageId: typescript
-command:
-  version: 3
-  spokenForm: ditch branch
-  action: {name: remove}
-  targets:
-    - type: primitive
-      modifiers:
-        - type: containingScope
-          scopeType: {type: branch}
-  usePrePhraseSnapshot: false
-initialState:
-  documentContents: |-
-    if (true) {
-      const whatever = "hello";
-    } else if (false) {
-      const whatever = "hello";
-    } else {
-      const whatever = "hello";
-    }
-  selections:
-    - anchor: {line: 2, character: 2}
-      active: {line: 2, character: 2}
-  marks: {}
-finalState:
-  documentContents: |-
-    if (true) {
-      const whatever = "hello";
-    }  else {
-      const whatever = "hello";
-    }
-  selections:
-    - anchor: {line: 2, character: 2}
-      active: {line: 2, character: 2}
-fullTargets: [{type: primitive, mark: {type: cursor}, modifiers: [{type: containingScope, scopeType: {type: branch}}]}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/typescript/ditchBranch3.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/typescript/ditchBranch3.yml
deleted file mode 100644
index ced3591cd3..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/typescript/ditchBranch3.yml
+++ /dev/null
@@ -1,35 +0,0 @@
-languageId: typescript
-command:
-  version: 3
-  spokenForm: ditch branch
-  action: {name: remove}
-  targets:
-    - type: primitive
-      modifiers:
-        - type: containingScope
-          scopeType: {type: branch}
-  usePrePhraseSnapshot: true
-initialState:
-  documentContents: |-
-    if (true) {
-      const whatever = "hello";
-    } else if (false) {
-      const whatever = "hello";
-    } else {
-      const whatever = "hello";
-    }
-  selections:
-    - anchor: {line: 1, character: 2}
-      active: {line: 1, character: 2}
-  marks: {}
-finalState:
-  documentContents: |-
-    if (false) {
-      const whatever = "hello";
-    } else {
-      const whatever = "hello";
-    }
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-fullTargets: [{type: primitive, mark: {type: cursor}, modifiers: [{type: containingScope, scopeType: {type: branch}}]}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/typescript/ditchFunk.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/typescript/ditchFunk.yml
deleted file mode 100644
index a7e662a2ef..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/typescript/ditchFunk.yml
+++ /dev/null
@@ -1,35 +0,0 @@
-languageId: typescript
-command:
-  spokenForm: ditch funk
-  version: 3
-  targets:
-    - type: primitive
-      modifiers:
-        - type: containingScope
-          scopeType: {type: namedFunction}
-  usePrePhraseSnapshot: true
-  action: {name: remove}
-initialState:
-  documentContents: |-
-    abstract class Foo {
-        protected abstract bar(): void;
-        protected abstract bongo(): void;
-
-        baz() {}
-    }
-  selections:
-    - anchor: {line: 2, character: 4}
-      active: {line: 2, character: 4}
-  marks: {}
-finalState:
-  documentContents: |-
-    abstract class Foo {
-        protected abstract bar(): void;
-
-
-        baz() {}
-    }
-  selections:
-    - anchor: {line: 2, character: 0}
-      active: {line: 2, character: 0}
-fullTargets: [{type: primitive, mark: {type: cursor}, modifiers: [{type: containingScope, scopeType: {type: namedFunction}}]}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/typescript/ditchFunk2.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/typescript/ditchFunk2.yml
deleted file mode 100644
index 79ebf1b8be..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/typescript/ditchFunk2.yml
+++ /dev/null
@@ -1,29 +0,0 @@
-languageId: typescript
-command:
-  spokenForm: ditch funk
-  version: 3
-  targets:
-    - type: primitive
-      modifiers:
-        - type: containingScope
-          scopeType: {type: namedFunction}
-  usePrePhraseSnapshot: true
-  action: {name: remove}
-initialState:
-  documentContents: |-
-    abstract class Foo {
-        protected abstract bongo(): void;
-    }
-  selections:
-    - anchor: {line: 1, character: 4}
-      active: {line: 1, character: 4}
-  marks: {}
-finalState:
-  documentContents: |-
-    abstract class Foo {
-
-    }
-  selections:
-    - anchor: {line: 1, character: 0}
-      active: {line: 1, character: 0}
-fullTargets: [{type: primitive, mark: {type: cursor}, modifiers: [{type: containingScope, scopeType: {type: namedFunction}}]}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/typescript/elseStateWrapThis.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/typescript/elseStateWrapThis.yml
deleted file mode 100644
index dcddacdc32..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/typescript/elseStateWrapThis.yml
+++ /dev/null
@@ -1,26 +0,0 @@
-languageId: typescript
-command:
-  version: 1
-  spokenForm: else state wrap this
-  action: wrapWithSnippet
-  targets:
-    - type: primitive
-      mark: {type: cursor}
-  extraArgs: [ifElseStatement.alternative]
-initialState:
-  documentContents: const foo = "hello";
-  selections:
-    - anchor: {line: 0, character: 6}
-      active: {line: 0, character: 6}
-  marks: {}
-finalState:
-  documentContents: |-
-    if () {
-        
-    } else {
-        const foo = "hello";
-    }
-  selections:
-    - anchor: {line: 0, character: 4}
-      active: {line: 0, character: 4}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: containingScope, scopeType: statement, includeSiblings: false}}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/typescript/ifElseWrapThis.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/typescript/ifElseWrapThis.yml
deleted file mode 100644
index ec944b8e20..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/typescript/ifElseWrapThis.yml
+++ /dev/null
@@ -1,26 +0,0 @@
-languageId: typescript
-command:
-  version: 1
-  spokenForm: if else wrap this
-  action: wrapWithSnippet
-  targets:
-    - type: primitive
-      mark: {type: cursor}
-  extraArgs: [ifElseStatement.consequence]
-initialState:
-  documentContents: const foo = "hello";
-  selections:
-    - anchor: {line: 0, character: 6}
-      active: {line: 0, character: 6}
-  marks: {}
-finalState:
-  documentContents: |-
-    if () {
-        const foo = "hello";
-    } else {
-        
-    }
-  selections:
-    - anchor: {line: 0, character: 4}
-      active: {line: 0, character: 4}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: containingScope, scopeType: statement, includeSiblings: false}}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/typescript/ifStateWrapThis.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/typescript/ifStateWrapThis.yml
deleted file mode 100644
index dac4ecffa0..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/typescript/ifStateWrapThis.yml
+++ /dev/null
@@ -1,24 +0,0 @@
-languageId: typescript
-command:
-  version: 1
-  spokenForm: if state wrap this
-  action: wrapWithSnippet
-  targets:
-    - type: primitive
-      mark: {type: cursor}
-  extraArgs: [ifStatement.consequence]
-initialState:
-  documentContents: const foo = "hello";
-  selections:
-    - anchor: {line: 0, character: 6}
-      active: {line: 0, character: 6}
-  marks: {}
-finalState:
-  documentContents: |-
-    if () {
-        const foo = "hello";
-    }
-  selections:
-    - anchor: {line: 0, character: 4}
-      active: {line: 0, character: 4}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: containingScope, scopeType: statement, includeSiblings: false}}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/typescript/takeArg.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/typescript/takeArg.yml
deleted file mode 100644
index a44fc9676b..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/typescript/takeArg.yml
+++ /dev/null
@@ -1,28 +0,0 @@
-languageId: typescript
-command:
-  version: 1
-  spokenForm: take arg
-  action: setSelection
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: argumentOrParameter}
-initialState:
-  documentContents: |
-
-    function myFunk (name: string) {
-
-    }
-  selections:
-    - anchor: {line: 1, character: 21}
-      active: {line: 1, character: 21}
-  marks: {}
-finalState:
-  documentContents: |
-
-    function myFunk (name: string) {
-
-    }
-  selections:
-    - anchor: {line: 1, character: 17}
-      active: {line: 1, character: 29}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, modifier: {type: containingScope, scopeType: argumentOrParameter}, insideOutsideType: inside}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/typescript/takeArg2.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/typescript/takeArg2.yml
deleted file mode 100644
index 06c17d32c2..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/typescript/takeArg2.yml
+++ /dev/null
@@ -1,24 +0,0 @@
-languageId: typescript
-command:
-  version: 1
-  spokenForm: take arg
-  action: setSelection
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: argumentOrParameter}
-initialState:
-  documentContents: |
-
-    myFunk(1, 2, 3)
-  selections:
-    - anchor: {line: 1, character: 8}
-      active: {line: 1, character: 8}
-  marks: {}
-finalState:
-  documentContents: |
-
-    myFunk(1, 2, 3)
-  selections:
-    - anchor: {line: 1, character: 7}
-      active: {line: 1, character: 8}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, modifier: {type: containingScope, scopeType: argumentOrParameter}, insideOutsideType: inside}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/typescript/takeArrow.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/typescript/takeArrow.yml
deleted file mode 100644
index 3902457989..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/typescript/takeArrow.yml
+++ /dev/null
@@ -1,28 +0,0 @@
-languageId: typescript
-command:
-  version: 1
-  spokenForm: take arrow
-  action: setSelection
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: anonymousFunction}
-initialState:
-  documentContents: |
-
-    const value = () => {
-
-    }
-  selections:
-    - anchor: {line: 2, character: 0}
-      active: {line: 2, character: 0}
-  marks: {}
-finalState:
-  documentContents: |
-
-    const value = () => {
-
-    }
-  selections:
-    - anchor: {line: 1, character: 14}
-      active: {line: 3, character: 1}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, modifier: {type: containingScope, scopeType: anonymousFunction}, insideOutsideType: inside}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/typescript/takeCall.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/typescript/takeCall.yml
deleted file mode 100644
index 82a167a952..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/typescript/takeCall.yml
+++ /dev/null
@@ -1,24 +0,0 @@
-languageId: typescript
-command:
-  version: 1
-  spokenForm: take call
-  action: setSelection
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: functionCall}
-initialState:
-  documentContents: |
-
-    myFunk()
-  selections:
-    - anchor: {line: 1, character: 1}
-      active: {line: 1, character: 1}
-  marks: {}
-finalState:
-  documentContents: |
-
-    myFunk()
-  selections:
-    - anchor: {line: 1, character: 0}
-      active: {line: 1, character: 8}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, modifier: {type: containingScope, scopeType: functionCall}, insideOutsideType: inside}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/typescript/takeClass.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/typescript/takeClass.yml
deleted file mode 100644
index 6060c04f8e..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/typescript/takeClass.yml
+++ /dev/null
@@ -1,38 +0,0 @@
-languageId: typescript
-command:
-  version: 1
-  spokenForm: take class
-  action: setSelection
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: class}
-initialState:
-  documentContents: |
-
-    class MyClass {
-        constructor () {
-
-        }
-        myFunk () {
-
-        }
-    }
-  selections:
-    - anchor: {line: 5, character: 4}
-      active: {line: 5, character: 4}
-  marks: {}
-finalState:
-  documentContents: |
-
-    class MyClass {
-        constructor () {
-
-        }
-        myFunk () {
-
-        }
-    }
-  selections:
-    - anchor: {line: 1, character: 0}
-      active: {line: 8, character: 1}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, modifier: {type: containingScope, scopeType: class}, insideOutsideType: inside}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/typescript/takeClassName.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/typescript/takeClassName.yml
deleted file mode 100644
index 46e6f635fb..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/typescript/takeClassName.yml
+++ /dev/null
@@ -1,38 +0,0 @@
-languageId: typescript
-command:
-  version: 1
-  spokenForm: take class name
-  action: setSelection
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: className}
-initialState:
-  documentContents: |
-
-    class MyClass {
-        constructor () {
-
-        }
-        myFunk () {
-
-        }
-    }
-  selections:
-    - anchor: {line: 5, character: 4}
-      active: {line: 5, character: 4}
-  marks: {}
-finalState:
-  documentContents: |
-
-    class MyClass {
-        constructor () {
-
-        }
-        myFunk () {
-
-        }
-    }
-  selections:
-    - anchor: {line: 1, character: 6}
-      active: {line: 1, character: 13}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, modifier: {type: containingScope, scopeType: className}, insideOutsideType: inside}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/typescript/takeComment.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/typescript/takeComment.yml
deleted file mode 100644
index 16afe7df7b..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/typescript/takeComment.yml
+++ /dev/null
@@ -1,24 +0,0 @@
-languageId: typescript
-command:
-  version: 1
-  spokenForm: take comment
-  action: setSelection
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: comment}
-initialState:
-  documentContents: |
-
-    // const value: string = "Hello world";
-  selections:
-    - anchor: {line: 1, character: 32}
-      active: {line: 1, character: 32}
-  marks: {}
-finalState:
-  documentContents: |
-
-    // const value: string = "Hello world";
-  selections:
-    - anchor: {line: 1, character: 0}
-      active: {line: 1, character: 39}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, modifier: {type: containingScope, scopeType: comment}, insideOutsideType: inside}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/typescript/takeCondition.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/typescript/takeCondition.yml
deleted file mode 100644
index 0fdd894fbb..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/typescript/takeCondition.yml
+++ /dev/null
@@ -1,38 +0,0 @@
-languageId: typescript
-command:
-  version: 1
-  spokenForm: take condition
-  action: setSelection
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: condition, includeSiblings: false}
-initialState:
-  documentContents: |-
-    if (true) {
-
-    }
-    for (let i = 0; i < length; ++i) {
-
-    }
-    while (true) {
-
-    }
-  selections:
-    - anchor: {line: 1, character: 0}
-      active: {line: 1, character: 0}
-  marks: {}
-finalState:
-  documentContents: |-
-    if (true) {
-
-    }
-    for (let i = 0; i < length; ++i) {
-
-    }
-    while (true) {
-
-    }
-  selections:
-    - anchor: {line: 0, character: 4}
-      active: {line: 0, character: 8}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: containingScope, scopeType: condition, includeSiblings: false}}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/typescript/takeCondition2.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/typescript/takeCondition2.yml
deleted file mode 100644
index e623ec8d17..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/typescript/takeCondition2.yml
+++ /dev/null
@@ -1,38 +0,0 @@
-languageId: typescript
-command:
-  version: 1
-  spokenForm: take condition
-  action: setSelection
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: condition, includeSiblings: false}
-initialState:
-  documentContents: |-
-    if (true) {
-
-    }
-    for (let i = 0; i < length; ++i) {
-
-    }
-    while (true) {
-
-    }
-  selections:
-    - anchor: {line: 4, character: 0}
-      active: {line: 4, character: 0}
-  marks: {}
-finalState:
-  documentContents: |-
-    if (true) {
-
-    }
-    for (let i = 0; i < length; ++i) {
-
-    }
-    while (true) {
-
-    }
-  selections:
-    - anchor: {line: 3, character: 16}
-      active: {line: 3, character: 26}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: containingScope, scopeType: condition, includeSiblings: false}}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/typescript/takeCondition3.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/typescript/takeCondition3.yml
deleted file mode 100644
index cc9824a97d..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/typescript/takeCondition3.yml
+++ /dev/null
@@ -1,38 +0,0 @@
-languageId: typescript
-command:
-  version: 1
-  spokenForm: take condition
-  action: setSelection
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: condition, includeSiblings: false}
-initialState:
-  documentContents: |-
-    if (true) {
-
-    }
-    for (let i = 0; i < length; ++i) {
-
-    }
-    while (true) {
-
-    }
-  selections:
-    - anchor: {line: 7, character: 0}
-      active: {line: 7, character: 0}
-  marks: {}
-finalState:
-  documentContents: |-
-    if (true) {
-
-    }
-    for (let i = 0; i < length; ++i) {
-
-    }
-    while (true) {
-
-    }
-  selections:
-    - anchor: {line: 6, character: 7}
-      active: {line: 6, character: 11}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: containingScope, scopeType: condition, includeSiblings: false}}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/typescript/takeEveryArgAir.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/typescript/takeEveryArgAir.yml
deleted file mode 100644
index c5ca4bb223..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/typescript/takeEveryArgAir.yml
+++ /dev/null
@@ -1,26 +0,0 @@
-languageId: typescript
-command:
-  version: 1
-  spokenForm: take every arg air
-  action: setSelection
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: argumentOrParameter, includeSiblings: true}
-      mark: {type: decoratedSymbol, symbolColor: default, character: a}
-initialState:
-  documentContents: foo(bar(baz, bongo), bazman)
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-  marks:
-    default.a:
-      start: {line: 0, character: 8}
-      end: {line: 0, character: 11}
-finalState:
-  documentContents: foo(bar(baz, bongo), bazman)
-  selections:
-    - anchor: {line: 0, character: 8}
-      active: {line: 0, character: 11}
-    - anchor: {line: 0, character: 13}
-      active: {line: 0, character: 18}
-fullTargets: [{type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: a}, selectionType: token, position: contents, modifier: {type: containingScope, scopeType: argumentOrParameter, includeSiblings: true}, insideOutsideType: inside}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/typescript/takeEveryArgBat.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/typescript/takeEveryArgBat.yml
deleted file mode 100644
index 507d8587fe..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/typescript/takeEveryArgBat.yml
+++ /dev/null
@@ -1,26 +0,0 @@
-languageId: typescript
-command:
-  version: 1
-  spokenForm: take every arg bat
-  action: setSelection
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: argumentOrParameter, includeSiblings: true}
-      mark: {type: decoratedSymbol, symbolColor: default, character: b}
-initialState:
-  documentContents: foo(bar(baz, bongo), bazman)
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-  marks:
-    default.b:
-      start: {line: 0, character: 21}
-      end: {line: 0, character: 27}
-finalState:
-  documentContents: foo(bar(baz, bongo), bazman)
-  selections:
-    - anchor: {line: 0, character: 4}
-      active: {line: 0, character: 19}
-    - anchor: {line: 0, character: 21}
-      active: {line: 0, character: 27}
-fullTargets: [{type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: b}, selectionType: token, position: contents, modifier: {type: containingScope, scopeType: argumentOrParameter, includeSiblings: true}, insideOutsideType: inside}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/typescript/takeEveryArgRam.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/typescript/takeEveryArgRam.yml
deleted file mode 100644
index 92e781a6de..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/typescript/takeEveryArgRam.yml
+++ /dev/null
@@ -1,26 +0,0 @@
-languageId: typescript
-command:
-  version: 1
-  spokenForm: take every arg ram
-  action: setSelection
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: argumentOrParameter, includeSiblings: true}
-      mark: {type: decoratedSymbol, symbolColor: default, character: r}
-initialState:
-  documentContents: foo(bar(baz, bongo), bazman)
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-  marks:
-    default.r:
-      start: {line: 0, character: 4}
-      end: {line: 0, character: 7}
-finalState:
-  documentContents: foo(bar(baz, bongo), bazman)
-  selections:
-    - anchor: {line: 0, character: 4}
-      active: {line: 0, character: 19}
-    - anchor: {line: 0, character: 21}
-      active: {line: 0, character: 27}
-fullTargets: [{type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: r}, selectionType: token, position: contents, modifier: {type: containingScope, scopeType: argumentOrParameter, includeSiblings: true}, insideOutsideType: inside}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/typescript/takeEveryItem.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/typescript/takeEveryItem.yml
deleted file mode 100644
index dbb081945e..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/typescript/takeEveryItem.yml
+++ /dev/null
@@ -1,30 +0,0 @@
-languageId: typescript
-command:
-  version: 1
-  spokenForm: take every item
-  action: setSelection
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: collectionItem, includeSiblings: true}
-initialState:
-  documentContents: |
-
-    const value = { a: 1, b: 2, c: 3, foo };
-  selections:
-    - anchor: {line: 1, character: 17}
-      active: {line: 1, character: 17}
-  marks: {}
-finalState:
-  documentContents: |
-
-    const value = { a: 1, b: 2, c: 3, foo };
-  selections:
-    - anchor: {line: 1, character: 16}
-      active: {line: 1, character: 20}
-    - anchor: {line: 1, character: 22}
-      active: {line: 1, character: 26}
-    - anchor: {line: 1, character: 28}
-      active: {line: 1, character: 32}
-    - anchor: {line: 1, character: 34}
-      active: {line: 1, character: 37}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, modifier: {type: containingScope, scopeType: collectionItem, includeSiblings: true}, insideOutsideType: inside}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/typescript/takeEveryItem2.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/typescript/takeEveryItem2.yml
deleted file mode 100644
index ca80a6ec0d..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/typescript/takeEveryItem2.yml
+++ /dev/null
@@ -1,30 +0,0 @@
-languageId: typescript
-command:
-  version: 1
-  spokenForm: take every item
-  action: setSelection
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: collectionItem, includeSiblings: true}
-initialState:
-  documentContents: |
-
-    const value = [1, 2, 3, foo];
-  selections:
-    - anchor: {line: 1, character: 17}
-      active: {line: 1, character: 17}
-  marks: {}
-finalState:
-  documentContents: |
-
-    const value = [1, 2, 3, foo];
-  selections:
-    - anchor: {line: 1, character: 15}
-      active: {line: 1, character: 16}
-    - anchor: {line: 1, character: 18}
-      active: {line: 1, character: 19}
-    - anchor: {line: 1, character: 21}
-      active: {line: 1, character: 22}
-    - anchor: {line: 1, character: 24}
-      active: {line: 1, character: 27}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, modifier: {type: containingScope, scopeType: collectionItem, includeSiblings: true}, insideOutsideType: inside}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/typescript/takeEveryItem3.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/typescript/takeEveryItem3.yml
deleted file mode 100644
index 2ef1eeb882..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/typescript/takeEveryItem3.yml
+++ /dev/null
@@ -1,28 +0,0 @@
-languageId: typescript
-command:
-  version: 1
-  spokenForm: take every item
-  action: setSelection
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: collectionItem, includeSiblings: true}
-initialState:
-  documentContents: |
-
-    const { a, b, c } = {};
-  selections:
-    - anchor: {line: 1, character: 10}
-      active: {line: 1, character: 10}
-  marks: {}
-finalState:
-  documentContents: |
-
-    const { a, b, c } = {};
-  selections:
-    - anchor: {line: 1, character: 8}
-      active: {line: 1, character: 9}
-    - anchor: {line: 1, character: 11}
-      active: {line: 1, character: 12}
-    - anchor: {line: 1, character: 14}
-      active: {line: 1, character: 15}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, modifier: {type: containingScope, scopeType: collectionItem, includeSiblings: true}, insideOutsideType: inside}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/typescript/takeEveryItem4.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/typescript/takeEveryItem4.yml
deleted file mode 100644
index aac082a7f4..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/typescript/takeEveryItem4.yml
+++ /dev/null
@@ -1,28 +0,0 @@
-languageId: typescript
-command:
-  version: 1
-  spokenForm: take every item
-  action: setSelection
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: collectionItem, includeSiblings: true}
-initialState:
-  documentContents: |
-
-    const [a, b, c] = [];
-  selections:
-    - anchor: {line: 1, character: 9}
-      active: {line: 1, character: 9}
-  marks: {}
-finalState:
-  documentContents: |
-
-    const [a, b, c] = [];
-  selections:
-    - anchor: {line: 1, character: 7}
-      active: {line: 1, character: 8}
-    - anchor: {line: 1, character: 10}
-      active: {line: 1, character: 11}
-    - anchor: {line: 1, character: 13}
-      active: {line: 1, character: 14}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, modifier: {type: containingScope, scopeType: collectionItem, includeSiblings: true}, insideOutsideType: inside}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/typescript/takeEveryItem5.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/typescript/takeEveryItem5.yml
deleted file mode 100644
index 03cd93c4ae..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/typescript/takeEveryItem5.yml
+++ /dev/null
@@ -1,32 +0,0 @@
-languageId: typescript
-command:
-  version: 1
-  spokenForm: take every item
-  action: setSelection
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: collectionItem, includeSiblings: true}
-initialState:
-  documentContents: |-
-    const value = {
-        key1: "hello",
-        key2: "there",
-    };
-  selections:
-    - anchor: {line: 1, character: 10}
-      active: {line: 1, character: 10}
-    - anchor: {line: 2, character: 10}
-      active: {line: 2, character: 17}
-  marks: {}
-finalState:
-  documentContents: |-
-    const value = {
-        key1: "hello",
-        key2: "there",
-    };
-  selections:
-    - anchor: {line: 1, character: 4}
-      active: {line: 1, character: 17}
-    - anchor: {line: 2, character: 4}
-      active: {line: 2, character: 17}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, modifier: {type: containingScope, scopeType: collectionItem, includeSiblings: true}, insideOutsideType: inside}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/typescript/takeEveryKey.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/typescript/takeEveryKey.yml
deleted file mode 100644
index 58e06e4105..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/typescript/takeEveryKey.yml
+++ /dev/null
@@ -1,30 +0,0 @@
-languageId: typescript
-command:
-  version: 1
-  spokenForm: take every key
-  action: setSelection
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: collectionKey, includeSiblings: true}
-initialState:
-  documentContents: |-
-    const value = {
-        key1: "hello",
-        key2: "there",
-    };
-  selections:
-    - anchor: {line: 1, character: 10}
-      active: {line: 1, character: 10}
-  marks: {}
-finalState:
-  documentContents: |-
-    const value = {
-        key1: "hello",
-        key2: "there",
-    };
-  selections:
-    - anchor: {line: 1, character: 4}
-      active: {line: 1, character: 8}
-    - anchor: {line: 2, character: 4}
-      active: {line: 2, character: 8}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, modifier: {type: containingScope, scopeType: collectionKey, includeSiblings: true}, insideOutsideType: inside}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/typescript/takeEveryKey2.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/typescript/takeEveryKey2.yml
deleted file mode 100644
index a00c2a1bb8..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/typescript/takeEveryKey2.yml
+++ /dev/null
@@ -1,30 +0,0 @@
-languageId: typescript
-command:
-  version: 1
-  spokenForm: take every key
-  action: setSelection
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: collectionKey, includeSiblings: true}
-initialState:
-  documentContents: |-
-    {
-        foo: "hello",
-        bar,
-    }
-  selections:
-    - anchor: {line: 1, character: 4}
-      active: {line: 1, character: 4}
-  marks: {}
-finalState:
-  documentContents: |-
-    {
-        foo: "hello",
-        bar,
-    }
-  selections:
-    - anchor: {line: 1, character: 4}
-      active: {line: 1, character: 7}
-    - anchor: {line: 2, character: 4}
-      active: {line: 2, character: 7}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: containingScope, scopeType: collectionKey, includeSiblings: true}}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/typescript/takeEveryValue.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/typescript/takeEveryValue.yml
deleted file mode 100644
index c9f523a4d1..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/typescript/takeEveryValue.yml
+++ /dev/null
@@ -1,30 +0,0 @@
-languageId: typescript
-command:
-  version: 1
-  spokenForm: take every value
-  action: setSelection
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: value, includeSiblings: true}
-initialState:
-  documentContents: |-
-    const value = {
-        key1: "hello",
-        key2: "there",
-    };
-  selections:
-    - anchor: {line: 1, character: 10}
-      active: {line: 1, character: 10}
-  marks: {}
-finalState:
-  documentContents: |-
-    const value = {
-        key1: "hello",
-        key2: "there",
-    };
-  selections:
-    - anchor: {line: 1, character: 10}
-      active: {line: 1, character: 17}
-    - anchor: {line: 2, character: 10}
-      active: {line: 2, character: 17}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, modifier: {type: containingScope, scopeType: value, includeSiblings: true}, insideOutsideType: inside}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/typescript/takeEveryValue2.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/typescript/takeEveryValue2.yml
deleted file mode 100644
index 4d82ab888a..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/typescript/takeEveryValue2.yml
+++ /dev/null
@@ -1,30 +0,0 @@
-languageId: typescript
-command:
-  version: 1
-  spokenForm: take every value
-  action: setSelection
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: value, includeSiblings: true}
-initialState:
-  documentContents: |-
-    {
-        foo: "hello",
-        bar,
-    }
-  selections:
-    - anchor: {line: 1, character: 4}
-      active: {line: 1, character: 4}
-  marks: {}
-finalState:
-  documentContents: |-
-    {
-        foo: "hello",
-        bar,
-    }
-  selections:
-    - anchor: {line: 1, character: 9}
-      active: {line: 1, character: 16}
-    - anchor: {line: 2, character: 4}
-      active: {line: 2, character: 7}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: containingScope, scopeType: value, includeSiblings: true}}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/typescript/takeFunk.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/typescript/takeFunk.yml
deleted file mode 100644
index 4e2e7135d3..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/typescript/takeFunk.yml
+++ /dev/null
@@ -1,28 +0,0 @@
-languageId: typescript
-command:
-  version: 1
-  spokenForm: take funk
-  action: setSelection
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: namedFunction}
-initialState:
-  documentContents: |
-
-    function foo () {
-
-    }
-  selections:
-    - anchor: {line: 2, character: 0}
-      active: {line: 2, character: 0}
-  marks: {}
-finalState:
-  documentContents: |
-
-    function foo () {
-
-    }
-  selections:
-    - anchor: {line: 1, character: 0}
-      active: {line: 3, character: 1}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, modifier: {type: containingScope, scopeType: namedFunction}, insideOutsideType: inside}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/typescript/takeFunk10.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/typescript/takeFunk10.yml
deleted file mode 100644
index 7be33531a2..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/typescript/takeFunk10.yml
+++ /dev/null
@@ -1,32 +0,0 @@
-languageId: typescript
-command:
-  version: 1
-  spokenForm: take funk
-  action: setSelection
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: namedFunction}
-initialState:
-  documentContents: |-
-
-    class Bar {
-        foo () {
-
-        }
-    }
-  selections:
-    - anchor: {line: 3, character: 0}
-      active: {line: 3, character: 0}
-  marks: {}
-finalState:
-  documentContents: |-
-
-    class Bar {
-        foo () {
-
-        }
-    }
-  selections:
-    - anchor: {line: 2, character: 4}
-      active: {line: 4, character: 5}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, modifier: {type: containingScope, scopeType: namedFunction}, insideOutsideType: inside}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/typescript/takeFunk11.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/typescript/takeFunk11.yml
deleted file mode 100644
index 19642629b0..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/typescript/takeFunk11.yml
+++ /dev/null
@@ -1,32 +0,0 @@
-languageId: typescript
-command:
-  version: 1
-  spokenForm: take funk
-  action: setSelection
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: namedFunction}
-initialState:
-  documentContents: |-
-
-    class Bar {
-        foo = () => {
-
-        }
-    }
-  selections:
-    - anchor: {line: 3, character: 0}
-      active: {line: 3, character: 0}
-  marks: {}
-finalState:
-  documentContents: |-
-
-    class Bar {
-        foo = () => {
-
-        }
-    }
-  selections:
-    - anchor: {line: 2, character: 4}
-      active: {line: 4, character: 5}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, modifier: {type: containingScope, scopeType: namedFunction}, insideOutsideType: inside}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/typescript/takeFunk12.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/typescript/takeFunk12.yml
deleted file mode 100644
index ad9aadb777..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/typescript/takeFunk12.yml
+++ /dev/null
@@ -1,28 +0,0 @@
-languageId: typescript
-command:
-  version: 1
-  spokenForm: take funk
-  action: setSelection
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: namedFunction}
-initialState:
-  documentContents: |
-
-    export default function() {
-
-    }
-  selections:
-    - anchor: {line: 2, character: 0}
-      active: {line: 2, character: 0}
-  marks: {}
-finalState:
-  documentContents: |
-
-    export default function() {
-
-    }
-  selections:
-    - anchor: {line: 1, character: 0}
-      active: {line: 3, character: 1}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, modifier: {type: containingScope, scopeType: namedFunction}, insideOutsideType: inside}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/typescript/takeFunk13.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/typescript/takeFunk13.yml
deleted file mode 100644
index e80e452bcb..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/typescript/takeFunk13.yml
+++ /dev/null
@@ -1,28 +0,0 @@
-languageId: typescript
-command:
-  version: 1
-  spokenForm: take funk
-  action: setSelection
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: namedFunction}
-initialState:
-  documentContents: |-
-
-    export default () => {
-
-    }
-  selections:
-    - anchor: {line: 2, character: 0}
-      active: {line: 2, character: 0}
-  marks: {}
-finalState:
-  documentContents: |-
-
-    export default () => {
-
-    }
-  selections:
-    - anchor: {line: 1, character: 0}
-      active: {line: 3, character: 1}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, modifier: {type: containingScope, scopeType: namedFunction}, insideOutsideType: inside}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/typescript/takeFunk2.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/typescript/takeFunk2.yml
deleted file mode 100644
index 13873d8fc8..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/typescript/takeFunk2.yml
+++ /dev/null
@@ -1,28 +0,0 @@
-languageId: typescript
-command:
-  version: 1
-  spokenForm: take funk
-  action: setSelection
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: namedFunction}
-initialState:
-  documentContents: |
-
-    export function foo () {
-
-    }
-  selections:
-    - anchor: {line: 2, character: 0}
-      active: {line: 2, character: 0}
-  marks: {}
-finalState:
-  documentContents: |
-
-    export function foo () {
-
-    }
-  selections:
-    - anchor: {line: 1, character: 0}
-      active: {line: 3, character: 1}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, modifier: {type: containingScope, scopeType: namedFunction}, insideOutsideType: inside}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/typescript/takeFunk3.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/typescript/takeFunk3.yml
deleted file mode 100644
index 1aeb1ac3e0..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/typescript/takeFunk3.yml
+++ /dev/null
@@ -1,28 +0,0 @@
-languageId: typescript
-command:
-  version: 1
-  spokenForm: take funk
-  action: setSelection
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: namedFunction}
-initialState:
-  documentContents: |
-
-    export default function foo () {
-
-    }
-  selections:
-    - anchor: {line: 2, character: 0}
-      active: {line: 2, character: 0}
-  marks: {}
-finalState:
-  documentContents: |
-
-    export default function foo () {
-
-    }
-  selections:
-    - anchor: {line: 1, character: 0}
-      active: {line: 3, character: 1}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, modifier: {type: containingScope, scopeType: namedFunction}, insideOutsideType: inside}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/typescript/takeFunk4.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/typescript/takeFunk4.yml
deleted file mode 100644
index 32990a1f97..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/typescript/takeFunk4.yml
+++ /dev/null
@@ -1,28 +0,0 @@
-languageId: typescript
-command:
-  version: 1
-  spokenForm: take funk
-  action: setSelection
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: namedFunction}
-initialState:
-  documentContents: |
-
-    let foo = function() {
-
-    }
-  selections:
-    - anchor: {line: 2, character: 0}
-      active: {line: 2, character: 0}
-  marks: {}
-finalState:
-  documentContents: |
-
-    let foo = function() {
-
-    }
-  selections:
-    - anchor: {line: 1, character: 0}
-      active: {line: 3, character: 1}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, modifier: {type: containingScope, scopeType: namedFunction}, insideOutsideType: inside}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/typescript/takeFunk5.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/typescript/takeFunk5.yml
deleted file mode 100644
index b7806f3cd8..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/typescript/takeFunk5.yml
+++ /dev/null
@@ -1,28 +0,0 @@
-languageId: typescript
-command:
-  version: 1
-  spokenForm: take funk
-  action: setSelection
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: namedFunction}
-initialState:
-  documentContents: |
-
-    foo = function() {
-
-    }
-  selections:
-    - anchor: {line: 2, character: 0}
-      active: {line: 2, character: 0}
-  marks: {}
-finalState:
-  documentContents: |
-
-    foo = function() {
-
-    }
-  selections:
-    - anchor: {line: 1, character: 0}
-      active: {line: 3, character: 1}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, modifier: {type: containingScope, scopeType: namedFunction}, insideOutsideType: inside}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/typescript/takeFunk6.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/typescript/takeFunk6.yml
deleted file mode 100644
index 737ea061c3..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/typescript/takeFunk6.yml
+++ /dev/null
@@ -1,28 +0,0 @@
-languageId: typescript
-command:
-  version: 1
-  spokenForm: take funk
-  action: setSelection
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: namedFunction}
-initialState:
-  documentContents: |
-
-    let foo = () => {
-
-    }
-  selections:
-    - anchor: {line: 2, character: 0}
-      active: {line: 2, character: 0}
-  marks: {}
-finalState:
-  documentContents: |
-
-    let foo = () => {
-
-    }
-  selections:
-    - anchor: {line: 1, character: 0}
-      active: {line: 3, character: 1}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, modifier: {type: containingScope, scopeType: namedFunction}, insideOutsideType: inside}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/typescript/takeFunk7.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/typescript/takeFunk7.yml
deleted file mode 100644
index eb1a54f2d4..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/typescript/takeFunk7.yml
+++ /dev/null
@@ -1,28 +0,0 @@
-languageId: typescript
-command:
-  version: 1
-  spokenForm: take funk
-  action: setSelection
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: namedFunction}
-initialState:
-  documentContents: |
-
-    foo = () => {
-
-    }
-  selections:
-    - anchor: {line: 2, character: 0}
-      active: {line: 2, character: 0}
-  marks: {}
-finalState:
-  documentContents: |
-
-    foo = () => {
-
-    }
-  selections:
-    - anchor: {line: 1, character: 0}
-      active: {line: 3, character: 1}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, modifier: {type: containingScope, scopeType: namedFunction}, insideOutsideType: inside}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/typescript/takeFunk8.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/typescript/takeFunk8.yml
deleted file mode 100644
index 041164e29d..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/typescript/takeFunk8.yml
+++ /dev/null
@@ -1,28 +0,0 @@
-languageId: typescript
-command:
-  version: 1
-  spokenForm: take funk
-  action: setSelection
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: namedFunction}
-initialState:
-  documentContents: |
-
-    export let foo = () => {
-
-    }
-  selections:
-    - anchor: {line: 2, character: 0}
-      active: {line: 2, character: 0}
-  marks: {}
-finalState:
-  documentContents: |
-
-    export let foo = () => {
-
-    }
-  selections:
-    - anchor: {line: 1, character: 0}
-      active: {line: 3, character: 1}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, modifier: {type: containingScope, scopeType: namedFunction}, insideOutsideType: inside}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/typescript/takeFunk9.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/typescript/takeFunk9.yml
deleted file mode 100644
index c897a3d673..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/typescript/takeFunk9.yml
+++ /dev/null
@@ -1,32 +0,0 @@
-languageId: typescript
-command:
-  version: 1
-  spokenForm: take funk
-  action: setSelection
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: namedFunction}
-initialState:
-  documentContents: |
-
-    class Bar {
-        constructor () {
-
-        }
-    }
-  selections:
-    - anchor: {line: 3, character: 0}
-      active: {line: 3, character: 0}
-  marks: {}
-finalState:
-  documentContents: |
-
-    class Bar {
-        constructor () {
-
-        }
-    }
-  selections:
-    - anchor: {line: 2, character: 4}
-      active: {line: 4, character: 5}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, modifier: {type: containingScope, scopeType: namedFunction}, insideOutsideType: inside}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/typescript/takeFunkCap.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/typescript/takeFunkCap.yml
deleted file mode 100644
index 03c0861c93..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/typescript/takeFunkCap.yml
+++ /dev/null
@@ -1,28 +0,0 @@
-languageId: typescript
-command:
-  version: 1
-  spokenForm: take funk cap
-  action: setSelection
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: namedFunction, includeSiblings: false}
-      mark: {type: decoratedSymbol, symbolColor: default, character: c}
-initialState:
-  documentContents: |
-    const myFunk = () => {
-    };
-  selections:
-    - anchor: {line: 2, character: 0}
-      active: {line: 2, character: 0}
-  marks:
-    default.c:
-      start: {line: 0, character: 0}
-      end: {line: 0, character: 5}
-finalState:
-  documentContents: |
-    const myFunk = () => {
-    };
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 1, character: 2}
-fullTargets: [{type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: c}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: containingScope, scopeType: namedFunction, includeSiblings: false}, isImplicit: false}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/typescript/takeFunkMade.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/typescript/takeFunkMade.yml
deleted file mode 100644
index 6d471c769a..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/typescript/takeFunkMade.yml
+++ /dev/null
@@ -1,28 +0,0 @@
-languageId: typescript
-command:
-  version: 1
-  spokenForm: take funk made
-  action: setSelection
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: namedFunction, includeSiblings: false}
-      mark: {type: decoratedSymbol, symbolColor: default, character: m}
-initialState:
-  documentContents: |
-    const myFunk = () => {
-    };
-  selections:
-    - anchor: {line: 2, character: 0}
-      active: {line: 2, character: 0}
-  marks:
-    default.m:
-      start: {line: 0, character: 6}
-      end: {line: 0, character: 12}
-finalState:
-  documentContents: |
-    const myFunk = () => {
-    };
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 1, character: 2}
-fullTargets: [{type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: m}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: containingScope, scopeType: namedFunction, includeSiblings: false}, isImplicit: false}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/typescript/takeFunkMade2.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/typescript/takeFunkMade2.yml
deleted file mode 100644
index c7de6ef3bf..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/typescript/takeFunkMade2.yml
+++ /dev/null
@@ -1,28 +0,0 @@
-languageId: typescript
-command:
-  version: 1
-  spokenForm: take funk made
-  action: setSelection
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: namedFunction, includeSiblings: false}
-      mark: {type: decoratedSymbol, symbolColor: default, character: m}
-initialState:
-  documentContents: |
-    const myFunk = function() {
-    }
-  selections:
-    - anchor: {line: 2, character: 0}
-      active: {line: 2, character: 0}
-  marks:
-    default.m:
-      start: {line: 0, character: 6}
-      end: {line: 0, character: 12}
-finalState:
-  documentContents: |
-    const myFunk = function() {
-    }
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 1, character: 1}
-fullTargets: [{type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: m}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: containingScope, scopeType: namedFunction, includeSiblings: false}, isImplicit: false}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/typescript/takeFunkName.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/typescript/takeFunkName.yml
deleted file mode 100644
index 6bb42c75ea..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/typescript/takeFunkName.yml
+++ /dev/null
@@ -1,28 +0,0 @@
-languageId: typescript
-command:
-  version: 1
-  spokenForm: take funk name
-  action: setSelection
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: functionName}
-initialState:
-  documentContents: |
-
-    function foo () {
-
-    }
-  selections:
-    - anchor: {line: 2, character: 0}
-      active: {line: 2, character: 0}
-  marks: {}
-finalState:
-  documentContents: |
-
-    function foo () {
-
-    }
-  selections:
-    - anchor: {line: 1, character: 9}
-      active: {line: 1, character: 12}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, modifier: {type: containingScope, scopeType: functionName}, insideOutsideType: inside}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/typescript/takeFunkName10.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/typescript/takeFunkName10.yml
deleted file mode 100644
index 75f662a169..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/typescript/takeFunkName10.yml
+++ /dev/null
@@ -1,32 +0,0 @@
-languageId: typescript
-command:
-  version: 1
-  spokenForm: take funk name
-  action: setSelection
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: functionName}
-initialState:
-  documentContents: |-
-
-    class Bar {
-        foo () {
-
-        }
-    }
-  selections:
-    - anchor: {line: 3, character: 0}
-      active: {line: 3, character: 0}
-  marks: {}
-finalState:
-  documentContents: |-
-
-    class Bar {
-        foo () {
-
-        }
-    }
-  selections:
-    - anchor: {line: 2, character: 4}
-      active: {line: 2, character: 7}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, modifier: {type: containingScope, scopeType: functionName}, insideOutsideType: inside}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/typescript/takeFunkName11.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/typescript/takeFunkName11.yml
deleted file mode 100644
index 547cbdbcab..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/typescript/takeFunkName11.yml
+++ /dev/null
@@ -1,32 +0,0 @@
-languageId: typescript
-command:
-  version: 1
-  spokenForm: take funk name
-  action: setSelection
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: functionName}
-initialState:
-  documentContents: |-
-
-    class Bar {
-        foo = () => {
-
-        }
-    }
-  selections:
-    - anchor: {line: 3, character: 0}
-      active: {line: 3, character: 0}
-  marks: {}
-finalState:
-  documentContents: |-
-
-    class Bar {
-        foo = () => {
-
-        }
-    }
-  selections:
-    - anchor: {line: 2, character: 4}
-      active: {line: 2, character: 7}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, modifier: {type: containingScope, scopeType: functionName}, insideOutsideType: inside}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/typescript/takeFunkName2.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/typescript/takeFunkName2.yml
deleted file mode 100644
index 55613fc028..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/typescript/takeFunkName2.yml
+++ /dev/null
@@ -1,28 +0,0 @@
-languageId: typescript
-command:
-  version: 1
-  spokenForm: take funk name
-  action: setSelection
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: functionName}
-initialState:
-  documentContents: |
-
-    export function foo () {
-
-    }
-  selections:
-    - anchor: {line: 2, character: 0}
-      active: {line: 2, character: 0}
-  marks: {}
-finalState:
-  documentContents: |
-
-    export function foo () {
-
-    }
-  selections:
-    - anchor: {line: 1, character: 16}
-      active: {line: 1, character: 19}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, modifier: {type: containingScope, scopeType: functionName}, insideOutsideType: inside}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/typescript/takeFunkName3.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/typescript/takeFunkName3.yml
deleted file mode 100644
index e06e87af30..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/typescript/takeFunkName3.yml
+++ /dev/null
@@ -1,28 +0,0 @@
-languageId: typescript
-command:
-  version: 1
-  spokenForm: take funk name
-  action: setSelection
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: functionName}
-initialState:
-  documentContents: |
-
-    export default function foo () {
-
-    }
-  selections:
-    - anchor: {line: 2, character: 0}
-      active: {line: 2, character: 0}
-  marks: {}
-finalState:
-  documentContents: |
-
-    export default function foo () {
-
-    }
-  selections:
-    - anchor: {line: 1, character: 24}
-      active: {line: 1, character: 27}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, modifier: {type: containingScope, scopeType: functionName}, insideOutsideType: inside}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/typescript/takeFunkName4.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/typescript/takeFunkName4.yml
deleted file mode 100644
index 12e19a8958..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/typescript/takeFunkName4.yml
+++ /dev/null
@@ -1,28 +0,0 @@
-languageId: typescript
-command:
-  version: 1
-  spokenForm: take funk name
-  action: setSelection
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: functionName}
-initialState:
-  documentContents: |
-
-    let foo = function() {
-
-    }
-  selections:
-    - anchor: {line: 2, character: 0}
-      active: {line: 2, character: 0}
-  marks: {}
-finalState:
-  documentContents: |
-
-    let foo = function() {
-
-    }
-  selections:
-    - anchor: {line: 1, character: 4}
-      active: {line: 1, character: 7}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, modifier: {type: containingScope, scopeType: functionName}, insideOutsideType: inside}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/typescript/takeFunkName5.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/typescript/takeFunkName5.yml
deleted file mode 100644
index e27f0613d6..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/typescript/takeFunkName5.yml
+++ /dev/null
@@ -1,28 +0,0 @@
-languageId: typescript
-command:
-  version: 1
-  spokenForm: take funk name
-  action: setSelection
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: functionName}
-initialState:
-  documentContents: |
-
-    foo = function() {
-
-    }
-  selections:
-    - anchor: {line: 2, character: 0}
-      active: {line: 2, character: 0}
-  marks: {}
-finalState:
-  documentContents: |
-
-    foo = function() {
-
-    }
-  selections:
-    - anchor: {line: 1, character: 0}
-      active: {line: 1, character: 3}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, modifier: {type: containingScope, scopeType: functionName}, insideOutsideType: inside}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/typescript/takeFunkName6.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/typescript/takeFunkName6.yml
deleted file mode 100644
index 5e9483c2c4..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/typescript/takeFunkName6.yml
+++ /dev/null
@@ -1,28 +0,0 @@
-languageId: typescript
-command:
-  version: 1
-  spokenForm: take funk name
-  action: setSelection
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: functionName}
-initialState:
-  documentContents: |
-
-    let foo = () => {
-
-    }
-  selections:
-    - anchor: {line: 2, character: 0}
-      active: {line: 2, character: 0}
-  marks: {}
-finalState:
-  documentContents: |
-
-    let foo = () => {
-
-    }
-  selections:
-    - anchor: {line: 1, character: 4}
-      active: {line: 1, character: 7}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, modifier: {type: containingScope, scopeType: functionName}, insideOutsideType: inside}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/typescript/takeFunkName7.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/typescript/takeFunkName7.yml
deleted file mode 100644
index f887039d94..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/typescript/takeFunkName7.yml
+++ /dev/null
@@ -1,28 +0,0 @@
-languageId: typescript
-command:
-  version: 1
-  spokenForm: take funk name
-  action: setSelection
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: functionName}
-initialState:
-  documentContents: |
-
-    foo = () => {
-
-    }
-  selections:
-    - anchor: {line: 2, character: 0}
-      active: {line: 2, character: 0}
-  marks: {}
-finalState:
-  documentContents: |
-
-    foo = () => {
-
-    }
-  selections:
-    - anchor: {line: 1, character: 0}
-      active: {line: 1, character: 3}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, modifier: {type: containingScope, scopeType: functionName}, insideOutsideType: inside}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/typescript/takeFunkName8.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/typescript/takeFunkName8.yml
deleted file mode 100644
index 115cd85773..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/typescript/takeFunkName8.yml
+++ /dev/null
@@ -1,28 +0,0 @@
-languageId: typescript
-command:
-  version: 1
-  spokenForm: take funk name
-  action: setSelection
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: functionName}
-initialState:
-  documentContents: |
-
-    export let foo = () => {
-
-    }
-  selections:
-    - anchor: {line: 2, character: 0}
-      active: {line: 2, character: 0}
-  marks: {}
-finalState:
-  documentContents: |
-
-    export let foo = () => {
-
-    }
-  selections:
-    - anchor: {line: 1, character: 11}
-      active: {line: 1, character: 14}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, modifier: {type: containingScope, scopeType: functionName}, insideOutsideType: inside}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/typescript/takeFunkName9.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/typescript/takeFunkName9.yml
deleted file mode 100644
index bbc0992e2e..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/typescript/takeFunkName9.yml
+++ /dev/null
@@ -1,32 +0,0 @@
-languageId: typescript
-command:
-  version: 1
-  spokenForm: take funk name
-  action: setSelection
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: functionName}
-initialState:
-  documentContents: |
-
-    class Bar {
-        constructor () {
-
-        }
-    }
-  selections:
-    - anchor: {line: 3, character: 0}
-      active: {line: 3, character: 0}
-  marks: {}
-finalState:
-  documentContents: |
-
-    class Bar {
-        constructor () {
-
-        }
-    }
-  selections:
-    - anchor: {line: 2, character: 4}
-      active: {line: 2, character: 15}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, modifier: {type: containingScope, scopeType: functionName}, insideOutsideType: inside}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/typescript/takeFunkSoon.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/typescript/takeFunkSoon.yml
deleted file mode 100644
index 6da242b486..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/typescript/takeFunkSoon.yml
+++ /dev/null
@@ -1,28 +0,0 @@
-languageId: typescript
-command:
-  version: 1
-  spokenForm: take funk soon
-  action: setSelection
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: namedFunction, includeSiblings: false}
-      mark: {type: decoratedSymbol, symbolColor: default, character: s}
-initialState:
-  documentContents: |
-    const myFunk = function() {
-    }
-  selections:
-    - anchor: {line: 2, character: 0}
-      active: {line: 2, character: 0}
-  marks:
-    default.s:
-      start: {line: 0, character: 0}
-      end: {line: 0, character: 5}
-finalState:
-  documentContents: |
-    const myFunk = function() {
-    }
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 1, character: 1}
-fullTargets: [{type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: s}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: containingScope, scopeType: namedFunction, includeSiblings: false}, isImplicit: false}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/typescript/takeIf.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/typescript/takeIf.yml
deleted file mode 100644
index 9799e3e20f..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/typescript/takeIf.yml
+++ /dev/null
@@ -1,28 +0,0 @@
-languageId: typescript
-command:
-  version: 1
-  spokenForm: take if
-  action: setSelection
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: ifStatement}
-initialState:
-  documentContents: |
-
-    if () {
-
-    }
-  selections:
-    - anchor: {line: 2, character: 0}
-      active: {line: 2, character: 0}
-  marks: {}
-finalState:
-  documentContents: |
-
-    if () {
-
-    }
-  selections:
-    - anchor: {line: 1, character: 0}
-      active: {line: 3, character: 1}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, modifier: {type: containingScope, scopeType: ifStatement}, insideOutsideType: inside}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/typescript/takeItem.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/typescript/takeItem.yml
deleted file mode 100644
index d3a8550375..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/typescript/takeItem.yml
+++ /dev/null
@@ -1,24 +0,0 @@
-languageId: typescript
-command:
-  version: 1
-  spokenForm: take item
-  action: setSelection
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: collectionItem}
-initialState:
-  documentContents: |
-
-    const value = { a: 1, b: 2, c: 3 };
-  selections:
-    - anchor: {line: 1, character: 15}
-      active: {line: 1, character: 15}
-  marks: {}
-finalState:
-  documentContents: |
-
-    const value = { a: 1, b: 2, c: 3 };
-  selections:
-    - anchor: {line: 1, character: 16}
-      active: {line: 1, character: 20}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, modifier: {type: containingScope, scopeType: collectionItem}, insideOutsideType: inside}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/typescript/takeItem2.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/typescript/takeItem2.yml
deleted file mode 100644
index 678792131b..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/typescript/takeItem2.yml
+++ /dev/null
@@ -1,24 +0,0 @@
-languageId: typescript
-command:
-  version: 1
-  spokenForm: take item
-  action: setSelection
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: collectionItem}
-initialState:
-  documentContents: |
-
-    const value = { a: 1, b: 2, c: 3 };
-  selections:
-    - anchor: {line: 1, character: 16}
-      active: {line: 1, character: 16}
-  marks: {}
-finalState:
-  documentContents: |
-
-    const value = { a: 1, b: 2, c: 3 };
-  selections:
-    - anchor: {line: 1, character: 16}
-      active: {line: 1, character: 20}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, modifier: {type: containingScope, scopeType: collectionItem}, insideOutsideType: inside}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/typescript/takeItem3.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/typescript/takeItem3.yml
deleted file mode 100644
index 9e3403a0f2..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/typescript/takeItem3.yml
+++ /dev/null
@@ -1,24 +0,0 @@
-languageId: typescript
-command:
-  version: 1
-  spokenForm: take item
-  action: setSelection
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: collectionItem}
-initialState:
-  documentContents: |
-
-    const value = { a: 1, b: 2, c: 3 };
-  selections:
-    - anchor: {line: 1, character: 20}
-      active: {line: 1, character: 20}
-  marks: {}
-finalState:
-  documentContents: |
-
-    const value = { a: 1, b: 2, c: 3 };
-  selections:
-    - anchor: {line: 1, character: 16}
-      active: {line: 1, character: 20}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, modifier: {type: containingScope, scopeType: collectionItem}, insideOutsideType: inside}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/typescript/takeItem4.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/typescript/takeItem4.yml
deleted file mode 100644
index 3a40be7785..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/typescript/takeItem4.yml
+++ /dev/null
@@ -1,24 +0,0 @@
-languageId: typescript
-command:
-  version: 1
-  spokenForm: take item
-  action: setSelection
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: collectionItem}
-initialState:
-  documentContents: |
-
-    const value = { a: 1, b: 2, c: 3 };
-  selections:
-    - anchor: {line: 1, character: 21}
-      active: {line: 1, character: 21}
-  marks: {}
-finalState:
-  documentContents: |
-
-    const value = { a: 1, b: 2, c: 3 };
-  selections:
-    - anchor: {line: 1, character: 22}
-      active: {line: 1, character: 26}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, modifier: {type: containingScope, scopeType: collectionItem}, insideOutsideType: inside}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/typescript/takeItemAir.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/typescript/takeItemAir.yml
deleted file mode 100644
index f1252985be..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/typescript/takeItemAir.yml
+++ /dev/null
@@ -1,28 +0,0 @@
-languageId: typescript
-command:
-  version: 1
-  spokenForm: take item air
-  action: setSelection
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: collectionItem}
-      mark: {type: decoratedSymbol, symbolColor: default, character: a}
-initialState:
-  documentContents: |
-
-    const value = { a: 1, b: 2, c: 3 };
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-  marks:
-    default.a:
-      start: {line: 1, character: 16}
-      end: {line: 1, character: 17}
-finalState:
-  documentContents: |
-
-    const value = { a: 1, b: 2, c: 3 };
-  selections:
-    - anchor: {line: 1, character: 16}
-      active: {line: 1, character: 20}
-fullTargets: [{type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: a}, selectionType: token, position: contents, modifier: {type: containingScope, scopeType: collectionItem}, insideOutsideType: inside}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/typescript/takeItemComma.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/typescript/takeItemComma.yml
deleted file mode 100644
index 98ec55d0a8..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/typescript/takeItemComma.yml
+++ /dev/null
@@ -1,28 +0,0 @@
-languageId: typescript
-command:
-  version: 1
-  spokenForm: take item comma
-  action: setSelection
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: collectionItem}
-      mark: {type: decoratedSymbol, symbolColor: default, character: ','}
-initialState:
-  documentContents: |
-
-    const value = { a: 1, b: 2, c: 3 };
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-  marks:
-    default.,:
-      start: {line: 1, character: 20}
-      end: {line: 1, character: 21}
-finalState:
-  documentContents: |
-
-    const value = { a: 1, b: 2, c: 3 };
-  selections:
-    - anchor: {line: 1, character: 16}
-      active: {line: 1, character: 26}
-fullTargets: [{type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: ','}, selectionType: token, position: contents, modifier: {type: containingScope, scopeType: collectionItem}, insideOutsideType: inside}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/typescript/takeItemOne.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/typescript/takeItemOne.yml
deleted file mode 100644
index db94909cca..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/typescript/takeItemOne.yml
+++ /dev/null
@@ -1,28 +0,0 @@
-languageId: typescript
-command:
-  version: 1
-  spokenForm: take item one
-  action: setSelection
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: collectionItem}
-      mark: {type: decoratedSymbol, symbolColor: default, character: '1'}
-initialState:
-  documentContents: |
-
-    const value = [1, 2, 3]
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-  marks:
-    default.1:
-      start: {line: 1, character: 15}
-      end: {line: 1, character: 16}
-finalState:
-  documentContents: |
-
-    const value = [1, 2, 3]
-  selections:
-    - anchor: {line: 1, character: 15}
-      active: {line: 1, character: 16}
-fullTargets: [{type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: '1'}, selectionType: token, position: contents, modifier: {type: containingScope, scopeType: collectionItem}, insideOutsideType: inside}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/typescript/takeKey.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/typescript/takeKey.yml
deleted file mode 100644
index e187dadd8f..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/typescript/takeKey.yml
+++ /dev/null
@@ -1,24 +0,0 @@
-languageId: typescript
-command:
-  version: 1
-  spokenForm: take key
-  action: setSelection
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: collectionKey}
-initialState:
-  documentContents: |
-
-    const value = { a: 1, b: 2, c: 3 };
-  selections:
-    - anchor: {line: 1, character: 17}
-      active: {line: 1, character: 17}
-  marks: {}
-finalState:
-  documentContents: |
-
-    const value = { a: 1, b: 2, c: 3 };
-  selections:
-    - anchor: {line: 1, character: 16}
-      active: {line: 1, character: 17}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, modifier: {type: containingScope, scopeType: collectionKey}, insideOutsideType: inside}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/typescript/takeList.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/typescript/takeList.yml
deleted file mode 100644
index 157dda7083..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/typescript/takeList.yml
+++ /dev/null
@@ -1,24 +0,0 @@
-languageId: typescript
-command:
-  version: 1
-  spokenForm: take list
-  action: setSelection
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: list}
-initialState:
-  documentContents: |
-
-    const value = [1, 2, 3]
-  selections:
-    - anchor: {line: 1, character: 16}
-      active: {line: 1, character: 16}
-  marks: {}
-finalState:
-  documentContents: |
-
-    const value = [1, 2, 3]
-  selections:
-    - anchor: {line: 1, character: 14}
-      active: {line: 1, character: 23}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, modifier: {type: containingScope, scopeType: list}, insideOutsideType: inside}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/typescript/takeList2.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/typescript/takeList2.yml
deleted file mode 100644
index fdd9153662..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/typescript/takeList2.yml
+++ /dev/null
@@ -1,24 +0,0 @@
-languageId: typescript
-command:
-  version: 1
-  spokenForm: take list
-  action: setSelection
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: list}
-initialState:
-  documentContents: |
-
-    const [a, b, c] = [];
-  selections:
-    - anchor: {line: 1, character: 9}
-      active: {line: 1, character: 9}
-  marks: {}
-finalState:
-  documentContents: |
-
-    const [a, b, c] = [];
-  selections:
-    - anchor: {line: 1, character: 6}
-      active: {line: 1, character: 15}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, modifier: {type: containingScope, scopeType: list}, insideOutsideType: inside}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/typescript/takeMap.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/typescript/takeMap.yml
deleted file mode 100644
index 2c9e79c6b8..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/typescript/takeMap.yml
+++ /dev/null
@@ -1,24 +0,0 @@
-languageId: typescript
-command:
-  version: 1
-  spokenForm: take map
-  action: setSelection
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: map}
-initialState:
-  documentContents: |
-
-    const value = { a: 1, b: 2, c: 3 };
-  selections:
-    - anchor: {line: 1, character: 17}
-      active: {line: 1, character: 17}
-  marks: {}
-finalState:
-  documentContents: |
-
-    const value = { a: 1, b: 2, c: 3 };
-  selections:
-    - anchor: {line: 1, character: 14}
-      active: {line: 1, character: 34}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, modifier: {type: containingScope, scopeType: map}, insideOutsideType: inside}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/typescript/takeMap2.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/typescript/takeMap2.yml
deleted file mode 100644
index e8de12944b..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/typescript/takeMap2.yml
+++ /dev/null
@@ -1,24 +0,0 @@
-languageId: typescript
-command:
-  version: 1
-  spokenForm: take map
-  action: setSelection
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: map}
-initialState:
-  documentContents: |
-
-    const { a, b, c } = {};
-  selections:
-    - anchor: {line: 1, character: 11}
-      active: {line: 1, character: 11}
-  marks: {}
-finalState:
-  documentContents: |
-
-    const { a, b, c } = {};
-  selections:
-    - anchor: {line: 1, character: 6}
-      active: {line: 1, character: 17}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, modifier: {type: containingScope, scopeType: map}, insideOutsideType: inside}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/typescript/takeName.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/typescript/takeName.yml
deleted file mode 100644
index aab30d455f..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/typescript/takeName.yml
+++ /dev/null
@@ -1,24 +0,0 @@
-languageId: typescript
-command:
-  version: 1
-  spokenForm: take name
-  action: setSelection
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: name}
-initialState:
-  documentContents: |
-
-    const value: string = "Hello world";
-  selections:
-    - anchor: {line: 1, character: 29}
-      active: {line: 1, character: 29}
-  marks: {}
-finalState:
-  documentContents: |
-
-    const value: string = "Hello world";
-  selections:
-    - anchor: {line: 1, character: 6}
-      active: {line: 1, character: 11}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, modifier: {type: containingScope, scopeType: name}, insideOutsideType: inside}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/typescript/takeName2.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/typescript/takeName2.yml
deleted file mode 100644
index 30cc83755e..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/typescript/takeName2.yml
+++ /dev/null
@@ -1,28 +0,0 @@
-languageId: typescript
-command:
-  version: 1
-  spokenForm: take name
-  action: setSelection
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: name}
-initialState:
-  documentContents: |
-
-    function myFunk (name: string) {
-
-    }
-  selections:
-    - anchor: {line: 1, character: 22}
-      active: {line: 1, character: 22}
-  marks: {}
-finalState:
-  documentContents: |
-
-    function myFunk (name: string) {
-
-    }
-  selections:
-    - anchor: {line: 1, character: 17}
-      active: {line: 1, character: 21}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, modifier: {type: containingScope, scopeType: name}, insideOutsideType: inside}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/typescript/takeRegex.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/typescript/takeRegex.yml
deleted file mode 100644
index c9cd36cbca..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/typescript/takeRegex.yml
+++ /dev/null
@@ -1,24 +0,0 @@
-languageId: typescript
-command:
-  version: 1
-  spokenForm: take regex
-  action: setSelection
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: regularExpression}
-initialState:
-  documentContents: |
-
-    const value = /\w.+$/
-  selections:
-    - anchor: {line: 1, character: 17}
-      active: {line: 1, character: 17}
-  marks: {}
-finalState:
-  documentContents: |
-
-    const value = /\w.+$/
-  selections:
-    - anchor: {line: 1, character: 14}
-      active: {line: 1, character: 21}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, modifier: {type: containingScope, scopeType: regularExpression}, insideOutsideType: inside}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/typescript/takeState.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/typescript/takeState.yml
deleted file mode 100644
index ddfcd58b4e..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/typescript/takeState.yml
+++ /dev/null
@@ -1,24 +0,0 @@
-languageId: typescript
-command:
-  version: 1
-  spokenForm: take state
-  action: setSelection
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: statement}
-initialState:
-  documentContents: |
-
-    const value: string = "Hello world";
-  selections:
-    - anchor: {line: 1, character: 29}
-      active: {line: 1, character: 29}
-  marks: {}
-finalState:
-  documentContents: |
-
-    const value: string = "Hello world";
-  selections:
-    - anchor: {line: 1, character: 0}
-      active: {line: 1, character: 36}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, modifier: {type: containingScope, scopeType: statement}, insideOutsideType: inside}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/typescript/takeState2.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/typescript/takeState2.yml
deleted file mode 100644
index 2fdfb56ea7..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/typescript/takeState2.yml
+++ /dev/null
@@ -1,26 +0,0 @@
-languageId: typescript
-command:
-  version: 1
-  spokenForm: take state
-  action: setSelection
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: statement, includeSiblings: false}
-initialState:
-  documentContents: |-
-    if (true) {
-
-    }
-  selections:
-    - anchor: {line: 1, character: 0}
-      active: {line: 1, character: 0}
-  marks: {}
-finalState:
-  documentContents: |-
-    if (true) {
-
-    }
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 2, character: 1}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: containingScope, scopeType: statement, includeSiblings: false}}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/typescript/takeString.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/typescript/takeString.yml
deleted file mode 100644
index d2dc592858..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/typescript/takeString.yml
+++ /dev/null
@@ -1,24 +0,0 @@
-languageId: typescript
-command:
-  version: 1
-  spokenForm: take string
-  action: setSelection
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: string}
-initialState:
-  documentContents: |
-
-    const value: string = "Hello world";
-  selections:
-    - anchor: {line: 1, character: 29}
-      active: {line: 1, character: 29}
-  marks: {}
-finalState:
-  documentContents: |
-
-    const value: string = "Hello world";
-  selections:
-    - anchor: {line: 1, character: 22}
-      active: {line: 1, character: 35}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, modifier: {type: containingScope, scopeType: string}, insideOutsideType: inside}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/typescript/takeType.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/typescript/takeType.yml
deleted file mode 100644
index 3275daa7c9..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/typescript/takeType.yml
+++ /dev/null
@@ -1,24 +0,0 @@
-languageId: typescript
-command:
-  version: 1
-  spokenForm: take type
-  action: setSelection
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: type}
-initialState:
-  documentContents: |
-
-    const value: string = "Hello world";
-  selections:
-    - anchor: {line: 1, character: 29}
-      active: {line: 1, character: 29}
-  marks: {}
-finalState:
-  documentContents: |
-
-    const value: string = "Hello world";
-  selections:
-    - anchor: {line: 1, character: 13}
-      active: {line: 1, character: 19}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, modifier: {type: containingScope, scopeType: type}, insideOutsideType: inside}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/typescript/takeType2.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/typescript/takeType2.yml
deleted file mode 100644
index 76208d62c4..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/typescript/takeType2.yml
+++ /dev/null
@@ -1,28 +0,0 @@
-languageId: typescript
-command:
-  version: 1
-  spokenForm: take type
-  action: setSelection
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: type}
-initialState:
-  documentContents: |
-
-    function myFunk (name: string) {
-
-    }
-  selections:
-    - anchor: {line: 1, character: 22}
-      active: {line: 1, character: 22}
-  marks: {}
-finalState:
-  documentContents: |
-
-    function myFunk (name: string) {
-
-    }
-  selections:
-    - anchor: {line: 1, character: 23}
-      active: {line: 1, character: 29}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, modifier: {type: containingScope, scopeType: type}, insideOutsideType: inside}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/typescript/takeValue.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/typescript/takeValue.yml
deleted file mode 100644
index 43de61e3d2..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/typescript/takeValue.yml
+++ /dev/null
@@ -1,24 +0,0 @@
-languageId: typescript
-command:
-  version: 1
-  spokenForm: take value
-  action: setSelection
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: value}
-initialState:
-  documentContents: |
-
-    const value: string = "Hello world";
-  selections:
-    - anchor: {line: 1, character: 11}
-      active: {line: 1, character: 11}
-  marks: {}
-finalState:
-  documentContents: |
-
-    const value: string = "Hello world";
-  selections:
-    - anchor: {line: 1, character: 22}
-      active: {line: 1, character: 35}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, modifier: {type: containingScope, scopeType: value}, insideOutsideType: inside}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/typescript/takeValue2.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/typescript/takeValue2.yml
deleted file mode 100644
index 91e0a2ca9a..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/typescript/takeValue2.yml
+++ /dev/null
@@ -1,24 +0,0 @@
-languageId: typescript
-command:
-  version: 1
-  spokenForm: take value
-  action: setSelection
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: value}
-initialState:
-  documentContents: |
-
-    const value = { a: 1, b: 2, c: 3 };
-  selections:
-    - anchor: {line: 1, character: 17}
-      active: {line: 1, character: 17}
-  marks: {}
-finalState:
-  documentContents: |
-
-    const value = { a: 1, b: 2, c: 3 };
-  selections:
-    - anchor: {line: 1, character: 19}
-      active: {line: 1, character: 20}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, modifier: {type: containingScope, scopeType: value}, insideOutsideType: inside}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/typescript/takeValue3.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/typescript/takeValue3.yml
deleted file mode 100644
index 9270e0b5b1..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/typescript/takeValue3.yml
+++ /dev/null
@@ -1,26 +0,0 @@
-languageId: typescript
-command:
-  version: 1
-  spokenForm: take value
-  action: setSelection
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: value, includeSiblings: false}
-initialState:
-  documentContents: |-
-    function foo() {
-        return "hello";
-    }
-  selections:
-    - anchor: {line: 1, character: 14}
-      active: {line: 1, character: 14}
-  marks: {}
-finalState:
-  documentContents: |-
-    function foo() {
-        return "hello";
-    }
-  selections:
-    - anchor: {line: 1, character: 11}
-      active: {line: 1, character: 18}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: containingScope, scopeType: value, includeSiblings: false}}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/typescript/takeValue4.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/typescript/takeValue4.yml
deleted file mode 100644
index 5b4910ee84..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/typescript/takeValue4.yml
+++ /dev/null
@@ -1,26 +0,0 @@
-languageId: typescript
-command:
-  version: 1
-  spokenForm: take value
-  action: setSelection
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: value, includeSiblings: false}
-initialState:
-  documentContents: |-
-    function foo() {
-        return "hello";
-    }
-  selections:
-    - anchor: {line: 1, character: 7}
-      active: {line: 1, character: 7}
-  marks: {}
-finalState:
-  documentContents: |-
-    function foo() {
-        return "hello";
-    }
-  selections:
-    - anchor: {line: 1, character: 11}
-      active: {line: 1, character: 18}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: containingScope, scopeType: value, includeSiblings: false}}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/typescript/tryCatchWrapThis.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/typescript/tryCatchWrapThis.yml
deleted file mode 100644
index aa810e10a7..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/typescript/tryCatchWrapThis.yml
+++ /dev/null
@@ -1,26 +0,0 @@
-languageId: typescript
-command:
-  version: 1
-  spokenForm: try catch wrap this
-  action: wrapWithSnippet
-  targets:
-    - type: primitive
-      mark: {type: cursor}
-  extraArgs: [tryCatchStatement.body]
-initialState:
-  documentContents: const foo = "hello";
-  selections:
-    - anchor: {line: 0, character: 6}
-      active: {line: 0, character: 6}
-  marks: {}
-finalState:
-  documentContents: |-
-    try {
-        const foo = "hello";
-    } catch (err) {
-        
-    }
-  selections:
-    - anchor: {line: 3, character: 4}
-      active: {line: 3, character: 4}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: containingScope, scopeType: statement, includeSiblings: false}}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/typescript/tryCatchWrapThis2.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/typescript/tryCatchWrapThis2.yml
deleted file mode 100644
index 500a8b5c8e..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/typescript/tryCatchWrapThis2.yml
+++ /dev/null
@@ -1,43 +0,0 @@
-languageId: typescript
-command:
-  version: 1
-  spokenForm: try catch wrap this
-  action: wrapWithSnippet
-  targets:
-    - type: primitive
-      mark: {type: cursor}
-  extraArgs: [tryCatchStatement.body]
-initialState:
-  documentContents: |-
-    if (true) {
-        const foo = "hello";
-    }
-
-    const bar = "hello";
-  selections:
-    - anchor: {line: 4, character: 0}
-      active: {line: 4, character: 0}
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-  marks: {}
-finalState:
-  documentContents: |-
-    try {
-        if (true) {
-            const foo = "hello";
-        }
-    } catch (err) {
-        
-    }
-
-    try {
-        const bar = "hello";
-    } catch (err) {
-        
-    }
-  selections:
-    - anchor: {line: 11, character: 4}
-      active: {line: 11, character: 4}
-    - anchor: {line: 5, character: 4}
-      active: {line: 5, character: 4}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: containingScope, scopeType: statement, includeSiblings: false}}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/xml/clearAtHerThen.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/xml/clearAtHerThen.yml
deleted file mode 100644
index 390655f5c0..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/xml/clearAtHerThen.yml
+++ /dev/null
@@ -1,20 +0,0 @@
-languageId: xml
-command:
-  version: 1
-  spokenForm: clear at her then
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: attribute, includeSiblings: false}
-initialState:
-  documentContents: <note bar="back">foo</note>
-  selections:
-    - anchor: {line: 0, character: 14}
-      active: {line: 0, character: 14}
-  marks: {}
-finalState:
-  documentContents: <note >foo</note>
-  selections:
-    - anchor: {line: 0, character: 6}
-      active: {line: 0, character: 6}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: containingScope, scopeType: attribute, includeSiblings: false}, isImplicit: false}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/xml/clearCore.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/xml/clearCore.yml
deleted file mode 100644
index aba8bcabce..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/xml/clearCore.yml
+++ /dev/null
@@ -1,20 +0,0 @@
-languageId: xml
-command:
-  version: 1
-  spokenForm: clear core
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: surroundingPair, delimiter: any, delimiterInclusion: interiorOnly}
-initialState:
-  documentContents: <note>foo</note>
-  selections:
-    - anchor: {line: 0, character: 13}
-      active: {line: 0, character: 13}
-  marks: {}
-finalState:
-  documentContents: <note>foo</>
-  selections:
-    - anchor: {line: 0, character: 11}
-      active: {line: 0, character: 11}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: surroundingPair, delimiter: any, delimiterInclusion: interiorOnly}, isImplicit: false}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/xml/clearCore2.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/xml/clearCore2.yml
deleted file mode 100644
index b748308bec..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/xml/clearCore2.yml
+++ /dev/null
@@ -1,20 +0,0 @@
-languageId: xml
-command:
-  version: 1
-  spokenForm: clear core
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: surroundingPair, delimiter: any, delimiterInclusion: interiorOnly}
-initialState:
-  documentContents: <note>foo</note>
-  selections:
-    - anchor: {line: 0, character: 3}
-      active: {line: 0, character: 3}
-  marks: {}
-finalState:
-  documentContents: <>foo</note>
-  selections:
-    - anchor: {line: 0, character: 1}
-      active: {line: 0, character: 1}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: surroundingPair, delimiter: any, delimiterInclusion: interiorOnly}, isImplicit: false}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/xml/clearEli.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/xml/clearEli.yml
deleted file mode 100644
index 52e9fa66e4..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/xml/clearEli.yml
+++ /dev/null
@@ -1,20 +0,0 @@
-languageId: xml
-command:
-  version: 1
-  spokenForm: clear eli
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: xmlElement, includeSiblings: false}
-initialState:
-  documentContents: <note>foo</note>
-  selections:
-    - anchor: {line: 0, character: 8}
-      active: {line: 0, character: 8}
-  marks: {}
-finalState:
-  documentContents: ""
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: containingScope, scopeType: xmlElement, includeSiblings: false}, isImplicit: false}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/xml/clearEndTag.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/xml/clearEndTag.yml
deleted file mode 100644
index 57f72f3ef7..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/xml/clearEndTag.yml
+++ /dev/null
@@ -1,20 +0,0 @@
-languageId: xml
-command:
-  version: 1
-  spokenForm: clear end tag
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: xmlEndTag, includeSiblings: false}
-initialState:
-  documentContents: <note>foo</note>
-  selections:
-    - anchor: {line: 0, character: 8}
-      active: {line: 0, character: 8}
-  marks: {}
-finalState:
-  documentContents: <note>foo
-  selections:
-    - anchor: {line: 0, character: 9}
-      active: {line: 0, character: 9}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: containingScope, scopeType: xmlEndTag, includeSiblings: false}, isImplicit: false}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/xml/clearEveryAtHer.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/xml/clearEveryAtHer.yml
deleted file mode 100644
index 627fcb9c6e..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/xml/clearEveryAtHer.yml
+++ /dev/null
@@ -1,22 +0,0 @@
-languageId: xml
-command:
-  version: 1
-  spokenForm: clear every at her
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: attribute, includeSiblings: true}
-initialState:
-  documentContents: <note bar="back" bongo="badman">foo</note>
-  selections:
-    - anchor: {line: 0, character: 26}
-      active: {line: 0, character: 26}
-  marks: {}
-finalState:
-  documentContents: <note  >foo</note>
-  selections:
-    - anchor: {line: 0, character: 6}
-      active: {line: 0, character: 6}
-    - anchor: {line: 0, character: 7}
-      active: {line: 0, character: 7}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: containingScope, scopeType: attribute, includeSiblings: true}, isImplicit: false}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/xml/clearEveryEli.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/xml/clearEveryEli.yml
deleted file mode 100644
index 3383bb4cce..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/xml/clearEveryEli.yml
+++ /dev/null
@@ -1,38 +0,0 @@
-languageId: xml
-command:
-  version: 1
-  spokenForm: clear every eli
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: xmlElement, includeSiblings: true}
-initialState:
-  documentContents: |-
-    <note>
-        <to>Tove</to>
-        <from>Jani</from>
-        <heading>Reminder</heading>
-        <body>Don't forget me this weekend!</body>
-    </note>
-  selections:
-    - anchor: {line: 1, character: 10}
-      active: {line: 1, character: 10}
-  marks: {}
-finalState:
-  documentContents: |-
-    <note>
-        
-        
-        
-        
-    </note>
-  selections:
-    - anchor: {line: 1, character: 4}
-      active: {line: 1, character: 4}
-    - anchor: {line: 2, character: 4}
-      active: {line: 2, character: 4}
-    - anchor: {line: 3, character: 4}
-      active: {line: 3, character: 4}
-    - anchor: {line: 4, character: 4}
-      active: {line: 4, character: 4}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: containingScope, scopeType: xmlElement, includeSiblings: true}, isImplicit: false}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/xml/clearEveryTags.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/xml/clearEveryTags.yml
deleted file mode 100644
index 3146caf881..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/xml/clearEveryTags.yml
+++ /dev/null
@@ -1,46 +0,0 @@
-languageId: xml
-command:
-  version: 1
-  spokenForm: clear every tags
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: xmlBothTags, includeSiblings: true}
-initialState:
-  documentContents: |-
-    <note>
-        <to>Tove</to>
-        <from>Jani</from>
-        <heading>Reminder</heading>
-        <body>Don't forget me this weekend!</body>
-    </note>
-  selections:
-    - anchor: {line: 1, character: 10}
-      active: {line: 1, character: 10}
-  marks: {}
-finalState:
-  documentContents: |-
-    <note>
-        Tove
-        Jani
-        Reminder
-        Don't forget me this weekend!
-    </note>
-  selections:
-    - anchor: {line: 1, character: 4}
-      active: {line: 1, character: 4}
-    - anchor: {line: 1, character: 8}
-      active: {line: 1, character: 8}
-    - anchor: {line: 2, character: 4}
-      active: {line: 2, character: 4}
-    - anchor: {line: 2, character: 8}
-      active: {line: 2, character: 8}
-    - anchor: {line: 3, character: 4}
-      active: {line: 3, character: 4}
-    - anchor: {line: 3, character: 12}
-      active: {line: 3, character: 12}
-    - anchor: {line: 4, character: 4}
-      active: {line: 4, character: 4}
-    - anchor: {line: 4, character: 33}
-      active: {line: 4, character: 33}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: containingScope, scopeType: xmlBothTags, includeSiblings: true}, isImplicit: false}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/xml/clearKeyThen.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/xml/clearKeyThen.yml
deleted file mode 100644
index 93ffcf6083..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/xml/clearKeyThen.yml
+++ /dev/null
@@ -1,20 +0,0 @@
-languageId: xml
-command:
-  version: 1
-  spokenForm: clear key then
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: collectionKey, includeSiblings: false}
-initialState:
-  documentContents: <note bar="back">foo</note>
-  selections:
-    - anchor: {line: 0, character: 14}
-      active: {line: 0, character: 14}
-  marks: {}
-finalState:
-  documentContents: <note ="back">foo</note>
-  selections:
-    - anchor: {line: 0, character: 6}
-      active: {line: 0, character: 6}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: containingScope, scopeType: collectionKey, includeSiblings: false}, isImplicit: false}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/xml/clearName.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/xml/clearName.yml
deleted file mode 100644
index 74750b9ef6..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/xml/clearName.yml
+++ /dev/null
@@ -1,20 +0,0 @@
-languageId: xml
-command:
-  version: 1
-  spokenForm: clear name
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: name, includeSiblings: false}
-initialState:
-  documentContents: <note bar="back">foo</note>
-  selections:
-    - anchor: {line: 0, character: 14}
-      active: {line: 0, character: 14}
-  marks: {}
-finalState:
-  documentContents: < bar="back">foo</note>
-  selections:
-    - anchor: {line: 0, character: 1}
-      active: {line: 0, character: 1}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: containingScope, scopeType: name, includeSiblings: false}, isImplicit: false}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/xml/clearPair.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/xml/clearPair.yml
deleted file mode 100644
index b75f528888..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/xml/clearPair.yml
+++ /dev/null
@@ -1,20 +0,0 @@
-languageId: xml
-command:
-  version: 1
-  spokenForm: clear pair
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: surroundingPair, delimiter: any}
-initialState:
-  documentContents: <note>foo</note>
-  selections:
-    - anchor: {line: 0, character: 3}
-      active: {line: 0, character: 3}
-  marks: {}
-finalState:
-  documentContents: foo</note>
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: surroundingPair, delimiter: any}, isImplicit: false}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/xml/clearPair2.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/xml/clearPair2.yml
deleted file mode 100644
index 826d2aa9b3..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/xml/clearPair2.yml
+++ /dev/null
@@ -1,20 +0,0 @@
-languageId: xml
-command:
-  version: 1
-  spokenForm: clear pair
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: surroundingPair, delimiter: any}
-initialState:
-  documentContents: <note>foo</note>
-  selections:
-    - anchor: {line: 0, character: 13}
-      active: {line: 0, character: 13}
-  marks: {}
-finalState:
-  documentContents: <note>foo
-  selections:
-    - anchor: {line: 0, character: 9}
-      active: {line: 0, character: 9}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: surroundingPair, delimiter: any}, isImplicit: false}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/xml/clearRound.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/xml/clearRound.yml
deleted file mode 100644
index 22d05bc350..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/xml/clearRound.yml
+++ /dev/null
@@ -1,20 +0,0 @@
-languageId: xml
-command:
-  version: 1
-  spokenForm: clear round
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: surroundingPair, delimiter: parentheses}
-initialState:
-  documentContents: <note>foo (hello) whatever</note>
-  selections:
-    - anchor: {line: 0, character: 13}
-      active: {line: 0, character: 13}
-  marks: {}
-finalState:
-  documentContents: <note>foo  whatever</note>
-  selections:
-    - anchor: {line: 0, character: 10}
-      active: {line: 0, character: 10}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: surroundingPair, delimiter: parentheses}, isImplicit: false}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/xml/clearStartTag.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/xml/clearStartTag.yml
deleted file mode 100644
index 81dc81ba83..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/xml/clearStartTag.yml
+++ /dev/null
@@ -1,20 +0,0 @@
-languageId: xml
-command:
-  version: 1
-  spokenForm: clear start tag
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: xmlStartTag, includeSiblings: false}
-initialState:
-  documentContents: <note>foo</note>
-  selections:
-    - anchor: {line: 0, character: 8}
-      active: {line: 0, character: 8}
-  marks: {}
-finalState:
-  documentContents: foo</note>
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: containingScope, scopeType: xmlStartTag, includeSiblings: false}, isImplicit: false}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/xml/clearTags.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/xml/clearTags.yml
deleted file mode 100644
index ca21e39894..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/xml/clearTags.yml
+++ /dev/null
@@ -1,22 +0,0 @@
-languageId: xml
-command:
-  version: 1
-  spokenForm: clear tags
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: xmlBothTags, includeSiblings: false}
-initialState:
-  documentContents: <note>foo</note>
-  selections:
-    - anchor: {line: 0, character: 8}
-      active: {line: 0, character: 8}
-  marks: {}
-finalState:
-  documentContents: foo
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-    - anchor: {line: 0, character: 3}
-      active: {line: 0, character: 3}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: containingScope, scopeType: xmlBothTags, includeSiblings: false}, isImplicit: false}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/xml/scratchClearValue.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/xml/scratchClearValue.yml
deleted file mode 100644
index 437da143e3..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/languages/xml/scratchClearValue.yml
+++ /dev/null
@@ -1,20 +0,0 @@
-languageId: xml
-command:
-  version: 1
-  spokenForm: scratch clear value
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: value, includeSiblings: false}
-initialState:
-  documentContents: <note bar="back">foo</note>
-  selections:
-    - anchor: {line: 0, character: 13}
-      active: {line: 0, character: 13}
-  marks: {}
-finalState:
-  documentContents: <note bar=>foo</note>
-  selections:
-    - anchor: {line: 0, character: 10}
-      active: {line: 0, character: 10}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: containingScope, scopeType: value, includeSiblings: false}, isImplicit: false}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/leadingTrailing/chuckLeadingWhale.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/leadingTrailing/chuckLeadingWhale.yml
deleted file mode 100644
index 562ffb8b28..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/leadingTrailing/chuckLeadingWhale.yml
+++ /dev/null
@@ -1,26 +0,0 @@
-languageId: plaintext
-command:
-  spokenForm: chuck leading whale
-  version: 2
-  targets:
-    - type: primitive
-      mark: {type: decoratedSymbol, symbolColor: default, character: w}
-      modifiers:
-        - {type: leading}
-  usePrePhraseSnapshot: true
-  action: {name: remove}
-initialState:
-  documentContents: hello world whatever
-  selections:
-    - anchor: {line: 0, character: 20}
-      active: {line: 0, character: 20}
-  marks:
-    default.w:
-      start: {line: 0, character: 6}
-      end: {line: 0, character: 11}
-finalState:
-  documentContents: helloworld whatever
-  selections:
-    - anchor: {line: 0, character: 19}
-      active: {line: 0, character: 19}
-fullTargets: [{type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: w}, modifiers: [{type: leading}]}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/leadingTrailing/chuckPastLeadingTrap.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/leadingTrailing/chuckPastLeadingTrap.yml
deleted file mode 100644
index f13bc2b524..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/leadingTrailing/chuckPastLeadingTrap.yml
+++ /dev/null
@@ -1,31 +0,0 @@
-languageId: plaintext
-command:
-  spokenForm: chuck past leading trap
-  version: 2
-  targets:
-    - type: range
-      anchor: {type: primitive, isImplicit: true}
-      active:
-        type: primitive
-        mark: {type: decoratedSymbol, symbolColor: default, character: t}
-        modifiers:
-          - {type: leading}
-      excludeAnchor: false
-      excludeActive: false
-  usePrePhraseSnapshot: true
-  action: {name: remove}
-initialState:
-  documentContents: hello there
-  selections:
-    - anchor: {line: 0, character: 8}
-      active: {line: 0, character: 8}
-  marks:
-    default.t:
-      start: {line: 0, character: 6}
-      end: {line: 0, character: 11}
-finalState:
-  documentContents: helloere
-  selections:
-    - anchor: {line: 0, character: 5}
-      active: {line: 0, character: 5}
-fullTargets: [{type: range, excludeAnchor: false, excludeActive: false, rangeType: continuous, anchor: {type: primitive, mark: {type: cursor}, modifiers: []}, active: {type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: t}, modifiers: [{type: leading}]}}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/leadingTrailing/chuckPastTrailingLook.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/leadingTrailing/chuckPastTrailingLook.yml
deleted file mode 100644
index e2781ea488..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/leadingTrailing/chuckPastTrailingLook.yml
+++ /dev/null
@@ -1,31 +0,0 @@
-languageId: plaintext
-command:
-  spokenForm: chuck past trailing look
-  version: 2
-  targets:
-    - type: range
-      anchor: {type: primitive, isImplicit: true}
-      active:
-        type: primitive
-        mark: {type: decoratedSymbol, symbolColor: default, character: l}
-        modifiers:
-          - {type: trailing}
-      excludeAnchor: false
-      excludeActive: false
-  usePrePhraseSnapshot: true
-  action: {name: remove}
-initialState:
-  documentContents: hello there
-  selections:
-    - anchor: {line: 0, character: 2}
-      active: {line: 0, character: 2}
-  marks:
-    default.l:
-      start: {line: 0, character: 0}
-      end: {line: 0, character: 5}
-finalState:
-  documentContents: hethere
-  selections:
-    - anchor: {line: 0, character: 2}
-      active: {line: 0, character: 2}
-fullTargets: [{type: range, excludeAnchor: false, excludeActive: false, rangeType: continuous, anchor: {type: primitive, mark: {type: cursor}, modifiers: []}, active: {type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: l}, modifiers: [{type: trailing}]}}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/leadingTrailing/chuckTrailingDrum.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/leadingTrailing/chuckTrailingDrum.yml
deleted file mode 100644
index f8e5b50978..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/leadingTrailing/chuckTrailingDrum.yml
+++ /dev/null
@@ -1,26 +0,0 @@
-languageId: plaintext
-command:
-  spokenForm: chuck trailing drum
-  version: 2
-  targets:
-    - type: primitive
-      mark: {type: decoratedSymbol, symbolColor: default, character: d}
-      modifiers:
-        - {type: trailing}
-  usePrePhraseSnapshot: true
-  action: {name: remove}
-initialState:
-  documentContents: hello world whatever
-  selections:
-    - anchor: {line: 0, character: 5}
-      active: {line: 0, character: 6}
-  marks:
-    default.d:
-      start: {line: 0, character: 6}
-      end: {line: 0, character: 11}
-finalState:
-  documentContents: hello worldwhatever
-  selections:
-    - anchor: {line: 0, character: 5}
-      active: {line: 0, character: 6}
-fullTargets: [{type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: d}, modifiers: [{type: trailing}]}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/leadingTrailing/clearLeadingWhale.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/leadingTrailing/clearLeadingWhale.yml
deleted file mode 100644
index dc63e579ca..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/leadingTrailing/clearLeadingWhale.yml
+++ /dev/null
@@ -1,26 +0,0 @@
-languageId: plaintext
-command:
-  spokenForm: clear leading whale
-  version: 2
-  targets:
-    - type: primitive
-      mark: {type: decoratedSymbol, symbolColor: default, character: w}
-      modifiers:
-        - {type: leading}
-  usePrePhraseSnapshot: true
-  action: {name: clearAndSetSelection}
-initialState:
-  documentContents: hello world whatever
-  selections:
-    - anchor: {line: 0, character: 20}
-      active: {line: 0, character: 20}
-  marks:
-    default.w:
-      start: {line: 0, character: 6}
-      end: {line: 0, character: 11}
-finalState:
-  documentContents: helloworld whatever
-  selections:
-    - anchor: {line: 0, character: 5}
-      active: {line: 0, character: 5}
-fullTargets: [{type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: w}, modifiers: [{type: leading}]}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/leadingTrailing/clearTrailingWhale.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/leadingTrailing/clearTrailingWhale.yml
deleted file mode 100644
index e4cf2b14af..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/leadingTrailing/clearTrailingWhale.yml
+++ /dev/null
@@ -1,26 +0,0 @@
-languageId: plaintext
-command:
-  spokenForm: clear trailing whale
-  version: 2
-  targets:
-    - type: primitive
-      mark: {type: decoratedSymbol, symbolColor: default, character: w}
-      modifiers:
-        - {type: trailing}
-  usePrePhraseSnapshot: true
-  action: {name: clearAndSetSelection}
-initialState:
-  documentContents: hello world whatever
-  selections:
-    - anchor: {line: 0, character: 20}
-      active: {line: 0, character: 20}
-  marks:
-    default.w:
-      start: {line: 0, character: 6}
-      end: {line: 0, character: 11}
-finalState:
-  documentContents: hello worldwhatever
-  selections:
-    - anchor: {line: 0, character: 11}
-      active: {line: 0, character: 11}
-fullTargets: [{type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: w}, modifiers: [{type: trailing}]}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/lineEndings/chuckVestLF.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/lineEndings/chuckVestLF.yml
deleted file mode 100644
index 747e5539d1..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/lineEndings/chuckVestLF.yml
+++ /dev/null
@@ -1,27 +0,0 @@
-languageId: typescript
-command:
-  version: 1
-  spokenForm: chuck vest
-  action: remove
-  targets:
-    - type: primitive
-      mark: {type: decoratedSymbol, symbolColor: default, character: v}
-initialState:
-  documentContents: |
-
-    const value = "Hello world";
-  selections:
-    - anchor: {line: 1, character: 28}
-      active: {line: 1, character: 28}
-  marks:
-    default.v:
-      start: {line: 1, character: 6}
-      end: {line: 1, character: 11}
-finalState:
-  documentContents: |
-
-    const = "Hello world";
-  selections:
-    - anchor: {line: 1, character: 22}
-      active: {line: 1, character: 22}
-fullTargets: [{type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: v}, selectionType: token, position: contents, modifier: {type: identity}, insideOutsideType: outside}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/lineEndings/chuckVestLFCR.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/lineEndings/chuckVestLFCR.yml
deleted file mode 100644
index f7aab45361..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/lineEndings/chuckVestLFCR.yml
+++ /dev/null
@@ -1,23 +0,0 @@
-languageId: typescript
-command:
-  version: 1
-  spokenForm: chuck vest
-  action: remove
-  targets:
-    - type: primitive
-      mark: {type: decoratedSymbol, symbolColor: default, character: v}
-initialState:
-  documentContents: "\r\nconst value = \"Hello world\";\r\n"
-  selections:
-    - anchor: {line: 1, character: 28}
-      active: {line: 1, character: 28}
-  marks:
-    default.v:
-      start: {line: 1, character: 6}
-      end: {line: 1, character: 11}
-finalState:
-  documentContents: "\r\nconst = \"Hello world\";\r\n"
-  selections:
-    - anchor: {line: 1, character: 22}
-      active: {line: 1, character: 22}
-fullTargets: [{type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: v}, selectionType: token, position: contents, modifier: {type: identity}, insideOutsideType: outside}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/lineEndings/clearCoreFileLFCR.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/lineEndings/clearCoreFileLFCR.yml
deleted file mode 100644
index 931e7d3e95..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/lineEndings/clearCoreFileLFCR.yml
+++ /dev/null
@@ -1,24 +0,0 @@
-languageId: plaintext
-command:
-  spokenForm: clear core file
-  version: 2
-  targets:
-    - type: primitive
-      modifiers:
-        - {type: interiorOnly}
-        - type: containingScope
-          scopeType: {type: document}
-  usePrePhraseSnapshot: true
-  action: {name: clearAndSetSelection}
-initialState:
-  documentContents: "\r\n abc \r\n"
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-  marks: {}
-finalState:
-  documentContents: "\r\n  \r\n"
-  selections:
-    - anchor: {line: 1, character: 1}
-      active: {line: 1, character: 1}
-fullTargets: [{type: primitive, mark: {type: cursor}, modifiers: [{type: interiorOnly}, {type: containingScope, scopeType: {type: document}}]}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/lineEndings/dropVestLF.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/lineEndings/dropVestLF.yml
deleted file mode 100644
index dde740ebab..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/lineEndings/dropVestLF.yml
+++ /dev/null
@@ -1,28 +0,0 @@
-languageId: typescript
-command:
-  version: 1
-  spokenForm: drop vest
-  action: insertEmptyLineBefore
-  targets:
-    - type: primitive
-      mark: {type: decoratedSymbol, symbolColor: default, character: v}
-initialState:
-  documentContents: |
-
-    const value = "Hello world";
-  selections:
-    - anchor: {line: 1, character: 28}
-      active: {line: 1, character: 28}
-  marks:
-    default.v:
-      start: {line: 1, character: 6}
-      end: {line: 1, character: 11}
-finalState:
-  documentContents: |
-
-
-    const value = "Hello world";
-  selections:
-    - anchor: {line: 2, character: 28}
-      active: {line: 2, character: 28}
-fullTargets: [{type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: v}, selectionType: token, position: contents, modifier: {type: identity}, insideOutsideType: inside}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/lineEndings/dropVestLFCR.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/lineEndings/dropVestLFCR.yml
deleted file mode 100644
index 5189f58910..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/lineEndings/dropVestLFCR.yml
+++ /dev/null
@@ -1,23 +0,0 @@
-languageId: typescript
-command:
-  version: 1
-  spokenForm: drop vest
-  action: insertEmptyLineBefore
-  targets:
-    - type: primitive
-      mark: {type: decoratedSymbol, symbolColor: default, character: v}
-initialState:
-  documentContents: "\r\nconst value = \"Hello world\";\r\n"
-  selections:
-    - anchor: {line: 1, character: 28}
-      active: {line: 1, character: 28}
-  marks:
-    default.v:
-      start: {line: 1, character: 6}
-      end: {line: 1, character: 11}
-finalState:
-  documentContents: "\r\n\r\nconst value = \"Hello world\";\r\n"
-  selections:
-    - anchor: {line: 2, character: 28}
-      active: {line: 2, character: 28}
-fullTargets: [{type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: v}, selectionType: token, position: contents, modifier: {type: identity}, insideOutsideType: inside}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/marks/chuckNothing.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/marks/chuckNothing.yml
deleted file mode 100644
index 5eb4e61713..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/marks/chuckNothing.yml
+++ /dev/null
@@ -1,20 +0,0 @@
-languageId: plaintext
-command:
-  version: 1
-  spokenForm: chuck nothing
-  action: remove
-  targets:
-    - type: primitive
-      mark: {type: nothing}
-initialState:
-  documentContents: hello world
-  selections:
-    - anchor: {line: 0, character: 11}
-      active: {line: 0, character: 11}
-  marks: {}
-finalState:
-  documentContents: hello world
-  selections:
-    - anchor: {line: 0, character: 11}
-      active: {line: 0, character: 11}
-fullTargets: [{type: primitive, mark: {type: nothing}, selectionType: token, position: contents, insideOutsideType: outside, modifier: {type: identity}, isImplicit: false}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/marks/highlightHarp.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/marks/highlightHarp.yml
deleted file mode 100644
index 9e34d96d51..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/marks/highlightHarp.yml
+++ /dev/null
@@ -1,29 +0,0 @@
-languageId: plaintext
-command:
-  version: 1
-  spokenForm: highlight harp
-  action: highlight
-  targets:
-    - type: primitive
-      mark: {type: decoratedSymbol, symbolColor: default, character: h}
-initialState:
-  documentContents: hello world
-  selections:
-    - anchor: {line: 0, character: 11}
-      active: {line: 0, character: 11}
-  marks:
-    default.h:
-      start: {line: 0, character: 0}
-      end: {line: 0, character: 5}
-finalState:
-  documentContents: hello world
-  selections:
-    - anchor: {line: 0, character: 11}
-      active: {line: 0, character: 11}
-fullTargets: [{type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: h}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: identity}, isImplicit: false}]
-ide:
-  highlights:
-    - ranges:
-        - type: character
-          start: {line: 0, character: 0}
-          end: {line: 0, character: 5}
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/marks/takeDownOne.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/marks/takeDownOne.yml
deleted file mode 100644
index 85e263ade2..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/marks/takeDownOne.yml
+++ /dev/null
@@ -1,32 +0,0 @@
-languageId: typescript
-command:
-  version: 1
-  spokenForm: take down one
-  action: setSelection
-  targets:
-    - type: primitive
-      selectionType: line
-      mark:
-        type: lineNumber
-        anchor: {lineNumber: 1, type: relative}
-        active: {lineNumber: 1, type: relative}
-initialState:
-  documentContents: |
-
-    const value = "Hello world";
-
-    const value = "Hello world";
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-  marks: {}
-finalState:
-  documentContents: |
-
-    const value = "Hello world";
-
-    const value = "Hello world";
-  selections:
-    - anchor: {line: 1, character: 0}
-      active: {line: 1, character: 28}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: line, position: contents, modifier: {type: lineNumber, anchor: {lineNumber: 1, type: relative}, active: {lineNumber: 1, type: relative}}, insideOutsideType: inside}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/marks/takeDownOnePastThree.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/marks/takeDownOnePastThree.yml
deleted file mode 100644
index aad7ee8eee..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/marks/takeDownOnePastThree.yml
+++ /dev/null
@@ -1,32 +0,0 @@
-languageId: typescript
-command:
-  version: 1
-  spokenForm: take down one past three
-  action: setSelection
-  targets:
-    - type: primitive
-      selectionType: line
-      mark:
-        type: lineNumber
-        anchor: {lineNumber: 1, type: relative}
-        active: {lineNumber: 3, type: relative}
-initialState:
-  documentContents: |
-
-    const value = "Hello world";
-
-    const value = "Hello world";
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-  marks: {}
-finalState:
-  documentContents: |
-
-    const value = "Hello world";
-
-    const value = "Hello world";
-  selections:
-    - anchor: {line: 1, character: 0}
-      active: {line: 3, character: 28}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: line, position: contents, modifier: {type: lineNumber, anchor: {lineNumber: 1, type: relative}, active: {lineNumber: 3, type: relative}}, insideOutsideType: inside}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/marks/takeRowFive.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/marks/takeRowFive.yml
deleted file mode 100644
index 1bf1d1ccc2..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/marks/takeRowFive.yml
+++ /dev/null
@@ -1,32 +0,0 @@
-languageId: typescript
-command:
-  version: 1
-  spokenForm: take row five
-  action: setSelection
-  targets:
-    - type: primitive
-      selectionType: line
-      mark:
-        type: lineNumber
-        anchor: {lineNumber: 4, type: modulo100}
-        active: {lineNumber: 4, type: modulo100}
-initialState:
-  documentContents: |+
-
-
-
-
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-  marks: {}
-finalState:
-  documentContents: |+
-
-
-
-
-  selections:
-    - anchor: {line: 4, character: 0}
-      active: {line: 4, character: 0}
-fullTargets: [{type: primitive, mark: {type: lineNumber, anchor: {lineNumber: 4, type: modulo100}, active: {lineNumber: 4, type: modulo100}}, selectionType: line, position: contents, insideOutsideType: inside, modifier: {type: identity}}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/marks/takeRowFour.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/marks/takeRowFour.yml
deleted file mode 100644
index 8357829db0..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/marks/takeRowFour.yml
+++ /dev/null
@@ -1,32 +0,0 @@
-languageId: typescript
-command:
-  version: 1
-  spokenForm: take row four
-  action: setSelection
-  targets:
-    - type: primitive
-      selectionType: line
-      mark:
-        type: lineNumber
-        anchor: {lineNumber: 3, type: absolute}
-        active: {lineNumber: 3, type: absolute}
-initialState:
-  documentContents: |
-
-    const value = "Hello world";
-
-    const value = "Hello world";
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-  marks: {}
-finalState:
-  documentContents: |
-
-    const value = "Hello world";
-
-    const value = "Hello world";
-  selections:
-    - anchor: {line: 3, character: 0}
-      active: {line: 3, character: 28}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: line, position: contents, modifier: {type: lineNumber, anchor: {lineNumber: 3, type: absolute}, active: {lineNumber: 3, type: absolute}}, insideOutsideType: inside}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/marks/takeRowOne.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/marks/takeRowOne.yml
deleted file mode 100644
index f4540d0f6b..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/marks/takeRowOne.yml
+++ /dev/null
@@ -1,32 +0,0 @@
-languageId: typescript
-command:
-  version: 1
-  spokenForm: take row one
-  action: setSelection
-  targets:
-    - type: primitive
-      selectionType: line
-      mark:
-        type: lineNumber
-        anchor: {lineNumber: 0, type: modulo100}
-        active: {lineNumber: 0, type: modulo100}
-initialState:
-  documentContents: |+
-
-
-
-
-  selections:
-    - anchor: {line: 4, character: 0}
-      active: {line: 4, character: 0}
-  marks: {}
-finalState:
-  documentContents: |+
-
-
-
-
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-fullTargets: [{type: primitive, mark: {type: lineNumber, anchor: {lineNumber: 0, type: modulo100}, active: {lineNumber: 0, type: modulo100}}, selectionType: line, position: contents, insideOutsideType: inside, modifier: {type: identity}}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/marks/takeRowTwoPastDownThree.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/marks/takeRowTwoPastDownThree.yml
deleted file mode 100644
index ba89ce197a..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/marks/takeRowTwoPastDownThree.yml
+++ /dev/null
@@ -1,32 +0,0 @@
-languageId: typescript
-command:
-  version: 1
-  spokenForm: take row two past down three
-  action: setSelection
-  targets:
-    - type: primitive
-      selectionType: line
-      mark:
-        type: lineNumber
-        anchor: {lineNumber: 1, type: absolute}
-        active: {lineNumber: 3, type: relative}
-initialState:
-  documentContents: |
-
-    const value = "Hello world";
-
-    const value = "Hello world";
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-  marks: {}
-finalState:
-  documentContents: |
-
-    const value = "Hello world";
-
-    const value = "Hello world";
-  selections:
-    - anchor: {line: 1, character: 0}
-      active: {line: 3, character: 28}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: line, position: contents, modifier: {type: lineNumber, anchor: {lineNumber: 1, type: absolute}, active: {lineNumber: 3, type: relative}}, insideOutsideType: inside}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/marks/takeRowTwoPastFour.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/marks/takeRowTwoPastFour.yml
deleted file mode 100644
index 7c03da24e2..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/marks/takeRowTwoPastFour.yml
+++ /dev/null
@@ -1,32 +0,0 @@
-languageId: typescript
-command:
-  version: 1
-  spokenForm: take row two past four
-  action: setSelection
-  targets:
-    - type: primitive
-      selectionType: line
-      mark:
-        type: lineNumber
-        anchor: {lineNumber: 1, type: absolute}
-        active: {lineNumber: 3, type: absolute}
-initialState:
-  documentContents: |
-
-    const value = "Hello world";
-
-    const value = "Hello world";
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-  marks: {}
-finalState:
-  documentContents: |
-
-    const value = "Hello world";
-
-    const value = "Hello world";
-  selections:
-    - anchor: {line: 1, character: 0}
-      active: {line: 3, character: 28}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: line, position: contents, modifier: {type: lineNumber, anchor: {lineNumber: 1, type: absolute}, active: {lineNumber: 3, type: absolute}}, insideOutsideType: inside}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/marks/takeSource.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/marks/takeSource.yml
deleted file mode 100644
index 38e95c18f2..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/marks/takeSource.yml
+++ /dev/null
@@ -1,31 +0,0 @@
-languageId: typescript
-command:
-  version: 1
-  spokenForm: take source
-  action: setSelection
-  targets:
-    - type: primitive
-      mark: {type: source}
-initialState:
-  documentContents: |
-    value
-    const value = "Hello world";
-  selections:
-    - anchor: {line: 0, character: 5}
-      active: {line: 0, character: 5}
-  sourceMark:
-    - type: UntypedTarget
-      contentRange:
-        start: {line: 1, character: 6}
-        end: {line: 1, character: 11}
-      isReversed: false
-      hasExplicitRange: true
-  marks: {}
-finalState:
-  documentContents: |
-    value
-    const value = "Hello world";
-  selections:
-    - anchor: {line: 1, character: 6}
-      active: {line: 1, character: 11}
-fullTargets: [{type: primitive, mark: {type: source}, selectionType: token, position: contents, modifier: {type: identity}, insideOutsideType: inside}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/marks/takeThat.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/marks/takeThat.yml
deleted file mode 100644
index 0a862fd4ab..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/marks/takeThat.yml
+++ /dev/null
@@ -1,31 +0,0 @@
-languageId: typescript
-command:
-  version: 1
-  spokenForm: take that
-  action: setSelection
-  targets:
-    - type: primitive
-      mark: {type: that}
-initialState:
-  documentContents: |
-    value
-    const value = "Hello world";
-  selections:
-    - anchor: {line: 0, character: 5}
-      active: {line: 0, character: 5}
-  thatMark:
-    - type: UntypedTarget
-      contentRange:
-        start: {line: 0, character: 0}
-        end: {line: 0, character: 5}
-      isReversed: false
-      hasExplicitRange: true
-  marks: {}
-finalState:
-  documentContents: |
-    value
-    const value = "Hello world";
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 5}
-fullTargets: [{type: primitive, mark: {type: that}, selectionType: token, position: contents, modifier: {type: identity}, insideOutsideType: inside}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/marks/takeThis.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/marks/takeThis.yml
deleted file mode 100644
index 73f4188be9..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/marks/takeThis.yml
+++ /dev/null
@@ -1,32 +0,0 @@
-languageId: typescript
-command:
-  version: 1
-  spokenForm: take this
-  action: setSelection
-  targets:
-    - type: primitive
-      mark: {type: cursor}
-initialState:
-  documentContents: |
-
-    const value = "Hello world";
-  selections:
-    - anchor: {line: 1, character: 0}
-      active: {line: 1, character: 5}
-    - anchor: {line: 1, character: 6}
-      active: {line: 1, character: 11}
-    - anchor: {line: 1, character: 15}
-      active: {line: 1, character: 20}
-  marks: {}
-finalState:
-  documentContents: |
-
-    const value = "Hello world";
-  selections:
-    - anchor: {line: 1, character: 0}
-      active: {line: 1, character: 5}
-    - anchor: {line: 1, character: 6}
-      active: {line: 1, character: 11}
-    - anchor: {line: 1, character: 15}
-      active: {line: 1, character: 20}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, modifier: {type: identity}, insideOutsideType: inside}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/marks/takeUpOnePastDownOne.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/marks/takeUpOnePastDownOne.yml
deleted file mode 100644
index 5ca7a2b4b3..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/marks/takeUpOnePastDownOne.yml
+++ /dev/null
@@ -1,32 +0,0 @@
-languageId: typescript
-command:
-  version: 1
-  spokenForm: take up one past down one
-  action: setSelection
-  targets:
-    - type: primitive
-      selectionType: line
-      mark:
-        type: lineNumber
-        anchor: {lineNumber: -1, type: relative}
-        active: {lineNumber: 1, type: relative}
-initialState:
-  documentContents: |
-
-    const value = "Hello world";
-
-    const value = "Hello world";
-  selections:
-    - anchor: {line: 2, character: 0}
-      active: {line: 2, character: 0}
-  marks: {}
-finalState:
-  documentContents: |
-
-    const value = "Hello world";
-
-    const value = "Hello world";
-  selections:
-    - anchor: {line: 1, character: 0}
-      active: {line: 3, character: 28}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: line, position: contents, modifier: {type: lineNumber, anchor: {lineNumber: -1, type: relative}, active: {lineNumber: 1, type: relative}}, insideOutsideType: inside}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/marks/takeUpOnePastRowFour.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/marks/takeUpOnePastRowFour.yml
deleted file mode 100644
index d4469c5e88..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/marks/takeUpOnePastRowFour.yml
+++ /dev/null
@@ -1,32 +0,0 @@
-languageId: typescript
-command:
-  version: 1
-  spokenForm: take up one past row four
-  action: setSelection
-  targets:
-    - type: primitive
-      selectionType: line
-      mark:
-        type: lineNumber
-        anchor: {lineNumber: -1, type: relative}
-        active: {lineNumber: 3, type: absolute}
-initialState:
-  documentContents: |
-
-    const value = "Hello world";
-
-    const value = "Hello world";
-  selections:
-    - anchor: {line: 2, character: 0}
-      active: {line: 2, character: 0}
-  marks: {}
-finalState:
-  documentContents: |
-
-    const value = "Hello world";
-
-    const value = "Hello world";
-  selections:
-    - anchor: {line: 1, character: 0}
-      active: {line: 3, character: 28}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: line, position: contents, modifier: {type: lineNumber, anchor: {lineNumber: -1, type: relative}, active: {lineNumber: 3, type: absolute}}, insideOutsideType: inside}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/modifiers/everyScope/clearEveryLine.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/modifiers/everyScope/clearEveryLine.yml
deleted file mode 100644
index a194bd5219..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/modifiers/everyScope/clearEveryLine.yml
+++ /dev/null
@@ -1,31 +0,0 @@
-languageId: plaintext
-command:
-  spokenForm: clear every line
-  version: 3
-  targets:
-    - type: primitive
-      modifiers:
-        - type: everyScope
-          scopeType: {type: line}
-  usePrePhraseSnapshot: true
-  action: {name: clearAndSetSelection}
-initialState:
-  documentContents: |
-    aaa bbb ccc
-    ddd eee fff
-  selections:
-    - anchor: {line: 0, character: 4}
-      active: {line: 0, character: 7}
-  marks: {}
-finalState:
-  documentContents: |+
-
-
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-    - anchor: {line: 1, character: 0}
-      active: {line: 1, character: 0}
-    - anchor: {line: 2, character: 0}
-      active: {line: 2, character: 0}
-fullTargets: [{type: primitive, mark: {type: cursor}, modifiers: [{type: everyScope, scopeType: {type: line}}]}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/modifiers/everyScope/clearEveryToken.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/modifiers/everyScope/clearEveryToken.yml
deleted file mode 100644
index d450fed334..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/modifiers/everyScope/clearEveryToken.yml
+++ /dev/null
@@ -1,29 +0,0 @@
-languageId: plaintext
-command:
-  spokenForm: clear every token
-  version: 3
-  targets:
-    - type: primitive
-      modifiers:
-        - type: everyScope
-          scopeType: {type: token}
-  usePrePhraseSnapshot: true
-  action: {name: clearAndSetSelection}
-initialState:
-  documentContents: aaa bbb ccc ddd
-  selections:
-    - anchor: {line: 0, character: 4}
-      active: {line: 0, character: 7}
-  marks: {}
-finalState:
-  documentContents: "   "
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-    - anchor: {line: 0, character: 1}
-      active: {line: 0, character: 1}
-    - anchor: {line: 0, character: 2}
-      active: {line: 0, character: 2}
-    - anchor: {line: 0, character: 3}
-      active: {line: 0, character: 3}
-fullTargets: [{type: primitive, mark: {type: cursor}, modifiers: [{type: everyScope, scopeType: {type: token}}]}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/modifiers/everyScope/clearFirstToken.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/modifiers/everyScope/clearFirstToken.yml
deleted file mode 100644
index 51c7a76e31..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/modifiers/everyScope/clearFirstToken.yml
+++ /dev/null
@@ -1,25 +0,0 @@
-languageId: plaintext
-command:
-  spokenForm: clear first token
-  version: 3
-  targets:
-    - type: primitive
-      modifiers:
-        - type: ordinalScope
-          scopeType: {type: token}
-          start: 0
-          length: 1
-  usePrePhraseSnapshot: true
-  action: {name: clearAndSetSelection}
-initialState:
-  documentContents: aaa bbb ccc ddd
-  selections:
-    - anchor: {line: 0, character: 4}
-      active: {line: 0, character: 7}
-  marks: {}
-finalState:
-  documentContents: " bbb ccc ddd"
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-fullTargets: [{type: primitive, mark: {type: cursor}, modifiers: [{type: ordinalScope, scopeType: {type: token}, start: 0, length: 1}]}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/modifiers/everyScope/clearLastToken.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/modifiers/everyScope/clearLastToken.yml
deleted file mode 100644
index b4a87e62b4..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/modifiers/everyScope/clearLastToken.yml
+++ /dev/null
@@ -1,25 +0,0 @@
-languageId: plaintext
-command:
-  spokenForm: clear last token
-  version: 3
-  targets:
-    - type: primitive
-      modifiers:
-        - type: ordinalScope
-          scopeType: {type: token}
-          start: -1
-          length: 1
-  usePrePhraseSnapshot: true
-  action: {name: clearAndSetSelection}
-initialState:
-  documentContents: aaa bbb ccc ddd
-  selections:
-    - anchor: {line: 0, character: 4}
-      active: {line: 0, character: 7}
-  marks: {}
-finalState:
-  documentContents: "aaa bbb ccc "
-  selections:
-    - anchor: {line: 0, character: 12}
-      active: {line: 0, character: 12}
-fullTargets: [{type: primitive, mark: {type: cursor}, modifiers: [{type: ordinalScope, scopeType: {type: token}, start: -1, length: 1}]}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/modifiers/everyScope/clearSecondLine.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/modifiers/everyScope/clearSecondLine.yml
deleted file mode 100644
index d3129a8eeb..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/modifiers/everyScope/clearSecondLine.yml
+++ /dev/null
@@ -1,29 +0,0 @@
-languageId: plaintext
-command:
-  spokenForm: clear second line
-  version: 3
-  targets:
-    - type: primitive
-      modifiers:
-        - type: ordinalScope
-          scopeType: {type: line}
-          start: 1
-          length: 1
-  usePrePhraseSnapshot: true
-  action: {name: clearAndSetSelection}
-initialState:
-  documentContents: |
-    aaa bbb ccc
-    ddd eee fff
-  selections:
-    - anchor: {line: 0, character: 4}
-      active: {line: 0, character: 7}
-  marks: {}
-finalState:
-  documentContents: |+
-    aaa bbb ccc
-
-  selections:
-    - anchor: {line: 1, character: 0}
-      active: {line: 1, character: 0}
-fullTargets: [{type: primitive, mark: {type: cursor}, modifiers: [{type: ordinalScope, scopeType: {type: line}, start: 1, length: 1}]}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/nonMatchErrors/takeFunk.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/nonMatchErrors/takeFunk.yml
deleted file mode 100644
index f1b9ab2c13..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/nonMatchErrors/takeFunk.yml
+++ /dev/null
@@ -1,17 +0,0 @@
-languageId: ruby
-command:
-  version: 1
-  spokenForm: take funk
-  action: setSelection
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: namedFunction, includeSiblings: false}
-initialState:
-  documentContents: |2
-      [1, 2, 3, [4, 5, 6]] 
-  selections:
-    - anchor: {line: 0, character: 11}
-      active: {line: 0, character: 11}
-  marks: {}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: containingScope, scopeType: namedFunction, includeSiblings: false}, isImplicit: false}]
-thrownError: {name: NoContainingScopeError}
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/nonMatchErrors/takeList.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/nonMatchErrors/takeList.yml
deleted file mode 100644
index ce3787e0a2..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/nonMatchErrors/takeList.yml
+++ /dev/null
@@ -1,17 +0,0 @@
-languageId: ruby
-command:
-  version: 1
-  spokenForm: take list
-  action: setSelection
-  targets:
-    - type: primitive
-      modifier: {type: containingScope, scopeType: list, includeSiblings: false}
-initialState:
-  documentContents: |2
-      [1, 2, 3, [4, 5, 6]] 
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-  marks: {}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: containingScope, scopeType: list, includeSiblings: false}, isImplicit: false}]
-thrownError: {name: NoContainingScopeError}
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/ordinalScopes/clearFirstPaint.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/ordinalScopes/clearFirstPaint.yml
deleted file mode 100644
index 7377d98cd3..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/ordinalScopes/clearFirstPaint.yml
+++ /dev/null
@@ -1,25 +0,0 @@
-languageId: plaintext
-command:
-  spokenForm: clear first paint
-  version: 3
-  targets:
-    - type: primitive
-      modifiers:
-        - type: ordinalScope
-          scopeType: {type: customRegex, regex: '[^\s"''`]+'}
-          start: 0
-          length: 1
-  usePrePhraseSnapshot: true
-  action: {name: clearAndSetSelection}
-initialState:
-  documentContents: aaa-bbb ccc-ddd eee-fff ggg-hhh
-  selections:
-    - anchor: {line: 0, character: 11}
-      active: {line: 0, character: 20}
-  marks: {}
-finalState:
-  documentContents: aaa-bbb  eee-fff ggg-hhh
-  selections:
-    - anchor: {line: 0, character: 8}
-      active: {line: 0, character: 8}
-fullTargets: [{type: primitive, mark: {type: cursor}, modifiers: [{type: ordinalScope, scopeType: {type: customRegex, regex: '[^\s"''`]+'}, start: 0, length: 1}]}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/ordinalScopes/clearFirstPaint2.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/ordinalScopes/clearFirstPaint2.yml
deleted file mode 100644
index 2c930fc247..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/ordinalScopes/clearFirstPaint2.yml
+++ /dev/null
@@ -1,25 +0,0 @@
-languageId: plaintext
-command:
-  spokenForm: clear first paint
-  version: 3
-  targets:
-    - type: primitive
-      modifiers:
-        - type: ordinalScope
-          scopeType: {type: customRegex, regex: '[^\s"''`]+'}
-          start: 0
-          length: 1
-  usePrePhraseSnapshot: true
-  action: {name: clearAndSetSelection}
-initialState:
-  documentContents: aaa-bbb ccc-ddd eee-fff ggg-hhh
-  selections:
-    - anchor: {line: 0, character: 11}
-      active: {line: 0, character: 11}
-  marks: {}
-finalState:
-  documentContents: " ccc-ddd eee-fff ggg-hhh"
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-fullTargets: [{type: primitive, mark: {type: cursor}, modifiers: [{type: ordinalScope, scopeType: {type: customRegex, regex: '[^\s"''`]+'}, start: 0, length: 1}]}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/ordinalScopes/clearFirstToken.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/ordinalScopes/clearFirstToken.yml
deleted file mode 100644
index b7fe5e7e9f..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/ordinalScopes/clearFirstToken.yml
+++ /dev/null
@@ -1,25 +0,0 @@
-languageId: plaintext
-command:
-  spokenForm: clear first token
-  version: 3
-  targets:
-    - type: primitive
-      modifiers:
-        - type: ordinalScope
-          scopeType: {type: token}
-          start: 0
-          length: 1
-  usePrePhraseSnapshot: true
-  action: {name: clearAndSetSelection}
-initialState:
-  documentContents: aaa bbb ccc ddd
-  selections:
-    - anchor: {line: 0, character: 5}
-      active: {line: 0, character: 10}
-  marks: {}
-finalState:
-  documentContents: aaa  ccc ddd
-  selections:
-    - anchor: {line: 0, character: 4}
-      active: {line: 0, character: 4}
-fullTargets: [{type: primitive, mark: {type: cursor}, modifiers: [{type: ordinalScope, scopeType: {type: token}, start: 0, length: 1}]}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/ordinalScopes/clearFirstToken2.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/ordinalScopes/clearFirstToken2.yml
deleted file mode 100644
index 3b87e62060..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/ordinalScopes/clearFirstToken2.yml
+++ /dev/null
@@ -1,25 +0,0 @@
-languageId: plaintext
-command:
-  spokenForm: clear first token
-  version: 3
-  targets:
-    - type: primitive
-      modifiers:
-        - type: ordinalScope
-          scopeType: {type: token}
-          start: 0
-          length: 1
-  usePrePhraseSnapshot: true
-  action: {name: clearAndSetSelection}
-initialState:
-  documentContents: aaa bbb ccc ddd
-  selections:
-    - anchor: {line: 0, character: 3}
-      active: {line: 0, character: 8}
-  marks: {}
-finalState:
-  documentContents: aaa  ccc ddd
-  selections:
-    - anchor: {line: 0, character: 4}
-      active: {line: 0, character: 4}
-fullTargets: [{type: primitive, mark: {type: cursor}, modifiers: [{type: ordinalScope, scopeType: {type: token}, start: 0, length: 1}]}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/ordinalScopes/clearLastPaint.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/ordinalScopes/clearLastPaint.yml
deleted file mode 100644
index f4eda00610..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/ordinalScopes/clearLastPaint.yml
+++ /dev/null
@@ -1,25 +0,0 @@
-languageId: plaintext
-command:
-  spokenForm: clear last paint
-  version: 3
-  targets:
-    - type: primitive
-      modifiers:
-        - type: ordinalScope
-          scopeType: {type: customRegex, regex: '[^\s"''`]+'}
-          start: -1
-          length: 1
-  usePrePhraseSnapshot: true
-  action: {name: clearAndSetSelection}
-initialState:
-  documentContents: aaa-bbb ccc-ddd eee-fff ggg-hhh
-  selections:
-    - anchor: {line: 0, character: 11}
-      active: {line: 0, character: 20}
-  marks: {}
-finalState:
-  documentContents: aaa-bbb ccc-ddd  ggg-hhh
-  selections:
-    - anchor: {line: 0, character: 16}
-      active: {line: 0, character: 16}
-fullTargets: [{type: primitive, mark: {type: cursor}, modifiers: [{type: ordinalScope, scopeType: {type: customRegex, regex: '[^\s"''`]+'}, start: -1, length: 1}]}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/ordinalScopes/clearLastPaint2.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/ordinalScopes/clearLastPaint2.yml
deleted file mode 100644
index 6fd68ee1fa..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/ordinalScopes/clearLastPaint2.yml
+++ /dev/null
@@ -1,25 +0,0 @@
-languageId: plaintext
-command:
-  spokenForm: clear last paint
-  version: 3
-  targets:
-    - type: primitive
-      modifiers:
-        - type: ordinalScope
-          scopeType: {type: customRegex, regex: '[^\s"''`]+'}
-          start: -1
-          length: 1
-  usePrePhraseSnapshot: true
-  action: {name: clearAndSetSelection}
-initialState:
-  documentContents: aaa-bbb ccc-ddd eee-fff ggg-hhh
-  selections:
-    - anchor: {line: 0, character: 11}
-      active: {line: 0, character: 11}
-  marks: {}
-finalState:
-  documentContents: "aaa-bbb ccc-ddd eee-fff "
-  selections:
-    - anchor: {line: 0, character: 24}
-      active: {line: 0, character: 24}
-fullTargets: [{type: primitive, mark: {type: cursor}, modifiers: [{type: ordinalScope, scopeType: {type: customRegex, regex: '[^\s"''`]+'}, start: -1, length: 1}]}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/ordinalScopes/clearLastToken.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/ordinalScopes/clearLastToken.yml
deleted file mode 100644
index 5002550cad..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/ordinalScopes/clearLastToken.yml
+++ /dev/null
@@ -1,25 +0,0 @@
-languageId: plaintext
-command:
-  spokenForm: clear last token
-  version: 3
-  targets:
-    - type: primitive
-      modifiers:
-        - type: ordinalScope
-          scopeType: {type: token}
-          start: -1
-          length: 1
-  usePrePhraseSnapshot: true
-  action: {name: clearAndSetSelection}
-initialState:
-  documentContents: aaa bbb ccc ddd
-  selections:
-    - anchor: {line: 0, character: 5}
-      active: {line: 0, character: 10}
-  marks: {}
-finalState:
-  documentContents: aaa bbb  ddd
-  selections:
-    - anchor: {line: 0, character: 8}
-      active: {line: 0, character: 8}
-fullTargets: [{type: primitive, mark: {type: cursor}, modifiers: [{type: ordinalScope, scopeType: {type: token}, start: -1, length: 1}]}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/ordinalScopes/clearLastToken2.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/ordinalScopes/clearLastToken2.yml
deleted file mode 100644
index 8511b998e1..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/ordinalScopes/clearLastToken2.yml
+++ /dev/null
@@ -1,25 +0,0 @@
-languageId: plaintext
-command:
-  spokenForm: clear last token
-  version: 3
-  targets:
-    - type: primitive
-      modifiers:
-        - type: ordinalScope
-          scopeType: {type: token}
-          start: -1
-          length: 1
-  usePrePhraseSnapshot: true
-  action: {name: clearAndSetSelection}
-initialState:
-  documentContents: aaa bbb ccc ddd
-  selections:
-    - anchor: {line: 0, character: 3}
-      active: {line: 0, character: 8}
-  marks: {}
-finalState:
-  documentContents: aaa  ccc ddd
-  selections:
-    - anchor: {line: 0, character: 4}
-      active: {line: 0, character: 4}
-fullTargets: [{type: primitive, mark: {type: cursor}, modifiers: [{type: ordinalScope, scopeType: {type: token}, start: -1, length: 1}]}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/positions/bringArgMadeAndGustToEndOfJustThis.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/positions/bringArgMadeAndGustToEndOfJustThis.yml
deleted file mode 100644
index 36a3d83f07..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/positions/bringArgMadeAndGustToEndOfJustThis.yml
+++ /dev/null
@@ -1,45 +0,0 @@
-languageId: typescript
-command:
-  spokenForm: bring arg made and gust to end of just this
-  version: 2
-  targets:
-    - type: list
-      elements:
-        - type: primitive
-          mark: {type: decoratedSymbol, symbolColor: default, character: m}
-          modifiers:
-            - type: containingScope
-              scopeType: {type: argumentOrParameter}
-        - type: primitive
-          mark: {type: decoratedSymbol, symbolColor: default, character: g}
-    - type: primitive
-      mark: {type: cursor}
-      modifiers:
-        - {type: position, position: end}
-        - {type: toRawSelection}
-  usePrePhraseSnapshot: true
-  action: {name: replaceWithTarget}
-initialState:
-  documentContents: |-
-    function whatever(name: string, age: number, inclose: boolean) {
-        
-    }
-  selections:
-    - anchor: {line: 1, character: 4}
-      active: {line: 1, character: 4}
-  marks:
-    default.m:
-      start: {line: 0, character: 18}
-      end: {line: 0, character: 22}
-    default.g:
-      start: {line: 0, character: 32}
-      end: {line: 0, character: 35}
-finalState:
-  documentContents: |-
-    function whatever(name: string, age: number, inclose: boolean) {
-        name: string, age: number
-    }
-  selections:
-    - anchor: {line: 1, character: 29}
-      active: {line: 1, character: 29}
-fullTargets: [{type: list, elements: [{type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: m}, modifiers: &ref_0 [{type: containingScope, scopeType: {type: argumentOrParameter}}]}, {type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: g}, modifiers: *ref_0}]}, {type: primitive, mark: {type: cursor}, modifiers: [{type: position, position: end}, {type: toRawSelection}]}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/positions/bringBlockAirBeforeBatAndDrumAndAfterBatAndDrum.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/positions/bringBlockAirBeforeBatAndDrumAndAfterBatAndDrum.yml
deleted file mode 100644
index cd005c8a45..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/positions/bringBlockAirBeforeBatAndDrumAndAfterBatAndDrum.yml
+++ /dev/null
@@ -1,69 +0,0 @@
-languageId: plaintext
-command:
-  spokenForm: bring block air before bat and drum and after bat and drum
-  version: 2
-  targets:
-    - type: primitive
-      mark: {type: decoratedSymbol, symbolColor: default, character: a}
-      modifiers:
-        - type: containingScope
-          scopeType: {type: paragraph}
-    - type: list
-      elements:
-        - type: primitive
-          mark: {type: decoratedSymbol, symbolColor: default, character: b}
-          modifiers:
-            - {type: position, position: before}
-        - type: primitive
-          mark: {type: decoratedSymbol, symbolColor: default, character: d}
-        - type: primitive
-          mark: {type: decoratedSymbol, symbolColor: default, character: b}
-          modifiers:
-            - {type: position, position: after}
-        - type: primitive
-          mark: {type: decoratedSymbol, symbolColor: default, character: d}
-  usePrePhraseSnapshot: true
-  action: {name: replaceWithTarget}
-initialState:
-  documentContents: |-
-    aaa
-
-        bbb
-            ccc
-
-            ddd
-        eee
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-  marks:
-    default.a:
-      start: {line: 0, character: 0}
-      end: {line: 0, character: 3}
-    default.b:
-      start: {line: 2, character: 4}
-      end: {line: 2, character: 7}
-    default.d:
-      start: {line: 5, character: 8}
-      end: {line: 5, character: 11}
-finalState:
-  documentContents: |-
-    aaa
-
-        aaa
-
-        bbb
-            ccc
-
-        aaa
-
-        aaa
-
-            ddd
-        eee
-
-        aaa
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-fullTargets: [{type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: a}, modifiers: [&ref_0 {type: containingScope, scopeType: {type: paragraph}}]}, {type: list, elements: [{type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: b}, modifiers: [*ref_0], positionModifier: {type: position, position: before}}, {type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: d}, modifiers: [*ref_0], positionModifier: {type: position, position: before}}, {type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: b}, modifiers: [*ref_0], positionModifier: {type: position, position: after}}, {type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: d}, modifiers: [*ref_0], positionModifier: {type: position, position: after}}]}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/positions/bringFunkAirAfterBat.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/positions/bringFunkAirAfterBat.yml
deleted file mode 100644
index 50d607c3ae..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/positions/bringFunkAirAfterBat.yml
+++ /dev/null
@@ -1,52 +0,0 @@
-languageId: python
-command:
-  spokenForm: bring funk air after bat
-  version: 2
-  targets:
-    - type: primitive
-      mark: {type: decoratedSymbol, symbolColor: default, character: a}
-      modifiers:
-        - type: containingScope
-          scopeType: {type: namedFunction}
-    - type: primitive
-      mark: {type: decoratedSymbol, symbolColor: default, character: b}
-      modifiers:
-        - {type: position, position: after}
-  usePrePhraseSnapshot: true
-  action: {name: replaceWithTarget}
-initialState:
-  documentContents: |2
-        def aaa():
-
-            pass
-
-        def bbb():
-
-            pass
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-  marks:
-    default.a:
-      start: {line: 0, character: 8}
-      end: {line: 0, character: 11}
-    default.b:
-      start: {line: 4, character: 8}
-      end: {line: 4, character: 11}
-finalState:
-  documentContents: |2
-        def aaa():
-
-            pass
-
-        def bbb():
-
-            pass
-
-        def aaa():
-
-            pass
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-fullTargets: [{type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: a}, modifiers: [&ref_0 {type: containingScope, scopeType: {type: namedFunction}}]}, {type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: b}, modifiers: [*ref_0], positionModifier: {type: position, position: after}}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/positions/bringFunkBatBeforeAir.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/positions/bringFunkBatBeforeAir.yml
deleted file mode 100644
index 55f55d8f3b..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/positions/bringFunkBatBeforeAir.yml
+++ /dev/null
@@ -1,52 +0,0 @@
-languageId: python
-command:
-  spokenForm: bring funk bat before air
-  version: 2
-  targets:
-    - type: primitive
-      mark: {type: decoratedSymbol, symbolColor: default, character: b}
-      modifiers:
-        - type: containingScope
-          scopeType: {type: namedFunction}
-    - type: primitive
-      mark: {type: decoratedSymbol, symbolColor: default, character: a}
-      modifiers:
-        - {type: position, position: before}
-  usePrePhraseSnapshot: true
-  action: {name: replaceWithTarget}
-initialState:
-  documentContents: |2
-        def aaa():
-
-            pass
-
-        def bbb():
-
-            pass
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-  marks:
-    default.b:
-      start: {line: 4, character: 8}
-      end: {line: 4, character: 11}
-    default.a:
-      start: {line: 0, character: 8}
-      end: {line: 0, character: 11}
-finalState:
-  documentContents: |2
-        def bbb():
-
-            pass
-
-        def aaa():
-
-            pass
-
-        def bbb():
-
-            pass
-  selections:
-    - anchor: {line: 4, character: 0}
-      active: {line: 4, character: 0}
-fullTargets: [{type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: b}, modifiers: [&ref_0 {type: containingScope, scopeType: {type: namedFunction}}]}, {type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: a}, modifiers: [*ref_0], positionModifier: {type: position, position: before}}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/positions/bringHarpAfterLineOatsAndWhale.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/positions/bringHarpAfterLineOatsAndWhale.yml
deleted file mode 100644
index b2b371e6ba..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/positions/bringHarpAfterLineOatsAndWhale.yml
+++ /dev/null
@@ -1,48 +0,0 @@
-languageId: typescript
-command:
-  spokenForm: bring harp after line oats and whale
-  version: 2
-  targets:
-    - type: primitive
-      mark: {type: decoratedSymbol, symbolColor: default, character: h}
-    - type: list
-      elements:
-        - type: primitive
-          mark: {type: decoratedSymbol, symbolColor: default, character: o}
-          modifiers:
-            - {type: position, position: after}
-            - type: containingScope
-              scopeType: {type: line}
-        - type: primitive
-          mark: {type: decoratedSymbol, symbolColor: default, character: w}
-  usePrePhraseSnapshot: true
-  action: {name: replaceWithTarget}
-initialState:
-  documentContents: |-
-    const whatever = "hello";
-
-    const whatever = "hello";
-  selections:
-    - anchor: {line: 2, character: 24}
-      active: {line: 2, character: 24}
-  marks:
-    default.h:
-      start: {line: 0, character: 6}
-      end: {line: 0, character: 14}
-    default.o:
-      start: {line: 0, character: 18}
-      end: {line: 0, character: 23}
-    default.w:
-      start: {line: 2, character: 6}
-      end: {line: 2, character: 14}
-finalState:
-  documentContents: |-
-    const whatever = "hello";
-    whatever
-
-    const whatever = "hello";
-    whatever
-  selections:
-    - anchor: {line: 3, character: 24}
-      active: {line: 3, character: 24}
-fullTargets: [{type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: h}, modifiers: []}, {type: list, elements: [{type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: o}, modifiers: &ref_0 [{type: position, position: after}, {type: containingScope, scopeType: {type: line}}]}, {type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: w}, modifiers: *ref_0}]}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/positions/bringHarpToAfterFile.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/positions/bringHarpToAfterFile.yml
deleted file mode 100644
index 93d3ee11fb..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/positions/bringHarpToAfterFile.yml
+++ /dev/null
@@ -1,31 +0,0 @@
-languageId: plaintext
-command:
-  spokenForm: bring harp to after file
-  version: 2
-  action: {name: replaceWithTarget}
-  targets:
-    - type: primitive
-      mark: {type: decoratedSymbol, symbolColor: default, character: h}
-    - type: primitive
-      modifiers:
-        - {type: position, position: after}
-        - type: containingScope
-          scopeType: {type: document}
-  usePrePhraseSnapshot: true
-initialState:
-  documentContents: hello world
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-  marks:
-    default.h:
-      start: {line: 0, character: 0}
-      end: {line: 0, character: 5}
-finalState:
-  documentContents: |-
-    hello world
-    hello
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-fullTargets: [{type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: h}, modifiers: []}, {type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: h}, modifiers: [{type: position, position: after}, {type: containingScope, scopeType: document}]}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/positions/bringStateFineToAfterBatt.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/positions/bringStateFineToAfterBatt.yml
deleted file mode 100644
index c236bebf07..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/positions/bringStateFineToAfterBatt.yml
+++ /dev/null
@@ -1,41 +0,0 @@
-languageId: typescript
-command:
-  spokenForm: bring state fine to after batt
-  version: 2
-  targets:
-    - type: primitive
-      mark: {type: decoratedSymbol, symbolColor: default, character: f}
-      modifiers:
-        - type: containingScope
-          scopeType: {type: statement}
-    - type: primitive
-      mark: {type: decoratedSymbol, symbolColor: default, character: b}
-      modifiers:
-        - {type: position, position: after}
-        - type: containingScope
-          scopeType: {type: statement}
-  usePrePhraseSnapshot: true
-  action: {name: replaceWithTarget}
-initialState:
-  documentContents: |
-    let foo;
-    let bar;
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-  marks:
-    default.f:
-      start: {line: 0, character: 4}
-      end: {line: 0, character: 7}
-    default.b:
-      start: {line: 1, character: 4}
-      end: {line: 1, character: 7}
-finalState:
-  documentContents: |
-    let foo;
-    let bar;
-    let foo;
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-fullTargets: [{type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: f}, modifiers: [&ref_0 {type: containingScope, scopeType: {type: statement}}]}, {type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: b}, modifiers: [*ref_0, {type: position, position: after}]}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/positions/bringWhaleToBeforeFile.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/positions/bringWhaleToBeforeFile.yml
deleted file mode 100644
index efd569a753..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/positions/bringWhaleToBeforeFile.yml
+++ /dev/null
@@ -1,31 +0,0 @@
-languageId: plaintext
-command:
-  spokenForm: bring whale to before file
-  version: 2
-  action: {name: replaceWithTarget}
-  targets:
-    - type: primitive
-      mark: {type: decoratedSymbol, symbolColor: default, character: w}
-    - type: primitive
-      modifiers:
-        - {type: position, position: before}
-        - type: containingScope
-          scopeType: {type: document}
-  usePrePhraseSnapshot: true
-initialState:
-  documentContents: hello world
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-  marks:
-    default.w:
-      start: {line: 0, character: 6}
-      end: {line: 0, character: 11}
-finalState:
-  documentContents: |-
-    world
-    hello world
-  selections:
-    - anchor: {line: 1, character: 0}
-      active: {line: 1, character: 0}
-fullTargets: [{type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: w}, modifiers: []}, {type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: w}, modifiers: [{type: position, position: before}, {type: containingScope, scopeType: document}]}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/positions/chuckAfterHarp.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/positions/chuckAfterHarp.yml
deleted file mode 100644
index 7b68e0760b..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/positions/chuckAfterHarp.yml
+++ /dev/null
@@ -1,32 +0,0 @@
-languageId: plaintext
-command:
-  version: 1
-  spokenForm: chuck after harp
-  action: remove
-  targets:
-    - type: primitive
-      position: after
-      mark: {type: decoratedSymbol, symbolColor: default, character: h}
-initialState:
-  documentContents: |
-    "hello "
-    " hello"
-    " hello "
-    return a.b
-  selections:
-    - anchor: {line: 4, character: 0}
-      active: {line: 4, character: 0}
-  marks:
-    default.h:
-      start: {line: 2, character: 2}
-      end: {line: 2, character: 7}
-finalState:
-  documentContents: |
-    "hello "
-    " hello"
-    " hello"
-    return a.b
-  selections:
-    - anchor: {line: 4, character: 0}
-      active: {line: 4, character: 0}
-fullTargets: [{type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: h}, selectionType: token, position: after, insideOutsideType: outside, modifier: {type: identity}}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/positions/chuckAfterLineVest.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/positions/chuckAfterLineVest.yml
deleted file mode 100644
index cca6a09107..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/positions/chuckAfterLineVest.yml
+++ /dev/null
@@ -1,32 +0,0 @@
-languageId: plaintext
-command:
-  version: 1
-  spokenForm: chuck after line vest
-  action: remove
-  targets:
-    - type: primitive
-      position: after
-      selectionType: line
-      mark: {type: decoratedSymbol, symbolColor: default, character: v}
-initialState:
-  documentContents: |-
-
-    const value = "Hello world";
-
-        const value = "Hello world";
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-  marks:
-    default.v:
-      start: {line: 1, character: 6}
-      end: {line: 1, character: 11}
-finalState:
-  documentContents: |-
-
-    const value = "Hello world";
-        const value = "Hello world";
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-fullTargets: [{type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: v}, selectionType: line, position: after, modifier: {type: identity}, insideOutsideType: outside}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/positions/chuckAfterLook.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/positions/chuckAfterLook.yml
deleted file mode 100644
index eb487d8cd7..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/positions/chuckAfterLook.yml
+++ /dev/null
@@ -1,32 +0,0 @@
-languageId: plaintext
-command:
-  version: 1
-  spokenForm: chuck after look
-  action: remove
-  targets:
-    - type: primitive
-      position: after
-      mark: {type: decoratedSymbol, symbolColor: default, character: l}
-initialState:
-  documentContents: |
-    "hello "
-    " hello"
-    " hello "
-    return a.b
-  selections:
-    - anchor: {line: 4, character: 0}
-      active: {line: 4, character: 0}
-  marks:
-    default.l:
-      start: {line: 0, character: 1}
-      end: {line: 0, character: 6}
-finalState:
-  documentContents: |
-    "hello"
-    " hello"
-    " hello "
-    return a.b
-  selections:
-    - anchor: {line: 4, character: 0}
-      active: {line: 4, character: 0}
-fullTargets: [{type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: l}, selectionType: token, position: after, insideOutsideType: outside, modifier: {type: identity}}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/positions/chuckAfterVest.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/positions/chuckAfterVest.yml
deleted file mode 100644
index cd31a96de9..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/positions/chuckAfterVest.yml
+++ /dev/null
@@ -1,28 +0,0 @@
-languageId: plaintext
-command:
-  version: 1
-  spokenForm: chuck after vest
-  action: remove
-  targets:
-    - type: primitive
-      position: after
-      mark: {type: decoratedSymbol, symbolColor: default, character: v}
-initialState:
-  documentContents: |
-
-    const value = "Hello world";
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-  marks:
-    default.v:
-      start: {line: 1, character: 6}
-      end: {line: 1, character: 11}
-finalState:
-  documentContents: |
-
-    const value= "Hello world";
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-fullTargets: [{type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: v}, selectionType: token, position: after, modifier: {type: identity}, insideOutsideType: outside}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/positions/chuckAfterWhale.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/positions/chuckAfterWhale.yml
deleted file mode 100644
index 11f62f65be..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/positions/chuckAfterWhale.yml
+++ /dev/null
@@ -1,22 +0,0 @@
-languageId: plaintext
-command:
-  spokenForm: chuck after whale
-  version: 2
-  targets:
-    - type: primitive
-      mark: {type: decoratedSymbol, symbolColor: default, character: w}
-      modifiers:
-        - {type: position, position: after}
-  usePrePhraseSnapshot: true
-  action: {name: remove}
-initialState:
-  documentContents: hello world whatever
-  selections:
-    - anchor: {line: 0, character: 20}
-      active: {line: 0, character: 20}
-  marks:
-    default.w:
-      start: {line: 0, character: 6}
-      end: {line: 0, character: 11}
-fullTargets: [{type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: w}, modifiers: [{type: position, position: after}]}]
-thrownError: {name: UnsupportedError}
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/positions/chuckAir.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/positions/chuckAir.yml
deleted file mode 100644
index f088b03804..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/positions/chuckAir.yml
+++ /dev/null
@@ -1,31 +0,0 @@
-languageId: plaintext
-command:
-  version: 1
-  spokenForm: chuck air
-  action: remove
-  targets:
-    - type: primitive
-      mark: {type: decoratedSymbol, symbolColor: default, character: a}
-initialState:
-  documentContents: |
-    "hello "
-    " hello"
-    " hello "
-    return a.b
-  selections:
-    - anchor: {line: 4, character: 0}
-      active: {line: 4, character: 0}
-  marks:
-    default.a:
-      start: {line: 3, character: 7}
-      end: {line: 3, character: 8}
-finalState:
-  documentContents: |
-    "hello "
-    " hello"
-    " hello "
-    return.b
-  selections:
-    - anchor: {line: 4, character: 0}
-      active: {line: 4, character: 0}
-fullTargets: [{type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: a}, selectionType: token, position: contents, insideOutsideType: outside, modifier: {type: identity}}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/positions/chuckBeforeAir.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/positions/chuckBeforeAir.yml
deleted file mode 100644
index fa4303f352..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/positions/chuckBeforeAir.yml
+++ /dev/null
@@ -1,32 +0,0 @@
-languageId: plaintext
-command:
-  version: 1
-  spokenForm: chuck before air
-  action: remove
-  targets:
-    - type: primitive
-      position: before
-      mark: {type: decoratedSymbol, symbolColor: default, character: a}
-initialState:
-  documentContents: |
-    "hello "
-    " hello"
-    " hello "
-    return a.b
-  selections:
-    - anchor: {line: 4, character: 0}
-      active: {line: 4, character: 0}
-  marks:
-    default.a:
-      start: {line: 3, character: 7}
-      end: {line: 3, character: 8}
-finalState:
-  documentContents: |
-    "hello "
-    " hello"
-    " hello "
-    returna.b
-  selections:
-    - anchor: {line: 4, character: 0}
-      active: {line: 4, character: 0}
-fullTargets: [{type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: a}, selectionType: token, position: before, insideOutsideType: outside, modifier: {type: identity}}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/positions/chuckBeforeEach.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/positions/chuckBeforeEach.yml
deleted file mode 100644
index bee0178a4f..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/positions/chuckBeforeEach.yml
+++ /dev/null
@@ -1,32 +0,0 @@
-languageId: plaintext
-command:
-  version: 1
-  spokenForm: chuck before each
-  action: remove
-  targets:
-    - type: primitive
-      position: before
-      mark: {type: decoratedSymbol, symbolColor: default, character: e}
-initialState:
-  documentContents: |
-    "hello "
-    " hello"
-    " hello "
-    return a.b
-  selections:
-    - anchor: {line: 4, character: 0}
-      active: {line: 4, character: 0}
-  marks:
-    default.e:
-      start: {line: 1, character: 2}
-      end: {line: 1, character: 7}
-finalState:
-  documentContents: |
-    "hello "
-    "hello"
-    " hello "
-    return a.b
-  selections:
-    - anchor: {line: 4, character: 0}
-      active: {line: 4, character: 0}
-fullTargets: [{type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: e}, selectionType: token, position: before, insideOutsideType: outside, modifier: {type: identity}}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/positions/chuckBeforeHarp.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/positions/chuckBeforeHarp.yml
deleted file mode 100644
index 7db03e1401..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/positions/chuckBeforeHarp.yml
+++ /dev/null
@@ -1,32 +0,0 @@
-languageId: plaintext
-command:
-  version: 1
-  spokenForm: chuck before harp
-  action: remove
-  targets:
-    - type: primitive
-      position: before
-      mark: {type: decoratedSymbol, symbolColor: default, character: h}
-initialState:
-  documentContents: |
-    "hello "
-    " hello"
-    " hello "
-    return a.b
-  selections:
-    - anchor: {line: 4, character: 0}
-      active: {line: 4, character: 0}
-  marks:
-    default.h:
-      start: {line: 2, character: 2}
-      end: {line: 2, character: 7}
-finalState:
-  documentContents: |
-    "hello "
-    " hello"
-    "hello "
-    return a.b
-  selections:
-    - anchor: {line: 4, character: 0}
-      active: {line: 4, character: 0}
-fullTargets: [{type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: h}, selectionType: token, position: before, insideOutsideType: outside, modifier: {type: identity}}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/positions/chuckBeforeLineAir.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/positions/chuckBeforeLineAir.yml
deleted file mode 100644
index 9b81a4a80e..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/positions/chuckBeforeLineAir.yml
+++ /dev/null
@@ -1,32 +0,0 @@
-languageId: plaintext
-command:
-  version: 1
-  spokenForm: chuck before line air
-  action: remove
-  targets:
-    - type: primitive
-      position: before
-      selectionType: line
-      mark: {type: decoratedSymbol, symbolColor: default, character: a}
-initialState:
-  documentContents: |-
-
-    const value = "Hello world";
-
-        const value = "Hello world";
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-  marks:
-    default.a:
-      start: {line: 3, character: 10}
-      end: {line: 3, character: 15}
-finalState:
-  documentContents: |-
-
-    const value = "Hello world";
-        const value = "Hello world";
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-fullTargets: [{type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: a}, selectionType: line, position: before, modifier: {type: identity}, insideOutsideType: outside}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/positions/chuckBeforeVest.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/positions/chuckBeforeVest.yml
deleted file mode 100644
index 6dbdb35f24..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/positions/chuckBeforeVest.yml
+++ /dev/null
@@ -1,28 +0,0 @@
-languageId: plaintext
-command:
-  version: 1
-  spokenForm: chuck before vest
-  action: remove
-  targets:
-    - type: primitive
-      position: before
-      mark: {type: decoratedSymbol, symbolColor: default, character: v}
-initialState:
-  documentContents: |
-
-    const value = "Hello world";
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-  marks:
-    default.v:
-      start: {line: 1, character: 6}
-      end: {line: 1, character: 11}
-finalState:
-  documentContents: |
-
-    constvalue = "Hello world";
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-fullTargets: [{type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: v}, selectionType: token, position: before, modifier: {type: identity}, insideOutsideType: outside}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/positions/chuckBeforeWhale.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/positions/chuckBeforeWhale.yml
deleted file mode 100644
index f81c285046..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/positions/chuckBeforeWhale.yml
+++ /dev/null
@@ -1,22 +0,0 @@
-languageId: plaintext
-command:
-  spokenForm: chuck before whale
-  version: 2
-  targets:
-    - type: primitive
-      mark: {type: decoratedSymbol, symbolColor: default, character: w}
-      modifiers:
-        - {type: position, position: before}
-  usePrePhraseSnapshot: true
-  action: {name: remove}
-initialState:
-  documentContents: hello world whatever
-  selections:
-    - anchor: {line: 0, character: 20}
-      active: {line: 0, character: 20}
-  marks:
-    default.w:
-      start: {line: 0, character: 6}
-      end: {line: 0, character: 11}
-fullTargets: [{type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: w}, modifiers: [{type: position, position: before}]}]
-thrownError: {name: UnsupportedError}
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/positions/chuckEndOfWhale.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/positions/chuckEndOfWhale.yml
deleted file mode 100644
index 58b7e67cb8..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/positions/chuckEndOfWhale.yml
+++ /dev/null
@@ -1,22 +0,0 @@
-languageId: plaintext
-command:
-  spokenForm: chuck end of whale
-  version: 2
-  targets:
-    - type: primitive
-      mark: {type: decoratedSymbol, symbolColor: default, character: w}
-      modifiers:
-        - {type: position, position: end}
-  usePrePhraseSnapshot: true
-  action: {name: remove}
-initialState:
-  documentContents: hello world whatever
-  selections:
-    - anchor: {line: 0, character: 20}
-      active: {line: 0, character: 20}
-  marks:
-    default.w:
-      start: {line: 0, character: 6}
-      end: {line: 0, character: 11}
-fullTargets: [{type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: w}, modifiers: [{type: position, position: end}]}]
-thrownError: {name: UnsupportedError}
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/positions/chuckLeadingBlockAir.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/positions/chuckLeadingBlockAir.yml
deleted file mode 100644
index e9d066bf4d..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/positions/chuckLeadingBlockAir.yml
+++ /dev/null
@@ -1,35 +0,0 @@
-languageId: plaintext
-command:
-  spokenForm: chuck leading block air
-  version: 2
-  targets:
-    - type: primitive
-      mark: {type: decoratedSymbol, symbolColor: default, character: a}
-      modifiers:
-        - {type: leading}
-        - type: containingScope
-          scopeType: {type: paragraph}
-  usePrePhraseSnapshot: true
-  action: {name: remove}
-initialState:
-  documentContents: |-
-
-    const value = "Hello world";
-
-        const value = "Hello world";
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-  marks:
-    default.a:
-      start: {line: 3, character: 10}
-      end: {line: 3, character: 15}
-finalState:
-  documentContents: |-
-
-    const value = "Hello world";
-        const value = "Hello world";
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-fullTargets: [{type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: a}, modifiers: [{type: position, position: before}, {type: containingScope, scopeType: {type: paragraph}}]}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/positions/chuckPastEndOfLine.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/positions/chuckPastEndOfLine.yml
deleted file mode 100644
index da9602b742..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/positions/chuckPastEndOfLine.yml
+++ /dev/null
@@ -1,26 +0,0 @@
-languageId: plaintext
-command:
-  version: 1
-  spokenForm: chuck past end of line
-  action: remove
-  targets:
-    - type: range
-      start: {type: primitive, isImplicit: true}
-      end: {type: primitive, position: after, insideOutsideType: inside, selectionType: line}
-      excludeStart: false
-      excludeEnd: false
-initialState:
-  documentContents: hello there
-  selections:
-    - anchor: {line: 0, character: 2}
-      active: {line: 0, character: 2}
-  marks: {}
-finalState:
-  documentContents: he
-  selections:
-    - anchor: {line: 0, character: 2}
-      active: {line: 0, character: 2}
-fullTargets: [{type: range, excludeStart: false, excludeEnd: false, start: {type: primitive, mark: {type: cursor}, selectionType: token, position: contents, modifier: {type: identity}, insideOutsideType: outside}, end: {type: primitive, mark: {type: cursor}, selectionType: line, position: after, modifier: {type: identity}, insideOutsideType: inside}}]
-ide:
-  messages:
-    - {type: warning, id: deprecatedPositionInference}
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/positions/chuckPastEndOfLook.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/positions/chuckPastEndOfLook.yml
deleted file mode 100644
index ff8a660ee3..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/positions/chuckPastEndOfLook.yml
+++ /dev/null
@@ -1,30 +0,0 @@
-languageId: plaintext
-command:
-  version: 1
-  spokenForm: chuck past end of look
-  action: remove
-  targets:
-    - type: range
-      start: {type: primitive, isImplicit: true}
-      end:
-        type: primitive
-        position: after
-        insideOutsideType: inside
-        mark: {type: decoratedSymbol, symbolColor: default, character: l}
-      excludeStart: false
-      excludeEnd: false
-initialState:
-  documentContents: hello there
-  selections:
-    - anchor: {line: 0, character: 2}
-      active: {line: 0, character: 2}
-  marks:
-    default.l:
-      start: {line: 0, character: 0}
-      end: {line: 0, character: 5}
-finalState:
-  documentContents: he there
-  selections:
-    - anchor: {line: 0, character: 2}
-      active: {line: 0, character: 2}
-fullTargets: [{type: range, excludeStart: false, excludeEnd: false, start: {type: primitive, mark: {type: cursor}, selectionType: token, position: contents, modifier: {type: identity}, insideOutsideType: outside}, end: {type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: l}, selectionType: token, position: after, modifier: {type: identity}, insideOutsideType: inside}}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/positions/chuckPastStartOfTrap.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/positions/chuckPastStartOfTrap.yml
deleted file mode 100644
index 040cb3c276..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/positions/chuckPastStartOfTrap.yml
+++ /dev/null
@@ -1,30 +0,0 @@
-languageId: plaintext
-command:
-  version: 1
-  spokenForm: chuck past start of trap
-  action: remove
-  targets:
-    - type: range
-      start: {type: primitive, isImplicit: true}
-      end:
-        type: primitive
-        position: before
-        insideOutsideType: inside
-        mark: {type: decoratedSymbol, symbolColor: default, character: t}
-      excludeStart: false
-      excludeEnd: false
-initialState:
-  documentContents: hello there
-  selections:
-    - anchor: {line: 0, character: 8}
-      active: {line: 0, character: 8}
-  marks:
-    default.t:
-      start: {line: 0, character: 6}
-      end: {line: 0, character: 11}
-finalState:
-  documentContents: hello ere
-  selections:
-    - anchor: {line: 0, character: 6}
-      active: {line: 0, character: 6}
-fullTargets: [{type: range, excludeStart: false, excludeEnd: false, start: {type: primitive, mark: {type: cursor}, selectionType: token, position: contents, modifier: {type: identity}, insideOutsideType: outside}, end: {type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: t}, selectionType: token, position: before, modifier: {type: identity}, insideOutsideType: inside}}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/positions/chuckStartOfWhale.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/positions/chuckStartOfWhale.yml
deleted file mode 100644
index 27f9d485ad..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/positions/chuckStartOfWhale.yml
+++ /dev/null
@@ -1,22 +0,0 @@
-languageId: plaintext
-command:
-  spokenForm: chuck start of whale
-  version: 2
-  targets:
-    - type: primitive
-      mark: {type: decoratedSymbol, symbolColor: default, character: w}
-      modifiers:
-        - {type: position, position: start}
-  usePrePhraseSnapshot: true
-  action: {name: remove}
-initialState:
-  documentContents: hello world whatever
-  selections:
-    - anchor: {line: 0, character: 20}
-      active: {line: 0, character: 20}
-  marks:
-    default.w:
-      start: {line: 0, character: 6}
-      end: {line: 0, character: 11}
-fullTargets: [{type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: w}, modifiers: [{type: position, position: start}]}]
-thrownError: {name: UnsupportedError}
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/positions/chuckTrailingBlockVest.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/positions/chuckTrailingBlockVest.yml
deleted file mode 100644
index 51b03f6a08..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/positions/chuckTrailingBlockVest.yml
+++ /dev/null
@@ -1,35 +0,0 @@
-languageId: plaintext
-command:
-  spokenForm: chuck trailing block vest
-  version: 2
-  targets:
-    - type: primitive
-      mark: {type: decoratedSymbol, symbolColor: default, character: v}
-      modifiers:
-        - {type: trailing}
-        - type: containingScope
-          scopeType: {type: paragraph}
-  usePrePhraseSnapshot: true
-  action: {name: remove}
-initialState:
-  documentContents: |-
-
-    const value = "Hello world";
-
-        const value = "Hello world";
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-  marks:
-    default.v:
-      start: {line: 1, character: 6}
-      end: {line: 1, character: 11}
-finalState:
-  documentContents: |-
-
-    const value = "Hello world";
-        const value = "Hello world";
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-fullTargets: [{type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: v}, modifiers: [{type: position, position: after}, {type: containingScope, scopeType: {type: paragraph}}]}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/positions/replaceAfterVestWithHallo.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/positions/replaceAfterVestWithHallo.yml
deleted file mode 100644
index 626584ad57..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/positions/replaceAfterVestWithHallo.yml
+++ /dev/null
@@ -1,30 +0,0 @@
-languageId: plaintext
-command:
-  version: 1
-  spokenForm: replace after vest with hallo
-  action: replace
-  targets:
-    - type: primitive
-      position: after
-      mark: {type: decoratedSymbol, symbolColor: default, character: v}
-  extraArgs:
-    - [hallo]
-initialState:
-  documentContents: |
-
-    const value = "Hello world";
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-  marks:
-    default.v:
-      start: {line: 1, character: 6}
-      end: {line: 1, character: 11}
-finalState:
-  documentContents: |
-
-    const value hallo = "Hello world";
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-fullTargets: [{type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: v}, selectionType: token, position: after, modifier: {type: identity}, insideOutsideType: null}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/positions/replaceBeforeVestWithHello.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/positions/replaceBeforeVestWithHello.yml
deleted file mode 100644
index b2db24c582..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/positions/replaceBeforeVestWithHello.yml
+++ /dev/null
@@ -1,30 +0,0 @@
-languageId: plaintext
-command:
-  version: 1
-  spokenForm: replace before vest with hello
-  action: replace
-  targets:
-    - type: primitive
-      position: before
-      mark: {type: decoratedSymbol, symbolColor: default, character: v}
-  extraArgs:
-    - [hello]
-initialState:
-  documentContents: |
-
-    const value = "Hello world";
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-  marks:
-    default.v:
-      start: {line: 1, character: 6}
-      end: {line: 1, character: 11}
-finalState:
-  documentContents: |
-
-    const hello value = "Hello world";
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-fullTargets: [{type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: v}, selectionType: token, position: before, modifier: {type: identity}, insideOutsideType: null}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/positions/replaceEndOfVestWithHello.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/positions/replaceEndOfVestWithHello.yml
deleted file mode 100644
index 4811e1e4d2..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/positions/replaceEndOfVestWithHello.yml
+++ /dev/null
@@ -1,31 +0,0 @@
-languageId: plaintext
-command:
-  version: 1
-  spokenForm: replace end of vest with hello
-  action: replace
-  targets:
-    - type: primitive
-      position: after
-      insideOutsideType: inside
-      mark: {type: decoratedSymbol, symbolColor: default, character: v}
-  extraArgs:
-    - [hello]
-initialState:
-  documentContents: |
-
-    const value = "Hello world";
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-  marks:
-    default.v:
-      start: {line: 1, character: 6}
-      end: {line: 1, character: 11}
-finalState:
-  documentContents: |
-
-    const valuehello = "Hello world";
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-fullTargets: [{type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: v}, selectionType: token, position: after, modifier: {type: identity}, insideOutsideType: inside}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/positions/replaceStartOfVestWithHello.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/positions/replaceStartOfVestWithHello.yml
deleted file mode 100644
index 3d3818b3af..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/positions/replaceStartOfVestWithHello.yml
+++ /dev/null
@@ -1,31 +0,0 @@
-languageId: plaintext
-command:
-  version: 1
-  spokenForm: replace start of vest with hello
-  action: replace
-  targets:
-    - type: primitive
-      position: before
-      insideOutsideType: inside
-      mark: {type: decoratedSymbol, symbolColor: default, character: v}
-  extraArgs:
-    - [hello]
-initialState:
-  documentContents: |
-
-    const value = "Hello world";
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-  marks:
-    default.v:
-      start: {line: 1, character: 6}
-      end: {line: 1, character: 11}
-finalState:
-  documentContents: |
-
-    const hellovalue = "Hello world";
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-fullTargets: [{type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: v}, selectionType: token, position: before, modifier: {type: identity}, insideOutsideType: inside}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/positions/takeAfterWhale.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/positions/takeAfterWhale.yml
deleted file mode 100644
index c7e221b5c9..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/positions/takeAfterWhale.yml
+++ /dev/null
@@ -1,26 +0,0 @@
-languageId: plaintext
-command:
-  spokenForm: take after whale
-  version: 2
-  targets:
-    - type: primitive
-      mark: {type: decoratedSymbol, symbolColor: default, character: w}
-      modifiers:
-        - {type: position, position: after}
-  usePrePhraseSnapshot: true
-  action: {name: setSelection}
-initialState:
-  documentContents: hello world whatever
-  selections:
-    - anchor: {line: 0, character: 20}
-      active: {line: 0, character: 20}
-  marks:
-    default.w:
-      start: {line: 0, character: 6}
-      end: {line: 0, character: 11}
-finalState:
-  documentContents: hello world whatever
-  selections:
-    - anchor: {line: 0, character: 11}
-      active: {line: 0, character: 11}
-fullTargets: [{type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: w}, modifiers: [{type: position, position: after}]}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/positions/takeBeforeWhale.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/positions/takeBeforeWhale.yml
deleted file mode 100644
index 8566200f47..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/positions/takeBeforeWhale.yml
+++ /dev/null
@@ -1,26 +0,0 @@
-languageId: plaintext
-command:
-  spokenForm: take before whale
-  version: 2
-  targets:
-    - type: primitive
-      mark: {type: decoratedSymbol, symbolColor: default, character: w}
-      modifiers:
-        - {type: position, position: before}
-  usePrePhraseSnapshot: true
-  action: {name: setSelection}
-initialState:
-  documentContents: hello world whatever
-  selections:
-    - anchor: {line: 0, character: 20}
-      active: {line: 0, character: 20}
-  marks:
-    default.w:
-      start: {line: 0, character: 6}
-      end: {line: 0, character: 11}
-finalState:
-  documentContents: hello world whatever
-  selections:
-    - anchor: {line: 0, character: 6}
-      active: {line: 0, character: 6}
-fullTargets: [{type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: w}, modifiers: [{type: position, position: before}]}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/positions/takeEndOfWhale.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/positions/takeEndOfWhale.yml
deleted file mode 100644
index d37957ef8d..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/positions/takeEndOfWhale.yml
+++ /dev/null
@@ -1,26 +0,0 @@
-languageId: plaintext
-command:
-  spokenForm: take end of whale
-  version: 2
-  targets:
-    - type: primitive
-      mark: {type: decoratedSymbol, symbolColor: default, character: w}
-      modifiers:
-        - {type: position, position: end}
-  usePrePhraseSnapshot: true
-  action: {name: setSelection}
-initialState:
-  documentContents: hello world whatever
-  selections:
-    - anchor: {line: 0, character: 20}
-      active: {line: 0, character: 20}
-  marks:
-    default.w:
-      start: {line: 0, character: 6}
-      end: {line: 0, character: 11}
-finalState:
-  documentContents: hello world whatever
-  selections:
-    - anchor: {line: 0, character: 11}
-      active: {line: 0, character: 11}
-fullTargets: [{type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: w}, modifiers: [{type: position, position: end}]}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/positions/takeStartOfWhale.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/positions/takeStartOfWhale.yml
deleted file mode 100644
index 30257e4bf3..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/positions/takeStartOfWhale.yml
+++ /dev/null
@@ -1,26 +0,0 @@
-languageId: plaintext
-command:
-  spokenForm: take start of whale
-  version: 2
-  targets:
-    - type: primitive
-      mark: {type: decoratedSymbol, symbolColor: default, character: w}
-      modifiers:
-        - {type: position, position: start}
-  usePrePhraseSnapshot: true
-  action: {name: setSelection}
-initialState:
-  documentContents: hello world whatever
-  selections:
-    - anchor: {line: 0, character: 20}
-      active: {line: 0, character: 20}
-  marks:
-    default.w:
-      start: {line: 0, character: 6}
-      end: {line: 0, character: 11}
-finalState:
-  documentContents: hello world whatever
-  selections:
-    - anchor: {line: 0, character: 6}
-      active: {line: 0, character: 6}
-fullTargets: [{type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: w}, modifiers: [{type: position, position: start}]}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/relativeScopes/clearFirstTokenRound.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/relativeScopes/clearFirstTokenRound.yml
deleted file mode 100644
index 0ab62c2bf9..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/relativeScopes/clearFirstTokenRound.yml
+++ /dev/null
@@ -1,35 +0,0 @@
-languageId: plaintext
-command:
-  spokenForm: clear first token round
-  version: 3
-  targets:
-    - type: primitive
-      modifiers:
-        - type: ordinalScope
-          scopeType: {type: token}
-          start: 0
-          length: 1
-        - type: containingScope
-          scopeType: {type: surroundingPair, delimiter: parentheses}
-  usePrePhraseSnapshot: true
-  action: {name: clearAndSetSelection}
-initialState:
-  documentContents: |-
-    hello (
-        there
-        now
-    ) testing
-  selections:
-    - anchor: {line: 1, character: 4}
-      active: {line: 1, character: 4}
-  marks: {}
-finalState:
-  documentContents: |-
-    hello 
-        there
-        now
-    ) testing
-  selections:
-    - anchor: {line: 0, character: 6}
-      active: {line: 0, character: 6}
-fullTargets: [{type: primitive, mark: {type: cursor}, modifiers: [{type: ordinalScope, scopeType: {type: token}, start: 0, length: 1}, {type: containingScope, scopeType: {type: surroundingPair, delimiter: parentheses}}]}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/relativeScopes/clearLastTokenRound.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/relativeScopes/clearLastTokenRound.yml
deleted file mode 100644
index be522a938c..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/relativeScopes/clearLastTokenRound.yml
+++ /dev/null
@@ -1,35 +0,0 @@
-languageId: plaintext
-command:
-  spokenForm: clear last token round
-  version: 3
-  targets:
-    - type: primitive
-      modifiers:
-        - type: ordinalScope
-          scopeType: {type: token}
-          start: -1
-          length: 1
-        - type: containingScope
-          scopeType: {type: surroundingPair, delimiter: parentheses}
-  usePrePhraseSnapshot: true
-  action: {name: clearAndSetSelection}
-initialState:
-  documentContents: |-
-    hello (
-        there
-        now
-    ) testing
-  selections:
-    - anchor: {line: 1, character: 4}
-      active: {line: 1, character: 4}
-  marks: {}
-finalState:
-  documentContents: |-
-    hello (
-        there
-        now
-     testing
-  selections:
-    - anchor: {line: 3, character: 0}
-      active: {line: 3, character: 0}
-fullTargets: [{type: primitive, mark: {type: cursor}, modifiers: [{type: ordinalScope, scopeType: {type: token}, start: -1, length: 1}, {type: containingScope, scopeType: {type: surroundingPair, delimiter: parentheses}}]}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/relativeScopes/clearLineBackward.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/relativeScopes/clearLineBackward.yml
deleted file mode 100644
index fef9e17ea4..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/relativeScopes/clearLineBackward.yml
+++ /dev/null
@@ -1,29 +0,0 @@
-languageId: plaintext
-command:
-  spokenForm: clear line backward
-  version: 3
-  targets:
-    - type: primitive
-      modifiers:
-        - type: relativeScope
-          scopeType: {type: line}
-          offset: 0
-          length: 1
-          direction: backward
-  usePrePhraseSnapshot: true
-  action: {name: clearAndSetSelection}
-initialState:
-  documentContents: |-
-    aaa bbb
-    ccc ddd
-  selections:
-    - anchor: {line: 1, character: 0}
-      active: {line: 1, character: 0}
-  marks: {}
-finalState:
-  documentContents: |
-    aaa bbb
-  selections:
-    - anchor: {line: 1, character: 0}
-      active: {line: 1, character: 0}
-fullTargets: [{type: primitive, mark: {type: cursor}, modifiers: [{type: relativeScope, scopeType: {type: line}, offset: 0, length: 1, direction: backward}]}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/relativeScopes/clearNextToken.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/relativeScopes/clearNextToken.yml
deleted file mode 100644
index 792c4433fa..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/relativeScopes/clearNextToken.yml
+++ /dev/null
@@ -1,26 +0,0 @@
-languageId: plaintext
-command:
-  spokenForm: clear next token
-  version: 3
-  targets:
-    - type: primitive
-      modifiers:
-        - type: relativeScope
-          scopeType: {type: token}
-          offset: 1
-          length: 1
-          direction: forward
-  usePrePhraseSnapshot: true
-  action: {name: clearAndSetSelection}
-initialState:
-  documentContents: .foo bar
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 1}
-  marks: {}
-finalState:
-  documentContents: . bar
-  selections:
-    - anchor: {line: 0, character: 1}
-      active: {line: 0, character: 1}
-fullTargets: [{type: primitive, mark: {type: cursor}, modifiers: [{type: relativeScope, scopeType: {type: token}, offset: 1, length: 1, direction: forward}]}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/relativeScopes/clearNextToken2.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/relativeScopes/clearNextToken2.yml
deleted file mode 100644
index 0c85b420b5..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/relativeScopes/clearNextToken2.yml
+++ /dev/null
@@ -1,26 +0,0 @@
-languageId: plaintext
-command:
-  spokenForm: clear next token
-  version: 3
-  targets:
-    - type: primitive
-      modifiers:
-        - type: relativeScope
-          scopeType: {type: token}
-          offset: 1
-          length: 1
-          direction: forward
-  usePrePhraseSnapshot: true
-  action: {name: clearAndSetSelection}
-initialState:
-  documentContents: .foo bar
-  selections:
-    - anchor: {line: 0, character: 1}
-      active: {line: 0, character: 1}
-  marks: {}
-finalState:
-  documentContents: ".foo "
-  selections:
-    - anchor: {line: 0, character: 5}
-      active: {line: 0, character: 5}
-fullTargets: [{type: primitive, mark: {type: cursor}, modifiers: [{type: relativeScope, scopeType: {type: token}, offset: 1, length: 1, direction: forward}]}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/relativeScopes/clearNextToken3.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/relativeScopes/clearNextToken3.yml
deleted file mode 100644
index 6c03889259..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/relativeScopes/clearNextToken3.yml
+++ /dev/null
@@ -1,32 +0,0 @@
-languageId: markdown
-command:
-  spokenForm: clear next token
-  version: 3
-  targets:
-    - type: primitive
-      modifiers:
-        - type: relativeScope
-          scopeType: {type: token}
-          offset: 1
-          length: 1
-          direction: forward
-  usePrePhraseSnapshot: true
-  action: {name: clearAndSetSelection}
-initialState:
-  documentContents: |-
-    aaa
-    bbb
-    ccc
-  selections:
-    - anchor: {line: 0, character: 1}
-      active: {line: 0, character: 1}
-  marks: {}
-finalState:
-  documentContents: |-
-    aaa
-
-    ccc
-  selections:
-    - anchor: {line: 1, character: 0}
-      active: {line: 1, character: 0}
-fullTargets: [{type: primitive, mark: {type: cursor}, modifiers: [{type: relativeScope, scopeType: {type: token}, offset: 1, length: 1, direction: forward}]}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/relativeScopes/clearNextTokenRound.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/relativeScopes/clearNextTokenRound.yml
deleted file mode 100644
index 2d77cf28e3..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/relativeScopes/clearNextTokenRound.yml
+++ /dev/null
@@ -1,36 +0,0 @@
-languageId: plaintext
-command:
-  spokenForm: clear next token round
-  version: 3
-  targets:
-    - type: primitive
-      modifiers:
-        - type: relativeScope
-          scopeType: {type: token}
-          offset: 1
-          length: 1
-          direction: forward
-        - type: containingScope
-          scopeType: {type: surroundingPair, delimiter: parentheses}
-  usePrePhraseSnapshot: true
-  action: {name: clearAndSetSelection}
-initialState:
-  documentContents: |-
-    hello (
-        there
-        now
-    ) testing
-  selections:
-    - anchor: {line: 1, character: 4}
-      active: {line: 1, character: 4}
-  marks: {}
-finalState:
-  documentContents: |-
-    hello (
-        there
-        now
-    ) 
-  selections:
-    - anchor: {line: 3, character: 2}
-      active: {line: 3, character: 2}
-fullTargets: [{type: primitive, mark: {type: cursor}, modifiers: [{type: relativeScope, scopeType: {type: token}, offset: 1, length: 1, direction: forward}, {type: containingScope, scopeType: {type: surroundingPair, delimiter: parentheses}}]}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/relativeScopes/clearNextTwoToken.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/relativeScopes/clearNextTwoToken.yml
deleted file mode 100644
index 6afd2f6105..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/relativeScopes/clearNextTwoToken.yml
+++ /dev/null
@@ -1,26 +0,0 @@
-languageId: plaintext
-command:
-  spokenForm: clear next two token
-  version: 3
-  targets:
-    - type: primitive
-      modifiers:
-        - type: relativeScope
-          scopeType: {type: token}
-          offset: 1
-          length: 2
-          direction: forward
-  usePrePhraseSnapshot: true
-  action: {name: clearAndSetSelection}
-initialState:
-  documentContents: aaa bbb ccc ddd
-  selections:
-    - anchor: {line: 0, character: 6}
-      active: {line: 0, character: 6}
-  marks: {}
-finalState:
-  documentContents: "aaa bbb "
-  selections:
-    - anchor: {line: 0, character: 8}
-      active: {line: 0, character: 8}
-fullTargets: [{type: primitive, mark: {type: cursor}, modifiers: [{type: relativeScope, scopeType: {type: token}, offset: 1, length: 2, direction: forward}]}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/relativeScopes/clearNextTwoToken2.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/relativeScopes/clearNextTwoToken2.yml
deleted file mode 100644
index 2336f15051..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/relativeScopes/clearNextTwoToken2.yml
+++ /dev/null
@@ -1,26 +0,0 @@
-languageId: plaintext
-command:
-  spokenForm: clear next two token
-  version: 3
-  targets:
-    - type: primitive
-      modifiers:
-        - type: relativeScope
-          scopeType: {type: token}
-          offset: 1
-          length: 2
-          direction: forward
-  usePrePhraseSnapshot: true
-  action: {name: clearAndSetSelection}
-initialState:
-  documentContents: aaa  bbb ccc
-  selections:
-    - anchor: {line: 0, character: 4}
-      active: {line: 0, character: 4}
-  marks: {}
-finalState:
-  documentContents: "aaa  "
-  selections:
-    - anchor: {line: 0, character: 5}
-      active: {line: 0, character: 5}
-fullTargets: [{type: primitive, mark: {type: cursor}, modifiers: [{type: relativeScope, scopeType: {type: token}, offset: 1, length: 2, direction: forward}]}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/relativeScopes/clearNextTwoTokens.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/relativeScopes/clearNextTwoTokens.yml
deleted file mode 100644
index b72eefe97c..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/relativeScopes/clearNextTwoTokens.yml
+++ /dev/null
@@ -1,30 +0,0 @@
-languageId: markdown
-command:
-  spokenForm: clear next two tokens
-  version: 3
-  targets:
-    - type: primitive
-      modifiers:
-        - type: relativeScope
-          scopeType: {type: token}
-          offset: 1
-          length: 2
-          direction: forward
-  usePrePhraseSnapshot: true
-  action: {name: clearAndSetSelection}
-initialState:
-  documentContents: |-
-    aaa
-    bbb
-    ccc
-  selections:
-    - anchor: {line: 0, character: 1}
-      active: {line: 0, character: 1}
-  marks: {}
-finalState:
-  documentContents: |
-    aaa
-  selections:
-    - anchor: {line: 1, character: 0}
-      active: {line: 1, character: 0}
-fullTargets: [{type: primitive, mark: {type: cursor}, modifiers: [{type: relativeScope, scopeType: {type: token}, offset: 1, length: 2, direction: forward}]}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/relativeScopes/clearOneLines.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/relativeScopes/clearOneLines.yml
deleted file mode 100644
index aeaa69f761..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/relativeScopes/clearOneLines.yml
+++ /dev/null
@@ -1,30 +0,0 @@
-languageId: plaintext
-command:
-  spokenForm: clear one lines
-  version: 3
-  targets:
-    - type: primitive
-      modifiers:
-        - type: relativeScope
-          scopeType: {type: line}
-          offset: 0
-          length: 1
-          direction: forward
-  usePrePhraseSnapshot: true
-  action: {name: clearAndSetSelection}
-initialState:
-  documentContents: |-
-    aaa bbb
-    ccc ddd
-  selections:
-    - anchor: {line: 0, character: 7}
-      active: {line: 0, character: 7}
-  marks: {}
-finalState:
-  documentContents: |-
-
-    ccc ddd
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-fullTargets: [{type: primitive, mark: {type: cursor}, modifiers: [{type: relativeScope, scopeType: {type: line}, offset: 0, length: 1, direction: forward}]}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/relativeScopes/clearOneToken.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/relativeScopes/clearOneToken.yml
deleted file mode 100644
index fe98c76a63..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/relativeScopes/clearOneToken.yml
+++ /dev/null
@@ -1,22 +0,0 @@
-languageId: plaintext
-command:
-  spokenForm: clear one token
-  version: 3
-  targets:
-    - type: primitive
-      modifiers:
-        - type: relativeScope
-          scopeType: {type: token}
-          offset: 0
-          length: 1
-          direction: forward
-  usePrePhraseSnapshot: true
-  action: {name: clearAndSetSelection}
-initialState:
-  documentContents: aaa bbb ccc ddd eee fff
-  selections:
-    - anchor: {line: 0, character: 9}
-      active: {line: 0, character: 13}
-  marks: {}
-fullTargets: [{type: primitive, mark: {type: cursor}, modifiers: [{type: relativeScope, scopeType: {type: token}, offset: 0, length: 1, direction: forward}]}]
-thrownError: {name: TooFewScopesError}
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/relativeScopes/clearOneTokens.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/relativeScopes/clearOneTokens.yml
deleted file mode 100644
index 972f701e15..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/relativeScopes/clearOneTokens.yml
+++ /dev/null
@@ -1,26 +0,0 @@
-languageId: plaintext
-command:
-  spokenForm: clear one tokens
-  version: 3
-  targets:
-    - type: primitive
-      modifiers:
-        - type: relativeScope
-          scopeType: {type: token}
-          offset: 0
-          length: 1
-          direction: forward
-  usePrePhraseSnapshot: true
-  action: {name: clearAndSetSelection}
-initialState:
-  documentContents: aaa bbb
-  selections:
-    - anchor: {line: 0, character: 3}
-      active: {line: 0, character: 3}
-  marks: {}
-finalState:
-  documentContents: " bbb"
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-fullTargets: [{type: primitive, mark: {type: cursor}, modifiers: [{type: relativeScope, scopeType: {type: token}, offset: 0, length: 1, direction: forward}]}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/relativeScopes/clearPreviousToken.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/relativeScopes/clearPreviousToken.yml
deleted file mode 100644
index 339e4dc55b..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/relativeScopes/clearPreviousToken.yml
+++ /dev/null
@@ -1,32 +0,0 @@
-languageId: markdown
-command:
-  spokenForm: clear previous token
-  version: 3
-  targets:
-    - type: primitive
-      modifiers:
-        - type: relativeScope
-          scopeType: {type: token}
-          offset: 1
-          length: 1
-          direction: backward
-  usePrePhraseSnapshot: true
-  action: {name: clearAndSetSelection}
-initialState:
-  documentContents: |-
-    aaa
-    bbb
-    ccc
-  selections:
-    - anchor: {line: 2, character: 1}
-      active: {line: 2, character: 1}
-  marks: {}
-finalState:
-  documentContents: |-
-    aaa
-
-    ccc
-  selections:
-    - anchor: {line: 1, character: 0}
-      active: {line: 1, character: 0}
-fullTargets: [{type: primitive, mark: {type: cursor}, modifiers: [{type: relativeScope, scopeType: {type: token}, offset: 1, length: 1, direction: backward}]}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/relativeScopes/clearPreviousTokenRound.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/relativeScopes/clearPreviousTokenRound.yml
deleted file mode 100644
index 03d30c3a58..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/relativeScopes/clearPreviousTokenRound.yml
+++ /dev/null
@@ -1,36 +0,0 @@
-languageId: plaintext
-command:
-  spokenForm: clear previous token round
-  version: 3
-  targets:
-    - type: primitive
-      modifiers:
-        - type: relativeScope
-          scopeType: {type: token}
-          offset: 1
-          length: 1
-          direction: backward
-        - type: containingScope
-          scopeType: {type: surroundingPair, delimiter: parentheses}
-  usePrePhraseSnapshot: true
-  action: {name: clearAndSetSelection}
-initialState:
-  documentContents: |-
-    hello (
-        there
-        now
-    ) testing
-  selections:
-    - anchor: {line: 1, character: 4}
-      active: {line: 1, character: 4}
-  marks: {}
-finalState:
-  documentContents: |2-
-     (
-        there
-        now
-    ) testing
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-fullTargets: [{type: primitive, mark: {type: cursor}, modifiers: [{type: relativeScope, scopeType: {type: token}, offset: 1, length: 1, direction: backward}, {type: containingScope, scopeType: {type: surroundingPair, delimiter: parentheses}}]}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/relativeScopes/clearPreviousTwoToken.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/relativeScopes/clearPreviousTwoToken.yml
deleted file mode 100644
index cef13a0b80..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/relativeScopes/clearPreviousTwoToken.yml
+++ /dev/null
@@ -1,26 +0,0 @@
-languageId: plaintext
-command:
-  spokenForm: clear previous two token
-  version: 3
-  targets:
-    - type: primitive
-      modifiers:
-        - type: relativeScope
-          scopeType: {type: token}
-          offset: 1
-          length: 2
-          direction: backward
-  usePrePhraseSnapshot: true
-  action: {name: clearAndSetSelection}
-initialState:
-  documentContents: aaa bbb  ccc
-  selections:
-    - anchor: {line: 0, character: 8}
-      active: {line: 0, character: 8}
-  marks: {}
-finalState:
-  documentContents: "  ccc"
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-fullTargets: [{type: primitive, mark: {type: cursor}, modifiers: [{type: relativeScope, scopeType: {type: token}, offset: 1, length: 2, direction: backward}]}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/relativeScopes/clearPreviousTwoToken2.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/relativeScopes/clearPreviousTwoToken2.yml
deleted file mode 100644
index 17548bc8f3..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/relativeScopes/clearPreviousTwoToken2.yml
+++ /dev/null
@@ -1,26 +0,0 @@
-languageId: plaintext
-command:
-  spokenForm: clear previous two token
-  version: 3
-  targets:
-    - type: primitive
-      modifiers:
-        - type: relativeScope
-          scopeType: {type: token}
-          offset: 1
-          length: 2
-          direction: backward
-  usePrePhraseSnapshot: true
-  action: {name: clearAndSetSelection}
-initialState:
-  documentContents: aaa bbb ccc
-  selections:
-    - anchor: {line: 0, character: 10}
-      active: {line: 0, character: 10}
-  marks: {}
-finalState:
-  documentContents: " ccc"
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-fullTargets: [{type: primitive, mark: {type: cursor}, modifiers: [{type: relativeScope, scopeType: {type: token}, offset: 1, length: 2, direction: backward}]}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/relativeScopes/clearPreviousTwoToken3.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/relativeScopes/clearPreviousTwoToken3.yml
deleted file mode 100644
index 861f78345f..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/relativeScopes/clearPreviousTwoToken3.yml
+++ /dev/null
@@ -1,22 +0,0 @@
-languageId: plaintext
-command:
-  spokenForm: clear previous two token
-  version: 3
-  targets:
-    - type: primitive
-      modifiers:
-        - type: relativeScope
-          scopeType: {type: token}
-          offset: 1
-          length: 2
-          direction: backward
-  usePrePhraseSnapshot: true
-  action: {name: clearAndSetSelection}
-initialState:
-  documentContents: aaa bbb ccc
-  selections:
-    - anchor: {line: 0, character: 6}
-      active: {line: 0, character: 6}
-  marks: {}
-fullTargets: [{type: primitive, mark: {type: cursor}, modifiers: [{type: relativeScope, scopeType: {type: token}, offset: 1, length: 2, direction: backward}]}]
-thrownError: {name: OutOfRangeError}
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/relativeScopes/clearPreviousTwoTokens.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/relativeScopes/clearPreviousTwoTokens.yml
deleted file mode 100644
index 5a36637c64..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/relativeScopes/clearPreviousTwoTokens.yml
+++ /dev/null
@@ -1,31 +0,0 @@
-languageId: markdown
-command:
-  spokenForm: clear previous two tokens
-  version: 3
-  targets:
-    - type: primitive
-      modifiers:
-        - type: relativeScope
-          scopeType: {type: token}
-          offset: 1
-          length: 2
-          direction: backward
-  usePrePhraseSnapshot: true
-  action: {name: clearAndSetSelection}
-initialState:
-  documentContents: |-
-    aaa
-    bbb
-    ccc
-  selections:
-    - anchor: {line: 2, character: 1}
-      active: {line: 2, character: 1}
-  marks: {}
-finalState:
-  documentContents: |-
-
-    ccc
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-fullTargets: [{type: primitive, mark: {type: cursor}, modifiers: [{type: relativeScope, scopeType: {type: token}, offset: 1, length: 2, direction: backward}]}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/relativeScopes/clearSecondNextToken.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/relativeScopes/clearSecondNextToken.yml
deleted file mode 100644
index 103a6bd0d6..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/relativeScopes/clearSecondNextToken.yml
+++ /dev/null
@@ -1,31 +0,0 @@
-languageId: markdown
-command:
-  spokenForm: clear second next token
-  version: 3
-  targets:
-    - type: primitive
-      modifiers:
-        - type: relativeScope
-          scopeType: {type: token}
-          offset: 2
-          length: 1
-          direction: forward
-  usePrePhraseSnapshot: true
-  action: {name: clearAndSetSelection}
-initialState:
-  documentContents: |-
-    aaa
-    bbb
-    ccc
-  selections:
-    - anchor: {line: 0, character: 1}
-      active: {line: 0, character: 1}
-  marks: {}
-finalState:
-  documentContents: |
-    aaa
-    bbb
-  selections:
-    - anchor: {line: 2, character: 0}
-      active: {line: 2, character: 0}
-fullTargets: [{type: primitive, mark: {type: cursor}, modifiers: [{type: relativeScope, scopeType: {type: token}, offset: 2, length: 1, direction: forward}]}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/relativeScopes/clearSecondPreviousToken.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/relativeScopes/clearSecondPreviousToken.yml
deleted file mode 100644
index 26221db80a..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/relativeScopes/clearSecondPreviousToken.yml
+++ /dev/null
@@ -1,32 +0,0 @@
-languageId: markdown
-command:
-  spokenForm: clear second previous token
-  version: 3
-  targets:
-    - type: primitive
-      modifiers:
-        - type: relativeScope
-          scopeType: {type: token}
-          offset: 2
-          length: 1
-          direction: backward
-  usePrePhraseSnapshot: true
-  action: {name: clearAndSetSelection}
-initialState:
-  documentContents: |-
-    aaa
-    bbb
-    ccc
-  selections:
-    - anchor: {line: 2, character: 1}
-      active: {line: 2, character: 1}
-  marks: {}
-finalState:
-  documentContents: |-
-
-    bbb
-    ccc
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-fullTargets: [{type: primitive, mark: {type: cursor}, modifiers: [{type: relativeScope, scopeType: {type: token}, offset: 2, length: 1, direction: backward}]}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/relativeScopes/clearThreeToken.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/relativeScopes/clearThreeToken.yml
deleted file mode 100644
index edc3b82639..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/relativeScopes/clearThreeToken.yml
+++ /dev/null
@@ -1,26 +0,0 @@
-languageId: plaintext
-command:
-  spokenForm: clear three token
-  version: 3
-  targets:
-    - type: primitive
-      modifiers:
-        - type: relativeScope
-          scopeType: {type: token}
-          offset: 0
-          length: 3
-          direction: forward
-  usePrePhraseSnapshot: true
-  action: {name: clearAndSetSelection}
-initialState:
-  documentContents: aaa bbb ccc ddd eee fff
-  selections:
-    - anchor: {line: 0, character: 9}
-      active: {line: 0, character: 13}
-  marks: {}
-finalState:
-  documentContents: aaa bbb  fff
-  selections:
-    - anchor: {line: 0, character: 8}
-      active: {line: 0, character: 8}
-fullTargets: [{type: primitive, mark: {type: cursor}, modifiers: [{type: relativeScope, scopeType: {type: token}, offset: 0, length: 3, direction: forward}]}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/relativeScopes/clearThreeTokenBackward.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/relativeScopes/clearThreeTokenBackward.yml
deleted file mode 100644
index db7cf96129..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/relativeScopes/clearThreeTokenBackward.yml
+++ /dev/null
@@ -1,26 +0,0 @@
-languageId: plaintext
-command:
-  spokenForm: clear three token backward
-  version: 3
-  targets:
-    - type: primitive
-      modifiers:
-        - type: relativeScope
-          scopeType: {type: token}
-          offset: 0
-          length: 3
-          direction: backward
-  usePrePhraseSnapshot: true
-  action: {name: clearAndSetSelection}
-initialState:
-  documentContents: aaa bbb ccc ddd eee fff
-  selections:
-    - anchor: {line: 0, character: 9}
-      active: {line: 0, character: 13}
-  marks: {}
-finalState:
-  documentContents: aaa  eee fff
-  selections:
-    - anchor: {line: 0, character: 4}
-      active: {line: 0, character: 4}
-fullTargets: [{type: primitive, mark: {type: cursor}, modifiers: [{type: relativeScope, scopeType: {type: token}, offset: 0, length: 3, direction: backward}]}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/relativeScopes/clearTokenBackward.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/relativeScopes/clearTokenBackward.yml
deleted file mode 100644
index 2d16e87dc1..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/relativeScopes/clearTokenBackward.yml
+++ /dev/null
@@ -1,26 +0,0 @@
-languageId: plaintext
-command:
-  spokenForm: clear token backward
-  version: 3
-  targets:
-    - type: primitive
-      modifiers:
-        - type: relativeScope
-          scopeType: {type: token}
-          offset: 0
-          length: 1
-          direction: backward
-  usePrePhraseSnapshot: true
-  action: {name: clearAndSetSelection}
-initialState:
-  documentContents: foo.
-  selections:
-    - anchor: {line: 0, character: 3}
-      active: {line: 0, character: 3}
-  marks: {}
-finalState:
-  documentContents: .
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-fullTargets: [{type: primitive, mark: {type: cursor}, modifiers: [{type: relativeScope, scopeType: {type: token}, offset: 0, length: 1, direction: backward}]}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/relativeScopes/clearTokenBackward2.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/relativeScopes/clearTokenBackward2.yml
deleted file mode 100644
index c3a1ff8c24..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/relativeScopes/clearTokenBackward2.yml
+++ /dev/null
@@ -1,26 +0,0 @@
-languageId: plaintext
-command:
-  spokenForm: clear token backward
-  version: 3
-  targets:
-    - type: primitive
-      modifiers:
-        - type: relativeScope
-          scopeType: {type: token}
-          offset: 0
-          length: 1
-          direction: backward
-  usePrePhraseSnapshot: true
-  action: {name: clearAndSetSelection}
-initialState:
-  documentContents: aaa bbb
-  selections:
-    - anchor: {line: 0, character: 4}
-      active: {line: 0, character: 4}
-  marks: {}
-finalState:
-  documentContents: "aaa "
-  selections:
-    - anchor: {line: 0, character: 4}
-      active: {line: 0, character: 4}
-fullTargets: [{type: primitive, mark: {type: cursor}, modifiers: [{type: relativeScope, scopeType: {type: token}, offset: 0, length: 1, direction: backward}]}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/relativeScopes/clearTwoLinesBackward.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/relativeScopes/clearTwoLinesBackward.yml
deleted file mode 100644
index cde24d3a94..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/relativeScopes/clearTwoLinesBackward.yml
+++ /dev/null
@@ -1,28 +0,0 @@
-languageId: plaintext
-command:
-  spokenForm: clear two lines backward
-  version: 3
-  targets:
-    - type: primitive
-      modifiers:
-        - type: relativeScope
-          scopeType: {type: line}
-          offset: 0
-          length: 2
-          direction: backward
-  usePrePhraseSnapshot: true
-  action: {name: clearAndSetSelection}
-initialState:
-  documentContents: |-
-    aaa bbb
-    ccc ddd
-  selections:
-    - anchor: {line: 1, character: 0}
-      active: {line: 1, character: 0}
-  marks: {}
-finalState:
-  documentContents: ""
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-fullTargets: [{type: primitive, mark: {type: cursor}, modifiers: [{type: relativeScope, scopeType: {type: line}, offset: 0, length: 2, direction: backward}]}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/relativeScopes/clearTwoToken.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/relativeScopes/clearTwoToken.yml
deleted file mode 100644
index 7dfa406d92..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/relativeScopes/clearTwoToken.yml
+++ /dev/null
@@ -1,26 +0,0 @@
-languageId: plaintext
-command:
-  spokenForm: clear two token
-  version: 3
-  targets:
-    - type: primitive
-      modifiers:
-        - type: relativeScope
-          scopeType: {type: token}
-          offset: 0
-          length: 2
-          direction: forward
-  usePrePhraseSnapshot: true
-  action: {name: clearAndSetSelection}
-initialState:
-  documentContents: aaa bbb ccc ddd eee fff
-  selections:
-    - anchor: {line: 0, character: 9}
-      active: {line: 0, character: 13}
-  marks: {}
-finalState:
-  documentContents: aaa bbb  eee fff
-  selections:
-    - anchor: {line: 0, character: 8}
-      active: {line: 0, character: 8}
-fullTargets: [{type: primitive, mark: {type: cursor}, modifiers: [{type: relativeScope, scopeType: {type: token}, offset: 0, length: 2, direction: forward}]}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/relativeScopes/clearTwoToken2.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/relativeScopes/clearTwoToken2.yml
deleted file mode 100644
index fa09c28380..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/relativeScopes/clearTwoToken2.yml
+++ /dev/null
@@ -1,26 +0,0 @@
-languageId: plaintext
-command:
-  spokenForm: clear two token
-  version: 3
-  targets:
-    - type: primitive
-      modifiers:
-        - type: relativeScope
-          scopeType: {type: token}
-          offset: 0
-          length: 2
-          direction: forward
-  usePrePhraseSnapshot: true
-  action: {name: clearAndSetSelection}
-initialState:
-  documentContents: aaa bbb ccc
-  selections:
-    - anchor: {line: 0, character: 5}
-      active: {line: 0, character: 5}
-  marks: {}
-finalState:
-  documentContents: "aaa "
-  selections:
-    - anchor: {line: 0, character: 4}
-      active: {line: 0, character: 4}
-fullTargets: [{type: primitive, mark: {type: cursor}, modifiers: [{type: relativeScope, scopeType: {type: token}, offset: 0, length: 2, direction: forward}]}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/relativeScopes/clearTwoToken3.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/relativeScopes/clearTwoToken3.yml
deleted file mode 100644
index a967aa51ab..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/relativeScopes/clearTwoToken3.yml
+++ /dev/null
@@ -1,22 +0,0 @@
-languageId: plaintext
-command:
-  spokenForm: clear two token
-  version: 3
-  targets:
-    - type: primitive
-      modifiers:
-        - type: relativeScope
-          scopeType: {type: token}
-          offset: 0
-          length: 2
-          direction: forward
-  usePrePhraseSnapshot: true
-  action: {name: clearAndSetSelection}
-initialState:
-  documentContents: aaa  bbb ccc
-  selections:
-    - anchor: {line: 0, character: 4}
-      active: {line: 0, character: 4}
-  marks: {}
-fullTargets: [{type: primitive, mark: {type: cursor}, modifiers: [{type: relativeScope, scopeType: {type: token}, offset: 0, length: 2, direction: forward}]}]
-thrownError: {name: NoContainingScopeError}
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/relativeScopes/clearTwoToken4.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/relativeScopes/clearTwoToken4.yml
deleted file mode 100644
index fb9df8934a..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/relativeScopes/clearTwoToken4.yml
+++ /dev/null
@@ -1,22 +0,0 @@
-languageId: plaintext
-command:
-  spokenForm: clear two token
-  version: 3
-  targets:
-    - type: primitive
-      modifiers:
-        - type: relativeScope
-          scopeType: {type: token}
-          offset: 0
-          length: 2
-          direction: forward
-  usePrePhraseSnapshot: true
-  action: {name: clearAndSetSelection}
-initialState:
-  documentContents: aaa bbb ccc
-  selections:
-    - anchor: {line: 0, character: 9}
-      active: {line: 0, character: 9}
-  marks: {}
-fullTargets: [{type: primitive, mark: {type: cursor}, modifiers: [{type: relativeScope, scopeType: {type: token}, offset: 0, length: 2, direction: forward}]}]
-thrownError: {name: OutOfRangeError}
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/relativeScopes/clearTwoTokenBackward.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/relativeScopes/clearTwoTokenBackward.yml
deleted file mode 100644
index 3c14d82247..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/relativeScopes/clearTwoTokenBackward.yml
+++ /dev/null
@@ -1,26 +0,0 @@
-languageId: plaintext
-command:
-  spokenForm: clear two token backward
-  version: 3
-  targets:
-    - type: primitive
-      modifiers:
-        - type: relativeScope
-          scopeType: {type: token}
-          offset: 0
-          length: 2
-          direction: backward
-  usePrePhraseSnapshot: true
-  action: {name: clearAndSetSelection}
-initialState:
-  documentContents: aaa bbb ccc
-  selections:
-    - anchor: {line: 0, character: 5}
-      active: {line: 0, character: 5}
-  marks: {}
-finalState:
-  documentContents: " ccc"
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-fullTargets: [{type: primitive, mark: {type: cursor}, modifiers: [{type: relativeScope, scopeType: {type: token}, offset: 0, length: 2, direction: backward}]}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/relativeScopes/clearTwoTokenBackward2.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/relativeScopes/clearTwoTokenBackward2.yml
deleted file mode 100644
index 29312e843d..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/relativeScopes/clearTwoTokenBackward2.yml
+++ /dev/null
@@ -1,22 +0,0 @@
-languageId: plaintext
-command:
-  spokenForm: clear two token backward
-  version: 3
-  targets:
-    - type: primitive
-      modifiers:
-        - type: relativeScope
-          scopeType: {type: token}
-          offset: 0
-          length: 2
-          direction: backward
-  usePrePhraseSnapshot: true
-  action: {name: clearAndSetSelection}
-initialState:
-  documentContents: aaa bbb  ccc
-  selections:
-    - anchor: {line: 0, character: 8}
-      active: {line: 0, character: 8}
-  marks: {}
-fullTargets: [{type: primitive, mark: {type: cursor}, modifiers: [{type: relativeScope, scopeType: {type: token}, offset: 0, length: 2, direction: backward}]}]
-thrownError: {name: NoContainingScopeError}
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/relativeScopes/clearTwoTokens.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/relativeScopes/clearTwoTokens.yml
deleted file mode 100644
index 8eca8b9f64..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/relativeScopes/clearTwoTokens.yml
+++ /dev/null
@@ -1,26 +0,0 @@
-languageId: plaintext
-command:
-  spokenForm: clear two tokens
-  version: 3
-  targets:
-    - type: primitive
-      modifiers:
-        - type: relativeScope
-          scopeType: {type: token}
-          offset: 0
-          length: 2
-          direction: forward
-  usePrePhraseSnapshot: true
-  action: {name: clearAndSetSelection}
-initialState:
-  documentContents: aaa bbb. ccc
-  selections:
-    - anchor: {line: 0, character: 7}
-      active: {line: 0, character: 7}
-  marks: {}
-finalState:
-  documentContents: aaa bbb
-  selections:
-    - anchor: {line: 0, character: 7}
-      active: {line: 0, character: 7}
-fullTargets: [{type: primitive, mark: {type: cursor}, modifiers: [{type: relativeScope, scopeType: {type: token}, offset: 0, length: 2, direction: forward}]}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/relativeScopes/clearTwoTokens2.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/relativeScopes/clearTwoTokens2.yml
deleted file mode 100644
index 15c6d64767..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/relativeScopes/clearTwoTokens2.yml
+++ /dev/null
@@ -1,26 +0,0 @@
-languageId: plaintext
-command:
-  spokenForm: clear two tokens
-  version: 3
-  targets:
-    - type: primitive
-      modifiers:
-        - type: relativeScope
-          scopeType: {type: token}
-          offset: 0
-          length: 2
-          direction: forward
-  usePrePhraseSnapshot: true
-  action: {name: clearAndSetSelection}
-initialState:
-  documentContents: aaa bbb. ccc
-  selections:
-    - anchor: {line: 0, character: 4}
-      active: {line: 0, character: 7}
-  marks: {}
-finalState:
-  documentContents: aaa  ccc
-  selections:
-    - anchor: {line: 0, character: 4}
-      active: {line: 0, character: 4}
-fullTargets: [{type: primitive, mark: {type: cursor}, modifiers: [{type: relativeScope, scopeType: {type: token}, offset: 0, length: 2, direction: forward}]}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/relativeScopes/clearTwoTokens3.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/relativeScopes/clearTwoTokens3.yml
deleted file mode 100644
index 175fc0a231..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/relativeScopes/clearTwoTokens3.yml
+++ /dev/null
@@ -1,26 +0,0 @@
-languageId: plaintext
-command:
-  spokenForm: clear two tokens
-  version: 3
-  targets:
-    - type: primitive
-      modifiers:
-        - type: relativeScope
-          scopeType: {type: token}
-          offset: 0
-          length: 2
-          direction: forward
-  usePrePhraseSnapshot: false
-  action: {name: clearAndSetSelection}
-initialState:
-  documentContents: aaa bbb. ccc
-  selections:
-    - anchor: {line: 0, character: 7}
-      active: {line: 0, character: 8}
-  marks: {}
-finalState:
-  documentContents: aaa bbb
-  selections:
-    - anchor: {line: 0, character: 7}
-      active: {line: 0, character: 7}
-fullTargets: [{type: primitive, mark: {type: cursor}, modifiers: [{type: relativeScope, scopeType: {type: token}, offset: 0, length: 2, direction: forward}]}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/relativeScopes/clearTwoTokens4.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/relativeScopes/clearTwoTokens4.yml
deleted file mode 100644
index 3a1f16fdc9..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/relativeScopes/clearTwoTokens4.yml
+++ /dev/null
@@ -1,26 +0,0 @@
-languageId: plaintext
-command:
-  spokenForm: clear two tokens
-  version: 3
-  targets:
-    - type: primitive
-      modifiers:
-        - type: relativeScope
-          scopeType: {type: token}
-          offset: 0
-          length: 2
-          direction: forward
-  usePrePhraseSnapshot: false
-  action: {name: clearAndSetSelection}
-initialState:
-  documentContents: aaa .bbb ccc
-  selections:
-    - anchor: {line: 0, character: 5}
-      active: {line: 0, character: 5}
-  marks: {}
-finalState:
-  documentContents: aaa .
-  selections:
-    - anchor: {line: 0, character: 5}
-      active: {line: 0, character: 5}
-fullTargets: [{type: primitive, mark: {type: cursor}, modifiers: [{type: relativeScope, scopeType: {type: token}, offset: 0, length: 2, direction: forward}]}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/relativeScopes/clearTwoTokens5.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/relativeScopes/clearTwoTokens5.yml
deleted file mode 100644
index 9fa95f34cb..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/relativeScopes/clearTwoTokens5.yml
+++ /dev/null
@@ -1,26 +0,0 @@
-languageId: plaintext
-command:
-  spokenForm: clear two tokens
-  version: 3
-  targets:
-    - type: primitive
-      modifiers:
-        - type: relativeScope
-          scopeType: {type: token}
-          offset: 0
-          length: 2
-          direction: forward
-  usePrePhraseSnapshot: false
-  action: {name: clearAndSetSelection}
-initialState:
-  documentContents: aaa .bbb ccc
-  selections:
-    - anchor: {line: 0, character: 4}
-      active: {line: 0, character: 5}
-  marks: {}
-finalState:
-  documentContents: aaa  ccc
-  selections:
-    - anchor: {line: 0, character: 4}
-      active: {line: 0, character: 4}
-fullTargets: [{type: primitive, mark: {type: cursor}, modifiers: [{type: relativeScope, scopeType: {type: token}, offset: 0, length: 2, direction: forward}]}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/relativeScopes/clearTwoTokens6.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/relativeScopes/clearTwoTokens6.yml
deleted file mode 100644
index abab566105..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/relativeScopes/clearTwoTokens6.yml
+++ /dev/null
@@ -1,26 +0,0 @@
-languageId: plaintext
-command:
-  spokenForm: clear two tokens
-  version: 3
-  targets:
-    - type: primitive
-      modifiers:
-        - type: relativeScope
-          scopeType: {type: token}
-          offset: 0
-          length: 2
-          direction: forward
-  usePrePhraseSnapshot: false
-  action: {name: clearAndSetSelection}
-initialState:
-  documentContents: aaa .bbb ccc
-  selections:
-    - anchor: {line: 0, character: 5}
-      active: {line: 0, character: 8}
-  marks: {}
-finalState:
-  documentContents: aaa .
-  selections:
-    - anchor: {line: 0, character: 5}
-      active: {line: 0, character: 5}
-fullTargets: [{type: primitive, mark: {type: cursor}, modifiers: [{type: relativeScope, scopeType: {type: token}, offset: 0, length: 2, direction: forward}]}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/relativeScopes/clearTwoTokens7.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/relativeScopes/clearTwoTokens7.yml
deleted file mode 100644
index ba4bff468d..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/relativeScopes/clearTwoTokens7.yml
+++ /dev/null
@@ -1,31 +0,0 @@
-languageId: markdown
-command:
-  spokenForm: clear two tokens
-  version: 3
-  targets:
-    - type: primitive
-      modifiers:
-        - type: relativeScope
-          scopeType: {type: token}
-          offset: 0
-          length: 2
-          direction: forward
-  usePrePhraseSnapshot: true
-  action: {name: clearAndSetSelection}
-initialState:
-  documentContents: |-
-    aaa
-    bbb
-    ccc
-  selections:
-    - anchor: {line: 0, character: 1}
-      active: {line: 0, character: 1}
-  marks: {}
-finalState:
-  documentContents: |-
-
-    ccc
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-fullTargets: [{type: primitive, mark: {type: cursor}, modifiers: [{type: relativeScope, scopeType: {type: token}, offset: 0, length: 2, direction: forward}]}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/relativeScopes/clearTwoTokens8.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/relativeScopes/clearTwoTokens8.yml
deleted file mode 100644
index 3d0ccd82cb..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/relativeScopes/clearTwoTokens8.yml
+++ /dev/null
@@ -1,26 +0,0 @@
-languageId: plaintext
-command:
-  spokenForm: clear two tokens
-  version: 3
-  targets:
-    - type: primitive
-      modifiers:
-        - type: relativeScope
-          scopeType: {type: token}
-          offset: 0
-          length: 2
-          direction: forward
-  usePrePhraseSnapshot: true
-  action: {name: clearAndSetSelection}
-initialState:
-  documentContents: aaa bbb ccc
-  selections:
-    - anchor: {line: 0, character: 3}
-      active: {line: 0, character: 3}
-  marks: {}
-finalState:
-  documentContents: " ccc"
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-fullTargets: [{type: primitive, mark: {type: cursor}, modifiers: [{type: relativeScope, scopeType: {type: token}, offset: 0, length: 2, direction: forward}]}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/relativeScopes/clearTwoTokensBackward.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/relativeScopes/clearTwoTokensBackward.yml
deleted file mode 100644
index 0eed316fd9..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/relativeScopes/clearTwoTokensBackward.yml
+++ /dev/null
@@ -1,26 +0,0 @@
-languageId: plaintext
-command:
-  spokenForm: clear two tokens backward
-  version: 3
-  targets:
-    - type: primitive
-      modifiers:
-        - type: relativeScope
-          scopeType: {type: token}
-          offset: 0
-          length: 2
-          direction: backward
-  usePrePhraseSnapshot: true
-  action: {name: clearAndSetSelection}
-initialState:
-  documentContents: aaa bbb. ccc
-  selections:
-    - anchor: {line: 0, character: 7}
-      active: {line: 0, character: 7}
-  marks: {}
-finalState:
-  documentContents: . ccc
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-fullTargets: [{type: primitive, mark: {type: cursor}, modifiers: [{type: relativeScope, scopeType: {type: token}, offset: 0, length: 2, direction: backward}]}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/relativeScopes/clearTwoTokensBackward2.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/relativeScopes/clearTwoTokensBackward2.yml
deleted file mode 100644
index 4767aa2345..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/relativeScopes/clearTwoTokensBackward2.yml
+++ /dev/null
@@ -1,26 +0,0 @@
-languageId: plaintext
-command:
-  spokenForm: clear two tokens backward
-  version: 3
-  targets:
-    - type: primitive
-      modifiers:
-        - type: relativeScope
-          scopeType: {type: token}
-          offset: 0
-          length: 2
-          direction: backward
-  usePrePhraseSnapshot: false
-  action: {name: clearAndSetSelection}
-initialState:
-  documentContents: aaa bbb. ccc
-  selections:
-    - anchor: {line: 0, character: 7}
-      active: {line: 0, character: 8}
-  marks: {}
-finalState:
-  documentContents: aaa  ccc
-  selections:
-    - anchor: {line: 0, character: 4}
-      active: {line: 0, character: 4}
-fullTargets: [{type: primitive, mark: {type: cursor}, modifiers: [{type: relativeScope, scopeType: {type: token}, offset: 0, length: 2, direction: backward}]}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/relativeScopes/clearTwoTokensBackward3.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/relativeScopes/clearTwoTokensBackward3.yml
deleted file mode 100644
index e15b103679..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/relativeScopes/clearTwoTokensBackward3.yml
+++ /dev/null
@@ -1,26 +0,0 @@
-languageId: plaintext
-command:
-  spokenForm: clear two tokens backward
-  version: 3
-  targets:
-    - type: primitive
-      modifiers:
-        - type: relativeScope
-          scopeType: {type: token}
-          offset: 0
-          length: 2
-          direction: backward
-  usePrePhraseSnapshot: false
-  action: {name: clearAndSetSelection}
-initialState:
-  documentContents: aaa bbb. ccc
-  selections:
-    - anchor: {line: 0, character: 4}
-      active: {line: 0, character: 7}
-  marks: {}
-finalState:
-  documentContents: . ccc
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-fullTargets: [{type: primitive, mark: {type: cursor}, modifiers: [{type: relativeScope, scopeType: {type: token}, offset: 0, length: 2, direction: backward}]}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/relativeScopes/clearTwoTokensBackward4.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/relativeScopes/clearTwoTokensBackward4.yml
deleted file mode 100644
index a2dde7c21c..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/relativeScopes/clearTwoTokensBackward4.yml
+++ /dev/null
@@ -1,26 +0,0 @@
-languageId: plaintext
-command:
-  spokenForm: clear two tokens backward
-  version: 3
-  targets:
-    - type: primitive
-      modifiers:
-        - type: relativeScope
-          scopeType: {type: token}
-          offset: 0
-          length: 2
-          direction: backward
-  usePrePhraseSnapshot: true
-  action: {name: clearAndSetSelection}
-initialState:
-  documentContents: aaa .bbb ccc
-  selections:
-    - anchor: {line: 0, character: 5}
-      active: {line: 0, character: 5}
-  marks: {}
-finalState:
-  documentContents: bbb ccc
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-fullTargets: [{type: primitive, mark: {type: cursor}, modifiers: [{type: relativeScope, scopeType: {type: token}, offset: 0, length: 2, direction: backward}]}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/relativeScopes/clearTwoTokensBackward5.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/relativeScopes/clearTwoTokensBackward5.yml
deleted file mode 100644
index c958630365..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/relativeScopes/clearTwoTokensBackward5.yml
+++ /dev/null
@@ -1,26 +0,0 @@
-languageId: plaintext
-command:
-  spokenForm: clear two tokens backward
-  version: 3
-  targets:
-    - type: primitive
-      modifiers:
-        - type: relativeScope
-          scopeType: {type: token}
-          offset: 0
-          length: 2
-          direction: backward
-  usePrePhraseSnapshot: false
-  action: {name: clearAndSetSelection}
-initialState:
-  documentContents: aaa .bbb ccc
-  selections:
-    - anchor: {line: 0, character: 5}
-      active: {line: 0, character: 8}
-  marks: {}
-finalState:
-  documentContents: aaa  ccc
-  selections:
-    - anchor: {line: 0, character: 4}
-      active: {line: 0, character: 4}
-fullTargets: [{type: primitive, mark: {type: cursor}, modifiers: [{type: relativeScope, scopeType: {type: token}, offset: 0, length: 2, direction: backward}]}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/relativeScopes/clearTwoTokensBackward6.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/relativeScopes/clearTwoTokensBackward6.yml
deleted file mode 100644
index 222b1c7f31..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/relativeScopes/clearTwoTokensBackward6.yml
+++ /dev/null
@@ -1,26 +0,0 @@
-languageId: plaintext
-command:
-  spokenForm: clear two tokens backward
-  version: 3
-  targets:
-    - type: primitive
-      modifiers:
-        - type: relativeScope
-          scopeType: {type: token}
-          offset: 0
-          length: 2
-          direction: backward
-  usePrePhraseSnapshot: false
-  action: {name: clearAndSetSelection}
-initialState:
-  documentContents: aaa .bbb ccc
-  selections:
-    - anchor: {line: 0, character: 5}
-      active: {line: 0, character: 4}
-  marks: {}
-finalState:
-  documentContents: bbb ccc
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-fullTargets: [{type: primitive, mark: {type: cursor}, modifiers: [{type: relativeScope, scopeType: {type: token}, offset: 0, length: 2, direction: backward}]}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/relativeScopes/clearTwoTokensBackward7.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/relativeScopes/clearTwoTokensBackward7.yml
deleted file mode 100644
index 537b2e2672..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/relativeScopes/clearTwoTokensBackward7.yml
+++ /dev/null
@@ -1,30 +0,0 @@
-languageId: markdown
-command:
-  spokenForm: clear two tokens backward
-  version: 3
-  targets:
-    - type: primitive
-      modifiers:
-        - type: relativeScope
-          scopeType: {type: token}
-          offset: 0
-          length: 2
-          direction: backward
-  usePrePhraseSnapshot: true
-  action: {name: clearAndSetSelection}
-initialState:
-  documentContents: |-
-    aaa
-    bbb
-    ccc
-  selections:
-    - anchor: {line: 2, character: 1}
-      active: {line: 2, character: 1}
-  marks: {}
-finalState:
-  documentContents: |
-    aaa
-  selections:
-    - anchor: {line: 1, character: 0}
-      active: {line: 1, character: 0}
-fullTargets: [{type: primitive, mark: {type: cursor}, modifiers: [{type: relativeScope, scopeType: {type: token}, offset: 0, length: 2, direction: backward}]}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/relativeScopes/clearTwoTokensBackward8.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/relativeScopes/clearTwoTokensBackward8.yml
deleted file mode 100644
index 59666c5be9..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/relativeScopes/clearTwoTokensBackward8.yml
+++ /dev/null
@@ -1,26 +0,0 @@
-languageId: plaintext
-command:
-  spokenForm: clear two tokens backward
-  version: 3
-  targets:
-    - type: primitive
-      modifiers:
-        - type: relativeScope
-          scopeType: {type: token}
-          offset: 0
-          length: 2
-          direction: backward
-  usePrePhraseSnapshot: true
-  action: {name: clearAndSetSelection}
-initialState:
-  documentContents: aaa bbb ccc
-  selections:
-    - anchor: {line: 0, character: 8}
-      active: {line: 0, character: 8}
-  marks: {}
-finalState:
-  documentContents: "aaa "
-  selections:
-    - anchor: {line: 0, character: 4}
-      active: {line: 0, character: 4}
-fullTargets: [{type: primitive, mark: {type: cursor}, modifiers: [{type: relativeScope, scopeType: {type: token}, offset: 0, length: 2, direction: backward}]}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/scopes/character/clearCar.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/scopes/character/clearCar.yml
deleted file mode 100644
index de5aeaa6cf..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/scopes/character/clearCar.yml
+++ /dev/null
@@ -1,25 +0,0 @@
-languageId: plaintext
-command:
-  spokenForm: clear car
-  version: 3
-  targets:
-    - type: primitive
-      modifiers:
-        - type: containingScope
-          scopeType: {type: character}
-  usePrePhraseSnapshot: true
-  action: {name: clearAndSetSelection}
-initialState:
-  documentContents: |2
-     
-  selections:
-    - anchor: {line: 0, character: 1}
-      active: {line: 0, character: 1}
-  marks: {}
-finalState:
-  documentContents: |+
-
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-fullTargets: [{type: primitive, mark: {type: cursor}, modifiers: [{type: containingScope, scopeType: {type: character}}]}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/scopes/character/clearCar2.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/scopes/character/clearCar2.yml
deleted file mode 100644
index 665ab3b673..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/scopes/character/clearCar2.yml
+++ /dev/null
@@ -1,20 +0,0 @@
-languageId: plaintext
-command:
-  spokenForm: clear car
-  version: 3
-  targets:
-    - type: primitive
-      modifiers:
-        - type: containingScope
-          scopeType: {type: character}
-  usePrePhraseSnapshot: false
-  action: {name: clearAndSetSelection}
-initialState:
-  documentContents: |+
-
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-  marks: {}
-fullTargets: [{type: primitive, mark: {type: cursor}, modifiers: [{type: containingScope, scopeType: {type: character}}]}]
-thrownError: {name: NoContainingScopeError}
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/scopes/character/clearCar3.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/scopes/character/clearCar3.yml
deleted file mode 100644
index b122953402..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/scopes/character/clearCar3.yml
+++ /dev/null
@@ -1,23 +0,0 @@
-languageId: plaintext
-command:
-  spokenForm: clear car
-  version: 3
-  targets:
-    - type: primitive
-      modifiers:
-        - type: containingScope
-          scopeType: {type: character}
-  usePrePhraseSnapshot: true
-  action: {name: clearAndSetSelection}
-initialState:
-  documentContents: ". "
-  selections:
-    - anchor: {line: 0, character: 1}
-      active: {line: 0, character: 1}
-  marks: {}
-finalState:
-  documentContents: " "
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-fullTargets: [{type: primitive, mark: {type: cursor}, modifiers: [{type: containingScope, scopeType: {type: character}}]}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/scopes/character/clearCar4.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/scopes/character/clearCar4.yml
deleted file mode 100644
index ff60986404..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/scopes/character/clearCar4.yml
+++ /dev/null
@@ -1,23 +0,0 @@
-languageId: plaintext
-command:
-  spokenForm: clear car
-  version: 3
-  targets:
-    - type: primitive
-      modifiers:
-        - type: containingScope
-          scopeType: {type: character}
-  usePrePhraseSnapshot: false
-  action: {name: clearAndSetSelection}
-initialState:
-  documentContents: "8."
-  selections:
-    - anchor: {line: 0, character: 1}
-      active: {line: 0, character: 1}
-  marks: {}
-finalState:
-  documentContents: .
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-fullTargets: [{type: primitive, mark: {type: cursor}, modifiers: [{type: containingScope, scopeType: {type: character}}]}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/scopes/character/clearNextCar.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/scopes/character/clearNextCar.yml
deleted file mode 100644
index 3ffda036dd..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/scopes/character/clearNextCar.yml
+++ /dev/null
@@ -1,22 +0,0 @@
-languageId: plaintext
-command:
-  spokenForm: clear next car
-  version: 3
-  targets:
-    - type: primitive
-      modifiers:
-        - type: relativeScope
-          scopeType: {type: character}
-          offset: 1
-          length: 1
-          direction: forward
-  usePrePhraseSnapshot: true
-  action: {name: clearAndSetSelection}
-initialState:
-  documentContents: a
-  selections:
-    - anchor: {line: 0, character: 1}
-      active: {line: 0, character: 1}
-  marks: {}
-fullTargets: [{type: primitive, mark: {type: cursor}, modifiers: [{type: relativeScope, scopeType: {type: character}, offset: 1, length: 1, direction: forward}]}]
-thrownError: {name: OutOfRangeError}
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/scopes/character/clearPreviousCar.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/scopes/character/clearPreviousCar.yml
deleted file mode 100644
index b6efeefb89..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/scopes/character/clearPreviousCar.yml
+++ /dev/null
@@ -1,22 +0,0 @@
-languageId: plaintext
-command:
-  spokenForm: clear previous car
-  version: 3
-  targets:
-    - type: primitive
-      modifiers:
-        - type: relativeScope
-          scopeType: {type: character}
-          offset: 1
-          length: 1
-          direction: backward
-  usePrePhraseSnapshot: true
-  action: {name: clearAndSetSelection}
-initialState:
-  documentContents: a
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-  marks: {}
-fullTargets: [{type: primitive, mark: {type: cursor}, modifiers: [{type: relativeScope, scopeType: {type: character}, offset: 1, length: 1, direction: backward}]}]
-thrownError: {name: OutOfRangeError}
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/scopes/character/clearTwentiethNextCar.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/scopes/character/clearTwentiethNextCar.yml
deleted file mode 100644
index bab7c1d21d..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/scopes/character/clearTwentiethNextCar.yml
+++ /dev/null
@@ -1,26 +0,0 @@
-languageId: plaintext
-command:
-  spokenForm: clear twentieth next car
-  version: 3
-  targets:
-    - type: primitive
-      modifiers:
-        - type: relativeScope
-          scopeType: {type: character}
-          offset: 20
-          length: 1
-          direction: forward
-  usePrePhraseSnapshot: true
-  action: {name: clearAndSetSelection}
-initialState:
-  documentContents: abcdefghijklmnopqrstuvwxyz
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-  marks: {}
-finalState:
-  documentContents: abcdefghijklmnopqrstvwxyz
-  selections:
-    - anchor: {line: 0, character: 20}
-      active: {line: 0, character: 20}
-fullTargets: [{type: primitive, mark: {type: cursor}, modifiers: [{type: relativeScope, scopeType: {type: character}, offset: 20, length: 1, direction: forward}]}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/scopes/character/ditchFirstCarLeadingBat.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/scopes/character/ditchFirstCarLeadingBat.yml
deleted file mode 100644
index 876e8a7d08..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/scopes/character/ditchFirstCarLeadingBat.yml
+++ /dev/null
@@ -1,32 +0,0 @@
-languageId: plaintext
-command:
-  spokenForm: ditch first car leading bat
-  version: 3
-  targets:
-    - type: primitive
-      modifiers:
-        - type: ordinalScope
-          scopeType: {type: character}
-          start: 0
-          length: 1
-        - {type: leading}
-      mark: {type: decoratedSymbol, symbolColor: default, character: b}
-  usePrePhraseSnapshot: true
-  action: {name: remove}
-initialState:
-  documentContents: |
-    aaa  bbb
-  selections:
-    - anchor: {line: 1, character: 0}
-      active: {line: 1, character: 0}
-  marks:
-    default.b:
-      start: {line: 0, character: 5}
-      end: {line: 0, character: 8}
-finalState:
-  documentContents: |
-    aaa bbb
-  selections:
-    - anchor: {line: 1, character: 0}
-      active: {line: 1, character: 0}
-fullTargets: [{type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: b}, modifiers: [{type: ordinalScope, scopeType: {type: character}, start: 0, length: 1}, {type: leading}]}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/scopes/character/takeCarForward.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/scopes/character/takeCarForward.yml
deleted file mode 100644
index 920dfdf2cc..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/scopes/character/takeCarForward.yml
+++ /dev/null
@@ -1,28 +0,0 @@
-languageId: plaintext
-command:
-  spokenForm: take car forward
-  version: 3
-  targets:
-    - type: primitive
-      modifiers:
-        - type: relativeScope
-          scopeType: {type: character}
-          offset: 0
-          length: 1
-          direction: forward
-  usePrePhraseSnapshot: true
-  action: {name: setSelection}
-initialState:
-  documentContents: |
-    a
-  selections:
-    - anchor: {line: 0, character: 1}
-      active: {line: 0, character: 1}
-  marks: {}
-finalState:
-  documentContents: |
-    a
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 1}
-fullTargets: [{type: primitive, mark: {type: cursor}, modifiers: [{type: relativeScope, scopeType: {type: character}, offset: 0, length: 1, direction: forward}]}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/scopes/character/takeEveryCarFile.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/scopes/character/takeEveryCarFile.yml
deleted file mode 100644
index 45b63dc361..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/scopes/character/takeEveryCarFile.yml
+++ /dev/null
@@ -1,55 +0,0 @@
-languageId: plaintext
-command:
-  spokenForm: take every car file
-  version: 3
-  targets:
-    - type: primitive
-      modifiers:
-        - type: everyScope
-          scopeType: {type: character}
-        - type: containingScope
-          scopeType: {type: document}
-  usePrePhraseSnapshot: true
-  action: {name: setSelection}
-initialState:
-  documentContents: |
-    aaa bbb
-    ccc ddd
-  selections:
-    - anchor: {line: 2, character: 0}
-      active: {line: 2, character: 0}
-  marks: {}
-finalState:
-  documentContents: |
-    aaa bbb
-    ccc ddd
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 1}
-    - anchor: {line: 0, character: 1}
-      active: {line: 0, character: 2}
-    - anchor: {line: 0, character: 2}
-      active: {line: 0, character: 3}
-    - anchor: {line: 0, character: 3}
-      active: {line: 0, character: 4}
-    - anchor: {line: 0, character: 4}
-      active: {line: 0, character: 5}
-    - anchor: {line: 0, character: 5}
-      active: {line: 0, character: 6}
-    - anchor: {line: 0, character: 6}
-      active: {line: 0, character: 7}
-    - anchor: {line: 1, character: 0}
-      active: {line: 1, character: 1}
-    - anchor: {line: 1, character: 1}
-      active: {line: 1, character: 2}
-    - anchor: {line: 1, character: 2}
-      active: {line: 1, character: 3}
-    - anchor: {line: 1, character: 3}
-      active: {line: 1, character: 4}
-    - anchor: {line: 1, character: 4}
-      active: {line: 1, character: 5}
-    - anchor: {line: 1, character: 5}
-      active: {line: 1, character: 6}
-    - anchor: {line: 1, character: 6}
-      active: {line: 1, character: 7}
-fullTargets: [{type: primitive, mark: {type: cursor}, modifiers: [{type: everyScope, scopeType: {type: character}}, {type: containingScope, scopeType: {type: document}}]}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/scopes/clearEveryIdentifier.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/scopes/clearEveryIdentifier.yml
deleted file mode 100644
index 5aea2ede51..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/scopes/clearEveryIdentifier.yml
+++ /dev/null
@@ -1,25 +0,0 @@
-languageId: plaintext
-command:
-  spokenForm: clear every identifier
-  version: 3
-  targets:
-    - type: primitive
-      modifiers:
-        - type: everyScope
-          scopeType: {type: identifier}
-  usePrePhraseSnapshot: true
-  action: {name: clearAndSetSelection}
-initialState:
-  documentContents: aaa bbb.
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-  marks: {}
-finalState:
-  documentContents: " ."
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-    - anchor: {line: 0, character: 1}
-      active: {line: 0, character: 1}
-fullTargets: [{type: primitive, mark: {type: cursor}, modifiers: [{type: everyScope, scopeType: {type: identifier}}]}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/scopes/clearIdentifier.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/scopes/clearIdentifier.yml
deleted file mode 100644
index bc92deb8a1..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/scopes/clearIdentifier.yml
+++ /dev/null
@@ -1,23 +0,0 @@
-languageId: plaintext
-command:
-  spokenForm: clear identifier
-  version: 3
-  targets:
-    - type: primitive
-      modifiers:
-        - type: containingScope
-          scopeType: {type: identifier}
-  usePrePhraseSnapshot: true
-  action: {name: clearAndSetSelection}
-initialState:
-  documentContents: foo.
-  selections:
-    - anchor: {line: 0, character: 3}
-      active: {line: 0, character: 3}
-  marks: {}
-finalState:
-  documentContents: .
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-fullTargets: [{type: primitive, mark: {type: cursor}, modifiers: [{type: containingScope, scopeType: {type: identifier}}]}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/scopes/clearIdentifier2.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/scopes/clearIdentifier2.yml
deleted file mode 100644
index 2a737e9b8a..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/scopes/clearIdentifier2.yml
+++ /dev/null
@@ -1,19 +0,0 @@
-languageId: plaintext
-command:
-  spokenForm: clear identifier
-  version: 3
-  targets:
-    - type: primitive
-      modifiers:
-        - type: containingScope
-          scopeType: {type: identifier}
-  usePrePhraseSnapshot: true
-  action: {name: clearAndSetSelection}
-initialState:
-  documentContents: .
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-  marks: {}
-fullTargets: [{type: primitive, mark: {type: cursor}, modifiers: [{type: containingScope, scopeType: {type: identifier}}]}]
-thrownError: {name: NoContainingScopeError}
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/scopes/clearLastIdentifier.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/scopes/clearLastIdentifier.yml
deleted file mode 100644
index 7c2087cd49..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/scopes/clearLastIdentifier.yml
+++ /dev/null
@@ -1,25 +0,0 @@
-languageId: plaintext
-command:
-  spokenForm: clear last identifier
-  version: 3
-  targets:
-    - type: primitive
-      modifiers:
-        - type: ordinalScope
-          scopeType: {type: identifier}
-          start: -1
-          length: 1
-  usePrePhraseSnapshot: true
-  action: {name: clearAndSetSelection}
-initialState:
-  documentContents: aaa bbb.
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-  marks: {}
-finalState:
-  documentContents: aaa .
-  selections:
-    - anchor: {line: 0, character: 4}
-      active: {line: 0, character: 4}
-fullTargets: [{type: primitive, mark: {type: cursor}, modifiers: [{type: ordinalScope, scopeType: {type: identifier}, start: -1, length: 1}]}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/scopes/line/clearTwoLines.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/scopes/line/clearTwoLines.yml
deleted file mode 100644
index e91875f26a..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/scopes/line/clearTwoLines.yml
+++ /dev/null
@@ -1,28 +0,0 @@
-languageId: plaintext
-command:
-  spokenForm: clear two lines
-  version: 3
-  targets:
-    - type: primitive
-      modifiers:
-        - type: relativeScope
-          scopeType: {type: line}
-          offset: 0
-          length: 2
-          direction: forward
-  usePrePhraseSnapshot: true
-  action: {name: clearAndSetSelection}
-initialState:
-  documentContents: |-
-    aaa bbb
-    ccc ddd
-  selections:
-    - anchor: {line: 0, character: 7}
-      active: {line: 0, character: 7}
-  marks: {}
-finalState:
-  documentContents: ""
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-fullTargets: [{type: primitive, mark: {type: cursor}, modifiers: [{type: relativeScope, scopeType: {type: line}, offset: 0, length: 2, direction: forward}]}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/scopes/paragraph/chuckBlockAir.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/scopes/paragraph/chuckBlockAir.yml
deleted file mode 100644
index ab35865662..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/scopes/paragraph/chuckBlockAir.yml
+++ /dev/null
@@ -1,31 +0,0 @@
-languageId: typescript
-command:
-  version: 1
-  spokenForm: chuck block air
-  action: remove
-  targets:
-    - type: primitive
-      selectionType: paragraph
-      mark: {type: decoratedSymbol, symbolColor: default, character: a}
-initialState:
-  documentContents: |
-
-    const value = "Hello world";
-
-    const value = "Hello world";
-    const value = "Hello world";
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-  marks:
-    default.a:
-      start: {line: 3, character: 6}
-      end: {line: 3, character: 11}
-finalState:
-  documentContents: |
-
-    const value = "Hello world";
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-fullTargets: [{type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: a}, selectionType: paragraph, position: contents, modifier: {type: identity}, insideOutsideType: outside}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/scopes/paragraph/chuckBlockAir2.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/scopes/paragraph/chuckBlockAir2.yml
deleted file mode 100644
index ef29bdb958..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/scopes/paragraph/chuckBlockAir2.yml
+++ /dev/null
@@ -1,31 +0,0 @@
-languageId: typescript
-command:
-  version: 1
-  spokenForm: chuck block air
-  action: remove
-  targets:
-    - type: primitive
-      selectionType: paragraph
-      mark: {type: decoratedSymbol, symbolColor: default, character: a}
-initialState:
-  documentContents: |-
-
-    const value = "Hello world";
-
-    const value = "Hello world";
-    const value = "Hello world";
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-  marks:
-    default.a:
-      start: {line: 3, character: 6}
-      end: {line: 3, character: 11}
-finalState:
-  documentContents: |-
-
-    const value = "Hello world";
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-fullTargets: [{type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: a}, selectionType: paragraph, position: contents, modifier: {type: identity}, insideOutsideType: outside}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/scopes/paragraph/chuckBlockHarpBetweenFine.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/scopes/paragraph/chuckBlockHarpBetweenFine.yml
deleted file mode 100644
index e99e9ab4e1..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/scopes/paragraph/chuckBlockHarpBetweenFine.yml
+++ /dev/null
@@ -1,45 +0,0 @@
-languageId: plaintext
-command:
-  spokenForm: chuck block harp between fine
-  version: 2
-  action: {name: remove}
-  targets:
-    - type: range
-      excludeAnchor: true
-      excludeActive: true
-      anchor:
-        type: primitive
-        mark: {type: decoratedSymbol, symbolColor: default, character: h}
-        modifiers:
-          - type: containingScope
-            scopeType: {type: paragraph}
-      active:
-        type: primitive
-        mark: {type: decoratedSymbol, symbolColor: default, character: f}
-  usePrePhraseSnapshot: true
-initialState:
-  documentContents: |
-
-    hello world
-
-
-    foo bar
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-  marks:
-    default.h:
-      start: {line: 1, character: 0}
-      end: {line: 1, character: 5}
-    default.f:
-      start: {line: 4, character: 0}
-      end: {line: 4, character: 3}
-finalState:
-  documentContents: |
-
-    hello world
-    foo bar
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-fullTargets: [{type: range, excludeAnchor: true, excludeActive: true, rangeType: continuous, anchor: {type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: h}, modifiers: &ref_0 [{type: containingScope, scopeType: paragraph}]}, active: {type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: f}, modifiers: *ref_0}}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/scopes/paragraph/chuckBlockVest.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/scopes/paragraph/chuckBlockVest.yml
deleted file mode 100644
index fd3fbc827a..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/scopes/paragraph/chuckBlockVest.yml
+++ /dev/null
@@ -1,32 +0,0 @@
-languageId: plaintext
-command:
-  version: 1
-  spokenForm: chuck block vest
-  action: remove
-  targets:
-    - type: primitive
-      selectionType: paragraph
-      mark: {type: decoratedSymbol, symbolColor: default, character: v}
-initialState:
-  documentContents: |
-
-    const value = "Hello world";
-
-    const value = "Hello world";
-    const value = "Hello world";
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-  marks:
-    default.v:
-      start: {line: 1, character: 6}
-      end: {line: 1, character: 11}
-finalState:
-  documentContents: |
-
-    const value = "Hello world";
-    const value = "Hello world";
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-fullTargets: [{type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: v}, selectionType: paragraph, position: contents, modifier: {type: identity}, insideOutsideType: outside}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/scopes/paragraph/clearBlock.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/scopes/paragraph/clearBlock.yml
deleted file mode 100644
index b2edd56737..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/scopes/paragraph/clearBlock.yml
+++ /dev/null
@@ -1,27 +0,0 @@
-languageId: plaintext
-command:
-  spokenForm: clear block
-  version: 3
-  targets:
-    - type: primitive
-      modifiers:
-        - type: containingScope
-          scopeType: {type: paragraph}
-  usePrePhraseSnapshot: true
-  action: {name: clearAndSetSelection}
-initialState:
-  documentContents: |
-
-    aaa
-  selections:
-    - anchor: {line: 1, character: 0}
-      active: {line: 1, character: 0}
-  marks: {}
-finalState:
-  documentContents: |+
-
-
-  selections:
-    - anchor: {line: 1, character: 0}
-      active: {line: 1, character: 0}
-fullTargets: [{type: primitive, mark: {type: cursor}, modifiers: [{type: containingScope, scopeType: {type: paragraph}}]}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/scopes/paragraph/clearBlock2.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/scopes/paragraph/clearBlock2.yml
deleted file mode 100644
index 6234770dc1..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/scopes/paragraph/clearBlock2.yml
+++ /dev/null
@@ -1,27 +0,0 @@
-languageId: plaintext
-command:
-  spokenForm: clear block
-  version: 3
-  targets:
-    - type: primitive
-      modifiers:
-        - type: containingScope
-          scopeType: {type: paragraph}
-  usePrePhraseSnapshot: true
-  action: {name: clearAndSetSelection}
-initialState:
-  documentContents: |
-
-    aaa
-  selections:
-    - anchor: {line: 1, character: 2}
-      active: {line: 1, character: 2}
-  marks: {}
-finalState:
-  documentContents: |+
-
-
-  selections:
-    - anchor: {line: 1, character: 0}
-      active: {line: 1, character: 0}
-fullTargets: [{type: primitive, mark: {type: cursor}, modifiers: [{type: containingScope, scopeType: {type: paragraph}}]}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/scopes/paragraph/clearBlock3.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/scopes/paragraph/clearBlock3.yml
deleted file mode 100644
index bd7d0c39ec..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/scopes/paragraph/clearBlock3.yml
+++ /dev/null
@@ -1,27 +0,0 @@
-languageId: plaintext
-command:
-  spokenForm: clear block
-  version: 3
-  targets:
-    - type: primitive
-      modifiers:
-        - type: containingScope
-          scopeType: {type: paragraph}
-  usePrePhraseSnapshot: true
-  action: {name: clearAndSetSelection}
-initialState:
-  documentContents: |
-
-    aaa
-  selections:
-    - anchor: {line: 1, character: 3}
-      active: {line: 1, character: 3}
-  marks: {}
-finalState:
-  documentContents: |+
-
-
-  selections:
-    - anchor: {line: 1, character: 0}
-      active: {line: 1, character: 0}
-fullTargets: [{type: primitive, mark: {type: cursor}, modifiers: [{type: containingScope, scopeType: {type: paragraph}}]}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/scopes/paragraph/clearNextBlock.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/scopes/paragraph/clearNextBlock.yml
deleted file mode 100644
index 6dcb0100e8..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/scopes/paragraph/clearNextBlock.yml
+++ /dev/null
@@ -1,34 +0,0 @@
-languageId: plaintext
-command:
-  spokenForm: clear next block
-  version: 3
-  targets:
-    - type: primitive
-      modifiers:
-        - type: relativeScope
-          scopeType: {type: paragraph}
-          offset: 1
-          length: 1
-          direction: forward
-  usePrePhraseSnapshot: true
-  action: {name: clearAndSetSelection}
-initialState:
-  documentContents: |
-
-    aaa
-
-    bbb
-  selections:
-    - anchor: {line: 1, character: 0}
-      active: {line: 1, character: 0}
-  marks: {}
-finalState:
-  documentContents: |+
-
-    aaa
-
-
-  selections:
-    - anchor: {line: 3, character: 0}
-      active: {line: 3, character: 0}
-fullTargets: [{type: primitive, mark: {type: cursor}, modifiers: [{type: relativeScope, scopeType: {type: paragraph}, offset: 1, length: 1, direction: forward}]}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/scopes/paragraph/clearNextBlock2.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/scopes/paragraph/clearNextBlock2.yml
deleted file mode 100644
index a3550b77d9..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/scopes/paragraph/clearNextBlock2.yml
+++ /dev/null
@@ -1,34 +0,0 @@
-languageId: plaintext
-command:
-  spokenForm: clear next block
-  version: 3
-  targets:
-    - type: primitive
-      modifiers:
-        - type: relativeScope
-          scopeType: {type: paragraph}
-          offset: 1
-          length: 1
-          direction: forward
-  usePrePhraseSnapshot: true
-  action: {name: clearAndSetSelection}
-initialState:
-  documentContents: |
-
-    aaa
-
-    bbb
-  selections:
-    - anchor: {line: 1, character: 1}
-      active: {line: 1, character: 1}
-  marks: {}
-finalState:
-  documentContents: |+
-
-    aaa
-
-
-  selections:
-    - anchor: {line: 3, character: 0}
-      active: {line: 3, character: 0}
-fullTargets: [{type: primitive, mark: {type: cursor}, modifiers: [{type: relativeScope, scopeType: {type: paragraph}, offset: 1, length: 1, direction: forward}]}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/scopes/paragraph/clearNextBlock3.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/scopes/paragraph/clearNextBlock3.yml
deleted file mode 100644
index 075570640b..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/scopes/paragraph/clearNextBlock3.yml
+++ /dev/null
@@ -1,34 +0,0 @@
-languageId: plaintext
-command:
-  spokenForm: clear next block
-  version: 3
-  targets:
-    - type: primitive
-      modifiers:
-        - type: relativeScope
-          scopeType: {type: paragraph}
-          offset: 1
-          length: 1
-          direction: forward
-  usePrePhraseSnapshot: true
-  action: {name: clearAndSetSelection}
-initialState:
-  documentContents: |
-
-    aaa
-
-    bbb
-  selections:
-    - anchor: {line: 1, character: 3}
-      active: {line: 1, character: 3}
-  marks: {}
-finalState:
-  documentContents: |+
-
-    aaa
-
-
-  selections:
-    - anchor: {line: 3, character: 0}
-      active: {line: 3, character: 0}
-fullTargets: [{type: primitive, mark: {type: cursor}, modifiers: [{type: relativeScope, scopeType: {type: paragraph}, offset: 1, length: 1, direction: forward}]}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/scopes/paragraph/clearPreviousBlock.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/scopes/paragraph/clearPreviousBlock.yml
deleted file mode 100644
index b6241ddc62..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/scopes/paragraph/clearPreviousBlock.yml
+++ /dev/null
@@ -1,34 +0,0 @@
-languageId: plaintext
-command:
-  spokenForm: clear previous block
-  version: 3
-  targets:
-    - type: primitive
-      modifiers:
-        - type: relativeScope
-          scopeType: {type: paragraph}
-          offset: 1
-          length: 1
-          direction: backward
-  usePrePhraseSnapshot: true
-  action: {name: clearAndSetSelection}
-initialState:
-  documentContents: |
-
-    aaa
-
-    bbb
-  selections:
-    - anchor: {line: 3, character: 0}
-      active: {line: 3, character: 0}
-  marks: {}
-finalState:
-  documentContents: |
-
-
-
-    bbb
-  selections:
-    - anchor: {line: 1, character: 0}
-      active: {line: 1, character: 0}
-fullTargets: [{type: primitive, mark: {type: cursor}, modifiers: [{type: relativeScope, scopeType: {type: paragraph}, offset: 1, length: 1, direction: backward}]}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/scopes/paragraph/clearPreviousBlock2.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/scopes/paragraph/clearPreviousBlock2.yml
deleted file mode 100644
index d424d365b3..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/scopes/paragraph/clearPreviousBlock2.yml
+++ /dev/null
@@ -1,34 +0,0 @@
-languageId: plaintext
-command:
-  spokenForm: clear previous block
-  version: 3
-  targets:
-    - type: primitive
-      modifiers:
-        - type: relativeScope
-          scopeType: {type: paragraph}
-          offset: 1
-          length: 1
-          direction: backward
-  usePrePhraseSnapshot: true
-  action: {name: clearAndSetSelection}
-initialState:
-  documentContents: |
-
-    aaa
-
-    bbb
-  selections:
-    - anchor: {line: 3, character: 1}
-      active: {line: 3, character: 1}
-  marks: {}
-finalState:
-  documentContents: |
-
-
-
-    bbb
-  selections:
-    - anchor: {line: 1, character: 0}
-      active: {line: 1, character: 0}
-fullTargets: [{type: primitive, mark: {type: cursor}, modifiers: [{type: relativeScope, scopeType: {type: paragraph}, offset: 1, length: 1, direction: backward}]}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/scopes/paragraph/clearPreviousBlock3.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/scopes/paragraph/clearPreviousBlock3.yml
deleted file mode 100644
index 81ad273df0..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/scopes/paragraph/clearPreviousBlock3.yml
+++ /dev/null
@@ -1,34 +0,0 @@
-languageId: plaintext
-command:
-  spokenForm: clear previous block
-  version: 3
-  targets:
-    - type: primitive
-      modifiers:
-        - type: relativeScope
-          scopeType: {type: paragraph}
-          offset: 1
-          length: 1
-          direction: backward
-  usePrePhraseSnapshot: true
-  action: {name: clearAndSetSelection}
-initialState:
-  documentContents: |
-
-    aaa
-
-    bbb
-  selections:
-    - anchor: {line: 3, character: 3}
-      active: {line: 3, character: 3}
-  marks: {}
-finalState:
-  documentContents: |
-
-
-
-    bbb
-  selections:
-    - anchor: {line: 1, character: 0}
-      active: {line: 1, character: 0}
-fullTargets: [{type: primitive, mark: {type: cursor}, modifiers: [{type: relativeScope, scopeType: {type: paragraph}, offset: 1, length: 1, direction: backward}]}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/scopes/paragraph/clearTwoBlocks.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/scopes/paragraph/clearTwoBlocks.yml
deleted file mode 100644
index 29ee94fcd8..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/scopes/paragraph/clearTwoBlocks.yml
+++ /dev/null
@@ -1,32 +0,0 @@
-languageId: plaintext
-command:
-  spokenForm: clear two blocks
-  version: 3
-  targets:
-    - type: primitive
-      modifiers:
-        - type: relativeScope
-          scopeType: {type: paragraph}
-          offset: 0
-          length: 2
-          direction: forward
-  usePrePhraseSnapshot: true
-  action: {name: clearAndSetSelection}
-initialState:
-  documentContents: |
-
-    aaa
-
-    bbb
-  selections:
-    - anchor: {line: 1, character: 0}
-      active: {line: 1, character: 0}
-  marks: {}
-finalState:
-  documentContents: |+
-
-
-  selections:
-    - anchor: {line: 1, character: 0}
-      active: {line: 1, character: 0}
-fullTargets: [{type: primitive, mark: {type: cursor}, modifiers: [{type: relativeScope, scopeType: {type: paragraph}, offset: 0, length: 2, direction: forward}]}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/scopes/paragraph/clearTwoBlocks2.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/scopes/paragraph/clearTwoBlocks2.yml
deleted file mode 100644
index c72687631f..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/scopes/paragraph/clearTwoBlocks2.yml
+++ /dev/null
@@ -1,32 +0,0 @@
-languageId: plaintext
-command:
-  spokenForm: clear two blocks
-  version: 3
-  targets:
-    - type: primitive
-      modifiers:
-        - type: relativeScope
-          scopeType: {type: paragraph}
-          offset: 0
-          length: 2
-          direction: forward
-  usePrePhraseSnapshot: true
-  action: {name: clearAndSetSelection}
-initialState:
-  documentContents: |
-
-    aaa
-
-    bbb
-  selections:
-    - anchor: {line: 1, character: 1}
-      active: {line: 1, character: 1}
-  marks: {}
-finalState:
-  documentContents: |+
-
-
-  selections:
-    - anchor: {line: 1, character: 0}
-      active: {line: 1, character: 0}
-fullTargets: [{type: primitive, mark: {type: cursor}, modifiers: [{type: relativeScope, scopeType: {type: paragraph}, offset: 0, length: 2, direction: forward}]}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/scopes/paragraph/clearTwoBlocks3.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/scopes/paragraph/clearTwoBlocks3.yml
deleted file mode 100644
index 1a6c52eb2f..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/scopes/paragraph/clearTwoBlocks3.yml
+++ /dev/null
@@ -1,32 +0,0 @@
-languageId: plaintext
-command:
-  spokenForm: clear two blocks
-  version: 3
-  targets:
-    - type: primitive
-      modifiers:
-        - type: relativeScope
-          scopeType: {type: paragraph}
-          offset: 0
-          length: 2
-          direction: forward
-  usePrePhraseSnapshot: true
-  action: {name: clearAndSetSelection}
-initialState:
-  documentContents: |
-
-    aaa
-
-    bbb
-  selections:
-    - anchor: {line: 1, character: 3}
-      active: {line: 1, character: 3}
-  marks: {}
-finalState:
-  documentContents: |+
-
-
-  selections:
-    - anchor: {line: 1, character: 0}
-      active: {line: 1, character: 0}
-fullTargets: [{type: primitive, mark: {type: cursor}, modifiers: [{type: relativeScope, scopeType: {type: paragraph}, offset: 0, length: 2, direction: forward}]}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/scopes/paragraph/clearTwoBlocksBackward.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/scopes/paragraph/clearTwoBlocksBackward.yml
deleted file mode 100644
index a1ae61e97d..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/scopes/paragraph/clearTwoBlocksBackward.yml
+++ /dev/null
@@ -1,32 +0,0 @@
-languageId: plaintext
-command:
-  spokenForm: clear two blocks backward
-  version: 3
-  targets:
-    - type: primitive
-      modifiers:
-        - type: relativeScope
-          scopeType: {type: paragraph}
-          offset: 0
-          length: 2
-          direction: backward
-  usePrePhraseSnapshot: true
-  action: {name: clearAndSetSelection}
-initialState:
-  documentContents: |
-
-    aaa
-
-    bbb
-  selections:
-    - anchor: {line: 3, character: 0}
-      active: {line: 3, character: 0}
-  marks: {}
-finalState:
-  documentContents: |+
-
-
-  selections:
-    - anchor: {line: 1, character: 0}
-      active: {line: 1, character: 0}
-fullTargets: [{type: primitive, mark: {type: cursor}, modifiers: [{type: relativeScope, scopeType: {type: paragraph}, offset: 0, length: 2, direction: backward}]}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/scopes/paragraph/clearTwoBlocksBackward2.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/scopes/paragraph/clearTwoBlocksBackward2.yml
deleted file mode 100644
index 5da4c661ae..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/scopes/paragraph/clearTwoBlocksBackward2.yml
+++ /dev/null
@@ -1,32 +0,0 @@
-languageId: plaintext
-command:
-  spokenForm: clear two blocks backward
-  version: 3
-  targets:
-    - type: primitive
-      modifiers:
-        - type: relativeScope
-          scopeType: {type: paragraph}
-          offset: 0
-          length: 2
-          direction: backward
-  usePrePhraseSnapshot: true
-  action: {name: clearAndSetSelection}
-initialState:
-  documentContents: |
-
-    aaa
-
-    bbb
-  selections:
-    - anchor: {line: 3, character: 1}
-      active: {line: 3, character: 1}
-  marks: {}
-finalState:
-  documentContents: |+
-
-
-  selections:
-    - anchor: {line: 1, character: 0}
-      active: {line: 1, character: 0}
-fullTargets: [{type: primitive, mark: {type: cursor}, modifiers: [{type: relativeScope, scopeType: {type: paragraph}, offset: 0, length: 2, direction: backward}]}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/scopes/paragraph/clearTwoBlocksBackward3.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/scopes/paragraph/clearTwoBlocksBackward3.yml
deleted file mode 100644
index d054b6639b..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/scopes/paragraph/clearTwoBlocksBackward3.yml
+++ /dev/null
@@ -1,32 +0,0 @@
-languageId: plaintext
-command:
-  spokenForm: clear two blocks backward
-  version: 3
-  targets:
-    - type: primitive
-      modifiers:
-        - type: relativeScope
-          scopeType: {type: paragraph}
-          offset: 0
-          length: 2
-          direction: backward
-  usePrePhraseSnapshot: true
-  action: {name: clearAndSetSelection}
-initialState:
-  documentContents: |
-
-    aaa
-
-    bbb
-  selections:
-    - anchor: {line: 3, character: 3}
-      active: {line: 3, character: 3}
-  marks: {}
-finalState:
-  documentContents: |+
-
-
-  selections:
-    - anchor: {line: 1, character: 0}
-      active: {line: 1, character: 0}
-fullTargets: [{type: primitive, mark: {type: cursor}, modifiers: [{type: relativeScope, scopeType: {type: paragraph}, offset: 0, length: 2, direction: backward}]}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/scopes/paragraph/drinkBlock.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/scopes/paragraph/drinkBlock.yml
deleted file mode 100644
index 93bf5f733e..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/scopes/paragraph/drinkBlock.yml
+++ /dev/null
@@ -1,29 +0,0 @@
-languageId: plaintext
-command:
-  spokenForm: drink block
-  version: 2
-  targets:
-    - type: primitive
-      modifiers:
-        - type: containingScope
-          scopeType: {type: paragraph}
-  usePrePhraseSnapshot: true
-  action: {name: editNewLineBefore}
-initialState:
-  documentContents: |2
-        hello there
-        hello there
-  selections:
-    - anchor: {line: 1, character: 4}
-      active: {line: 1, character: 9}
-  marks: {}
-finalState:
-  documentContents: |2
-        
-
-        hello there
-        hello there
-  selections:
-    - anchor: {line: 0, character: 4}
-      active: {line: 0, character: 4}
-fullTargets: [{type: primitive, mark: {type: cursor}, modifiers: [{type: containingScope, scopeType: {type: paragraph}}]}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/scopes/paragraph/pourBlock.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/scopes/paragraph/pourBlock.yml
deleted file mode 100644
index 6cf06f5cc5..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/scopes/paragraph/pourBlock.yml
+++ /dev/null
@@ -1,29 +0,0 @@
-languageId: plaintext
-command:
-  spokenForm: pour block
-  version: 2
-  targets:
-    - type: primitive
-      modifiers:
-        - type: containingScope
-          scopeType: {type: paragraph}
-  usePrePhraseSnapshot: true
-  action: {name: editNewLineAfter}
-initialState:
-  documentContents: |2
-        hello there
-        hello there
-  selections:
-    - anchor: {line: 1, character: 4}
-      active: {line: 1, character: 9}
-  marks: {}
-finalState:
-  documentContents: |2
-        hello there
-        hello there
-
-        
-  selections:
-    - anchor: {line: 3, character: 4}
-      active: {line: 3, character: 4}
-fullTargets: [{type: primitive, mark: {type: cursor}, modifiers: [{type: containingScope, scopeType: {type: paragraph}}]}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/scopes/paragraph/takeBlockAir.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/scopes/paragraph/takeBlockAir.yml
deleted file mode 100644
index 1a29313974..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/scopes/paragraph/takeBlockAir.yml
+++ /dev/null
@@ -1,34 +0,0 @@
-languageId: typescript
-command:
-  version: 1
-  spokenForm: take block air
-  action: setSelection
-  targets:
-    - type: primitive
-      selectionType: paragraph
-      mark: {type: decoratedSymbol, symbolColor: default, character: a}
-initialState:
-  documentContents: |
-
-    const value = "Hello world";
-
-    const value = "Hello world";
-    const value = "Hello world";
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-  marks:
-    default.a:
-      start: {line: 3, character: 6}
-      end: {line: 3, character: 11}
-finalState:
-  documentContents: |
-
-    const value = "Hello world";
-
-    const value = "Hello world";
-    const value = "Hello world";
-  selections:
-    - anchor: {line: 3, character: 0}
-      active: {line: 4, character: 28}
-fullTargets: [{type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: a}, selectionType: paragraph, position: contents, modifier: {type: identity}, insideOutsideType: inside}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/scopes/paragraph/takeEveryBlock.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/scopes/paragraph/takeEveryBlock.yml
deleted file mode 100644
index b7f4b8d0cf..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/scopes/paragraph/takeEveryBlock.yml
+++ /dev/null
@@ -1,37 +0,0 @@
-languageId: plaintext
-command:
-  spokenForm: take every block
-  version: 2
-  action: {name: setSelection}
-  targets:
-    - type: primitive
-      modifiers:
-        - type: everyScope
-          scopeType: {type: paragraph}
-  usePrePhraseSnapshot: true
-initialState:
-  documentContents: |
-
-    a
-
-    b   c
-    d   e
-    f   g
-  selections:
-    - anchor: {line: 6, character: 0}
-      active: {line: 6, character: 0}
-  marks: {}
-finalState:
-  documentContents: |
-
-    a
-
-    b   c
-    d   e
-    f   g
-  selections:
-    - anchor: {line: 1, character: 0}
-      active: {line: 1, character: 1}
-    - anchor: {line: 3, character: 0}
-      active: {line: 5, character: 5}
-fullTargets: [{type: primitive, mark: {type: cursor}, modifiers: [{type: everyScope, scopeType: paragraph}]}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/scopes/paragraph/takeEveryBlock2.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/scopes/paragraph/takeEveryBlock2.yml
deleted file mode 100644
index 9981642871..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/scopes/paragraph/takeEveryBlock2.yml
+++ /dev/null
@@ -1,37 +0,0 @@
-languageId: plaintext
-command:
-  spokenForm: take every block
-  version: 2
-  action: {name: setSelection}
-  targets:
-    - type: primitive
-      modifiers:
-        - type: everyScope
-          scopeType: {type: paragraph}
-  usePrePhraseSnapshot: true
-initialState:
-  documentContents: |
-
-    a
-
-    b   c
-    d   e
-    f   g
-  selections:
-    - anchor: {line: 4, character: 5}
-      active: {line: 1, character: 0}
-  marks: {}
-finalState:
-  documentContents: |
-
-    a
-
-    b   c
-    d   e
-    f   g
-  selections:
-    - anchor: {line: 1, character: 1}
-      active: {line: 1, character: 0}
-    - anchor: {line: 5, character: 5}
-      active: {line: 3, character: 0}
-fullTargets: [{type: primitive, mark: {type: cursor}, modifiers: [{type: everyScope, scopeType: paragraph}]}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/scopes/paragraph/takeEveryBlock3.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/scopes/paragraph/takeEveryBlock3.yml
deleted file mode 100644
index 6eb3a96096..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/scopes/paragraph/takeEveryBlock3.yml
+++ /dev/null
@@ -1,37 +0,0 @@
-languageId: plaintext
-command:
-  spokenForm: take every block
-  version: 2
-  action: {name: setSelection}
-  targets:
-    - type: primitive
-      modifiers:
-        - type: everyScope
-          scopeType: {type: paragraph}
-  usePrePhraseSnapshot: true
-initialState:
-  documentContents: |
-
-    a
-
-    b   c
-    d   e
-    f   g
-  selections:
-    - anchor: {line: 1, character: 0}
-      active: {line: 4, character: 5}
-  marks: {}
-finalState:
-  documentContents: |
-
-    a
-
-    b   c
-    d   e
-    f   g
-  selections:
-    - anchor: {line: 1, character: 0}
-      active: {line: 1, character: 1}
-    - anchor: {line: 3, character: 0}
-      active: {line: 5, character: 5}
-fullTargets: [{type: primitive, mark: {type: cursor}, modifiers: [{type: everyScope, scopeType: paragraph}]}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/scopes/token/clearTokenBackward.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/scopes/token/clearTokenBackward.yml
deleted file mode 100644
index 7b4acb9c75..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/scopes/token/clearTokenBackward.yml
+++ /dev/null
@@ -1,26 +0,0 @@
-languageId: plaintext
-command:
-  spokenForm: clear token backward
-  version: 3
-  targets:
-    - type: primitive
-      modifiers:
-        - type: relativeScope
-          scopeType: {type: token}
-          offset: 0
-          length: 1
-          direction: backward
-  usePrePhraseSnapshot: true
-  action: {name: clearAndSetSelection}
-initialState:
-  documentContents: aaa.
-  selections:
-    - anchor: {line: 0, character: 3}
-      active: {line: 0, character: 3}
-  marks: {}
-finalState:
-  documentContents: .
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-fullTargets: [{type: primitive, mark: {type: cursor}, modifiers: [{type: relativeScope, scopeType: {type: token}, offset: 0, length: 1, direction: backward}]}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/scopes/token/clearTokenBackward2.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/scopes/token/clearTokenBackward2.yml
deleted file mode 100644
index d287feda30..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/scopes/token/clearTokenBackward2.yml
+++ /dev/null
@@ -1,26 +0,0 @@
-languageId: plaintext
-command:
-  spokenForm: clear token backward
-  version: 3
-  targets:
-    - type: primitive
-      modifiers:
-        - type: relativeScope
-          scopeType: {type: token}
-          offset: 0
-          length: 1
-          direction: backward
-  usePrePhraseSnapshot: true
-  action: {name: clearAndSetSelection}
-initialState:
-  documentContents: .aaa
-  selections:
-    - anchor: {line: 0, character: 1}
-      active: {line: 0, character: 1}
-  marks: {}
-finalState:
-  documentContents: aaa
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-fullTargets: [{type: primitive, mark: {type: cursor}, modifiers: [{type: relativeScope, scopeType: {type: token}, offset: 0, length: 1, direction: backward}]}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/scopes/token/clearTokenForward.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/scopes/token/clearTokenForward.yml
deleted file mode 100644
index 3cb5ded658..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/scopes/token/clearTokenForward.yml
+++ /dev/null
@@ -1,26 +0,0 @@
-languageId: plaintext
-command:
-  spokenForm: clear token forward
-  version: 3
-  targets:
-    - type: primitive
-      modifiers:
-        - type: relativeScope
-          scopeType: {type: token}
-          offset: 0
-          length: 1
-          direction: forward
-  usePrePhraseSnapshot: true
-  action: {name: clearAndSetSelection}
-initialState:
-  documentContents: aaa.
-  selections:
-    - anchor: {line: 0, character: 3}
-      active: {line: 0, character: 3}
-  marks: {}
-finalState:
-  documentContents: aaa
-  selections:
-    - anchor: {line: 0, character: 3}
-      active: {line: 0, character: 3}
-fullTargets: [{type: primitive, mark: {type: cursor}, modifiers: [{type: relativeScope, scopeType: {type: token}, offset: 0, length: 1, direction: forward}]}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/scopes/token/clearTokenForward2.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/scopes/token/clearTokenForward2.yml
deleted file mode 100644
index d0b60b8032..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/scopes/token/clearTokenForward2.yml
+++ /dev/null
@@ -1,26 +0,0 @@
-languageId: plaintext
-command:
-  spokenForm: clear token forward
-  version: 3
-  targets:
-    - type: primitive
-      modifiers:
-        - type: relativeScope
-          scopeType: {type: token}
-          offset: 0
-          length: 1
-          direction: forward
-  usePrePhraseSnapshot: true
-  action: {name: clearAndSetSelection}
-initialState:
-  documentContents: .aaa
-  selections:
-    - anchor: {line: 0, character: 1}
-      active: {line: 0, character: 1}
-  marks: {}
-finalState:
-  documentContents: .
-  selections:
-    - anchor: {line: 0, character: 1}
-      active: {line: 0, character: 1}
-fullTargets: [{type: primitive, mark: {type: cursor}, modifiers: [{type: relativeScope, scopeType: {type: token}, offset: 0, length: 1, direction: forward}]}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/scopes/token/ditchFine.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/scopes/token/ditchFine.yml
deleted file mode 100644
index 5622366abf..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/scopes/token/ditchFine.yml
+++ /dev/null
@@ -1,26 +0,0 @@
-languageId: plaintext
-command:
-  spokenForm: ditch fine
-  version: 3
-  targets:
-    - type: primitive
-      mark: {type: decoratedSymbol, symbolColor: default, character: f}
-  usePrePhraseSnapshot: true
-  action: {name: remove}
-initialState:
-  documentContents: |2
-        foo   
-  selections:
-    - anchor: {line: 1, character: 0}
-      active: {line: 1, character: 0}
-  marks:
-    default.f:
-      start: {line: 0, character: 4}
-      end: {line: 0, character: 7}
-finalState:
-  documentContents: |+
-
-  selections:
-    - anchor: {line: 1, character: 0}
-      active: {line: 1, character: 0}
-fullTargets: [{type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: f}, modifiers: []}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/scopes/token/ditchFinePastBat.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/scopes/token/ditchFinePastBat.yml
deleted file mode 100644
index 63b64a38fe..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/scopes/token/ditchFinePastBat.yml
+++ /dev/null
@@ -1,37 +0,0 @@
-languageId: plaintext
-command:
-  spokenForm: ditch fine past bat
-  version: 3
-  targets:
-    - type: range
-      anchor:
-        type: primitive
-        mark: {type: decoratedSymbol, symbolColor: default, character: f}
-      active:
-        type: primitive
-        mark: {type: decoratedSymbol, symbolColor: default, character: b}
-      excludeAnchor: false
-      excludeActive: false
-  usePrePhraseSnapshot: true
-  action: {name: remove}
-initialState:
-  documentContents: |2
-        foo
-        bar.
-  selections:
-    - anchor: {line: 2, character: 0}
-      active: {line: 2, character: 0}
-  marks:
-    default.f:
-      start: {line: 0, character: 4}
-      end: {line: 0, character: 7}
-    default.b:
-      start: {line: 1, character: 4}
-      end: {line: 1, character: 7}
-finalState:
-  documentContents: |2
-        .
-  selections:
-    - anchor: {line: 1, character: 0}
-      active: {line: 1, character: 0}
-fullTargets: [{type: range, excludeAnchor: false, excludeActive: false, rangeType: continuous, anchor: {type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: f}, modifiers: []}, active: {type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: b}, modifiers: []}}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/scopes/token/ditchFinePastPoint.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/scopes/token/ditchFinePastPoint.yml
deleted file mode 100644
index e630d58ae6..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/scopes/token/ditchFinePastPoint.yml
+++ /dev/null
@@ -1,37 +0,0 @@
-languageId: plaintext
-command:
-  spokenForm: ditch fine past point
-  version: 3
-  targets:
-    - type: range
-      anchor:
-        type: primitive
-        mark: {type: decoratedSymbol, symbolColor: default, character: f}
-      active:
-        type: primitive
-        mark: {type: decoratedSymbol, symbolColor: default, character: .}
-      excludeAnchor: false
-      excludeActive: false
-  usePrePhraseSnapshot: true
-  action: {name: remove}
-initialState:
-  documentContents: |2
-       foo
-       bar.
-  selections:
-    - anchor: {line: 2, character: 0}
-      active: {line: 2, character: 0}
-  marks:
-    default.f:
-      start: {line: 0, character: 3}
-      end: {line: 0, character: 6}
-    default..:
-      start: {line: 1, character: 6}
-      end: {line: 1, character: 7}
-finalState:
-  documentContents: |+
-
-  selections:
-    - anchor: {line: 1, character: 0}
-      active: {line: 1, character: 0}
-fullTargets: [{type: range, excludeAnchor: false, excludeActive: false, rangeType: continuous, anchor: {type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: f}, modifiers: []}, active: {type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: .}, modifiers: []}}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/scopes/token/ditchFinePastPoint2.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/scopes/token/ditchFinePastPoint2.yml
deleted file mode 100644
index 58aa3ff49a..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/scopes/token/ditchFinePastPoint2.yml
+++ /dev/null
@@ -1,37 +0,0 @@
-languageId: plaintext
-command:
-  spokenForm: ditch fine past point
-  version: 3
-  targets:
-    - type: range
-      anchor:
-        type: primitive
-        mark: {type: decoratedSymbol, symbolColor: default, character: f}
-      active:
-        type: primitive
-        mark: {type: decoratedSymbol, symbolColor: default, character: .}
-      excludeAnchor: false
-      excludeActive: false
-  usePrePhraseSnapshot: true
-  action: {name: remove}
-initialState:
-  documentContents: |2
-       foo
-       bar.   
-  selections:
-    - anchor: {line: 2, character: 0}
-      active: {line: 2, character: 0}
-  marks:
-    default.f:
-      start: {line: 0, character: 3}
-      end: {line: 0, character: 6}
-    default..:
-      start: {line: 1, character: 6}
-      end: {line: 1, character: 7}
-finalState:
-  documentContents: |+
-
-  selections:
-    - anchor: {line: 1, character: 0}
-      active: {line: 1, character: 0}
-fullTargets: [{type: range, excludeAnchor: false, excludeActive: false, rangeType: continuous, anchor: {type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: f}, modifiers: []}, active: {type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: .}, modifiers: []}}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/scopes/token/takeToken.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/scopes/token/takeToken.yml
deleted file mode 100644
index 0d051e9363..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/scopes/token/takeToken.yml
+++ /dev/null
@@ -1,19 +0,0 @@
-languageId: plaintext
-command:
-  spokenForm: take token
-  version: 3
-  targets:
-    - type: primitive
-      modifiers:
-        - type: containingScope
-          scopeType: {type: token}
-  usePrePhraseSnapshot: true
-  action: {name: setSelection}
-initialState:
-  documentContents: a b
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 2}
-  marks: {}
-fullTargets: [{type: primitive, mark: {type: cursor}, modifiers: [{type: containingScope, scopeType: {type: token}}]}]
-thrownError: {name: NoContainingScopeError}
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/scopes/token/takeToken2.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/scopes/token/takeToken2.yml
deleted file mode 100644
index 8668d4e604..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/scopes/token/takeToken2.yml
+++ /dev/null
@@ -1,19 +0,0 @@
-languageId: plaintext
-command:
-  spokenForm: take token
-  version: 3
-  targets:
-    - type: primitive
-      modifiers:
-        - type: containingScope
-          scopeType: {type: token}
-  usePrePhraseSnapshot: true
-  action: {name: setSelection}
-initialState:
-  documentContents: a b
-  selections:
-    - anchor: {line: 0, character: 3}
-      active: {line: 0, character: 1}
-  marks: {}
-fullTargets: [{type: primitive, mark: {type: cursor}, modifiers: [{type: containingScope, scopeType: {type: token}}]}]
-thrownError: {name: NoContainingScopeError}
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/selectionTypes/bringHarpToAfterFile.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/selectionTypes/bringHarpToAfterFile.yml
deleted file mode 100644
index 869cd7c915..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/selectionTypes/bringHarpToAfterFile.yml
+++ /dev/null
@@ -1,32 +0,0 @@
-languageId: plaintext
-command:
-  spokenForm: bring harp to after file
-  version: 2
-  action: {name: replaceWithTarget}
-  targets:
-    - type: primitive
-      mark: {type: decoratedSymbol, symbolColor: default, character: h}
-      modifiers: []
-    - type: primitive
-      modifiers:
-        - {type: position, position: after}
-        - type: containingScope
-          scopeType: {type: document}
-  usePrePhraseSnapshot: true
-initialState:
-  documentContents: hello world
-  selections:
-    - anchor: {line: 0, character: 11}
-      active: {line: 0, character: 11}
-  marks:
-    default.h:
-      start: {line: 0, character: 0}
-      end: {line: 0, character: 5}
-finalState:
-  documentContents: |-
-    hello world
-    hello
-  selections:
-    - anchor: {line: 0, character: 11}
-      active: {line: 0, character: 11}
-fullTargets: [{type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: h}, modifiers: []}, {type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: h}, modifiers: [{type: position, position: after}, {type: containingScope, scopeType: document}]}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/selectionTypes/bringWhaleToBeforeFile.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/selectionTypes/bringWhaleToBeforeFile.yml
deleted file mode 100644
index aee654b871..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/selectionTypes/bringWhaleToBeforeFile.yml
+++ /dev/null
@@ -1,32 +0,0 @@
-languageId: plaintext
-command:
-  spokenForm: bring whale to before file
-  version: 2
-  action: {name: replaceWithTarget}
-  targets:
-    - type: primitive
-      mark: {type: decoratedSymbol, symbolColor: default, character: w}
-      modifiers: []
-    - type: primitive
-      modifiers:
-        - {type: position, position: before}
-        - type: containingScope
-          scopeType: {type: document}
-  usePrePhraseSnapshot: true
-initialState:
-  documentContents: hello world
-  selections:
-    - anchor: {line: 0, character: 11}
-      active: {line: 0, character: 11}
-  marks:
-    default.w:
-      start: {line: 0, character: 6}
-      end: {line: 0, character: 11}
-finalState:
-  documentContents: |-
-    world
-    hello world
-  selections:
-    - anchor: {line: 1, character: 11}
-      active: {line: 1, character: 11}
-fullTargets: [{type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: w}, modifiers: []}, {type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: w}, modifiers: [{type: position, position: before}, {type: containingScope, scopeType: document}]}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/selectionTypes/changeEveryPaint.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/selectionTypes/changeEveryPaint.yml
deleted file mode 100644
index d857ac03eb..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/selectionTypes/changeEveryPaint.yml
+++ /dev/null
@@ -1,25 +0,0 @@
-languageId: plaintext
-command:
-  spokenForm: change every paint
-  version: 2
-  targets:
-    - type: primitive
-      modifiers:
-        - type: everyScope
-          scopeType: {type: nonWhitespaceSequence}
-  usePrePhraseSnapshot: true
-  action: {name: clearAndSetSelection}
-initialState:
-  documentContents: aa|aa-().c_d bb|bb-().''
-  selections:
-    - anchor: {line: 0, character: 1}
-      active: {line: 0, character: 1}
-  marks: {}
-finalState:
-  documentContents: " "
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-    - anchor: {line: 0, character: 1}
-      active: {line: 0, character: 1}
-fullTargets: [{type: primitive, mark: {type: cursor}, modifiers: [{type: everyScope, scopeType: {type: nonWhitespaceSequence}}]}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/selectionTypes/changeEveryPaint2.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/selectionTypes/changeEveryPaint2.yml
deleted file mode 100644
index 29a8fe9ca3..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/selectionTypes/changeEveryPaint2.yml
+++ /dev/null
@@ -1,25 +0,0 @@
-languageId: plaintext
-command:
-  spokenForm: change every paint
-  version: 2
-  targets:
-    - type: primitive
-      modifiers:
-        - type: everyScope
-          scopeType: {type: nonWhitespaceSequence}
-  usePrePhraseSnapshot: true
-  action: {name: clearAndSetSelection}
-initialState:
-  documentContents: foo(aa|aa-().c_d bb|bb-().'')
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-  marks: {}
-finalState:
-  documentContents: " "
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-    - anchor: {line: 0, character: 1}
-      active: {line: 0, character: 1}
-fullTargets: [{type: primitive, mark: {type: cursor}, modifiers: [{type: everyScope, scopeType: {type: nonWhitespaceSequence}}]}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/selectionTypes/changeEveryPaint3.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/selectionTypes/changeEveryPaint3.yml
deleted file mode 100644
index a17ad83542..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/selectionTypes/changeEveryPaint3.yml
+++ /dev/null
@@ -1,25 +0,0 @@
-languageId: plaintext
-command:
-  spokenForm: change every paint
-  version: 2
-  targets:
-    - type: primitive
-      modifiers:
-        - type: everyScope
-          scopeType: {type: nonWhitespaceSequence}
-  usePrePhraseSnapshot: true
-  action: {name: clearAndSetSelection}
-initialState:
-  documentContents: foo(aa|aa-().c_d bb|bb-().'')
-  selections:
-    - anchor: {line: 0, character: 4}
-      active: {line: 0, character: 28}
-  marks: {}
-finalState:
-  documentContents: " "
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-    - anchor: {line: 0, character: 1}
-      active: {line: 0, character: 1}
-fullTargets: [{type: primitive, mark: {type: cursor}, modifiers: [{type: everyScope, scopeType: {type: nonWhitespaceSequence}}]}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/selectionTypes/changeEveryPaintInsideParen2.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/selectionTypes/changeEveryPaintInsideParen2.yml
deleted file mode 100644
index 7cc643f7f7..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/selectionTypes/changeEveryPaintInsideParen2.yml
+++ /dev/null
@@ -1,30 +0,0 @@
-languageId: plaintext
-command:
-  spokenForm: change every paint inside paren
-  version: 2
-  targets:
-    - type: primitive
-      mark: {type: decoratedSymbol, symbolColor: default, character: (}
-      modifiers:
-        - type: everyScope
-          scopeType: {type: nonWhitespaceSequence}
-        - {type: interiorOnly}
-  usePrePhraseSnapshot: true
-  action: {name: clearAndSetSelection}
-initialState:
-  documentContents: foo(aa|aa-().c_d bb|bb-().'') { return 1; }
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-  marks:
-    default.(:
-      start: {line: 0, character: 3}
-      end: {line: 0, character: 4}
-finalState:
-  documentContents: "  { return 1; }"
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-    - anchor: {line: 0, character: 1}
-      active: {line: 0, character: 1}
-fullTargets: [{type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: (}, modifiers: [{type: everyScope, scopeType: {type: nonWhitespaceSequence}}, {type: interiorOnly}]}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/selectionTypes/changeEveryPaintPairParen2.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/selectionTypes/changeEveryPaintPairParen2.yml
deleted file mode 100644
index 775eb92722..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/selectionTypes/changeEveryPaintPairParen2.yml
+++ /dev/null
@@ -1,31 +0,0 @@
-languageId: plaintext
-command:
-  spokenForm: change every paint pair paren
-  version: 2
-  targets:
-    - type: primitive
-      mark: {type: decoratedSymbol, symbolColor: default, character: (}
-      modifiers:
-        - type: everyScope
-          scopeType: {type: nonWhitespaceSequence}
-        - type: containingScope
-          scopeType: {type: surroundingPair, delimiter: any}
-  usePrePhraseSnapshot: true
-  action: {name: clearAndSetSelection}
-initialState:
-  documentContents: foo(aa|aa-().c_d bb|bb-().'') { return 1; }
-  selections:
-    - anchor: {line: 0, character: 1}
-      active: {line: 0, character: 1}
-  marks:
-    default.(:
-      start: {line: 0, character: 3}
-      end: {line: 0, character: 4}
-finalState:
-  documentContents: "  { return 1; }"
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-    - anchor: {line: 0, character: 1}
-      active: {line: 0, character: 1}
-fullTargets: [{type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: (}, modifiers: [{type: everyScope, scopeType: {type: nonWhitespaceSequence}}, {type: containingScope, scopeType: {type: surroundingPair, delimiter: any}}]}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/selectionTypes/changeEveryShortPaint.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/selectionTypes/changeEveryShortPaint.yml
deleted file mode 100644
index 9ef5c194bc..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/selectionTypes/changeEveryShortPaint.yml
+++ /dev/null
@@ -1,27 +0,0 @@
-languageId: python
-command:
-  spokenForm: change every short paint
-  version: 2
-  targets:
-    - type: primitive
-      modifiers:
-        - type: everyScope
-          scopeType: {type: boundedNonWhitespaceSequence}
-  usePrePhraseSnapshot: true
-  action: {name: clearAndSetSelection}
-initialState:
-  documentContents: several different words
-  selections:
-    - anchor: {line: 0, character: 5}
-      active: {line: 0, character: 5}
-  marks: {}
-finalState:
-  documentContents: "  "
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-    - anchor: {line: 0, character: 1}
-      active: {line: 0, character: 1}
-    - anchor: {line: 0, character: 2}
-      active: {line: 0, character: 2}
-fullTargets: [{type: primitive, mark: {type: cursor}, modifiers: [{type: everyScope, scopeType: {type: boundedNonWhitespaceSequence}}]}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/selectionTypes/changeEveryShortPaint2.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/selectionTypes/changeEveryShortPaint2.yml
deleted file mode 100644
index 62789fc60f..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/selectionTypes/changeEveryShortPaint2.yml
+++ /dev/null
@@ -1,27 +0,0 @@
-languageId: plaintext
-command:
-  spokenForm: change every short paint
-  version: 2
-  targets:
-    - type: primitive
-      modifiers:
-        - type: everyScope
-          scopeType: {type: boundedNonWhitespaceSequence}
-  usePrePhraseSnapshot: true
-  action: {name: clearAndSetSelection}
-initialState:
-  documentContents: some.text.here some-other-text word()[]
-  selections:
-    - anchor: {line: 0, character: 20}
-      active: {line: 0, character: 20}
-  marks: {}
-finalState:
-  documentContents: "  "
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-    - anchor: {line: 0, character: 1}
-      active: {line: 0, character: 1}
-    - anchor: {line: 0, character: 2}
-      active: {line: 0, character: 2}
-fullTargets: [{type: primitive, mark: {type: cursor}, modifiers: [{type: everyScope, scopeType: {type: boundedNonWhitespaceSequence}}]}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/selectionTypes/changeEveryShortPaint3.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/selectionTypes/changeEveryShortPaint3.yml
deleted file mode 100644
index d1799f02f3..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/selectionTypes/changeEveryShortPaint3.yml
+++ /dev/null
@@ -1,25 +0,0 @@
-languageId: plaintext
-command:
-  spokenForm: change every short paint
-  version: 2
-  targets:
-    - type: primitive
-      modifiers:
-        - type: everyScope
-          scopeType: {type: boundedNonWhitespaceSequence}
-  usePrePhraseSnapshot: true
-  action: {name: clearAndSetSelection}
-initialState:
-  documentContents: "\"aa|aa-().c_d\" (bb|bb-().'')"
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-  marks: {}
-finalState:
-  documentContents: " "
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-    - anchor: {line: 0, character: 1}
-      active: {line: 0, character: 1}
-fullTargets: [{type: primitive, mark: {type: cursor}, modifiers: [{type: everyScope, scopeType: {type: boundedNonWhitespaceSequence}}]}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/selectionTypes/changeEveryShortPaint4.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/selectionTypes/changeEveryShortPaint4.yml
deleted file mode 100644
index a95d220f14..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/selectionTypes/changeEveryShortPaint4.yml
+++ /dev/null
@@ -1,25 +0,0 @@
-languageId: plaintext
-command:
-  spokenForm: change every short paint
-  version: 2
-  targets:
-    - type: primitive
-      modifiers:
-        - type: everyScope
-          scopeType: {type: boundedNonWhitespaceSequence}
-  usePrePhraseSnapshot: true
-  action: {name: clearAndSetSelection}
-initialState:
-  documentContents: foo(aa|aa-().c_d bb|bb-().'')
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-  marks: {}
-finalState:
-  documentContents: " "
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-    - anchor: {line: 0, character: 1}
-      active: {line: 0, character: 1}
-fullTargets: [{type: primitive, mark: {type: cursor}, modifiers: [{type: everyScope, scopeType: {type: boundedNonWhitespaceSequence}}]}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/selectionTypes/changeEveryShortPaintInsideParen.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/selectionTypes/changeEveryShortPaintInsideParen.yml
deleted file mode 100644
index be788a87dc..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/selectionTypes/changeEveryShortPaintInsideParen.yml
+++ /dev/null
@@ -1,30 +0,0 @@
-languageId: plaintext
-command:
-  spokenForm: change every short paint inside paren
-  version: 2
-  targets:
-    - type: primitive
-      mark: {type: decoratedSymbol, symbolColor: default, character: (}
-      modifiers:
-        - type: everyScope
-          scopeType: {type: boundedNonWhitespaceSequence}
-        - {type: interiorOnly}
-  usePrePhraseSnapshot: true
-  action: {name: clearAndSetSelection}
-initialState:
-  documentContents: foo(aa|aa-().c_d bb|bb-().'')
-  selections:
-    - anchor: {line: 0, character: 1}
-      active: {line: 0, character: 1}
-  marks:
-    default.(:
-      start: {line: 0, character: 3}
-      end: {line: 0, character: 4}
-finalState:
-  documentContents: foo( )
-  selections:
-    - anchor: {line: 0, character: 4}
-      active: {line: 0, character: 4}
-    - anchor: {line: 0, character: 5}
-      active: {line: 0, character: 5}
-fullTargets: [{type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: (}, modifiers: [{type: everyScope, scopeType: {type: boundedNonWhitespaceSequence}}, {type: interiorOnly}]}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/selectionTypes/changeEveryShortPaintPairParen.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/selectionTypes/changeEveryShortPaintPairParen.yml
deleted file mode 100644
index 67ec84aa15..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/selectionTypes/changeEveryShortPaintPairParen.yml
+++ /dev/null
@@ -1,31 +0,0 @@
-languageId: plaintext
-command:
-  spokenForm: change every short paint pair paren
-  version: 2
-  targets:
-    - type: primitive
-      mark: {type: decoratedSymbol, symbolColor: default, character: (}
-      modifiers:
-        - type: everyScope
-          scopeType: {type: boundedNonWhitespaceSequence}
-        - type: containingScope
-          scopeType: {type: surroundingPair, delimiter: any}
-  usePrePhraseSnapshot: true
-  action: {name: clearAndSetSelection}
-initialState:
-  documentContents: foo(aa|aa-().c_d bb|bb-().'')
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-  marks:
-    default.(:
-      start: {line: 0, character: 3}
-      end: {line: 0, character: 4}
-finalState:
-  documentContents: foo( )
-  selections:
-    - anchor: {line: 0, character: 4}
-      active: {line: 0, character: 4}
-    - anchor: {line: 0, character: 5}
-      active: {line: 0, character: 5}
-fullTargets: [{type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: (}, modifiers: [{type: everyScope, scopeType: {type: boundedNonWhitespaceSequence}}, {type: containingScope, scopeType: {type: surroundingPair, delimiter: any}}]}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/selectionTypes/changeShortPaintParen.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/selectionTypes/changeShortPaintParen.yml
deleted file mode 100644
index 8bb75b09cd..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/selectionTypes/changeShortPaintParen.yml
+++ /dev/null
@@ -1,26 +0,0 @@
-command:
-  spokenForm: change short paint paren
-  version: 2
-  targets:
-    - type: primitive
-      mark: {type: decoratedSymbol, symbolColor: default, character: (}
-      modifiers:
-        - type: containingScope
-          scopeType: {type: boundedNonWhitespaceSequence}
-  usePrePhraseSnapshot: true
-  action: {name: clearAndSetSelection}
-initialState:
-  documentContents: foo(aa|aa-.c_d bb|bb-.'')
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-  marks:
-    default.(:
-      start: {line: 0, character: 3}
-      end: {line: 0, character: 4}
-finalState:
-  documentContents: " bb|bb-.'')"
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-fullTargets: [{type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: (}, modifiers: [{type: containingScope, scopeType: {type: boundedNonWhitespaceSequence}}]}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/selectionTypes/chuckDot.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/selectionTypes/chuckDot.yml
deleted file mode 100644
index a66ae3c56b..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/selectionTypes/chuckDot.yml
+++ /dev/null
@@ -1,24 +0,0 @@
-languageId: plaintext
-command:
-  spokenForm: chuck dot
-  version: 3
-  targets:
-    - type: primitive
-      mark: {type: decoratedSymbol, symbolColor: default, character: .}
-  usePrePhraseSnapshot: true
-  action: {name: remove}
-initialState:
-  documentContents: "  .a"
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-  marks:
-    default..:
-      start: {line: 0, character: 2}
-      end: {line: 0, character: 3}
-finalState:
-  documentContents: "  a"
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-fullTargets: [{type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: .}, modifiers: []}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/selectionTypes/chuckDot2.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/selectionTypes/chuckDot2.yml
deleted file mode 100644
index 6799be56dd..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/selectionTypes/chuckDot2.yml
+++ /dev/null
@@ -1,24 +0,0 @@
-languageId: plaintext
-command:
-  spokenForm: chuck dot
-  version: 3
-  targets:
-    - type: primitive
-      mark: {type: decoratedSymbol, symbolColor: default, character: .}
-  usePrePhraseSnapshot: true
-  action: {name: remove}
-initialState:
-  documentContents: "  ."
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-  marks:
-    default..:
-      start: {line: 0, character: 2}
-      end: {line: 0, character: 3}
-finalState:
-  documentContents: ""
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-fullTargets: [{type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: .}, modifiers: []}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/selectionTypes/chuckDot3.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/selectionTypes/chuckDot3.yml
deleted file mode 100644
index b77d209e46..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/selectionTypes/chuckDot3.yml
+++ /dev/null
@@ -1,24 +0,0 @@
-languageId: plaintext
-command:
-  spokenForm: chuck dot
-  version: 3
-  targets:
-    - type: primitive
-      mark: {type: decoratedSymbol, symbolColor: default, character: .}
-  usePrePhraseSnapshot: true
-  action: {name: remove}
-initialState:
-  documentContents: "  . a"
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-  marks:
-    default..:
-      start: {line: 0, character: 2}
-      end: {line: 0, character: 3}
-finalState:
-  documentContents: "  a"
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-fullTargets: [{type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: .}, modifiers: []}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/selectionTypes/chuckEveryShortPaint.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/selectionTypes/chuckEveryShortPaint.yml
deleted file mode 100644
index cf3c16136a..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/selectionTypes/chuckEveryShortPaint.yml
+++ /dev/null
@@ -1,23 +0,0 @@
-languageId: plaintext
-command:
-  spokenForm: chuck every short paint
-  version: 2
-  targets:
-    - type: primitive
-      modifiers:
-        - type: everyScope
-          scopeType: {type: boundedNonWhitespaceSequence}
-  usePrePhraseSnapshot: true
-  action: {name: remove}
-initialState:
-  documentContents: some.text.here some-other-text word()[]
-  selections:
-    - anchor: {line: 0, character: 20}
-      active: {line: 0, character: 20}
-  marks: {}
-finalState:
-  documentContents: ""
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-fullTargets: [{type: primitive, mark: {type: cursor}, modifiers: [{type: everyScope, scopeType: {type: boundedNonWhitespaceSequence}}]}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/selectionTypes/chuckFile.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/selectionTypes/chuckFile.yml
deleted file mode 100644
index f6c9ec3e69..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/selectionTypes/chuckFile.yml
+++ /dev/null
@@ -1,21 +0,0 @@
-languageId: typescript
-command:
-  version: 1
-  spokenForm: chuck file
-  action: remove
-  targets:
-    - {type: primitive, selectionType: document}
-initialState:
-  documentContents: |
-
-    const value = "Hello world";
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-  marks: {}
-finalState:
-  documentContents: ""
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: document, position: contents, modifier: {type: identity}, insideOutsideType: outside}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/selectionTypes/chuckFile2.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/selectionTypes/chuckFile2.yml
deleted file mode 100644
index 06e8a99386..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/selectionTypes/chuckFile2.yml
+++ /dev/null
@@ -1,29 +0,0 @@
-languageId: plaintext
-command:
-  spokenForm: chuck file
-  version: 2
-  action: {name: remove}
-  targets:
-    - type: primitive
-      modifiers:
-        - type: containingScope
-          scopeType: {type: document}
-  usePrePhraseSnapshot: true
-initialState:
-  documentContents: |2+
-
-
-        foo 
-
-        bar 
-
-  selections:
-    - anchor: {line: 6, character: 0}
-      active: {line: 6, character: 0}
-  marks: {}
-finalState:
-  documentContents: ""
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-fullTargets: [{type: primitive, mark: {type: cursor}, modifiers: [{type: containingScope, scopeType: document}]}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/selectionTypes/chuckLastTwoItem.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/selectionTypes/chuckLastTwoItem.yml
deleted file mode 100644
index 2ace070a49..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/selectionTypes/chuckLastTwoItem.yml
+++ /dev/null
@@ -1,25 +0,0 @@
-languageId: plaintext
-command:
-  spokenForm: chuck last two item
-  version: 3
-  targets:
-    - type: primitive
-      modifiers:
-        - type: ordinalScope
-          scopeType: {type: collectionItem}
-          start: -2
-          length: 2
-  usePrePhraseSnapshot: true
-  action: {name: remove}
-initialState:
-  documentContents: a, b, c, d
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-  marks: {}
-finalState:
-  documentContents: a, b
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-fullTargets: [{type: primitive, mark: {type: cursor}, modifiers: [{type: ordinalScope, scopeType: {type: collectionItem}, start: -2, length: 2}]}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/selectionTypes/chuckLineVest.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/selectionTypes/chuckLineVest.yml
deleted file mode 100644
index d9a52b0f27..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/selectionTypes/chuckLineVest.yml
+++ /dev/null
@@ -1,27 +0,0 @@
-languageId: typescript
-command:
-  version: 1
-  spokenForm: chuck line vest
-  action: remove
-  targets:
-    - type: primitive
-      selectionType: line
-      mark: {type: decoratedSymbol, symbolColor: default, character: v}
-initialState:
-  documentContents: |
-
-    const value = "Hello world";
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-  marks:
-    default.v:
-      start: {line: 1, character: 6}
-      end: {line: 1, character: 11}
-finalState:
-  documentContents: |+
-
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-fullTargets: [{type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: v}, selectionType: line, position: contents, modifier: {type: identity}, insideOutsideType: outside}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/selectionTypes/chuckLineVest2.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/selectionTypes/chuckLineVest2.yml
deleted file mode 100644
index f06b40c3b6..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/selectionTypes/chuckLineVest2.yml
+++ /dev/null
@@ -1,29 +0,0 @@
-languageId: typescript
-command:
-  version: 1
-  spokenForm: chuck line vest
-  action: remove
-  targets:
-    - type: primitive
-      selectionType: line
-      mark: {type: decoratedSymbol, symbolColor: default, character: v}
-initialState:
-  documentContents: |
-
-    const value = "Hello world";
-    const value = "Hello world";
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-  marks:
-    default.v:
-      start: {line: 1, character: 6}
-      end: {line: 1, character: 11}
-finalState:
-  documentContents: |
-
-    const value = "Hello world";
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-fullTargets: [{type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: v}, selectionType: line, position: contents, modifier: {type: identity}, insideOutsideType: outside}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/selectionTypes/chuckLinkMade.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/selectionTypes/chuckLinkMade.yml
deleted file mode 100644
index b4868fbd28..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/selectionTypes/chuckLinkMade.yml
+++ /dev/null
@@ -1,27 +0,0 @@
-languageId: plaintext
-command:
-  version: 1
-  spokenForm: chuck link made
-  action: remove
-  targets:
-    - type: primitive
-      selectionType: url
-      mark: {type: decoratedSymbol, symbolColor: default, character: m}
-initialState:
-  documentContents: >
-    https://www.atomiccommits.io/consistent-hashing
-    https://www.atomiccommits.io/consistent-hashing#code
-  selections:
-    - anchor: {line: 1, character: 0}
-      active: {line: 1, character: 0}
-  marks:
-    default.m:
-      start: {line: 0, character: 12}
-      end: {line: 0, character: 25}
-finalState:
-  documentContents: |
-    https://www.atomiccommits.io/consistent-hashing#code
-  selections:
-    - anchor: {line: 1, character: 0}
-      active: {line: 1, character: 0}
-fullTargets: [{type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: m}, selectionType: url, position: contents, insideOutsideType: outside, modifier: {type: identity}, isImplicit: false}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/selectionTypes/chuckLinkMadePastLinkAir.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/selectionTypes/chuckLinkMadePastLinkAir.yml
deleted file mode 100644
index d8e3097d7f..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/selectionTypes/chuckLinkMadePastLinkAir.yml
+++ /dev/null
@@ -1,38 +0,0 @@
-languageId: plaintext
-command:
-  version: 1
-  spokenForm: chuck link made past link air
-  action: remove
-  targets:
-    - type: range
-      start:
-        type: primitive
-        selectionType: url
-        mark: {type: decoratedSymbol, symbolColor: default, character: m}
-      end:
-        type: primitive
-        selectionType: url
-        mark: {type: decoratedSymbol, symbolColor: default, character: a}
-      excludeStart: false
-      excludeEnd: false
-initialState:
-  documentContents: >
-    https://www.atomiccommits.io/consistent-hashing
-    https://www.atomiccommits.io/consistent-hashing#code
-  selections:
-    - anchor: {line: 1, character: 0}
-      active: {line: 1, character: 0}
-  marks:
-    default.m:
-      start: {line: 0, character: 12}
-      end: {line: 0, character: 25}
-    default.a:
-      start: {line: 0, character: 60}
-      end: {line: 0, character: 73}
-finalState:
-  documentContents: |+
-
-  selections:
-    - anchor: {line: 1, character: 0}
-      active: {line: 1, character: 0}
-fullTargets: [{type: range, excludeAnchor: false, excludeActive: false, rangeType: continuous, anchor: {type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: m}, selectionType: url, position: contents, insideOutsideType: outside, modifier: {type: identity}, isImplicit: false}, active: {type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: a}, selectionType: url, position: contents, insideOutsideType: outside, modifier: {type: identity}, isImplicit: false}}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/selectionTypes/chuckLinkPit.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/selectionTypes/chuckLinkPit.yml
deleted file mode 100644
index cd284f4e87..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/selectionTypes/chuckLinkPit.yml
+++ /dev/null
@@ -1,26 +0,0 @@
-languageId: plaintext
-command:
-  version: 1
-  spokenForm: chuck link pit
-  action: remove
-  targets:
-    - type: primitive
-      selectionType: url
-      mark: {type: decoratedSymbol, symbolColor: default, character: p}
-initialState:
-  documentContents: |
-    (https://www.atomiccommits.io/consistent-hashing#code)
-  selections:
-    - anchor: {line: 1, character: 0}
-      active: {line: 1, character: 0}
-  marks:
-    default.p:
-      start: {line: 0, character: 1}
-      end: {line: 0, character: 6}
-finalState:
-  documentContents: |
-    ()
-  selections:
-    - anchor: {line: 1, character: 0}
-      active: {line: 1, character: 0}
-fullTargets: [{type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: p}, selectionType: url, position: contents, insideOutsideType: outside, modifier: {type: identity}, isImplicit: false}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/selectionTypes/chuckPaintBatt.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/selectionTypes/chuckPaintBatt.yml
deleted file mode 100644
index 67d33da3a4..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/selectionTypes/chuckPaintBatt.yml
+++ /dev/null
@@ -1,26 +0,0 @@
-languageId: plaintext
-command:
-  version: 1
-  spokenForm: chuck paint batt
-  action: remove
-  targets:
-    - type: primitive
-      selectionType: nonWhitespaceSequence
-      mark: {type: decoratedSymbol, symbolColor: default, character: b}
-initialState:
-  documentContents: |
-    const r = /a[b]*(c)/;
-  selections:
-    - anchor: {line: 1, character: 0}
-      active: {line: 1, character: 0}
-  marks:
-    default.b:
-      start: {line: 0, character: 13}
-      end: {line: 0, character: 14}
-finalState:
-  documentContents: |
-    const r =
-  selections:
-    - anchor: {line: 1, character: 0}
-      active: {line: 1, character: 0}
-fullTargets: [{type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: b}, selectionType: nonWhitespaceSequence, position: contents, insideOutsideType: outside, modifier: {type: identity}, isImplicit: false}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/selectionTypes/chuckSmallPaintAir.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/selectionTypes/chuckSmallPaintAir.yml
deleted file mode 100644
index 108693930b..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/selectionTypes/chuckSmallPaintAir.yml
+++ /dev/null
@@ -1,27 +0,0 @@
-languageId: python
-command:
-  spokenForm: chuck small paint air
-  version: 2
-  targets:
-    - type: primitive
-      mark: {type: decoratedSymbol, symbolColor: default, character: a}
-      modifiers:
-        - type: containingScope
-          scopeType: {type: boundedNonWhitespaceSequence}
-  usePrePhraseSnapshot: true
-  action: {name: remove}
-initialState:
-  documentContents: some amount of text
-  selections:
-    - anchor: {line: 0, character: 19}
-      active: {line: 0, character: 19}
-  marks:
-    default.a:
-      start: {line: 0, character: 5}
-      end: {line: 0, character: 11}
-finalState:
-  documentContents: some of text
-  selections:
-    - anchor: {line: 0, character: 12}
-      active: {line: 0, character: 12}
-fullTargets: [{type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: a}, modifiers: [{type: containingScope, scopeType: {type: boundedNonWhitespaceSequence}}]}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/selectionTypes/chuckSmallPaintFine.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/selectionTypes/chuckSmallPaintFine.yml
deleted file mode 100644
index 4d4f80a520..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/selectionTypes/chuckSmallPaintFine.yml
+++ /dev/null
@@ -1,27 +0,0 @@
-languageId: python
-command:
-  spokenForm: chuck small paint fine
-  version: 2
-  targets:
-    - type: primitive
-      mark: {type: decoratedSymbol, symbolColor: default, character: f}
-      modifiers:
-        - type: containingScope
-          scopeType: {type: boundedNonWhitespaceSequence}
-  usePrePhraseSnapshot: true
-  action: {name: remove}
-initialState:
-  documentContents: "[foo[0], bar]"
-  selections:
-    - anchor: {line: 0, character: 3}
-      active: {line: 0, character: 3}
-  marks:
-    default.f:
-      start: {line: 0, character: 1}
-      end: {line: 0, character: 4}
-finalState:
-  documentContents: "[bar]"
-  selections:
-    - anchor: {line: 0, character: 1}
-      active: {line: 0, character: 1}
-fullTargets: [{type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: f}, modifiers: [{type: containingScope, scopeType: {type: boundedNonWhitespaceSequence}}]}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/selectionTypes/chuckSmallPaintFine2.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/selectionTypes/chuckSmallPaintFine2.yml
deleted file mode 100644
index e9c515f800..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/selectionTypes/chuckSmallPaintFine2.yml
+++ /dev/null
@@ -1,27 +0,0 @@
-languageId: python
-command:
-  spokenForm: chuck small paint fine
-  version: 2
-  targets:
-    - type: primitive
-      mark: {type: decoratedSymbol, symbolColor: default, character: f}
-      modifiers:
-        - type: containingScope
-          scopeType: {type: boundedNonWhitespaceSequence}
-  usePrePhraseSnapshot: true
-  action: {name: remove}
-initialState:
-  documentContents: "[baz, foo[0], bar]"
-  selections:
-    - anchor: {line: 0, character: 6}
-      active: {line: 0, character: 6}
-  marks:
-    default.f:
-      start: {line: 0, character: 6}
-      end: {line: 0, character: 9}
-finalState:
-  documentContents: "[baz, bar]"
-  selections:
-    - anchor: {line: 0, character: 6}
-      active: {line: 0, character: 6}
-fullTargets: [{type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: f}, modifiers: [{type: containingScope, scopeType: {type: boundedNonWhitespaceSequence}}]}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/selectionTypes/chuckSmallPaintSoap2.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/selectionTypes/chuckSmallPaintSoap2.yml
deleted file mode 100644
index 516846f446..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/selectionTypes/chuckSmallPaintSoap2.yml
+++ /dev/null
@@ -1,27 +0,0 @@
-languageId: python
-command:
-  spokenForm: chuck small paint soap
-  version: 2
-  targets:
-    - type: primitive
-      mark: {type: decoratedSymbol, symbolColor: default, character: s}
-      modifiers:
-        - type: containingScope
-          scopeType: {type: boundedNonWhitespaceSequence}
-  usePrePhraseSnapshot: true
-  action: {name: remove}
-initialState:
-  documentContents: f.o(some() text)
-  selections:
-    - anchor: {line: 0, character: 16}
-      active: {line: 0, character: 16}
-  marks:
-    default.s:
-      start: {line: 0, character: 4}
-      end: {line: 0, character: 8}
-finalState:
-  documentContents: f.o(text)
-  selections:
-    - anchor: {line: 0, character: 9}
-      active: {line: 0, character: 9}
-fullTargets: [{type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: s}, modifiers: [{type: containingScope, scopeType: {type: boundedNonWhitespaceSequence}}]}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/selectionTypes/chuckSmallPaintZero.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/selectionTypes/chuckSmallPaintZero.yml
deleted file mode 100644
index c4f05d1c73..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/selectionTypes/chuckSmallPaintZero.yml
+++ /dev/null
@@ -1,27 +0,0 @@
-languageId: python
-command:
-  spokenForm: chuck small paint zero
-  version: 2
-  targets:
-    - type: primitive
-      mark: {type: decoratedSymbol, symbolColor: default, character: '0'}
-      modifiers:
-        - type: containingScope
-          scopeType: {type: boundedNonWhitespaceSequence}
-  usePrePhraseSnapshot: true
-  action: {name: remove}
-initialState:
-  documentContents: "[foo[0], bar]"
-  selections:
-    - anchor: {line: 0, character: 3}
-      active: {line: 0, character: 3}
-  marks:
-    default.0:
-      start: {line: 0, character: 5}
-      end: {line: 0, character: 6}
-finalState:
-  documentContents: "[foo[], bar]"
-  selections:
-    - anchor: {line: 0, character: 3}
-      active: {line: 0, character: 3}
-fullTargets: [{type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: '0'}, modifiers: [{type: containingScope, scopeType: {type: boundedNonWhitespaceSequence}}]}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/selectionTypes/chuckTokenVest.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/selectionTypes/chuckTokenVest.yml
deleted file mode 100644
index d09802eea5..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/selectionTypes/chuckTokenVest.yml
+++ /dev/null
@@ -1,28 +0,0 @@
-languageId: typescript
-command:
-  version: 1
-  spokenForm: chuck token vest
-  action: remove
-  targets:
-    - type: primitive
-      selectionType: token
-      mark: {type: decoratedSymbol, symbolColor: default, character: v}
-initialState:
-  documentContents: |
-
-    const value   = "Hello.world  ";
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-  marks:
-    default.v:
-      start: {line: 1, character: 6}
-      end: {line: 1, character: 11}
-finalState:
-  documentContents: |
-
-    const = "Hello.world  ";
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-fullTargets: [{type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: v}, selectionType: token, position: contents, modifier: {type: identity}, insideOutsideType: outside}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/selectionTypes/chuckWord.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/selectionTypes/chuckWord.yml
deleted file mode 100644
index 004a43fefc..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/selectionTypes/chuckWord.yml
+++ /dev/null
@@ -1,23 +0,0 @@
-languageId: plaintext
-command:
-  spokenForm: chuck word
-  version: 3
-  targets:
-    - type: primitive
-      modifiers:
-        - type: containingScope
-          scopeType: {type: word}
-  usePrePhraseSnapshot: true
-  action: {name: remove}
-initialState:
-  documentContents: aaa_bbb_ccc
-  selections:
-    - anchor: {line: 0, character: 5}
-      active: {line: 0, character: 5}
-  marks: {}
-finalState:
-  documentContents: aaa_ccc
-  selections:
-    - anchor: {line: 0, character: 4}
-      active: {line: 0, character: 4}
-fullTargets: [{type: primitive, mark: {type: cursor}, modifiers: [{type: containingScope, scopeType: {type: word}}]}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/selectionTypes/chuckWord2.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/selectionTypes/chuckWord2.yml
deleted file mode 100644
index d26c4f98a1..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/selectionTypes/chuckWord2.yml
+++ /dev/null
@@ -1,23 +0,0 @@
-languageId: plaintext
-command:
-  spokenForm: chuck word
-  version: 3
-  targets:
-    - type: primitive
-      modifiers:
-        - type: containingScope
-          scopeType: {type: word}
-  usePrePhraseSnapshot: true
-  action: {name: remove}
-initialState:
-  documentContents: aaaBbbCcc
-  selections:
-    - anchor: {line: 0, character: 4}
-      active: {line: 0, character: 4}
-  marks: {}
-finalState:
-  documentContents: aaaCcc
-  selections:
-    - anchor: {line: 0, character: 3}
-      active: {line: 0, character: 3}
-fullTargets: [{type: primitive, mark: {type: cursor}, modifiers: [{type: containingScope, scopeType: {type: word}}]}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/selectionTypes/clearCar.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/selectionTypes/clearCar.yml
deleted file mode 100644
index d61c179349..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/selectionTypes/clearCar.yml
+++ /dev/null
@@ -1,23 +0,0 @@
-languageId: plaintext
-command:
-  spokenForm: clear car
-  version: 3
-  targets:
-    - type: primitive
-      modifiers:
-        - type: containingScope
-          scopeType: {type: character}
-  usePrePhraseSnapshot: true
-  action: {name: clearAndSetSelection}
-initialState:
-  documentContents: aaaBbbCcc
-  selections:
-    - anchor: {line: 0, character: 4}
-      active: {line: 0, character: 4}
-  marks: {}
-finalState:
-  documentContents: aaaBbCcc
-  selections:
-    - anchor: {line: 0, character: 4}
-      active: {line: 0, character: 4}
-fullTargets: [{type: primitive, mark: {type: cursor}, modifiers: [{type: containingScope, scopeType: {type: character}}]}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/selectionTypes/clearCar2.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/selectionTypes/clearCar2.yml
deleted file mode 100644
index b680b3c245..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/selectionTypes/clearCar2.yml
+++ /dev/null
@@ -1,23 +0,0 @@
-languageId: plaintext
-command:
-  spokenForm: clear car
-  version: 3
-  targets:
-    - type: primitive
-      modifiers:
-        - type: containingScope
-          scopeType: {type: character}
-  usePrePhraseSnapshot: true
-  action: {name: clearAndSetSelection}
-initialState:
-  documentContents: aaaBbbCcc
-  selections:
-    - anchor: {line: 0, character: 3}
-      active: {line: 0, character: 4}
-  marks: {}
-finalState:
-  documentContents: aaabbCcc
-  selections:
-    - anchor: {line: 0, character: 3}
-      active: {line: 0, character: 3}
-fullTargets: [{type: primitive, mark: {type: cursor}, modifiers: [{type: containingScope, scopeType: {type: character}}]}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/selectionTypes/clearCar3.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/selectionTypes/clearCar3.yml
deleted file mode 100644
index 2126236eb4..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/selectionTypes/clearCar3.yml
+++ /dev/null
@@ -1,23 +0,0 @@
-languageId: plaintext
-command:
-  spokenForm: clear car
-  version: 3
-  targets:
-    - type: primitive
-      modifiers:
-        - type: containingScope
-          scopeType: {type: character}
-  usePrePhraseSnapshot: true
-  action: {name: clearAndSetSelection}
-initialState:
-  documentContents: aaaBbbCcc
-  selections:
-    - anchor: {line: 0, character: 2}
-      active: {line: 0, character: 4}
-  marks: {}
-finalState:
-  documentContents: aabbCcc
-  selections:
-    - anchor: {line: 0, character: 2}
-      active: {line: 0, character: 2}
-fullTargets: [{type: primitive, mark: {type: cursor}, modifiers: [{type: containingScope, scopeType: {type: character}}]}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/selectionTypes/clearCar4.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/selectionTypes/clearCar4.yml
deleted file mode 100644
index 48980db8c8..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/selectionTypes/clearCar4.yml
+++ /dev/null
@@ -1,23 +0,0 @@
-languageId: plaintext
-command:
-  spokenForm: clear car
-  version: 3
-  targets:
-    - type: primitive
-      modifiers:
-        - type: containingScope
-          scopeType: {type: character}
-  usePrePhraseSnapshot: true
-  action: {name: clearAndSetSelection}
-initialState:
-  documentContents: " a"
-  selections:
-    - anchor: {line: 0, character: 1}
-      active: {line: 0, character: 1}
-  marks: {}
-finalState:
-  documentContents: " "
-  selections:
-    - anchor: {line: 0, character: 1}
-      active: {line: 0, character: 1}
-fullTargets: [{type: primitive, mark: {type: cursor}, modifiers: [{type: containingScope, scopeType: {type: character}}]}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/selectionTypes/clearCar5.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/selectionTypes/clearCar5.yml
deleted file mode 100644
index 60d428b4e0..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/selectionTypes/clearCar5.yml
+++ /dev/null
@@ -1,23 +0,0 @@
-languageId: plaintext
-command:
-  spokenForm: clear car
-  version: 3
-  targets:
-    - type: primitive
-      modifiers:
-        - type: containingScope
-          scopeType: {type: character}
-  usePrePhraseSnapshot: true
-  action: {name: clearAndSetSelection}
-initialState:
-  documentContents: "a "
-  selections:
-    - anchor: {line: 0, character: 1}
-      active: {line: 0, character: 1}
-  marks: {}
-finalState:
-  documentContents: " "
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-fullTargets: [{type: primitive, mark: {type: cursor}, modifiers: [{type: containingScope, scopeType: {type: character}}]}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/selectionTypes/clearContent.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/selectionTypes/clearContent.yml
deleted file mode 100644
index fa8f242437..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/selectionTypes/clearContent.yml
+++ /dev/null
@@ -1,37 +0,0 @@
-languageId: markdown
-command:
-  spokenForm: clear content
-  version: 3
-  targets:
-    - type: primitive
-      modifiers:
-        - {type: keepContentFilter}
-  usePrePhraseSnapshot: true
-  action: {name: clearAndSetSelection}
-initialState:
-  documentContents: |-
-
-    a
-     
-    b
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-    - anchor: {line: 1, character: 0}
-      active: {line: 1, character: 1}
-    - anchor: {line: 2, character: 0}
-      active: {line: 2, character: 1}
-    - anchor: {line: 3, character: 0}
-      active: {line: 3, character: 1}
-  marks: {}
-finalState:
-  documentContents: |2
-
-
-     
-  selections:
-    - anchor: {line: 1, character: 0}
-      active: {line: 1, character: 0}
-    - anchor: {line: 3, character: 0}
-      active: {line: 3, character: 0}
-fullTargets: [{type: primitive, mark: {type: cursor}, modifiers: [{type: keepContentFilter}]}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/selectionTypes/clearCore.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/selectionTypes/clearCore.yml
deleted file mode 100644
index e6ea183aa1..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/selectionTypes/clearCore.yml
+++ /dev/null
@@ -1,22 +0,0 @@
-languageId: plaintext
-command:
-  spokenForm: clear core
-  version: 2
-  targets:
-    - type: primitive
-      modifiers:
-        - {type: interiorOnly}
-  usePrePhraseSnapshot: true
-  action: {name: clearAndSetSelection}
-initialState:
-  documentContents: (    )
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-  marks: {}
-finalState:
-  documentContents: ()
-  selections:
-    - anchor: {line: 0, character: 1}
-      active: {line: 0, character: 1}
-fullTargets: [{type: primitive, mark: {type: cursor}, modifiers: [{type: interiorOnly}]}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/selectionTypes/clearCore2.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/selectionTypes/clearCore2.yml
deleted file mode 100644
index 7a06636cc6..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/selectionTypes/clearCore2.yml
+++ /dev/null
@@ -1,22 +0,0 @@
-languageId: plaintext
-command:
-  spokenForm: clear core
-  version: 2
-  targets:
-    - type: primitive
-      modifiers:
-        - {type: interiorOnly}
-  usePrePhraseSnapshot: true
-  action: {name: clearAndSetSelection}
-initialState:
-  documentContents: ()
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-  marks: {}
-finalState:
-  documentContents: ()
-  selections:
-    - anchor: {line: 0, character: 1}
-      active: {line: 0, character: 1}
-fullTargets: [{type: primitive, mark: {type: cursor}, modifiers: [{type: interiorOnly}]}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/selectionTypes/clearCustomRegex.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/selectionTypes/clearCustomRegex.yml
deleted file mode 100644
index da100466b0..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/selectionTypes/clearCustomRegex.yml
+++ /dev/null
@@ -1,23 +0,0 @@
-languageId: plaintext
-command:
-  spokenForm: clear custom regex
-  version: 2
-  targets:
-    - type: primitive
-      modifiers:
-        - type: containingScope
-          scopeType: {type: customRegex, regex: '[\w/_.]+'}
-  usePrePhraseSnapshot: true
-  action: {name: clearAndSetSelection}
-initialState:
-  documentContents: aa.bb/cc_dd123(  )
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-  marks: {}
-finalState:
-  documentContents: (  )
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-fullTargets: [{type: primitive, mark: {type: cursor}, modifiers: [{type: containingScope, scopeType: {type: customRegex, regex: '[\w/_.]+'}}]}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/selectionTypes/clearEmpty.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/selectionTypes/clearEmpty.yml
deleted file mode 100644
index f81eb57ad2..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/selectionTypes/clearEmpty.yml
+++ /dev/null
@@ -1,38 +0,0 @@
-languageId: markdown
-command:
-  spokenForm: clear empty
-  version: 3
-  targets:
-    - type: primitive
-      modifiers:
-        - {type: keepEmptyFilter}
-  usePrePhraseSnapshot: true
-  action: {name: clearAndSetSelection}
-initialState:
-  documentContents: |-
-
-    a
-     
-    b
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-    - anchor: {line: 1, character: 0}
-      active: {line: 1, character: 1}
-    - anchor: {line: 2, character: 0}
-      active: {line: 2, character: 1}
-    - anchor: {line: 3, character: 0}
-      active: {line: 3, character: 1}
-  marks: {}
-finalState:
-  documentContents: |-
-
-    a
-
-    b
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-    - anchor: {line: 2, character: 0}
-      active: {line: 2, character: 0}
-fullTargets: [{type: primitive, mark: {type: cursor}, modifiers: [{type: keepEmptyFilter}]}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/selectionTypes/clearEveryCustomRegex.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/selectionTypes/clearEveryCustomRegex.yml
deleted file mode 100644
index a3e0966e4d..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/selectionTypes/clearEveryCustomRegex.yml
+++ /dev/null
@@ -1,25 +0,0 @@
-languageId: plaintext
-command:
-  spokenForm: clear every custom regex
-  version: 2
-  targets:
-    - type: primitive
-      modifiers:
-        - type: everyScope
-          scopeType: {type: customRegex, regex: '[\w/_.]+'}
-  usePrePhraseSnapshot: true
-  action: {name: clearAndSetSelection}
-initialState:
-  documentContents: aa.bb/cc_dd123 aa.bb/cc_dd123(  )
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-  marks: {}
-finalState:
-  documentContents: " (  )"
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-    - anchor: {line: 0, character: 1}
-      active: {line: 0, character: 1}
-fullTargets: [{type: primitive, mark: {type: cursor}, modifiers: [{type: containingScope, scopeType: {type: customRegex, regex: '[\w/_.]+'}}]}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/selectionTypes/clearEveryShortPaint.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/selectionTypes/clearEveryShortPaint.yml
deleted file mode 100644
index b955cc2700..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/selectionTypes/clearEveryShortPaint.yml
+++ /dev/null
@@ -1,25 +0,0 @@
-languageId: plaintext
-command:
-  spokenForm: clear every short paint
-  version: 2
-  targets:
-    - type: primitive
-      modifiers:
-        - type: everyScope
-          scopeType: {type: boundedNonWhitespaceSequence}
-  usePrePhraseSnapshot: true
-  action: {name: clearAndSetSelection}
-initialState:
-  documentContents: "{foo.bar(hello-world, whatever-now)} test-this"
-  selections:
-    - anchor: {line: 0, character: 11}
-      active: {line: 0, character: 11}
-  marks: {}
-finalState:
-  documentContents: "{foo.bar( )} test-this"
-  selections:
-    - anchor: {line: 0, character: 9}
-      active: {line: 0, character: 9}
-    - anchor: {line: 0, character: 10}
-      active: {line: 0, character: 10}
-fullTargets: [{type: primitive, mark: {type: cursor}, modifiers: [{type: everyScope, scopeType: {type: boundedNonWhitespaceSequence}}]}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/selectionTypes/clearEveryShortPaint2.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/selectionTypes/clearEveryShortPaint2.yml
deleted file mode 100644
index b13854d85b..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/selectionTypes/clearEveryShortPaint2.yml
+++ /dev/null
@@ -1,25 +0,0 @@
-languageId: plaintext
-command:
-  spokenForm: clear every short paint
-  version: 2
-  targets:
-    - type: primitive
-      modifiers:
-        - type: everyScope
-          scopeType: {type: boundedNonWhitespaceSequence}
-  usePrePhraseSnapshot: true
-  action: {name: clearAndSetSelection}
-initialState:
-  documentContents: "{foo.bar(hello-world, whatever-now)} test-this"
-  selections:
-    - anchor: {line: 0, character: 8}
-      active: {line: 0, character: 8}
-  marks: {}
-finalState:
-  documentContents: "{ } test-this"
-  selections:
-    - anchor: {line: 0, character: 1}
-      active: {line: 0, character: 1}
-    - anchor: {line: 0, character: 2}
-      active: {line: 0, character: 2}
-fullTargets: [{type: primitive, mark: {type: cursor}, modifiers: [{type: everyScope, scopeType: {type: boundedNonWhitespaceSequence}}]}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/selectionTypes/clearFirstTwoItem.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/selectionTypes/clearFirstTwoItem.yml
deleted file mode 100644
index 59e0aadf8d..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/selectionTypes/clearFirstTwoItem.yml
+++ /dev/null
@@ -1,25 +0,0 @@
-languageId: plaintext
-command:
-  spokenForm: clear first two item
-  version: 3
-  targets:
-    - type: primitive
-      modifiers:
-        - type: ordinalScope
-          scopeType: {type: collectionItem}
-          start: 0
-          length: 2
-  usePrePhraseSnapshot: true
-  action: {name: clearAndSetSelection}
-initialState:
-  documentContents: a, b, c, d
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-  marks: {}
-finalState:
-  documentContents: ", c, d"
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-fullTargets: [{type: primitive, mark: {type: cursor}, modifiers: [{type: ordinalScope, scopeType: {type: collectionItem}, start: 0, length: 2}]}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/selectionTypes/clearHeadCore.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/selectionTypes/clearHeadCore.yml
deleted file mode 100644
index 91e15ee837..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/selectionTypes/clearHeadCore.yml
+++ /dev/null
@@ -1,24 +0,0 @@
-languageId: plaintext
-command:
-  spokenForm: clear head core
-  version: 2
-  targets:
-    - type: primitive
-      modifiers:
-        - type: extendThroughStartOf
-          modifiers:
-            - {type: interiorOnly}
-  usePrePhraseSnapshot: true
-  action: {name: clearAndSetSelection}
-initialState:
-  documentContents: foo(bar baz)
-  selections:
-    - anchor: {line: 0, character: 10}
-      active: {line: 0, character: 10}
-  marks: {}
-finalState:
-  documentContents: foo(z)
-  selections:
-    - anchor: {line: 0, character: 4}
-      active: {line: 0, character: 4}
-fullTargets: [{type: primitive, mark: {type: cursor}, modifiers: [{type: extendThroughStartOf}, {type: interiorOnly}]}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/selectionTypes/clearHeadCoreCurly.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/selectionTypes/clearHeadCoreCurly.yml
deleted file mode 100644
index d7f782fc95..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/selectionTypes/clearHeadCoreCurly.yml
+++ /dev/null
@@ -1,32 +0,0 @@
-languageId: plaintext
-command:
-  spokenForm: clear head core curly
-  version: 2
-  targets:
-    - type: primitive
-      modifiers:
-        - type: extendThroughStartOf
-          modifiers:
-            - {type: interiorOnly}
-            - type: containingScope
-              scopeType: {type: surroundingPair, delimiter: curlyBrackets}
-  usePrePhraseSnapshot: true
-  action: {name: clearAndSetSelection}
-initialState:
-  documentContents: |-
-    {
-        foo(bar baz)
-    }
-  selections:
-    - anchor: {line: 1, character: 14}
-      active: {line: 1, character: 14}
-  marks: {}
-finalState:
-  documentContents: |-
-    {
-        z)
-    }
-  selections:
-    - anchor: {line: 1, character: 4}
-      active: {line: 1, character: 4}
-fullTargets: [{type: primitive, mark: {type: cursor}, modifiers: [{type: extendThroughStartOf, modifiers: [{type: interiorOnly}, {type: containingScope, scopeType: {type: surroundingPair, delimiter: curlyBrackets}}]}]}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/selectionTypes/clearHeadFunk.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/selectionTypes/clearHeadFunk.yml
deleted file mode 100644
index e3ac7df963..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/selectionTypes/clearHeadFunk.yml
+++ /dev/null
@@ -1,30 +0,0 @@
-languageId: typescript
-command:
-  spokenForm: clear head funk
-  version: 2
-  targets:
-    - type: primitive
-      modifiers:
-        - type: extendThroughStartOf
-          modifiers:
-            - type: containingScope
-              scopeType: {type: namedFunction}
-  usePrePhraseSnapshot: true
-  action: {name: clearAndSetSelection}
-initialState:
-  documentContents: |-
-    function whatever() {
-        
-    }
-  selections:
-    - anchor: {line: 1, character: 4}
-      active: {line: 1, character: 4}
-  marks: {}
-finalState:
-  documentContents: |-
-
-    }
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-fullTargets: [{type: primitive, mark: {type: cursor}, modifiers: [{type: extendThroughStartOf}, {type: containingScope, scopeType: {type: namedFunction}}]}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/selectionTypes/clearLastTwoItem.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/selectionTypes/clearLastTwoItem.yml
deleted file mode 100644
index fd7016eec1..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/selectionTypes/clearLastTwoItem.yml
+++ /dev/null
@@ -1,25 +0,0 @@
-languageId: plaintext
-command:
-  spokenForm: clear last two item
-  version: 3
-  targets:
-    - type: primitive
-      modifiers:
-        - type: ordinalScope
-          scopeType: {type: collectionItem}
-          start: -2
-          length: 2
-  usePrePhraseSnapshot: true
-  action: {name: clearAndSetSelection}
-initialState:
-  documentContents: a, b, c, d
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-  marks: {}
-finalState:
-  documentContents: "a, b, "
-  selections:
-    - anchor: {line: 0, character: 6}
-      active: {line: 0, character: 6}
-fullTargets: [{type: primitive, mark: {type: cursor}, modifiers: [{type: ordinalScope, scopeType: {type: collectionItem}, start: -2, length: 2}]}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/selectionTypes/clearLeading.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/selectionTypes/clearLeading.yml
deleted file mode 100644
index 2f0450f38c..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/selectionTypes/clearLeading.yml
+++ /dev/null
@@ -1,22 +0,0 @@
-languageId: plaintext
-command:
-  spokenForm: clear leading
-  version: 2
-  targets:
-    - type: primitive
-      modifiers:
-        - {type: leading}
-  usePrePhraseSnapshot: true
-  action: {name: clearAndSetSelection}
-initialState:
-  documentContents: aaa bbb ccc
-  selections:
-    - anchor: {line: 0, character: 6}
-      active: {line: 0, character: 6}
-  marks: {}
-finalState:
-  documentContents: aaabbb ccc
-  selections:
-    - anchor: {line: 0, character: 3}
-      active: {line: 0, character: 3}
-fullTargets: [{type: primitive, mark: {type: cursor}, modifiers: [{type: leading}]}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/selectionTypes/clearLinePair.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/selectionTypes/clearLinePair.yml
deleted file mode 100644
index 66d7782514..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/selectionTypes/clearLinePair.yml
+++ /dev/null
@@ -1,25 +0,0 @@
-languageId: plaintext
-command:
-  spokenForm: clear line pair
-  version: 2
-  action: {name: clearAndSetSelection}
-  targets:
-    - type: primitive
-      modifiers:
-        - type: containingScope
-          scopeType: {type: line}
-        - type: containingScope
-          scopeType: {type: surroundingPair, delimiter: any}
-  usePrePhraseSnapshot: true
-initialState:
-  documentContents: foo (bar) baz
-  selections:
-    - anchor: {line: 0, character: 7}
-      active: {line: 0, character: 7}
-  marks: {}
-finalState:
-  documentContents: ""
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-fullTargets: [{type: primitive, mark: {type: cursor}, modifiers: [{type: containingScope, scopeType: line}, {type: surroundingPair, delimiter: any}]}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/selectionTypes/clearNextFile.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/selectionTypes/clearNextFile.yml
deleted file mode 100644
index 62fcd2b79d..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/selectionTypes/clearNextFile.yml
+++ /dev/null
@@ -1,22 +0,0 @@
-languageId: plaintext
-command:
-  spokenForm: clear next file
-  version: 3
-  targets:
-    - type: primitive
-      modifiers:
-        - type: relativeScope
-          scopeType: {type: document}
-          offset: 1
-          length: 1
-          direction: forward
-  usePrePhraseSnapshot: true
-  action: {name: clearAndSetSelection}
-initialState:
-  documentContents: aaa
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-  marks: {}
-fullTargets: [{type: primitive, mark: {type: cursor}, modifiers: [{type: relativeScope, scopeType: {type: document}, offset: 1, length: 1, direction: forward}]}]
-thrownError: {name: OutOfRangeError}
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/selectionTypes/clearNextFunk.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/selectionTypes/clearNextFunk.yml
deleted file mode 100644
index dea9907f6b..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/selectionTypes/clearNextFunk.yml
+++ /dev/null
@@ -1,31 +0,0 @@
-languageId: typescript
-command:
-  spokenForm: clear next funk
-  version: 2
-  targets:
-    - type: primitive
-      modifiers:
-        - type: relativeScope
-          scopeType: {type: namedFunction}
-          offset: 1
-          length: 1
-          direction: forward
-  usePrePhraseSnapshot: true
-  action: {name: clearAndSetSelection}
-initialState:
-  documentContents: |-
-    function foo() {}
-
-    function bar() {}
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-  marks: {}
-finalState:
-  documentContents: |+
-    function foo() {}
-
-  selections:
-    - anchor: {line: 2, character: 0}
-      active: {line: 2, character: 0}
-fullTargets: [{type: primitive, mark: {type: cursor}, modifiers: [{type: nextContainingScope, scopeType: {type: namedFunction}}]}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/selectionTypes/clearNextToken.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/selectionTypes/clearNextToken.yml
deleted file mode 100644
index 78ea9e2770..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/selectionTypes/clearNextToken.yml
+++ /dev/null
@@ -1,26 +0,0 @@
-languageId: plaintext
-command:
-  spokenForm: clear next token
-  version: 3
-  targets:
-    - type: primitive
-      modifiers:
-        - type: relativeScope
-          scopeType: {type: token}
-          offset: 1
-          length: 1
-          direction: forward
-  usePrePhraseSnapshot: true
-  action: {name: clearAndSetSelection}
-initialState:
-  documentContents: a  b
-  selections:
-    - anchor: {line: 0, character: 2}
-      active: {line: 0, character: 2}
-  marks: {}
-finalState:
-  documentContents: "a  "
-  selections:
-    - anchor: {line: 0, character: 3}
-      active: {line: 0, character: 3}
-fullTargets: [{type: primitive, mark: {type: cursor}, modifiers: [{type: relativeScope, scopeType: {type: token}, offset: 1, length: 1, direction: forward}]}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/selectionTypes/clearNextWord.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/selectionTypes/clearNextWord.yml
deleted file mode 100644
index 4aa1be02d9..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/selectionTypes/clearNextWord.yml
+++ /dev/null
@@ -1,26 +0,0 @@
-languageId: plaintext
-command:
-  spokenForm: clear next word
-  version: 3
-  targets:
-    - type: primitive
-      modifiers:
-        - type: relativeScope
-          scopeType: {type: word}
-          offset: 1
-          length: 1
-          direction: forward
-  usePrePhraseSnapshot: true
-  action: {name: clearAndSetSelection}
-initialState:
-  documentContents: aaaBbbCccDdd
-  selections:
-    - anchor: {line: 0, character: 6}
-      active: {line: 0, character: 6}
-  marks: {}
-finalState:
-  documentContents: aaaBbbCcc
-  selections:
-    - anchor: {line: 0, character: 9}
-      active: {line: 0, character: 9}
-fullTargets: [{type: primitive, mark: {type: cursor}, modifiers: [{type: relativeScope, scopeType: {type: word}, offset: 1, length: 1, direction: forward}]}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/selectionTypes/clearNextWord2.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/selectionTypes/clearNextWord2.yml
deleted file mode 100644
index 5a3c20442d..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/selectionTypes/clearNextWord2.yml
+++ /dev/null
@@ -1,26 +0,0 @@
-languageId: plaintext
-command:
-  spokenForm: clear next word
-  version: 3
-  targets:
-    - type: primitive
-      modifiers:
-        - type: relativeScope
-          scopeType: {type: word}
-          offset: 1
-          length: 1
-          direction: forward
-  usePrePhraseSnapshot: true
-  action: {name: clearAndSetSelection}
-initialState:
-  documentContents: aaaBbbCccDdd
-  selections:
-    - anchor: {line: 0, character: 6}
-      active: {line: 0, character: 7}
-  marks: {}
-finalState:
-  documentContents: aaaBbbCcc
-  selections:
-    - anchor: {line: 0, character: 9}
-      active: {line: 0, character: 9}
-fullTargets: [{type: primitive, mark: {type: cursor}, modifiers: [{type: relativeScope, scopeType: {type: word}, offset: 1, length: 1, direction: forward}]}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/selectionTypes/clearNextWord3.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/selectionTypes/clearNextWord3.yml
deleted file mode 100644
index 0379d60e54..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/selectionTypes/clearNextWord3.yml
+++ /dev/null
@@ -1,26 +0,0 @@
-languageId: plaintext
-command:
-  spokenForm: clear next word
-  version: 3
-  targets:
-    - type: primitive
-      modifiers:
-        - type: relativeScope
-          scopeType: {type: word}
-          offset: 1
-          length: 1
-          direction: forward
-  usePrePhraseSnapshot: true
-  action: {name: clearAndSetSelection}
-initialState:
-  documentContents: aaaBbbCccDdd
-  selections:
-    - anchor: {line: 0, character: 5}
-      active: {line: 0, character: 7}
-  marks: {}
-finalState:
-  documentContents: aaaBbbCcc
-  selections:
-    - anchor: {line: 0, character: 9}
-      active: {line: 0, character: 9}
-fullTargets: [{type: primitive, mark: {type: cursor}, modifiers: [{type: relativeScope, scopeType: {type: word}, offset: 1, length: 1, direction: forward}]}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/selectionTypes/clearPaint.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/selectionTypes/clearPaint.yml
deleted file mode 100644
index 61a0795e38..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/selectionTypes/clearPaint.yml
+++ /dev/null
@@ -1,23 +0,0 @@
-languageId: plaintext
-command:
-  version: 1
-  spokenForm: clear paint
-  action: clearAndSetSelection
-  targets:
-    - {type: primitive, selectionType: nonWhitespaceSequence}
-initialState:
-  documentContents: |
-    const r = /a[b]*(c)/;
-
-    // a/b/c /d
-  selections:
-    - anchor: {line: 2, character: 6}
-      active: {line: 0, character: 13}
-  marks: {}
-finalState:
-  documentContents: |
-    const r =  /d
-  selections:
-    - anchor: {line: 0, character: 10}
-      active: {line: 0, character: 10}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: nonWhitespaceSequence, position: contents, insideOutsideType: inside, modifier: {type: identity}, isImplicit: false}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/selectionTypes/clearPaintBatt.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/selectionTypes/clearPaintBatt.yml
deleted file mode 100644
index fac9d961c3..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/selectionTypes/clearPaintBatt.yml
+++ /dev/null
@@ -1,26 +0,0 @@
-languageId: plaintext
-command:
-  version: 1
-  spokenForm: clear paint batt
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      selectionType: nonWhitespaceSequence
-      mark: {type: decoratedSymbol, symbolColor: default, character: b}
-initialState:
-  documentContents: |
-    const r = /a[b]*(c)/;
-  selections:
-    - anchor: {line: 1, character: 0}
-      active: {line: 1, character: 0}
-  marks:
-    default.b:
-      start: {line: 0, character: 13}
-      end: {line: 0, character: 14}
-finalState:
-  documentContents: |
-    const r = 
-  selections:
-    - anchor: {line: 0, character: 10}
-      active: {line: 0, character: 10}
-fullTargets: [{type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: b}, selectionType: nonWhitespaceSequence, position: contents, insideOutsideType: inside, modifier: {type: identity}, isImplicit: false}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/selectionTypes/clearPaintBattPastBlueBatt.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/selectionTypes/clearPaintBattPastBlueBatt.yml
deleted file mode 100644
index d69138db2e..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/selectionTypes/clearPaintBattPastBlueBatt.yml
+++ /dev/null
@@ -1,38 +0,0 @@
-languageId: plaintext
-command:
-  version: 1
-  spokenForm: clear paint batt past blue batt
-  action: clearAndSetSelection
-  targets:
-    - type: range
-      start:
-        type: primitive
-        selectionType: nonWhitespaceSequence
-        mark: {type: decoratedSymbol, symbolColor: default, character: b}
-      end:
-        type: primitive
-        mark: {type: decoratedSymbol, symbolColor: blue, character: b}
-      excludeStart: false
-      excludeEnd: false
-initialState:
-  documentContents: |
-    const r = /a[b]*(c)/;
-
-    // a/b/c /d
-  selections:
-    - anchor: {line: 3, character: 0}
-      active: {line: 3, character: 0}
-  marks:
-    default.b:
-      start: {line: 2, character: 5}
-      end: {line: 2, character: 6}
-    blue.b:
-      start: {line: 0, character: 13}
-      end: {line: 0, character: 14}
-finalState:
-  documentContents: |
-    const r =  /d
-  selections:
-    - anchor: {line: 0, character: 10}
-      active: {line: 0, character: 10}
-fullTargets: [{type: range, excludeAnchor: false, excludeActive: false, rangeType: continuous, anchor: {type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: b}, selectionType: nonWhitespaceSequence, position: contents, insideOutsideType: inside, modifier: {type: identity}, isImplicit: false}, active: {type: primitive, mark: {type: decoratedSymbol, symbolColor: blue, character: b}, selectionType: nonWhitespaceSequence, position: contents, insideOutsideType: inside, modifier: {type: identity}, isImplicit: false}}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/selectionTypes/clearPreviousFunk.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/selectionTypes/clearPreviousFunk.yml
deleted file mode 100644
index 5278c034ce..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/selectionTypes/clearPreviousFunk.yml
+++ /dev/null
@@ -1,32 +0,0 @@
-languageId: typescript
-command:
-  spokenForm: clear previous funk
-  version: 2
-  targets:
-    - type: primitive
-      modifiers:
-        - type: relativeScope
-          scopeType: {type: namedFunction}
-          offset: 1
-          length: 1
-          direction: backward
-  usePrePhraseSnapshot: true
-  action: {name: clearAndSetSelection}
-initialState:
-  documentContents: |-
-    function foo() {}
-
-    function bar() {}
-  selections:
-    - anchor: {line: 2, character: 0}
-      active: {line: 2, character: 0}
-  marks: {}
-finalState:
-  documentContents: |-
-
-
-    function bar() {}
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-fullTargets: [{type: primitive, mark: {type: cursor}, modifiers: [{type: previousContainingScope, scopeType: {type: namedFunction}}]}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/selectionTypes/clearPreviousToken.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/selectionTypes/clearPreviousToken.yml
deleted file mode 100644
index 3bb06a0364..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/selectionTypes/clearPreviousToken.yml
+++ /dev/null
@@ -1,26 +0,0 @@
-languageId: plaintext
-command:
-  spokenForm: clear previous token
-  version: 3
-  targets:
-    - type: primitive
-      modifiers:
-        - type: relativeScope
-          scopeType: {type: token}
-          offset: 1
-          length: 1
-          direction: backward
-  usePrePhraseSnapshot: true
-  action: {name: clearAndSetSelection}
-initialState:
-  documentContents: a  b
-  selections:
-    - anchor: {line: 0, character: 2}
-      active: {line: 0, character: 2}
-  marks: {}
-finalState:
-  documentContents: "  b"
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-fullTargets: [{type: primitive, mark: {type: cursor}, modifiers: [{type: relativeScope, scopeType: {type: token}, offset: 1, length: 1, direction: backward}]}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/selectionTypes/clearPreviousWord.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/selectionTypes/clearPreviousWord.yml
deleted file mode 100644
index 86ac4e3e80..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/selectionTypes/clearPreviousWord.yml
+++ /dev/null
@@ -1,26 +0,0 @@
-languageId: plaintext
-command:
-  spokenForm: clear previous word
-  version: 3
-  targets:
-    - type: primitive
-      modifiers:
-        - type: relativeScope
-          scopeType: {type: word}
-          offset: 1
-          length: 1
-          direction: backward
-  usePrePhraseSnapshot: true
-  action: {name: clearAndSetSelection}
-initialState:
-  documentContents: aaaBbbCccDdd
-  selections:
-    - anchor: {line: 0, character: 6}
-      active: {line: 0, character: 6}
-  marks: {}
-finalState:
-  documentContents: BbbCccDdd
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-fullTargets: [{type: primitive, mark: {type: cursor}, modifiers: [{type: relativeScope, scopeType: {type: word}, offset: 1, length: 1, direction: backward}]}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/selectionTypes/clearPreviousWord2.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/selectionTypes/clearPreviousWord2.yml
deleted file mode 100644
index c6e60edc01..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/selectionTypes/clearPreviousWord2.yml
+++ /dev/null
@@ -1,26 +0,0 @@
-languageId: plaintext
-command:
-  spokenForm: clear previous word
-  version: 3
-  targets:
-    - type: primitive
-      modifiers:
-        - type: relativeScope
-          scopeType: {type: word}
-          offset: 1
-          length: 1
-          direction: backward
-  usePrePhraseSnapshot: true
-  action: {name: clearAndSetSelection}
-initialState:
-  documentContents: aaaBbbCccDdd
-  selections:
-    - anchor: {line: 0, character: 6}
-      active: {line: 0, character: 7}
-  marks: {}
-finalState:
-  documentContents: aaaCccDdd
-  selections:
-    - anchor: {line: 0, character: 3}
-      active: {line: 0, character: 3}
-fullTargets: [{type: primitive, mark: {type: cursor}, modifiers: [{type: relativeScope, scopeType: {type: word}, offset: 1, length: 1, direction: backward}]}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/selectionTypes/clearPreviousWord3.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/selectionTypes/clearPreviousWord3.yml
deleted file mode 100644
index 874a8bde15..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/selectionTypes/clearPreviousWord3.yml
+++ /dev/null
@@ -1,26 +0,0 @@
-languageId: plaintext
-command:
-  spokenForm: clear previous word
-  version: 3
-  targets:
-    - type: primitive
-      modifiers:
-        - type: relativeScope
-          scopeType: {type: word}
-          offset: 1
-          length: 1
-          direction: backward
-  usePrePhraseSnapshot: true
-  action: {name: clearAndSetSelection}
-initialState:
-  documentContents: aaaBbbCccDdd
-  selections:
-    - anchor: {line: 0, character: 5}
-      active: {line: 0, character: 7}
-  marks: {}
-finalState:
-  documentContents: BbbCccDdd
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-fullTargets: [{type: primitive, mark: {type: cursor}, modifiers: [{type: relativeScope, scopeType: {type: word}, offset: 1, length: 1, direction: backward}]}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/selectionTypes/clearRowTwoPastFour.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/selectionTypes/clearRowTwoPastFour.yml
deleted file mode 100644
index c94cddb43d..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/selectionTypes/clearRowTwoPastFour.yml
+++ /dev/null
@@ -1,34 +0,0 @@
-languageId: plaintext
-command:
-  spokenForm: clear row two past four
-  version: 3
-  targets:
-    - type: primitive
-      mark:
-        type: range
-        anchor: {type: lineNumber, lineNumberType: modulo100, lineNumber: 1}
-        active: {type: lineNumber, lineNumberType: modulo100, lineNumber: 3}
-        excludeAnchor: false
-        excludeActive: false
-  usePrePhraseSnapshot: true
-  action: {name: clearAndSetSelection}
-initialState:
-  documentContents: |-
-    a
-    b
-    c
-    d
-    e
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-  marks: {}
-finalState:
-  documentContents: |-
-    a
-
-    e
-  selections:
-    - anchor: {line: 1, character: 0}
-      active: {line: 1, character: 0}
-fullTargets: [{type: primitive, mark: {type: range, anchor: {type: lineNumber, lineNumberType: modulo100, lineNumber: 1}, active: {type: lineNumber, lineNumberType: modulo100, lineNumber: 3}, excludeAnchor: false, excludeActive: false}, modifiers: []}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/selectionTypes/clearRowTwoUntilFour.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/selectionTypes/clearRowTwoUntilFour.yml
deleted file mode 100644
index e7b8f724f1..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/selectionTypes/clearRowTwoUntilFour.yml
+++ /dev/null
@@ -1,35 +0,0 @@
-languageId: plaintext
-command:
-  spokenForm: clear row two until four
-  version: 3
-  targets:
-    - type: primitive
-      mark:
-        type: range
-        anchor: {type: lineNumber, lineNumberType: modulo100, lineNumber: 1}
-        active: {type: lineNumber, lineNumberType: modulo100, lineNumber: 3}
-        excludeAnchor: false
-        excludeActive: true
-  usePrePhraseSnapshot: true
-  action: {name: clearAndSetSelection}
-initialState:
-  documentContents: |-
-    a
-    b
-    c
-    d
-    e
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-  marks: {}
-finalState:
-  documentContents: |-
-    a
-
-    d
-    e
-  selections:
-    - anchor: {line: 1, character: 0}
-      active: {line: 1, character: 0}
-fullTargets: [{type: primitive, mark: {type: range, anchor: {type: lineNumber, lineNumberType: modulo100, lineNumber: 1}, active: {type: lineNumber, lineNumberType: modulo100, lineNumber: 3}, excludeAnchor: false, excludeActive: true}, modifiers: []}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/selectionTypes/clearSecondBetweenThirdItem.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/selectionTypes/clearSecondBetweenThirdItem.yml
deleted file mode 100644
index 3ac6abcd09..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/selectionTypes/clearSecondBetweenThirdItem.yml
+++ /dev/null
@@ -1,34 +0,0 @@
-languageId: plaintext
-command:
-  spokenForm: clear second between third item
-  version: 3
-  targets:
-    - type: primitive
-      modifiers:
-        - type: range
-          anchor:
-            type: ordinalScope
-            scopeType: {type: collectionItem}
-            start: 1
-            length: 1
-          active:
-            type: ordinalScope
-            scopeType: {type: collectionItem}
-            start: 2
-            length: 1
-          excludeAnchor: true
-          excludeActive: true
-  usePrePhraseSnapshot: true
-  action: {name: clearAndSetSelection}
-initialState:
-  documentContents: a, b, c, d
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-  marks: {}
-finalState:
-  documentContents: a, bc, d
-  selections:
-    - anchor: {line: 0, character: 4}
-      active: {line: 0, character: 4}
-fullTargets: [{type: primitive, mark: {type: cursor}, modifiers: [{type: range, anchor: {type: ordinalScope, scopeType: {type: collectionItem}, start: 1, length: 1}, active: {type: ordinalScope, scopeType: {type: collectionItem}, start: 2, length: 1}, excludeAnchor: true, excludeActive: true}]}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/selectionTypes/clearSecondItem.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/selectionTypes/clearSecondItem.yml
deleted file mode 100644
index d4b0f7fac9..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/selectionTypes/clearSecondItem.yml
+++ /dev/null
@@ -1,25 +0,0 @@
-languageId: plaintext
-command:
-  spokenForm: clear second item
-  version: 3
-  targets:
-    - type: primitive
-      modifiers:
-        - type: ordinalScope
-          scopeType: {type: collectionItem}
-          start: 1
-          length: 1
-  usePrePhraseSnapshot: true
-  action: {name: clearAndSetSelection}
-initialState:
-  documentContents: a, b, c, d
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-  marks: {}
-finalState:
-  documentContents: a, , c, d
-  selections:
-    - anchor: {line: 0, character: 3}
-      active: {line: 0, character: 3}
-fullTargets: [{type: primitive, mark: {type: cursor}, modifiers: [{type: ordinalScope, scopeType: {type: collectionItem}, start: 1, length: 1}]}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/selectionTypes/clearSecondLastWord.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/selectionTypes/clearSecondLastWord.yml
deleted file mode 100644
index 546945afd4..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/selectionTypes/clearSecondLastWord.yml
+++ /dev/null
@@ -1,25 +0,0 @@
-languageId: plaintext
-command:
-  spokenForm: clear second last word
-  version: 3
-  targets:
-    - type: primitive
-      modifiers:
-        - type: ordinalScope
-          scopeType: {type: word}
-          start: -2
-          length: 1
-  usePrePhraseSnapshot: true
-  action: {name: clearAndSetSelection}
-initialState:
-  documentContents: aaaBbbCccDdd
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-  marks: {}
-finalState:
-  documentContents: aaaBbbDdd
-  selections:
-    - anchor: {line: 0, character: 6}
-      active: {line: 0, character: 6}
-fullTargets: [{type: primitive, mark: {type: cursor}, modifiers: [{type: ordinalScope, scopeType: {type: word}, start: -2, length: 1}]}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/selectionTypes/clearSecondNextWord.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/selectionTypes/clearSecondNextWord.yml
deleted file mode 100644
index e5c1fcfd85..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/selectionTypes/clearSecondNextWord.yml
+++ /dev/null
@@ -1,26 +0,0 @@
-languageId: plaintext
-command:
-  spokenForm: clear second next word
-  version: 3
-  targets:
-    - type: primitive
-      modifiers:
-        - type: relativeScope
-          scopeType: {type: word}
-          offset: 2
-          length: 1
-          direction: forward
-  usePrePhraseSnapshot: true
-  action: {name: clearAndSetSelection}
-initialState:
-  documentContents: aaaBbbCccDdd
-  selections:
-    - anchor: {line: 0, character: 4}
-      active: {line: 0, character: 4}
-  marks: {}
-finalState:
-  documentContents: aaaBbbCcc
-  selections:
-    - anchor: {line: 0, character: 9}
-      active: {line: 0, character: 9}
-fullTargets: [{type: primitive, mark: {type: cursor}, modifiers: [{type: relativeScope, scopeType: {type: word}, offset: 2, length: 1, direction: forward}]}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/selectionTypes/clearSecondPastThirdItem.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/selectionTypes/clearSecondPastThirdItem.yml
deleted file mode 100644
index cbd2bd6f6b..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/selectionTypes/clearSecondPastThirdItem.yml
+++ /dev/null
@@ -1,34 +0,0 @@
-languageId: plaintext
-command:
-  spokenForm: clear second past third item
-  version: 3
-  targets:
-    - type: primitive
-      modifiers:
-        - type: range
-          anchor:
-            type: ordinalScope
-            scopeType: {type: collectionItem}
-            start: 1
-            length: 1
-          active:
-            type: ordinalScope
-            scopeType: {type: collectionItem}
-            start: 2
-            length: 1
-          excludeAnchor: false
-          excludeActive: false
-  usePrePhraseSnapshot: true
-  action: {name: clearAndSetSelection}
-initialState:
-  documentContents: a, b, c, d
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-  marks: {}
-finalState:
-  documentContents: a, , d
-  selections:
-    - anchor: {line: 0, character: 3}
-      active: {line: 0, character: 3}
-fullTargets: [{type: primitive, mark: {type: cursor}, modifiers: [{type: range, anchor: {type: ordinalScope, scopeType: {type: collectionItem}, start: 1, length: 1}, active: {type: ordinalScope, scopeType: {type: collectionItem}, start: 2, length: 1}, excludeAnchor: false, excludeActive: false}]}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/selectionTypes/clearSecondUntilFourthItem.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/selectionTypes/clearSecondUntilFourthItem.yml
deleted file mode 100644
index 57273426f0..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/selectionTypes/clearSecondUntilFourthItem.yml
+++ /dev/null
@@ -1,34 +0,0 @@
-languageId: plaintext
-command:
-  spokenForm: clear second until fourth item
-  version: 3
-  targets:
-    - type: primitive
-      modifiers:
-        - type: range
-          anchor:
-            type: ordinalScope
-            scopeType: {type: collectionItem}
-            start: 1
-            length: 1
-          active:
-            type: ordinalScope
-            scopeType: {type: collectionItem}
-            start: 3
-            length: 1
-          excludeAnchor: false
-          excludeActive: true
-  usePrePhraseSnapshot: true
-  action: {name: clearAndSetSelection}
-initialState:
-  documentContents: a, b, c, d
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-  marks: {}
-finalState:
-  documentContents: a, d
-  selections:
-    - anchor: {line: 0, character: 3}
-      active: {line: 0, character: 3}
-fullTargets: [{type: primitive, mark: {type: cursor}, modifiers: [{type: range, anchor: {type: ordinalScope, scopeType: {type: collectionItem}, start: 1, length: 1}, active: {type: ordinalScope, scopeType: {type: collectionItem}, start: 3, length: 1}, excludeAnchor: false, excludeActive: true}]}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/selectionTypes/clearShortPaint.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/selectionTypes/clearShortPaint.yml
deleted file mode 100644
index 58b618ddd9..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/selectionTypes/clearShortPaint.yml
+++ /dev/null
@@ -1,23 +0,0 @@
-languageId: plaintext
-command:
-  spokenForm: clear short paint
-  version: 2
-  targets:
-    - type: primitive
-      modifiers:
-        - type: containingScope
-          scopeType: {type: boundedNonWhitespaceSequence}
-  usePrePhraseSnapshot: true
-  action: {name: clearAndSetSelection}
-initialState:
-  documentContents: "{foo.bar(hello-world, whatever-now)} test-this"
-  selections:
-    - anchor: {line: 0, character: 9}
-      active: {line: 0, character: 9}
-  marks: {}
-finalState:
-  documentContents: "{foo.bar( whatever-now)} test-this"
-  selections:
-    - anchor: {line: 0, character: 9}
-      active: {line: 0, character: 9}
-fullTargets: [{type: primitive, mark: {type: cursor}, modifiers: [{type: containingScope, scopeType: {type: boundedNonWhitespaceSequence}}]}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/selectionTypes/clearShortPaint2.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/selectionTypes/clearShortPaint2.yml
deleted file mode 100644
index 5f25077e14..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/selectionTypes/clearShortPaint2.yml
+++ /dev/null
@@ -1,23 +0,0 @@
-languageId: plaintext
-command:
-  spokenForm: clear short paint
-  version: 2
-  targets:
-    - type: primitive
-      modifiers:
-        - type: containingScope
-          scopeType: {type: boundedNonWhitespaceSequence}
-  usePrePhraseSnapshot: true
-  action: {name: clearAndSetSelection}
-initialState:
-  documentContents: "{foo.bar(hello-world, whatever-now)} test-this"
-  selections:
-    - anchor: {line: 0, character: 8}
-      active: {line: 0, character: 8}
-  marks: {}
-finalState:
-  documentContents: "{ whatever-now)} test-this"
-  selections:
-    - anchor: {line: 0, character: 1}
-      active: {line: 0, character: 1}
-fullTargets: [{type: primitive, mark: {type: cursor}, modifiers: [{type: containingScope, scopeType: {type: boundedNonWhitespaceSequence}}]}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/selectionTypes/clearShortPaint3.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/selectionTypes/clearShortPaint3.yml
deleted file mode 100644
index 1a5c127ecd..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/selectionTypes/clearShortPaint3.yml
+++ /dev/null
@@ -1,23 +0,0 @@
-languageId: plaintext
-command:
-  spokenForm: clear short paint
-  version: 2
-  targets:
-    - type: primitive
-      modifiers:
-        - type: containingScope
-          scopeType: {type: boundedNonWhitespaceSequence}
-  usePrePhraseSnapshot: true
-  action: {name: clearAndSetSelection}
-initialState:
-  documentContents: "{foo.bar(hello-world, whatever-now)} test-this"
-  selections:
-    - anchor: {line: 0, character: 6}
-      active: {line: 0, character: 11}
-  marks: {}
-finalState:
-  documentContents: "{ whatever-now)} test-this"
-  selections:
-    - anchor: {line: 0, character: 1}
-      active: {line: 0, character: 1}
-fullTargets: [{type: primitive, mark: {type: cursor}, modifiers: [{type: containingScope, scopeType: {type: boundedNonWhitespaceSequence}}]}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/selectionTypes/clearShortPaintLeper.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/selectionTypes/clearShortPaintLeper.yml
deleted file mode 100644
index dee66cf617..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/selectionTypes/clearShortPaintLeper.yml
+++ /dev/null
@@ -1,27 +0,0 @@
-languageId: plaintext
-command:
-  spokenForm: clear short paint leper
-  version: 2
-  targets:
-    - type: primitive
-      mark: {type: decoratedSymbol, symbolColor: default, character: (}
-      modifiers:
-        - type: containingScope
-          scopeType: {type: boundedNonWhitespaceSequence}
-  usePrePhraseSnapshot: true
-  action: {name: clearAndSetSelection}
-initialState:
-  documentContents: "{foo.bar(hello-world, whatever-now)} test-this"
-  selections:
-    - anchor: {line: 0, character: 14}
-      active: {line: 0, character: 14}
-  marks:
-    default.(:
-      start: {line: 0, character: 8}
-      end: {line: 0, character: 9}
-finalState:
-  documentContents: "{ whatever-now)} test-this"
-  selections:
-    - anchor: {line: 0, character: 1}
-      active: {line: 0, character: 1}
-fullTargets: [{type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: (}, modifiers: [{type: containingScope, scopeType: {type: boundedNonWhitespaceSequence}}]}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/selectionTypes/clearTrailing.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/selectionTypes/clearTrailing.yml
deleted file mode 100644
index 7acfc1bea9..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/selectionTypes/clearTrailing.yml
+++ /dev/null
@@ -1,22 +0,0 @@
-languageId: plaintext
-command:
-  spokenForm: clear trailing
-  version: 2
-  targets:
-    - type: primitive
-      modifiers:
-        - {type: trailing}
-  usePrePhraseSnapshot: true
-  action: {name: clearAndSetSelection}
-initialState:
-  documentContents: aaa bbb ccc
-  selections:
-    - anchor: {line: 0, character: 6}
-      active: {line: 0, character: 6}
-  marks: {}
-finalState:
-  documentContents: aaa bbbccc
-  selections:
-    - anchor: {line: 0, character: 7}
-      active: {line: 0, character: 7}
-fullTargets: [{type: primitive, mark: {type: cursor}, modifiers: [{type: trailing}]}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/selectionTypes/clearWord.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/selectionTypes/clearWord.yml
deleted file mode 100644
index dc6d674c8e..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/selectionTypes/clearWord.yml
+++ /dev/null
@@ -1,23 +0,0 @@
-languageId: plaintext
-command:
-  spokenForm: clear word
-  version: 3
-  targets:
-    - type: primitive
-      modifiers:
-        - type: containingScope
-          scopeType: {type: word}
-  usePrePhraseSnapshot: true
-  action: {name: clearAndSetSelection}
-initialState:
-  documentContents: aaaBbbCcc
-  selections:
-    - anchor: {line: 0, character: 4}
-      active: {line: 0, character: 4}
-  marks: {}
-finalState:
-  documentContents: aaaCcc
-  selections:
-    - anchor: {line: 0, character: 3}
-      active: {line: 0, character: 3}
-fullTargets: [{type: primitive, mark: {type: cursor}, modifiers: [{type: containingScope, scopeType: {type: word}}]}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/selectionTypes/clearWord2.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/selectionTypes/clearWord2.yml
deleted file mode 100644
index dd1ace6460..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/selectionTypes/clearWord2.yml
+++ /dev/null
@@ -1,23 +0,0 @@
-languageId: plaintext
-command:
-  spokenForm: clear word
-  version: 3
-  targets:
-    - type: primitive
-      modifiers:
-        - type: containingScope
-          scopeType: {type: word}
-  usePrePhraseSnapshot: true
-  action: {name: clearAndSetSelection}
-initialState:
-  documentContents: aaaBbbCcc
-  selections:
-    - anchor: {line: 0, character: 3}
-      active: {line: 0, character: 4}
-  marks: {}
-finalState:
-  documentContents: aaaCcc
-  selections:
-    - anchor: {line: 0, character: 3}
-      active: {line: 0, character: 3}
-fullTargets: [{type: primitive, mark: {type: cursor}, modifiers: [{type: containingScope, scopeType: {type: word}}]}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/selectionTypes/clearWord3.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/selectionTypes/clearWord3.yml
deleted file mode 100644
index f7bc901bf8..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/selectionTypes/clearWord3.yml
+++ /dev/null
@@ -1,23 +0,0 @@
-languageId: plaintext
-command:
-  spokenForm: clear word
-  version: 3
-  targets:
-    - type: primitive
-      modifiers:
-        - type: containingScope
-          scopeType: {type: word}
-  usePrePhraseSnapshot: true
-  action: {name: clearAndSetSelection}
-initialState:
-  documentContents: aaaBbbCcc
-  selections:
-    - anchor: {line: 0, character: 2}
-      active: {line: 0, character: 4}
-  marks: {}
-finalState:
-  documentContents: Ccc
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-fullTargets: [{type: primitive, mark: {type: cursor}, modifiers: [{type: containingScope, scopeType: {type: word}}]}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/selectionTypes/clearWord4.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/selectionTypes/clearWord4.yml
deleted file mode 100644
index a84f3ee2d9..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/selectionTypes/clearWord4.yml
+++ /dev/null
@@ -1,23 +0,0 @@
-languageId: plaintext
-command:
-  spokenForm: clear word
-  version: 3
-  targets:
-    - type: primitive
-      modifiers:
-        - type: containingScope
-          scopeType: {type: word}
-  usePrePhraseSnapshot: true
-  action: {name: clearAndSetSelection}
-initialState:
-  documentContents: aaaBbbCcc
-  selections:
-    - anchor: {line: 0, character: 3}
-      active: {line: 0, character: 6}
-  marks: {}
-finalState:
-  documentContents: aaaCcc
-  selections:
-    - anchor: {line: 0, character: 3}
-      active: {line: 0, character: 3}
-fullTargets: [{type: primitive, mark: {type: cursor}, modifiers: [{type: containingScope, scopeType: {type: word}}]}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/selectionTypes/clearWord5.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/selectionTypes/clearWord5.yml
deleted file mode 100644
index 4a5c99d622..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/selectionTypes/clearWord5.yml
+++ /dev/null
@@ -1,23 +0,0 @@
-languageId: plaintext
-command:
-  spokenForm: clear word
-  version: 3
-  targets:
-    - type: primitive
-      modifiers:
-        - type: containingScope
-          scopeType: {type: word}
-  usePrePhraseSnapshot: true
-  action: {name: clearAndSetSelection}
-initialState:
-  documentContents: aaaBbbCcc
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-  marks: {}
-finalState:
-  documentContents: BbbCcc
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-fullTargets: [{type: primitive, mark: {type: cursor}, modifiers: [{type: containingScope, scopeType: {type: word}}]}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/selectionTypes/clearWord6.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/selectionTypes/clearWord6.yml
deleted file mode 100644
index 92a3ed8d36..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/selectionTypes/clearWord6.yml
+++ /dev/null
@@ -1,23 +0,0 @@
-languageId: plaintext
-command:
-  spokenForm: clear word
-  version: 3
-  targets:
-    - type: primitive
-      modifiers:
-        - type: containingScope
-          scopeType: {type: word}
-  usePrePhraseSnapshot: true
-  action: {name: clearAndSetSelection}
-initialState:
-  documentContents: aaaBbbCcc
-  selections:
-    - anchor: {line: 0, character: 3}
-      active: {line: 0, character: 3}
-  marks: {}
-finalState:
-  documentContents: aaaCcc
-  selections:
-    - anchor: {line: 0, character: 3}
-      active: {line: 0, character: 3}
-fullTargets: [{type: primitive, mark: {type: cursor}, modifiers: [{type: containingScope, scopeType: {type: word}}]}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/selectionTypes/clearWord7.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/selectionTypes/clearWord7.yml
deleted file mode 100644
index 850d9c397e..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/selectionTypes/clearWord7.yml
+++ /dev/null
@@ -1,23 +0,0 @@
-languageId: plaintext
-command:
-  spokenForm: clear word
-  version: 3
-  targets:
-    - type: primitive
-      modifiers:
-        - type: containingScope
-          scopeType: {type: word}
-  usePrePhraseSnapshot: true
-  action: {name: clearAndSetSelection}
-initialState:
-  documentContents: aaaBbbCcc
-  selections:
-    - anchor: {line: 0, character: 9}
-      active: {line: 0, character: 9}
-  marks: {}
-finalState:
-  documentContents: aaaBbb
-  selections:
-    - anchor: {line: 0, character: 6}
-      active: {line: 0, character: 6}
-fullTargets: [{type: primitive, mark: {type: cursor}, modifiers: [{type: containingScope, scopeType: {type: word}}]}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/selectionTypes/drinkCell.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/selectionTypes/drinkCell.yml
deleted file mode 100644
index 7bd2c814d0..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/selectionTypes/drinkCell.yml
+++ /dev/null
@@ -1,26 +0,0 @@
-languageId: python
-postCommandSleepTimeMs: 400
-command:
-  version: 1
-  spokenForm: drink cell
-  action: editNewLineBefore
-  targets:
-    - {type: primitive, selectionType: notebookCell}
-initialState:
-  documentContents: |-
-    # %%
-    print("hello")
-  selections:
-    - anchor: {line: 1, character: 12}
-      active: {line: 1, character: 12}
-  marks: {}
-finalState:
-  documentContents: |-
-    # %%
-
-    # %%
-    print("hello")
-  selections:
-    - anchor: {line: 1, character: 0}
-      active: {line: 1, character: 0}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: notebookCell, position: contents, insideOutsideType: inside, modifier: {type: identity}}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/selectionTypes/drinkCellEach.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/selectionTypes/drinkCellEach.yml
deleted file mode 100644
index bb1f2940e1..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/selectionTypes/drinkCellEach.yml
+++ /dev/null
@@ -1,38 +0,0 @@
-languageId: python
-postEditorOpenSleepTimeMs: 250
-postCommandSleepTimeMs: 400
-command:
-  version: 1
-  spokenForm: drink cell each
-  action: editNewLineBefore
-  targets:
-    - type: primitive
-      selectionType: notebookCell
-      mark: {type: decoratedSymbol, symbolColor: default, character: e}
-initialState:
-  documentContents: |-
-    # %%
-    print("hello")
-
-    # %%
-    print("hello")
-  selections:
-    - anchor: {line: 4, character: 12}
-      active: {line: 4, character: 12}
-  marks:
-    default.e:
-      start: {line: 1, character: 7}
-      end: {line: 1, character: 12}
-finalState:
-  documentContents: |-
-    # %%
-
-    # %%
-    print("hello")
-
-    # %%
-    print("hello")
-  selections:
-    - anchor: {line: 1, character: 0}
-      active: {line: 1, character: 0}
-fullTargets: [{type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: e}, selectionType: notebookCell, position: contents, insideOutsideType: inside, modifier: {type: identity}}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/selectionTypes/drinkEveryArg.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/selectionTypes/drinkEveryArg.yml
deleted file mode 100644
index 3cae035868..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/selectionTypes/drinkEveryArg.yml
+++ /dev/null
@@ -1,33 +0,0 @@
-languageId: typescript
-command:
-  spokenForm: drink every arg
-  version: 2
-  targets:
-    - type: primitive
-      modifiers:
-        - type: everyScope
-          scopeType: {type: argumentOrParameter}
-  usePrePhraseSnapshot: true
-  action: {name: editNewLineBefore}
-initialState:
-  documentContents: |-
-    function whatever(a: number, b: number, c: number) {
-        
-    }
-  selections:
-    - anchor: {line: 0, character: 29}
-      active: {line: 0, character: 29}
-  marks: {}
-finalState:
-  documentContents: |-
-    function whatever(, a: number, , b: number, , c: number) {
-        
-    }
-  selections:
-    - anchor: {line: 0, character: 18}
-      active: {line: 0, character: 18}
-    - anchor: {line: 0, character: 31}
-      active: {line: 0, character: 31}
-    - anchor: {line: 0, character: 44}
-      active: {line: 0, character: 44}
-fullTargets: [{type: primitive, mark: {type: cursor}, modifiers: [{type: everyScope, scopeType: {type: argumentOrParameter}}]}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/selectionTypes/drinkJustFine.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/selectionTypes/drinkJustFine.yml
deleted file mode 100644
index f3b9e7cc0b..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/selectionTypes/drinkJustFine.yml
+++ /dev/null
@@ -1,26 +0,0 @@
-languageId: plaintext
-command:
-  spokenForm: drink just fine
-  version: 2
-  action: {name: editNewLineBefore}
-  targets:
-    - type: primitive
-      mark: {type: decoratedSymbol, symbolColor: default, character: f}
-      modifiers:
-        - {type: toRawSelection}
-  usePrePhraseSnapshot: true
-initialState:
-  documentContents: foo
-  selections:
-    - anchor: {line: 0, character: 3}
-      active: {line: 0, character: 3}
-  marks:
-    default.f:
-      start: {line: 0, character: 0}
-      end: {line: 0, character: 3}
-finalState:
-  documentContents: foo
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-fullTargets: [{type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: f}, modifiers: [{type: toRawSelection}]}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/selectionTypes/drinkToken.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/selectionTypes/drinkToken.yml
deleted file mode 100644
index e489a99d72..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/selectionTypes/drinkToken.yml
+++ /dev/null
@@ -1,23 +0,0 @@
-languageId: python
-command:
-  spokenForm: drink token
-  version: 2
-  action: {name: editNewLineBefore}
-  targets:
-    - type: primitive
-      modifiers:
-        - type: containingScope
-          scopeType: {type: token}
-  usePrePhraseSnapshot: true
-initialState:
-  documentContents: foo
-  selections:
-    - anchor: {line: 0, character: 2}
-      active: {line: 0, character: 2}
-  marks: {}
-finalState:
-  documentContents: " foo"
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-fullTargets: [{type: primitive, mark: {type: cursor}, modifiers: [{type: containingScope, scopeType: token}]}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/selectionTypes/pourCell.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/selectionTypes/pourCell.yml
deleted file mode 100644
index fa504043cf..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/selectionTypes/pourCell.yml
+++ /dev/null
@@ -1,25 +0,0 @@
-languageId: python
-postCommandSleepTimeMs: 400
-command:
-  version: 1
-  spokenForm: pour cell
-  action: editNewLineAfter
-  targets:
-    - {type: primitive, selectionType: notebookCell}
-initialState:
-  documentContents: |-
-    # %%
-    print("hello")
-  selections:
-    - anchor: {line: 1, character: 12}
-      active: {line: 1, character: 12}
-  marks: {}
-finalState:
-  documentContents: |
-    # %%
-    print("hello")
-    # %%
-  selections:
-    - anchor: {line: 3, character: 0}
-      active: {line: 3, character: 0}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: notebookCell, position: contents, insideOutsideType: inside, modifier: {type: identity}}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/selectionTypes/pourCellEach.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/selectionTypes/pourCellEach.yml
deleted file mode 100644
index bacb91bb71..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/selectionTypes/pourCellEach.yml
+++ /dev/null
@@ -1,38 +0,0 @@
-languageId: python
-postEditorOpenSleepTimeMs: 250
-postCommandSleepTimeMs: 400
-command:
-  version: 1
-  spokenForm: pour cell each
-  action: editNewLineAfter
-  targets:
-    - type: primitive
-      selectionType: notebookCell
-      mark: {type: decoratedSymbol, symbolColor: default, character: e}
-initialState:
-  documentContents: |-
-    # %%
-    print("hello")
-
-    # %%
-    print("hello")
-  selections:
-    - anchor: {line: 4, character: 12}
-      active: {line: 4, character: 12}
-  marks:
-    default.e:
-      start: {line: 1, character: 7}
-      end: {line: 1, character: 12}
-finalState:
-  documentContents: |-
-    # %%
-    print("hello")
-
-    # %%
-
-    # %%
-    print("hello")
-  selections:
-    - anchor: {line: 4, character: 0}
-      active: {line: 4, character: 0}
-fullTargets: [{type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: e}, selectionType: notebookCell, position: contents, insideOutsideType: inside, modifier: {type: identity}}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/selectionTypes/pourEveryArg.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/selectionTypes/pourEveryArg.yml
deleted file mode 100644
index e354cd2800..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/selectionTypes/pourEveryArg.yml
+++ /dev/null
@@ -1,33 +0,0 @@
-languageId: typescript
-command:
-  spokenForm: pour every arg
-  version: 2
-  targets:
-    - type: primitive
-      modifiers:
-        - type: everyScope
-          scopeType: {type: argumentOrParameter}
-  usePrePhraseSnapshot: true
-  action: {name: editNewLineAfter}
-initialState:
-  documentContents: |-
-    function whatever(a: number, b: number, c: number) {
-        
-    }
-  selections:
-    - anchor: {line: 0, character: 29}
-      active: {line: 0, character: 29}
-  marks: {}
-finalState:
-  documentContents: |-
-    function whatever(a: number, , b: number, , c: number, ) {
-        
-    }
-  selections:
-    - anchor: {line: 0, character: 29}
-      active: {line: 0, character: 29}
-    - anchor: {line: 0, character: 42}
-      active: {line: 0, character: 42}
-    - anchor: {line: 0, character: 55}
-      active: {line: 0, character: 55}
-fullTargets: [{type: primitive, mark: {type: cursor}, modifiers: [{type: everyScope, scopeType: {type: argumentOrParameter}}]}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/selectionTypes/takeEveryCar.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/selectionTypes/takeEveryCar.yml
deleted file mode 100644
index e9a7611b45..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/selectionTypes/takeEveryCar.yml
+++ /dev/null
@@ -1,39 +0,0 @@
-languageId: plaintext
-command:
-  spokenForm: take every car
-  version: 3
-  targets:
-    - type: primitive
-      modifiers:
-        - type: everyScope
-          scopeType: {type: character}
-  usePrePhraseSnapshot: true
-  action: {name: setSelection}
-initialState:
-  documentContents: aaaBbbCcc
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-  marks: {}
-finalState:
-  documentContents: aaaBbbCcc
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 1}
-    - anchor: {line: 0, character: 1}
-      active: {line: 0, character: 2}
-    - anchor: {line: 0, character: 2}
-      active: {line: 0, character: 3}
-    - anchor: {line: 0, character: 3}
-      active: {line: 0, character: 4}
-    - anchor: {line: 0, character: 4}
-      active: {line: 0, character: 5}
-    - anchor: {line: 0, character: 5}
-      active: {line: 0, character: 6}
-    - anchor: {line: 0, character: 6}
-      active: {line: 0, character: 7}
-    - anchor: {line: 0, character: 7}
-      active: {line: 0, character: 8}
-    - anchor: {line: 0, character: 8}
-      active: {line: 0, character: 9}
-fullTargets: [{type: primitive, mark: {type: cursor}, modifiers: [{type: everyScope, scopeType: {type: character}}]}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/selectionTypes/takeEveryCarBlock.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/selectionTypes/takeEveryCarBlock.yml
deleted file mode 100644
index 7f404d9b1a..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/selectionTypes/takeEveryCarBlock.yml
+++ /dev/null
@@ -1,47 +0,0 @@
-languageId: plaintext
-command:
-  spokenForm: take every car block
-  version: 3
-  targets:
-    - type: primitive
-      modifiers:
-        - type: everyScope
-          scopeType: {type: character}
-        - type: containingScope
-          scopeType: {type: paragraph}
-  usePrePhraseSnapshot: true
-  action: {name: setSelection}
-initialState:
-  documentContents: |-
-    a*a
-    b-b
-    c/c
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-  marks: {}
-finalState:
-  documentContents: |-
-    a*a
-    b-b
-    c/c
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 1}
-    - anchor: {line: 0, character: 1}
-      active: {line: 0, character: 2}
-    - anchor: {line: 0, character: 2}
-      active: {line: 0, character: 3}
-    - anchor: {line: 1, character: 0}
-      active: {line: 1, character: 1}
-    - anchor: {line: 1, character: 1}
-      active: {line: 1, character: 2}
-    - anchor: {line: 1, character: 2}
-      active: {line: 1, character: 3}
-    - anchor: {line: 2, character: 0}
-      active: {line: 2, character: 1}
-    - anchor: {line: 2, character: 1}
-      active: {line: 2, character: 2}
-    - anchor: {line: 2, character: 2}
-      active: {line: 2, character: 3}
-fullTargets: [{type: primitive, mark: {type: cursor}, modifiers: [{type: everyScope, scopeType: {type: character}}, {type: containingScope, scopeType: {type: paragraph}}]}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/selectionTypes/takeEveryFile.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/selectionTypes/takeEveryFile.yml
deleted file mode 100644
index cd9c3109a5..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/selectionTypes/takeEveryFile.yml
+++ /dev/null
@@ -1,35 +0,0 @@
-languageId: plaintext
-command:
-  spokenForm: take every file
-  version: 2
-  targets:
-    - type: primitive
-      modifiers:
-        - type: everyScope
-          scopeType: {type: document}
-  usePrePhraseSnapshot: true
-  action: {name: setSelection}
-initialState:
-  documentContents: |2+
-
-
-        foo 
-
-        bar 
-
-  selections:
-    - anchor: {line: 6, character: 0}
-      active: {line: 6, character: 0}
-  marks: {}
-finalState:
-  documentContents: |2+
-
-
-        foo 
-
-        bar 
-
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 6, character: 0}
-fullTargets: [{type: primitive, mark: {type: cursor}, modifiers: [{type: everyScope, scopeType: {type: document}}]}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/selectionTypes/takeEveryLine.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/selectionTypes/takeEveryLine.yml
deleted file mode 100644
index 28878f942c..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/selectionTypes/takeEveryLine.yml
+++ /dev/null
@@ -1,47 +0,0 @@
-languageId: plaintext
-command:
-  spokenForm: take every line
-  version: 2
-  action: {name: setSelection}
-  targets:
-    - type: primitive
-      modifiers:
-        - type: everyScope
-          scopeType: {type: line}
-  usePrePhraseSnapshot: true
-initialState:
-  documentContents: |
-
-    a
-
-    b   c
-    d   e
-    f   g
-  selections:
-    - anchor: {line: 6, character: 0}
-      active: {line: 6, character: 0}
-  marks: {}
-finalState:
-  documentContents: |
-
-    a
-
-    b   c
-    d   e
-    f   g
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-    - anchor: {line: 1, character: 0}
-      active: {line: 1, character: 1}
-    - anchor: {line: 2, character: 0}
-      active: {line: 2, character: 0}
-    - anchor: {line: 3, character: 0}
-      active: {line: 3, character: 5}
-    - anchor: {line: 4, character: 0}
-      active: {line: 4, character: 5}
-    - anchor: {line: 5, character: 0}
-      active: {line: 5, character: 5}
-    - anchor: {line: 6, character: 0}
-      active: {line: 6, character: 0}
-fullTargets: [{type: primitive, mark: {type: cursor}, modifiers: [{type: everyScope, scopeType: line}]}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/selectionTypes/takeEveryLine2.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/selectionTypes/takeEveryLine2.yml
deleted file mode 100644
index d2c21eca89..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/selectionTypes/takeEveryLine2.yml
+++ /dev/null
@@ -1,41 +0,0 @@
-languageId: plaintext
-command:
-  spokenForm: take every line
-  version: 2
-  action: {name: setSelection}
-  targets:
-    - type: primitive
-      modifiers:
-        - type: everyScope
-          scopeType: {type: line}
-  usePrePhraseSnapshot: true
-initialState:
-  documentContents: |
-
-    a
-
-    b   c
-    d   e
-    f   g
-  selections:
-    - anchor: {line: 4, character: 5}
-      active: {line: 1, character: 0}
-  marks: {}
-finalState:
-  documentContents: |
-
-    a
-
-    b   c
-    d   e
-    f   g
-  selections:
-    - anchor: {line: 1, character: 1}
-      active: {line: 1, character: 0}
-    - anchor: {line: 2, character: 0}
-      active: {line: 2, character: 0}
-    - anchor: {line: 3, character: 5}
-      active: {line: 3, character: 0}
-    - anchor: {line: 4, character: 5}
-      active: {line: 4, character: 0}
-fullTargets: [{type: primitive, mark: {type: cursor}, modifiers: [{type: everyScope, scopeType: line}]}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/selectionTypes/takeEveryLine3.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/selectionTypes/takeEveryLine3.yml
deleted file mode 100644
index e7bf1df1b5..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/selectionTypes/takeEveryLine3.yml
+++ /dev/null
@@ -1,41 +0,0 @@
-languageId: plaintext
-command:
-  spokenForm: take every line
-  version: 2
-  action: {name: setSelection}
-  targets:
-    - type: primitive
-      modifiers:
-        - type: everyScope
-          scopeType: {type: line}
-  usePrePhraseSnapshot: true
-initialState:
-  documentContents: |
-
-    a
-
-    b   c
-    d   e
-    f   g
-  selections:
-    - anchor: {line: 1, character: 0}
-      active: {line: 4, character: 5}
-  marks: {}
-finalState:
-  documentContents: |
-
-    a
-
-    b   c
-    d   e
-    f   g
-  selections:
-    - anchor: {line: 1, character: 0}
-      active: {line: 1, character: 1}
-    - anchor: {line: 2, character: 0}
-      active: {line: 2, character: 0}
-    - anchor: {line: 3, character: 0}
-      active: {line: 3, character: 5}
-    - anchor: {line: 4, character: 0}
-      active: {line: 4, character: 5}
-fullTargets: [{type: primitive, mark: {type: cursor}, modifiers: [{type: everyScope, scopeType: line}]}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/selectionTypes/takeEveryShortPaint.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/selectionTypes/takeEveryShortPaint.yml
deleted file mode 100644
index b5b7e88d5f..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/selectionTypes/takeEveryShortPaint.yml
+++ /dev/null
@@ -1,27 +0,0 @@
-languageId: plaintext
-command:
-  spokenForm: take every short paint
-  version: 2
-  targets:
-    - type: primitive
-      modifiers:
-        - type: everyScope
-          scopeType: {type: boundedNonWhitespaceSequence}
-  usePrePhraseSnapshot: true
-  action: {name: setSelection}
-initialState:
-  documentContents: foo[0](bar.test, baz-other-test) something[]
-  selections:
-    - anchor: {line: 0, character: 33}
-      active: {line: 0, character: 33}
-  marks: {}
-finalState:
-  documentContents: foo[0](bar.test, baz-other-test) something[]
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 16}
-    - anchor: {line: 0, character: 17}
-      active: {line: 0, character: 32}
-    - anchor: {line: 0, character: 33}
-      active: {line: 0, character: 44}
-fullTargets: [{type: primitive, mark: {type: cursor}, modifiers: [{type: everyScope, scopeType: {type: boundedNonWhitespaceSequence}}]}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/selectionTypes/takeEveryShortPaint2.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/selectionTypes/takeEveryShortPaint2.yml
deleted file mode 100644
index 8aca348cce..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/selectionTypes/takeEveryShortPaint2.yml
+++ /dev/null
@@ -1,25 +0,0 @@
-languageId: plaintext
-command:
-  spokenForm: take every short paint
-  version: 2
-  targets:
-    - type: primitive
-      modifiers:
-        - type: everyScope
-          scopeType: {type: boundedNonWhitespaceSequence}
-  usePrePhraseSnapshot: true
-  action: {name: setSelection}
-initialState:
-  documentContents: foo[0](bar.test, baz-other-test) something[]
-  selections:
-    - anchor: {line: 0, character: 29}
-      active: {line: 0, character: 29}
-  marks: {}
-finalState:
-  documentContents: foo[0](bar.test, baz-other-test) something[]
-  selections:
-    - anchor: {line: 0, character: 7}
-      active: {line: 0, character: 16}
-    - anchor: {line: 0, character: 17}
-      active: {line: 0, character: 31}
-fullTargets: [{type: primitive, mark: {type: cursor}, modifiers: [{type: everyScope, scopeType: {type: boundedNonWhitespaceSequence}}]}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/selectionTypes/takeEveryShortPaint3.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/selectionTypes/takeEveryShortPaint3.yml
deleted file mode 100644
index b73fb48ca4..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/selectionTypes/takeEveryShortPaint3.yml
+++ /dev/null
@@ -1,27 +0,0 @@
-languageId: plaintext
-command:
-  spokenForm: take every short paint
-  version: 2
-  targets:
-    - type: primitive
-      modifiers:
-        - type: everyScope
-          scopeType: {type: boundedNonWhitespaceSequence}
-  usePrePhraseSnapshot: true
-  action: {name: setSelection}
-initialState:
-  documentContents: foo[0](bar.test, baz-other-test) something[]
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-  marks: {}
-finalState:
-  documentContents: foo[0](bar.test, baz-other-test) something[]
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 16}
-    - anchor: {line: 0, character: 17}
-      active: {line: 0, character: 32}
-    - anchor: {line: 0, character: 33}
-      active: {line: 0, character: 44}
-fullTargets: [{type: primitive, mark: {type: cursor}, modifiers: [{type: everyScope, scopeType: {type: boundedNonWhitespaceSequence}}]}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/selectionTypes/takeEveryWord.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/selectionTypes/takeEveryWord.yml
deleted file mode 100644
index fcf7d054ae..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/selectionTypes/takeEveryWord.yml
+++ /dev/null
@@ -1,27 +0,0 @@
-languageId: plaintext
-command:
-  spokenForm: take every word
-  version: 3
-  targets:
-    - type: primitive
-      modifiers:
-        - type: everyScope
-          scopeType: {type: word}
-  usePrePhraseSnapshot: true
-  action: {name: setSelection}
-initialState:
-  documentContents: aaaBbbCcc
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-  marks: {}
-finalState:
-  documentContents: aaaBbbCcc
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 3}
-    - anchor: {line: 0, character: 3}
-      active: {line: 0, character: 6}
-    - anchor: {line: 0, character: 6}
-      active: {line: 0, character: 9}
-fullTargets: [{type: primitive, mark: {type: cursor}, modifiers: [{type: everyScope, scopeType: {type: word}}]}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/selectionTypes/takeFile.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/selectionTypes/takeFile.yml
deleted file mode 100644
index cd81f51c23..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/selectionTypes/takeFile.yml
+++ /dev/null
@@ -1,35 +0,0 @@
-languageId: plaintext
-command:
-  spokenForm: take file
-  version: 2
-  targets:
-    - type: primitive
-      modifiers:
-        - type: containingScope
-          scopeType: {type: document}
-  usePrePhraseSnapshot: true
-  action: {name: setSelection}
-initialState:
-  documentContents: |2+
-
-
-        foo 
-
-        bar 
-
-  selections:
-    - anchor: {line: 6, character: 0}
-      active: {line: 6, character: 0}
-  marks: {}
-finalState:
-  documentContents: |2+
-
-
-        foo 
-
-        bar 
-
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 6, character: 0}
-fullTargets: [{type: primitive, mark: {type: cursor}, modifiers: [{type: containingScope, scopeType: {type: document}}]}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/selectionTypes/takeLineVest.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/selectionTypes/takeLineVest.yml
deleted file mode 100644
index 8bc6002229..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/selectionTypes/takeLineVest.yml
+++ /dev/null
@@ -1,28 +0,0 @@
-languageId: typescript
-command:
-  version: 1
-  spokenForm: take line vest
-  action: setSelection
-  targets:
-    - type: primitive
-      selectionType: line
-      mark: {type: decoratedSymbol, symbolColor: default, character: v}
-initialState:
-  documentContents: |
-
-    const value = "Hello world";
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-  marks:
-    default.v:
-      start: {line: 1, character: 6}
-      end: {line: 1, character: 11}
-finalState:
-  documentContents: |
-
-    const value = "Hello world";
-  selections:
-    - anchor: {line: 1, character: 0}
-      active: {line: 1, character: 28}
-fullTargets: [{type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: v}, selectionType: line, position: contents, modifier: {type: identity}, insideOutsideType: inside}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/selectionTypes/takeShortPaint.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/selectionTypes/takeShortPaint.yml
deleted file mode 100644
index cb0ae95d77..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/selectionTypes/takeShortPaint.yml
+++ /dev/null
@@ -1,23 +0,0 @@
-languageId: plaintext
-command:
-  spokenForm: take short paint
-  version: 2
-  targets:
-    - type: primitive
-      modifiers:
-        - type: containingScope
-          scopeType: {type: boundedNonWhitespaceSequence}
-  usePrePhraseSnapshot: true
-  action: {name: setSelection}
-initialState:
-  documentContents: foo[0](bar.test, baz-other-test) something[]
-  selections:
-    - anchor: {line: 0, character: 7}
-      active: {line: 0, character: 7}
-  marks: {}
-finalState:
-  documentContents: foo[0](bar.test, baz-other-test) something[]
-  selections:
-    - anchor: {line: 0, character: 7}
-      active: {line: 0, character: 16}
-fullTargets: [{type: primitive, mark: {type: cursor}, modifiers: [{type: containingScope, scopeType: {type: boundedNonWhitespaceSequence}}]}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/selectionTypes/takeSmallPaintAir.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/selectionTypes/takeSmallPaintAir.yml
deleted file mode 100644
index b2824033f0..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/selectionTypes/takeSmallPaintAir.yml
+++ /dev/null
@@ -1,27 +0,0 @@
-languageId: python
-command:
-  spokenForm: take small paint air
-  version: 2
-  targets:
-    - type: primitive
-      mark: {type: decoratedSymbol, symbolColor: default, character: a}
-      modifiers:
-        - type: containingScope
-          scopeType: {type: boundedNonWhitespaceSequence}
-  usePrePhraseSnapshot: true
-  action: {name: setSelection}
-initialState:
-  documentContents: some amount of text
-  selections:
-    - anchor: {line: 0, character: 19}
-      active: {line: 0, character: 19}
-  marks:
-    default.a:
-      start: {line: 0, character: 5}
-      end: {line: 0, character: 11}
-finalState:
-  documentContents: some amount of text
-  selections:
-    - anchor: {line: 0, character: 5}
-      active: {line: 0, character: 11}
-fullTargets: [{type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: a}, modifiers: [{type: containingScope, scopeType: {type: boundedNonWhitespaceSequence}}]}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/selectionTypes/takeSmallPaintFine.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/selectionTypes/takeSmallPaintFine.yml
deleted file mode 100644
index 4aa1d1bfb2..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/selectionTypes/takeSmallPaintFine.yml
+++ /dev/null
@@ -1,27 +0,0 @@
-languageId: python
-command:
-  spokenForm: take small paint fine
-  version: 2
-  targets:
-    - type: primitive
-      mark: {type: decoratedSymbol, symbolColor: default, character: f}
-      modifiers:
-        - type: containingScope
-          scopeType: {type: boundedNonWhitespaceSequence}
-  usePrePhraseSnapshot: true
-  action: {name: setSelection}
-initialState:
-  documentContents: "[foo[0], bar]"
-  selections:
-    - anchor: {line: 0, character: 3}
-      active: {line: 0, character: 3}
-  marks:
-    default.f:
-      start: {line: 0, character: 1}
-      end: {line: 0, character: 4}
-finalState:
-  documentContents: "[foo[0], bar]"
-  selections:
-    - anchor: {line: 0, character: 1}
-      active: {line: 0, character: 8}
-fullTargets: [{type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: f}, modifiers: [{type: containingScope, scopeType: {type: boundedNonWhitespaceSequence}}]}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/selectionTypes/takeSmallPaintFine2.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/selectionTypes/takeSmallPaintFine2.yml
deleted file mode 100644
index f9f9d29cdb..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/selectionTypes/takeSmallPaintFine2.yml
+++ /dev/null
@@ -1,27 +0,0 @@
-languageId: python
-command:
-  spokenForm: take small paint fine
-  version: 2
-  targets:
-    - type: primitive
-      mark: {type: decoratedSymbol, symbolColor: default, character: f}
-      modifiers:
-        - type: containingScope
-          scopeType: {type: boundedNonWhitespaceSequence}
-  usePrePhraseSnapshot: true
-  action: {name: setSelection}
-initialState:
-  documentContents: "[baz, foo[0], bar]"
-  selections:
-    - anchor: {line: 0, character: 6}
-      active: {line: 0, character: 6}
-  marks:
-    default.f:
-      start: {line: 0, character: 6}
-      end: {line: 0, character: 9}
-finalState:
-  documentContents: "[baz, foo[0], bar]"
-  selections:
-    - anchor: {line: 0, character: 6}
-      active: {line: 0, character: 13}
-fullTargets: [{type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: f}, modifiers: [{type: containingScope, scopeType: {type: boundedNonWhitespaceSequence}}]}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/selectionTypes/takeTokenVest.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/selectionTypes/takeTokenVest.yml
deleted file mode 100644
index 1c7c745964..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/selectionTypes/takeTokenVest.yml
+++ /dev/null
@@ -1,28 +0,0 @@
-languageId: typescript
-command:
-  version: 1
-  spokenForm: take token vest
-  action: setSelection
-  targets:
-    - type: primitive
-      selectionType: token
-      mark: {type: decoratedSymbol, symbolColor: default, character: v}
-initialState:
-  documentContents: |
-
-    const value   = "Hello.world  ";
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-  marks:
-    default.v:
-      start: {line: 1, character: 6}
-      end: {line: 1, character: 11}
-finalState:
-  documentContents: |
-
-    const value   = "Hello.world  ";
-  selections:
-    - anchor: {line: 1, character: 6}
-      active: {line: 1, character: 11}
-fullTargets: [{type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: v}, selectionType: token, position: contents, modifier: {type: identity}, insideOutsideType: inside}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/spokenGrammar/bringLineBeforeWhale.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/spokenGrammar/bringLineBeforeWhale.yml
deleted file mode 100644
index 65446ef920..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/spokenGrammar/bringLineBeforeWhale.yml
+++ /dev/null
@@ -1,35 +0,0 @@
-languageId: plaintext
-command:
-  spokenForm: bring line before whale
-  version: 2
-  targets:
-    - type: primitive
-      modifiers:
-        - type: containingScope
-          scopeType: {type: line}
-    - type: primitive
-      mark: {type: decoratedSymbol, symbolColor: default, character: w}
-      modifiers:
-        - {type: position, position: before}
-  usePrePhraseSnapshot: true
-  action: {name: replaceWithTarget}
-initialState:
-  documentContents: |-
-    hello world
-    whatever now
-  selections:
-    - anchor: {line: 1, character: 12}
-      active: {line: 1, character: 12}
-  marks:
-    default.w:
-      start: {line: 0, character: 6}
-      end: {line: 0, character: 11}
-finalState:
-  documentContents: |-
-    whatever now
-    hello world
-    whatever now
-  selections:
-    - anchor: {line: 2, character: 12}
-      active: {line: 2, character: 12}
-fullTargets: [{type: primitive, mark: {type: cursor}, modifiers: [&ref_0 {type: containingScope, scopeType: {type: line}}]}, {type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: w}, modifiers: [*ref_0], positionModifier: {type: position, position: before}}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/subtoken/chuckFirstCharVest.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/subtoken/chuckFirstCharVest.yml
deleted file mode 100644
index c52f3ba19b..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/subtoken/chuckFirstCharVest.yml
+++ /dev/null
@@ -1,28 +0,0 @@
-languageId: typescript
-command:
-  version: 1
-  spokenForm: chuck first char vest
-  action: remove
-  targets:
-    - type: primitive
-      modifier: {type: subpiece, pieceType: character, anchor: 0, active: 0}
-      mark: {type: decoratedSymbol, symbolColor: default, character: v}
-initialState:
-  documentContents: |
-
-    const value_hello_str = "Hello world";
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-  marks:
-    default.v:
-      start: {line: 1, character: 6}
-      end: {line: 1, character: 21}
-finalState:
-  documentContents: |
-
-    const alue_hello_str = "Hello world";
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-fullTargets: [{type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: v}, selectionType: token, position: contents, modifier: {type: subpiece, pieceType: character, anchor: 0, active: 0}, insideOutsideType: outside}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/subtoken/chuckFirstWordVest.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/subtoken/chuckFirstWordVest.yml
deleted file mode 100644
index 26b638804f..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/subtoken/chuckFirstWordVest.yml
+++ /dev/null
@@ -1,28 +0,0 @@
-languageId: typescript
-command:
-  version: 1
-  spokenForm: chuck first word vest
-  action: remove
-  targets:
-    - type: primitive
-      modifier: {type: subpiece, pieceType: word, anchor: 0, active: 0}
-      mark: {type: decoratedSymbol, symbolColor: default, character: v}
-initialState:
-  documentContents: |
-
-    const value_hello_str = "Hello world";
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-  marks:
-    default.v:
-      start: {line: 1, character: 6}
-      end: {line: 1, character: 21}
-finalState:
-  documentContents: |
-
-    const hello_str = "Hello world";
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-fullTargets: [{type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: v}, selectionType: token, position: contents, modifier: {type: subpiece, pieceType: word, anchor: 0, active: 0}, insideOutsideType: outside}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/subtoken/chuckLastCharVest.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/subtoken/chuckLastCharVest.yml
deleted file mode 100644
index d3d6947540..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/subtoken/chuckLastCharVest.yml
+++ /dev/null
@@ -1,28 +0,0 @@
-languageId: typescript
-command:
-  version: 1
-  spokenForm: chuck last char vest
-  action: remove
-  targets:
-    - type: primitive
-      modifier: {type: subpiece, pieceType: character, anchor: -1, active: -1}
-      mark: {type: decoratedSymbol, symbolColor: default, character: v}
-initialState:
-  documentContents: |
-
-    const value_hello_str = "Hello world";
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-  marks:
-    default.v:
-      start: {line: 1, character: 6}
-      end: {line: 1, character: 21}
-finalState:
-  documentContents: |
-
-    const value_hello_st = "Hello world";
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-fullTargets: [{type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: v}, selectionType: token, position: contents, modifier: {type: subpiece, pieceType: character, anchor: -1, active: -1}, insideOutsideType: outside}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/subtoken/chuckLastWord.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/subtoken/chuckLastWord.yml
deleted file mode 100644
index 25be2450e1..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/subtoken/chuckLastWord.yml
+++ /dev/null
@@ -1,25 +0,0 @@
-languageId: scss
-command:
-  spokenForm: chuck last word
-  version: 3
-  targets:
-    - type: primitive
-      modifiers:
-        - type: ordinalScope
-          scopeType: {type: word}
-          start: -1
-          length: 1
-  usePrePhraseSnapshot: true
-  action: {name: remove}
-initialState:
-  documentContents: "margin-top: 0;"
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-  marks: {}
-finalState:
-  documentContents: "margin: 0;"
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-fullTargets: [{type: primitive, mark: {type: cursor}, modifiers: [{type: ordinalScope, scopeType: {type: word}, start: -1, length: 1}]}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/subtoken/chuckLastWordVest.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/subtoken/chuckLastWordVest.yml
deleted file mode 100644
index a9e83ad7f0..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/subtoken/chuckLastWordVest.yml
+++ /dev/null
@@ -1,28 +0,0 @@
-languageId: typescript
-command:
-  version: 1
-  spokenForm: chuck last word vest
-  action: remove
-  targets:
-    - type: primitive
-      modifier: {type: subpiece, pieceType: word, anchor: -1, active: -1}
-      mark: {type: decoratedSymbol, symbolColor: default, character: v}
-initialState:
-  documentContents: |
-
-    const value_hello_str = "Hello world";
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-  marks:
-    default.v:
-      start: {line: 1, character: 6}
-      end: {line: 1, character: 21}
-finalState:
-  documentContents: |
-
-    const value_hello = "Hello world";
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-fullTargets: [{type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: v}, selectionType: token, position: contents, modifier: {type: subpiece, pieceType: word, anchor: -1, active: -1}, insideOutsideType: outside}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/subtoken/chuckSecondWordVest.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/subtoken/chuckSecondWordVest.yml
deleted file mode 100644
index dfbbea91d7..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/subtoken/chuckSecondWordVest.yml
+++ /dev/null
@@ -1,28 +0,0 @@
-languageId: typescript
-command:
-  version: 1
-  spokenForm: chuck second word vest
-  action: remove
-  targets:
-    - type: primitive
-      modifier: {type: subpiece, pieceType: word, anchor: 1, active: 1}
-      mark: {type: decoratedSymbol, symbolColor: default, character: v}
-initialState:
-  documentContents: |
-
-    const value_hello_str = "Hello world";
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-  marks:
-    default.v:
-      start: {line: 1, character: 6}
-      end: {line: 1, character: 21}
-finalState:
-  documentContents: |
-
-    const value_str = "Hello world";
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-fullTargets: [{type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: v}, selectionType: token, position: contents, modifier: {type: subpiece, pieceType: word, anchor: 1, active: 1}, insideOutsideType: outside}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/subtoken/chuckSixthCharVest.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/subtoken/chuckSixthCharVest.yml
deleted file mode 100644
index 348d820661..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/subtoken/chuckSixthCharVest.yml
+++ /dev/null
@@ -1,28 +0,0 @@
-languageId: typescript
-command:
-  version: 1
-  spokenForm: chuck sixth char vest
-  action: remove
-  targets:
-    - type: primitive
-      modifier: {type: subpiece, pieceType: character, anchor: 5, active: 5}
-      mark: {type: decoratedSymbol, symbolColor: default, character: v}
-initialState:
-  documentContents: |
-
-    const value_hello_str = "Hello world";
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-  marks:
-    default.v:
-      start: {line: 1, character: 6}
-      end: {line: 1, character: 21}
-finalState:
-  documentContents: |
-
-    const valuehello_str = "Hello world";
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-fullTargets: [{type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: v}, selectionType: token, position: contents, modifier: {type: subpiece, pieceType: character, anchor: 5, active: 5}, insideOutsideType: outside}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/subtoken/clearFirstCharVest.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/subtoken/clearFirstCharVest.yml
deleted file mode 100644
index 973a5422c0..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/subtoken/clearFirstCharVest.yml
+++ /dev/null
@@ -1,28 +0,0 @@
-languageId: typescript
-command:
-  version: 1
-  spokenForm: clear first char vest
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: subpiece, pieceType: character, anchor: 0, active: 0}
-      mark: {type: decoratedSymbol, symbolColor: default, character: v}
-initialState:
-  documentContents: |
-
-    const value_hello_str = "Hello world";
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-  marks:
-    default.v:
-      start: {line: 1, character: 6}
-      end: {line: 1, character: 21}
-finalState:
-  documentContents: |
-
-    const alue_hello_str = "Hello world";
-  selections:
-    - anchor: {line: 1, character: 6}
-      active: {line: 1, character: 6}
-fullTargets: [{type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: v}, selectionType: token, position: contents, modifier: {type: subpiece, pieceType: character, anchor: 0, active: 0}, insideOutsideType: inside}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/subtoken/clearFirstWordVest.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/subtoken/clearFirstWordVest.yml
deleted file mode 100644
index cb434fd07e..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/subtoken/clearFirstWordVest.yml
+++ /dev/null
@@ -1,28 +0,0 @@
-languageId: typescript
-command:
-  version: 1
-  spokenForm: clear first word vest
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: subpiece, pieceType: word, anchor: 0, active: 0}
-      mark: {type: decoratedSymbol, symbolColor: default, character: v}
-initialState:
-  documentContents: |
-
-    const value_hello_str = "Hello world";
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-  marks:
-    default.v:
-      start: {line: 1, character: 6}
-      end: {line: 1, character: 21}
-finalState:
-  documentContents: |
-
-    const _hello_str = "Hello world";
-  selections:
-    - anchor: {line: 1, character: 6}
-      active: {line: 1, character: 6}
-fullTargets: [{type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: v}, selectionType: token, position: contents, modifier: {type: subpiece, pieceType: word, anchor: 0, active: 0}, insideOutsideType: inside}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/subtoken/clearLastCharVest.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/subtoken/clearLastCharVest.yml
deleted file mode 100644
index 44db1afdf4..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/subtoken/clearLastCharVest.yml
+++ /dev/null
@@ -1,28 +0,0 @@
-languageId: typescript
-command:
-  version: 1
-  spokenForm: clear last char vest
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: subpiece, pieceType: character, anchor: -1, active: -1}
-      mark: {type: decoratedSymbol, symbolColor: default, character: v}
-initialState:
-  documentContents: |
-
-    const value_hello_str = "Hello world";
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-  marks:
-    default.v:
-      start: {line: 1, character: 6}
-      end: {line: 1, character: 21}
-finalState:
-  documentContents: |
-
-    const value_hello_st = "Hello world";
-  selections:
-    - anchor: {line: 1, character: 20}
-      active: {line: 1, character: 20}
-fullTargets: [{type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: v}, selectionType: token, position: contents, modifier: {type: subpiece, pieceType: character, anchor: -1, active: -1}, insideOutsideType: inside}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/subtoken/clearLastWordVest.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/subtoken/clearLastWordVest.yml
deleted file mode 100644
index d9d48625b6..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/subtoken/clearLastWordVest.yml
+++ /dev/null
@@ -1,28 +0,0 @@
-languageId: typescript
-command:
-  version: 1
-  spokenForm: clear last word vest
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: subpiece, pieceType: word, anchor: -1, active: -1}
-      mark: {type: decoratedSymbol, symbolColor: default, character: v}
-initialState:
-  documentContents: |
-
-    const value_hello_str = "Hello world";
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-  marks:
-    default.v:
-      start: {line: 1, character: 6}
-      end: {line: 1, character: 21}
-finalState:
-  documentContents: |
-
-    const value_hello_ = "Hello world";
-  selections:
-    - anchor: {line: 1, character: 18}
-      active: {line: 1, character: 18}
-fullTargets: [{type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: v}, selectionType: token, position: contents, modifier: {type: subpiece, pieceType: word, anchor: -1, active: -1}, insideOutsideType: inside}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/subtoken/clearNextWord.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/subtoken/clearNextWord.yml
deleted file mode 100644
index 9bd7d369e3..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/subtoken/clearNextWord.yml
+++ /dev/null
@@ -1,26 +0,0 @@
-languageId: plaintext
-command:
-  spokenForm: clear next word
-  version: 3
-  targets:
-    - type: primitive
-      modifiers:
-        - type: relativeScope
-          scopeType: {type: word}
-          offset: 1
-          length: 1
-          direction: forward
-  usePrePhraseSnapshot: true
-  action: {name: clearAndSetSelection}
-initialState:
-  documentContents: aaa  bbbCcc
-  selections:
-    - anchor: {line: 0, character: 4}
-      active: {line: 0, character: 4}
-  marks: {}
-finalState:
-  documentContents: aaa  Ccc
-  selections:
-    - anchor: {line: 0, character: 5}
-      active: {line: 0, character: 5}
-fullTargets: [{type: primitive, mark: {type: cursor}, modifiers: [{type: relativeScope, scopeType: {type: word}, offset: 1, length: 1, direction: forward}]}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/subtoken/clearSecondWordVest.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/subtoken/clearSecondWordVest.yml
deleted file mode 100644
index 7cd6b17aa3..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/subtoken/clearSecondWordVest.yml
+++ /dev/null
@@ -1,28 +0,0 @@
-languageId: typescript
-command:
-  version: 1
-  spokenForm: clear second word vest
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: subpiece, pieceType: word, anchor: 1, active: 1}
-      mark: {type: decoratedSymbol, symbolColor: default, character: v}
-initialState:
-  documentContents: |
-
-    const value_hello_str = "Hello world";
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-  marks:
-    default.v:
-      start: {line: 1, character: 6}
-      end: {line: 1, character: 21}
-finalState:
-  documentContents: |
-
-    const value__str = "Hello world";
-  selections:
-    - anchor: {line: 1, character: 12}
-      active: {line: 1, character: 12}
-fullTargets: [{type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: v}, selectionType: token, position: contents, modifier: {type: subpiece, pieceType: word, anchor: 1, active: 1}, insideOutsideType: inside}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/subtoken/clearSixthCharVest.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/subtoken/clearSixthCharVest.yml
deleted file mode 100644
index d559e17868..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/subtoken/clearSixthCharVest.yml
+++ /dev/null
@@ -1,28 +0,0 @@
-languageId: typescript
-command:
-  version: 1
-  spokenForm: clear sixth char vest
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: subpiece, pieceType: character, anchor: 5, active: 5}
-      mark: {type: decoratedSymbol, symbolColor: default, character: v}
-initialState:
-  documentContents: |
-
-    const value_hello_str = "Hello world";
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-  marks:
-    default.v:
-      start: {line: 1, character: 6}
-      end: {line: 1, character: 21}
-finalState:
-  documentContents: |
-
-    const valuehello_str = "Hello world";
-  selections:
-    - anchor: {line: 1, character: 11}
-      active: {line: 1, character: 11}
-fullTargets: [{type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: v}, selectionType: token, position: contents, modifier: {type: subpiece, pieceType: character, anchor: 5, active: 5}, insideOutsideType: inside}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/subtoken/clearSixthNextWord.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/subtoken/clearSixthNextWord.yml
deleted file mode 100644
index 6ea057dd47..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/subtoken/clearSixthNextWord.yml
+++ /dev/null
@@ -1,30 +0,0 @@
-languageId: plaintext
-command:
-  spokenForm: clear sixth next word
-  version: 3
-  targets:
-    - type: primitive
-      modifiers:
-        - type: relativeScope
-          scopeType: {type: word}
-          offset: 6
-          length: 1
-          direction: forward
-  usePrePhraseSnapshot: true
-  action: {name: clearAndSetSelection}
-initialState:
-  documentContents: |-
-    aaaBbb cccDdd
-    eeeFff gggHhh
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-  marks: {}
-finalState:
-  documentContents: |-
-    aaaBbb cccDdd
-    eeeFff Hhh
-  selections:
-    - anchor: {line: 1, character: 7}
-      active: {line: 1, character: 7}
-fullTargets: [{type: primitive, mark: {type: cursor}, modifiers: [{type: relativeScope, scopeType: {type: word}, offset: 6, length: 1, direction: forward}]}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/subtoken/ditchFourthWordLine.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/subtoken/ditchFourthWordLine.yml
deleted file mode 100644
index 5b1199af9f..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/subtoken/ditchFourthWordLine.yml
+++ /dev/null
@@ -1,27 +0,0 @@
-languageId: plaintext
-command:
-  spokenForm: ditch fourth word line
-  version: 3
-  targets:
-    - type: primitive
-      modifiers:
-        - type: ordinalScope
-          scopeType: {type: word}
-          start: 3
-          length: 1
-        - type: containingScope
-          scopeType: {type: line}
-  usePrePhraseSnapshot: true
-  action: {name: remove}
-initialState:
-  documentContents: apiV1 api_v_1
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-  marks: {}
-finalState:
-  documentContents: apiV1 v_1
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-fullTargets: [{type: primitive, mark: {type: cursor}, modifiers: [{type: ordinalScope, scopeType: {type: word}, start: 3, length: 1}, {type: containingScope, scopeType: {type: line}}]}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/subtoken/ditchLastCar.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/subtoken/ditchLastCar.yml
deleted file mode 100644
index db571fc196..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/subtoken/ditchLastCar.yml
+++ /dev/null
@@ -1,27 +0,0 @@
-languageId: plaintext
-command:
-  spokenForm: ditch last car
-  version: 2
-  targets:
-    - type: primitive
-      modifiers:
-        - type: ordinalRange
-          scopeType: {type: character}
-          anchor: -1
-          active: -1
-          excludeAnchor: false
-          excludeActive: false
-  usePrePhraseSnapshot: true
-  action: {name: remove}
-initialState:
-  documentContents: añ
-  selections:
-    - anchor: {line: 0, character: 3}
-      active: {line: 0, character: 3}
-  marks: {}
-finalState:
-  documentContents: a
-  selections:
-    - anchor: {line: 0, character: 1}
-      active: {line: 0, character: 1}
-fullTargets: [{type: primitive, mark: {type: cursor}, modifiers: [{type: ordinalRange, scopeType: {type: character}, anchor: -1, active: -1, excludeAnchor: false, excludeActive: false}]}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/subtoken/ditchLastCar2.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/subtoken/ditchLastCar2.yml
deleted file mode 100644
index 4fe0158898..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/subtoken/ditchLastCar2.yml
+++ /dev/null
@@ -1,27 +0,0 @@
-languageId: plaintext
-command:
-  spokenForm: ditch last car
-  version: 2
-  targets:
-    - type: primitive
-      modifiers:
-        - type: ordinalRange
-          scopeType: {type: character}
-          anchor: -1
-          active: -1
-          excludeAnchor: false
-          excludeActive: false
-  usePrePhraseSnapshot: true
-  action: {name: remove}
-initialState:
-  documentContents: aña
-  selections:
-    - anchor: {line: 0, character: 4}
-      active: {line: 0, character: 4}
-  marks: {}
-finalState:
-  documentContents: añ
-  selections:
-    - anchor: {line: 0, character: 3}
-      active: {line: 0, character: 3}
-fullTargets: [{type: primitive, mark: {type: cursor}, modifiers: [{type: ordinalRange, scopeType: {type: character}, anchor: -1, active: -1, excludeAnchor: false, excludeActive: false}]}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/subtoken/ditchLastWordLine.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/subtoken/ditchLastWordLine.yml
deleted file mode 100644
index 1490b89bb0..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/subtoken/ditchLastWordLine.yml
+++ /dev/null
@@ -1,27 +0,0 @@
-languageId: plaintext
-command:
-  spokenForm: ditch last word line
-  version: 3
-  targets:
-    - type: primitive
-      modifiers:
-        - type: ordinalScope
-          scopeType: {type: word}
-          start: -1
-          length: 1
-        - type: containingScope
-          scopeType: {type: line}
-  usePrePhraseSnapshot: true
-  action: {name: remove}
-initialState:
-  documentContents: apiV1 api_v_1
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-  marks: {}
-finalState:
-  documentContents: apiV1 api_v
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-fullTargets: [{type: primitive, mark: {type: cursor}, modifiers: [{type: ordinalScope, scopeType: {type: word}, start: -1, length: 1}, {type: containingScope, scopeType: {type: line}}]}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/subtoken/ditchSecondCar.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/subtoken/ditchSecondCar.yml
deleted file mode 100644
index f80f5791e1..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/subtoken/ditchSecondCar.yml
+++ /dev/null
@@ -1,27 +0,0 @@
-languageId: plaintext
-command:
-  spokenForm: ditch second car
-  version: 2
-  targets:
-    - type: primitive
-      modifiers:
-        - type: ordinalRange
-          scopeType: {type: character}
-          anchor: 1
-          active: 1
-          excludeAnchor: false
-          excludeActive: false
-  usePrePhraseSnapshot: true
-  action: {name: remove}
-initialState:
-  documentContents: añ
-  selections:
-    - anchor: {line: 0, character: 3}
-      active: {line: 0, character: 3}
-  marks: {}
-finalState:
-  documentContents: a
-  selections:
-    - anchor: {line: 0, character: 1}
-      active: {line: 0, character: 1}
-fullTargets: [{type: primitive, mark: {type: cursor}, modifiers: [{type: ordinalRange, scopeType: {type: character}, anchor: 1, active: 1, excludeAnchor: false, excludeActive: false}]}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/subtoken/ditchThirdWordLine.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/subtoken/ditchThirdWordLine.yml
deleted file mode 100644
index 664e704986..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/subtoken/ditchThirdWordLine.yml
+++ /dev/null
@@ -1,27 +0,0 @@
-languageId: plaintext
-command:
-  spokenForm: ditch third word line
-  version: 3
-  targets:
-    - type: primitive
-      modifiers:
-        - type: ordinalScope
-          scopeType: {type: word}
-          start: 2
-          length: 1
-        - type: containingScope
-          scopeType: {type: line}
-  usePrePhraseSnapshot: true
-  action: {name: remove}
-initialState:
-  documentContents: apiV1 api_v_1
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-  marks: {}
-finalState:
-  documentContents: apiV api_v_1
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-fullTargets: [{type: primitive, mark: {type: cursor}, modifiers: [{type: ordinalScope, scopeType: {type: word}, start: 2, length: 1}, {type: containingScope, scopeType: {type: line}}]}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/subtoken/takeEveryWordLine.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/subtoken/takeEveryWordLine.yml
deleted file mode 100644
index 7a8f59ec4d..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/subtoken/takeEveryWordLine.yml
+++ /dev/null
@@ -1,35 +0,0 @@
-languageId: plaintext
-command:
-  spokenForm: take every word line
-  version: 3
-  targets:
-    - type: primitive
-      modifiers:
-        - type: everyScope
-          scopeType: {type: word}
-        - type: containingScope
-          scopeType: {type: line}
-  usePrePhraseSnapshot: true
-  action: {name: setSelection}
-initialState:
-  documentContents: |-
-    aaaBbb cccDdd
-    eee
-  selections:
-    - anchor: {line: 0, character: 13}
-      active: {line: 0, character: 13}
-  marks: {}
-finalState:
-  documentContents: |-
-    aaaBbb cccDdd
-    eee
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 3}
-    - anchor: {line: 0, character: 3}
-      active: {line: 0, character: 6}
-    - anchor: {line: 0, character: 7}
-      active: {line: 0, character: 10}
-    - anchor: {line: 0, character: 10}
-      active: {line: 0, character: 13}
-fullTargets: [{type: primitive, mark: {type: cursor}, modifiers: [{type: everyScope, scopeType: {type: word}}, {type: containingScope, scopeType: {type: line}}]}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/subtoken/takeEveryWordLine2.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/subtoken/takeEveryWordLine2.yml
deleted file mode 100644
index 8fb7498caa..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/subtoken/takeEveryWordLine2.yml
+++ /dev/null
@@ -1,35 +0,0 @@
-languageId: plaintext
-command:
-  spokenForm: take every word line
-  version: 3
-  targets:
-    - type: primitive
-      modifiers:
-        - type: everyScope
-          scopeType: {type: word}
-        - type: containingScope
-          scopeType: {type: line}
-  usePrePhraseSnapshot: true
-  action: {name: setSelection}
-initialState:
-  documentContents: apiV1 api_v_1
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-  marks: {}
-finalState:
-  documentContents: apiV1 api_v_1
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 3}
-    - anchor: {line: 0, character: 3}
-      active: {line: 0, character: 4}
-    - anchor: {line: 0, character: 4}
-      active: {line: 0, character: 5}
-    - anchor: {line: 0, character: 6}
-      active: {line: 0, character: 9}
-    - anchor: {line: 0, character: 10}
-      active: {line: 0, character: 11}
-    - anchor: {line: 0, character: 12}
-      active: {line: 0, character: 13}
-fullTargets: [{type: primitive, mark: {type: cursor}, modifiers: [{type: everyScope, scopeType: {type: word}}, {type: containingScope, scopeType: {type: line}}]}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/subtoken/takeFirstChar.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/subtoken/takeFirstChar.yml
deleted file mode 100644
index 9d0cc2d6e6..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/subtoken/takeFirstChar.yml
+++ /dev/null
@@ -1,21 +0,0 @@
-languageId: typescript
-command:
-  version: 1
-  spokenForm: take first char
-  action: setSelection
-  targets:
-    - type: primitive
-      selectionType: token
-      modifier: {type: subpiece, pieceType: character, anchor: 0, active: 0}
-initialState:
-  documentContents: //aa
-  selections:
-    - anchor: {line: 0, character: 2}
-      active: {line: 0, character: 2}
-  marks: {}
-finalState:
-  documentContents: //aa
-  selections:
-    - anchor: {line: 0, character: 2}
-      active: {line: 0, character: 3}
-fullTargets: [{type: primitive, mark: {type: cursorToken}, selectionType: token, position: contents, modifier: {type: subpiece, pieceType: character, anchor: 0, active: 0}, insideOutsideType: inside}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/subtoken/takeFirstChar2.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/subtoken/takeFirstChar2.yml
deleted file mode 100644
index 823664f87d..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/subtoken/takeFirstChar2.yml
+++ /dev/null
@@ -1,21 +0,0 @@
-languageId: typescript
-command:
-  version: 1
-  spokenForm: take first char
-  action: setSelection
-  targets:
-    - type: primitive
-      selectionType: token
-      modifier: {type: subpiece, pieceType: character, anchor: 0, active: 0}
-initialState:
-  documentContents: aa//
-  selections:
-    - anchor: {line: 0, character: 2}
-      active: {line: 0, character: 2}
-  marks: {}
-finalState:
-  documentContents: aa//
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 1}
-fullTargets: [{type: primitive, mark: {type: cursorToken}, selectionType: token, position: contents, modifier: {type: subpiece, pieceType: character, anchor: 0, active: 0}, insideOutsideType: inside}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/subtoken/takeFirstChar3.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/subtoken/takeFirstChar3.yml
deleted file mode 100644
index ebe46c8926..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/subtoken/takeFirstChar3.yml
+++ /dev/null
@@ -1,21 +0,0 @@
-languageId: typescript
-command:
-  version: 1
-  spokenForm: take first char
-  action: setSelection
-  targets:
-    - type: primitive
-      selectionType: token
-      modifier: {type: subpiece, pieceType: character, anchor: 0, active: 0}
-initialState:
-  documentContents: ///**
-  selections:
-    - anchor: {line: 0, character: 3}
-      active: {line: 0, character: 3}
-  marks: {}
-finalState:
-  documentContents: ///**
-  selections:
-    - anchor: {line: 0, character: 3}
-      active: {line: 0, character: 4}
-fullTargets: [{type: primitive, mark: {type: cursorToken}, selectionType: token, position: contents, modifier: {type: subpiece, pieceType: character, anchor: 0, active: 0}, insideOutsideType: inside}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/subtoken/takeFirstChar4.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/subtoken/takeFirstChar4.yml
deleted file mode 100644
index 6f2b8b8f39..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/subtoken/takeFirstChar4.yml
+++ /dev/null
@@ -1,21 +0,0 @@
-languageId: typescript
-command:
-  version: 1
-  spokenForm: take first char
-  action: setSelection
-  targets:
-    - type: primitive
-      selectionType: token
-      modifier: {type: subpiece, pieceType: character, anchor: 0, active: 0}
-initialState:
-  documentContents: //***
-  selections:
-    - anchor: {line: 0, character: 2}
-      active: {line: 0, character: 2}
-  marks: {}
-finalState:
-  documentContents: //***
-  selections:
-    - anchor: {line: 0, character: 2}
-      active: {line: 0, character: 3}
-fullTargets: [{type: primitive, mark: {type: cursorToken}, selectionType: token, position: contents, modifier: {type: subpiece, pieceType: character, anchor: 0, active: 0}, insideOutsideType: inside}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/subtoken/takeFirstChar5.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/subtoken/takeFirstChar5.yml
deleted file mode 100644
index b9dc05d088..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/subtoken/takeFirstChar5.yml
+++ /dev/null
@@ -1,21 +0,0 @@
-languageId: typescript
-command:
-  version: 1
-  spokenForm: take first char
-  action: setSelection
-  targets:
-    - type: primitive
-      selectionType: token
-      modifier: {type: subpiece, pieceType: character, anchor: 0, active: 0}
-initialState:
-  documentContents: //**
-  selections:
-    - anchor: {line: 0, character: 2}
-      active: {line: 0, character: 2}
-  marks: {}
-finalState:
-  documentContents: //**
-  selections:
-    - anchor: {line: 0, character: 2}
-      active: {line: 0, character: 3}
-fullTargets: [{type: primitive, mark: {type: cursorToken}, selectionType: token, position: contents, modifier: {type: subpiece, pieceType: character, anchor: 0, active: 0}, insideOutsideType: inside}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/subtoken/takeFirstPastLastCharHarp.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/subtoken/takeFirstPastLastCharHarp.yml
deleted file mode 100644
index a2f878847d..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/subtoken/takeFirstPastLastCharHarp.yml
+++ /dev/null
@@ -1,31 +0,0 @@
-languageId: typescript
-command:
-  version: 1
-  spokenForm: take first past last char harp
-  action: setSelection
-  targets:
-    - type: primitive
-      selectionType: token
-      modifier: {type: subpiece, pieceType: character, anchor: 0, active: -1}
-      mark: {type: decoratedSymbol, symbolColor: default, character: h}
-initialState:
-  documentContents: |+
-
-    const value = "HelloWorldWhatever";
-
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-  marks:
-    default.h:
-      start: {line: 1, character: 15}
-      end: {line: 1, character: 33}
-finalState:
-  documentContents: |+
-
-    const value = "HelloWorldWhatever";
-
-  selections:
-    - anchor: {line: 1, character: 15}
-      active: {line: 1, character: 33}
-fullTargets: [{type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: h}, selectionType: token, position: contents, modifier: {type: subpiece, pieceType: character, anchor: 0, active: -1}, insideOutsideType: inside}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/subtoken/takeFirstPastLastWordHarp.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/subtoken/takeFirstPastLastWordHarp.yml
deleted file mode 100644
index ef376fc6e1..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/subtoken/takeFirstPastLastWordHarp.yml
+++ /dev/null
@@ -1,31 +0,0 @@
-languageId: typescript
-command:
-  version: 1
-  spokenForm: take first past last word harp
-  action: setSelection
-  targets:
-    - type: primitive
-      selectionType: token
-      modifier: {type: subpiece, pieceType: word, anchor: 0, active: -1}
-      mark: {type: decoratedSymbol, symbolColor: default, character: h}
-initialState:
-  documentContents: |+
-
-    const value = "HelloWorldWhatever";
-
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-  marks:
-    default.h:
-      start: {line: 1, character: 15}
-      end: {line: 1, character: 33}
-finalState:
-  documentContents: |+
-
-    const value = "HelloWorldWhatever";
-
-  selections:
-    - anchor: {line: 1, character: 15}
-      active: {line: 1, character: 33}
-fullTargets: [{type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: h}, selectionType: token, position: contents, modifier: {type: subpiece, pieceType: word, anchor: 0, active: -1}, insideOutsideType: inside}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/subtoken/takeFirstPastSecondWordHarp.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/subtoken/takeFirstPastSecondWordHarp.yml
deleted file mode 100644
index 1e80425378..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/subtoken/takeFirstPastSecondWordHarp.yml
+++ /dev/null
@@ -1,31 +0,0 @@
-languageId: typescript
-command:
-  version: 1
-  spokenForm: take first past second word harp
-  action: setSelection
-  targets:
-    - type: primitive
-      selectionType: token
-      modifier: {type: subpiece, pieceType: word, anchor: 0, active: 1}
-      mark: {type: decoratedSymbol, symbolColor: default, character: h}
-initialState:
-  documentContents: |+
-
-    const value = "HelloWorldWhatever";
-
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-  marks:
-    default.h:
-      start: {line: 1, character: 15}
-      end: {line: 1, character: 33}
-finalState:
-  documentContents: |+
-
-    const value = "HelloWorldWhatever";
-
-  selections:
-    - anchor: {line: 1, character: 15}
-      active: {line: 1, character: 25}
-fullTargets: [{type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: h}, selectionType: token, position: contents, modifier: {type: subpiece, pieceType: word, anchor: 0, active: 1}, insideOutsideType: inside}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/subtoken/takeFirstThreeCharHarp.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/subtoken/takeFirstThreeCharHarp.yml
deleted file mode 100644
index 18131e5e27..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/subtoken/takeFirstThreeCharHarp.yml
+++ /dev/null
@@ -1,31 +0,0 @@
-languageId: typescript
-command:
-  version: 1
-  spokenForm: take first three char harp
-  action: setSelection
-  targets:
-    - type: primitive
-      selectionType: token
-      modifier: {type: subpiece, pieceType: character, anchor: 0, active: 2}
-      mark: {type: decoratedSymbol, symbolColor: default, character: h}
-initialState:
-  documentContents: |+
-
-    const value = "HelloWorldWhatever";
-
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-  marks:
-    default.h:
-      start: {line: 1, character: 15}
-      end: {line: 1, character: 33}
-finalState:
-  documentContents: |+
-
-    const value = "HelloWorldWhatever";
-
-  selections:
-    - anchor: {line: 1, character: 15}
-      active: {line: 1, character: 18}
-fullTargets: [{type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: h}, selectionType: token, position: contents, modifier: {type: subpiece, pieceType: character, anchor: 0, active: 2}, insideOutsideType: inside}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/subtoken/takeFirstTwoWordHarp.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/subtoken/takeFirstTwoWordHarp.yml
deleted file mode 100644
index 0c07156a21..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/subtoken/takeFirstTwoWordHarp.yml
+++ /dev/null
@@ -1,31 +0,0 @@
-languageId: typescript
-command:
-  version: 1
-  spokenForm: take first two word harp
-  action: setSelection
-  targets:
-    - type: primitive
-      selectionType: token
-      modifier: {type: subpiece, pieceType: word, anchor: 0, active: 1}
-      mark: {type: decoratedSymbol, symbolColor: default, character: h}
-initialState:
-  documentContents: |+
-
-    const value = "HelloWorldWhatever";
-
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-  marks:
-    default.h:
-      start: {line: 1, character: 15}
-      end: {line: 1, character: 33}
-finalState:
-  documentContents: |+
-
-    const value = "HelloWorldWhatever";
-
-  selections:
-    - anchor: {line: 1, character: 15}
-      active: {line: 1, character: 25}
-fullTargets: [{type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: h}, selectionType: token, position: contents, modifier: {type: subpiece, pieceType: word, anchor: 0, active: 1}, insideOutsideType: inside}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/subtoken/takeFirstWord.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/subtoken/takeFirstWord.yml
deleted file mode 100644
index 4b83e392d0..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/subtoken/takeFirstWord.yml
+++ /dev/null
@@ -1,21 +0,0 @@
-languageId: typescript
-command:
-  version: 1
-  spokenForm: take first word
-  action: setSelection
-  targets:
-    - type: primitive
-      selectionType: token
-      modifier: {type: subpiece, pieceType: word, anchor: 0, active: 0}
-initialState:
-  documentContents: ;helloThere;
-  selections:
-    - anchor: {line: 0, character: 11}
-      active: {line: 0, character: 11}
-  marks: {}
-finalState:
-  documentContents: ;helloThere;
-  selections:
-    - anchor: {line: 0, character: 1}
-      active: {line: 0, character: 6}
-fullTargets: [{type: primitive, mark: {type: cursorToken}, selectionType: token, position: contents, modifier: {type: subpiece, pieceType: word, anchor: 0, active: 0}, insideOutsideType: inside}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/subtoken/takeLastPastFirstCharHarp.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/subtoken/takeLastPastFirstCharHarp.yml
deleted file mode 100644
index 352d502493..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/subtoken/takeLastPastFirstCharHarp.yml
+++ /dev/null
@@ -1,31 +0,0 @@
-languageId: typescript
-command:
-  version: 1
-  spokenForm: take last past first char harp
-  action: setSelection
-  targets:
-    - type: primitive
-      selectionType: token
-      modifier: {type: subpiece, pieceType: character, anchor: -1, active: 0}
-      mark: {type: decoratedSymbol, symbolColor: default, character: h}
-initialState:
-  documentContents: |+
-
-    const value = "HelloWorldWhatever";
-
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-  marks:
-    default.h:
-      start: {line: 1, character: 15}
-      end: {line: 1, character: 33}
-finalState:
-  documentContents: |+
-
-    const value = "HelloWorldWhatever";
-
-  selections:
-    - anchor: {line: 1, character: 33}
-      active: {line: 1, character: 15}
-fullTargets: [{type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: h}, selectionType: token, position: contents, modifier: {type: subpiece, pieceType: character, anchor: -1, active: 0}, insideOutsideType: inside}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/subtoken/takeLastPastFirstWordHarp.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/subtoken/takeLastPastFirstWordHarp.yml
deleted file mode 100644
index f463524fb5..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/subtoken/takeLastPastFirstWordHarp.yml
+++ /dev/null
@@ -1,31 +0,0 @@
-languageId: typescript
-command:
-  version: 1
-  spokenForm: take last past first word harp
-  action: setSelection
-  targets:
-    - type: primitive
-      selectionType: token
-      modifier: {type: subpiece, pieceType: word, anchor: -1, active: 0}
-      mark: {type: decoratedSymbol, symbolColor: default, character: h}
-initialState:
-  documentContents: |+
-
-    const value = "HelloWorldWhatever";
-
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-  marks:
-    default.h:
-      start: {line: 1, character: 15}
-      end: {line: 1, character: 33}
-finalState:
-  documentContents: |+
-
-    const value = "HelloWorldWhatever";
-
-  selections:
-    - anchor: {line: 1, character: 33}
-      active: {line: 1, character: 15}
-fullTargets: [{type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: h}, selectionType: token, position: contents, modifier: {type: subpiece, pieceType: word, anchor: -1, active: 0}, insideOutsideType: inside}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/subtoken/takeLastThreeCharHarp.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/subtoken/takeLastThreeCharHarp.yml
deleted file mode 100644
index 2b0ba6ecc8..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/subtoken/takeLastThreeCharHarp.yml
+++ /dev/null
@@ -1,31 +0,0 @@
-languageId: typescript
-command:
-  version: 1
-  spokenForm: take last three char harp
-  action: setSelection
-  targets:
-    - type: primitive
-      selectionType: token
-      modifier: {type: subpiece, pieceType: character, anchor: -3, active: -1}
-      mark: {type: decoratedSymbol, symbolColor: default, character: h}
-initialState:
-  documentContents: |+
-
-    const value = "HelloWorldWhatever";
-
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-  marks:
-    default.h:
-      start: {line: 1, character: 15}
-      end: {line: 1, character: 33}
-finalState:
-  documentContents: |+
-
-    const value = "HelloWorldWhatever";
-
-  selections:
-    - anchor: {line: 1, character: 30}
-      active: {line: 1, character: 33}
-fullTargets: [{type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: h}, selectionType: token, position: contents, modifier: {type: subpiece, pieceType: character, anchor: -3, active: -1}, insideOutsideType: inside}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/subtoken/takeLastTwoWordHarp.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/subtoken/takeLastTwoWordHarp.yml
deleted file mode 100644
index 24d351285d..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/subtoken/takeLastTwoWordHarp.yml
+++ /dev/null
@@ -1,31 +0,0 @@
-languageId: typescript
-command:
-  version: 1
-  spokenForm: take last two word harp
-  action: setSelection
-  targets:
-    - type: primitive
-      selectionType: token
-      modifier: {type: subpiece, pieceType: word, anchor: -2, active: -1}
-      mark: {type: decoratedSymbol, symbolColor: default, character: h}
-initialState:
-  documentContents: |+
-
-    const value = "HelloWorldWhatever";
-
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-  marks:
-    default.h:
-      start: {line: 1, character: 15}
-      end: {line: 1, character: 33}
-finalState:
-  documentContents: |+
-
-    const value = "HelloWorldWhatever";
-
-  selections:
-    - anchor: {line: 1, character: 20}
-      active: {line: 1, character: 33}
-fullTargets: [{type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: h}, selectionType: token, position: contents, modifier: {type: subpiece, pieceType: word, anchor: -2, active: -1}, insideOutsideType: inside}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/subtoken/takeSecondCharLookPastSecondCharTrap.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/subtoken/takeSecondCharLookPastSecondCharTrap.yml
deleted file mode 100644
index 229ae446d3..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/subtoken/takeSecondCharLookPastSecondCharTrap.yml
+++ /dev/null
@@ -1,37 +0,0 @@
-languageId: typescript
-command:
-  version: 1
-  spokenForm: take second char look past second char trap
-  action: setSelection
-  targets:
-    - type: range
-      start:
-        type: primitive
-        selectionType: token
-        modifier: {type: subpiece, pieceType: character, anchor: 1, active: 1}
-        mark: {type: decoratedSymbol, symbolColor: default, character: l}
-      end:
-        type: primitive
-        selectionType: token
-        modifier: {type: subpiece, pieceType: character, anchor: 1, active: 1}
-        mark: {type: decoratedSymbol, symbolColor: default, character: t}
-      excludeStart: false
-      excludeEnd: false
-initialState:
-  documentContents: "    hello there"
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-  marks:
-    default.l:
-      start: {line: 0, character: 4}
-      end: {line: 0, character: 9}
-    default.t:
-      start: {line: 0, character: 10}
-      end: {line: 0, character: 15}
-finalState:
-  documentContents: "    hello there"
-  selections:
-    - anchor: {line: 0, character: 5}
-      active: {line: 0, character: 12}
-fullTargets: [{type: range, excludeStart: false, excludeEnd: false, start: {type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: l}, selectionType: token, position: contents, modifier: {type: subpiece, pieceType: character, anchor: 1, active: 1}, insideOutsideType: inside}, end: {type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: t}, selectionType: token, position: contents, modifier: {type: subpiece, pieceType: character, anchor: 1, active: 1}, insideOutsideType: inside}}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/subtoken/takeSecondWord.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/subtoken/takeSecondWord.yml
deleted file mode 100644
index 4a69b3a69a..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/subtoken/takeSecondWord.yml
+++ /dev/null
@@ -1,21 +0,0 @@
-languageId: typescript
-command:
-  version: 1
-  spokenForm: take second word
-  action: setSelection
-  targets:
-    - type: primitive
-      selectionType: token
-      modifier: {type: subpiece, pieceType: word, anchor: 1, active: 1}
-initialState:
-  documentContents: ;helloThere;
-  selections:
-    - anchor: {line: 0, character: 1}
-      active: {line: 0, character: 1}
-  marks: {}
-finalState:
-  documentContents: ;helloThere;
-  selections:
-    - anchor: {line: 0, character: 6}
-      active: {line: 0, character: 11}
-fullTargets: [{type: primitive, mark: {type: cursorToken}, selectionType: token, position: contents, modifier: {type: subpiece, pieceType: word, anchor: 1, active: 1}, insideOutsideType: inside}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/subtoken/takeThirdPastSecondWordHarp.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/subtoken/takeThirdPastSecondWordHarp.yml
deleted file mode 100644
index ff6e3fc6d5..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/subtoken/takeThirdPastSecondWordHarp.yml
+++ /dev/null
@@ -1,31 +0,0 @@
-languageId: typescript
-command:
-  version: 1
-  spokenForm: take third past second word harp
-  action: setSelection
-  targets:
-    - type: primitive
-      selectionType: token
-      modifier: {type: subpiece, pieceType: word, anchor: 2, active: 1}
-      mark: {type: decoratedSymbol, symbolColor: default, character: h}
-initialState:
-  documentContents: |+
-
-    const value = "HelloWorldWhatever";
-
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-  marks:
-    default.h:
-      start: {line: 1, character: 15}
-      end: {line: 1, character: 33}
-finalState:
-  documentContents: |+
-
-    const value = "HelloWorldWhatever";
-
-  selections:
-    - anchor: {line: 1, character: 33}
-      active: {line: 1, character: 20}
-fullTargets: [{type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: h}, selectionType: token, position: contents, modifier: {type: subpiece, pieceType: word, anchor: 2, active: 1}, insideOutsideType: inside}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/chuckCore.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/chuckCore.yml
deleted file mode 100644
index e70125095b..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/chuckCore.yml
+++ /dev/null
@@ -1,26 +0,0 @@
-languageId: typescript
-command:
-  spokenForm: chuck core
-  version: 2
-  targets:
-    - type: primitive
-      modifiers:
-        - {type: interiorOnly}
-  usePrePhraseSnapshot: true
-  action: {name: remove}
-initialState:
-  documentContents: |-
-    [
-        "foo",
-        "bar"
-    ]
-  selections:
-    - anchor: {line: 1, character: 10}
-      active: {line: 1, character: 10}
-  marks: {}
-finalState:
-  documentContents: "[]"
-  selections:
-    - anchor: {line: 0, character: 1}
-      active: {line: 0, character: 1}
-fullTargets: [{type: primitive, mark: {type: cursor}, modifiers: [{type: interiorOnly}]}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/chuckCore2.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/chuckCore2.yml
deleted file mode 100644
index f3a8da45f3..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/chuckCore2.yml
+++ /dev/null
@@ -1,22 +0,0 @@
-languageId: plaintext
-command:
-  spokenForm: chuck core
-  version: 2
-  targets:
-    - type: primitive
-      modifiers:
-        - {type: interiorOnly}
-  usePrePhraseSnapshot: true
-  action: {name: remove}
-initialState:
-  documentContents: ( hello )
-  selections:
-    - anchor: {line: 0, character: 6}
-      active: {line: 0, character: 6}
-  marks: {}
-finalState:
-  documentContents: ()
-  selections:
-    - anchor: {line: 0, character: 1}
-      active: {line: 0, character: 1}
-fullTargets: [{type: primitive, mark: {type: cursor}, modifiers: [{type: interiorOnly}]}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/clearCoreRiskPastHarp.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/clearCoreRiskPastHarp.yml
deleted file mode 100644
index fcfc43001e..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/clearCoreRiskPastHarp.yml
+++ /dev/null
@@ -1,38 +0,0 @@
-languageId: plaintext
-command:
-  spokenForm: clear core risk past harp
-  version: 2
-  targets:
-    - type: range
-      anchor:
-        type: primitive
-        modifiers:
-          - {type: interiorOnly}
-        mark: {type: decoratedSymbol, symbolColor: default, character: r}
-      active:
-        type: primitive
-        mark: {type: decoratedSymbol, symbolColor: default, character: h}
-      excludeAnchor: false
-      excludeActive: false
-  usePrePhraseSnapshot: true
-  action: {name: clearAndSetSelection}
-initialState:
-  documentContents: |-
-    ( hello world )
-    [ hello world ]
-  selections:
-    - anchor: {line: 1, character: 15}
-      active: {line: 1, character: 15}
-  marks:
-    default.r:
-      start: {line: 0, character: 8}
-      end: {line: 0, character: 13}
-    default.h:
-      start: {line: 1, character: 2}
-      end: {line: 1, character: 7}
-finalState:
-  documentContents: (  ]
-  selections:
-    - anchor: {line: 0, character: 2}
-      active: {line: 0, character: 2}
-fullTargets: [{type: range, excludeAnchor: false, excludeActive: false, rangeType: continuous, anchor: {type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: r}, modifiers: [{type: interiorOnly}]}, active: {type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: h}, modifiers: [{type: interiorOnly}]}}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/ditchCoreEachPastWhale.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/ditchCoreEachPastWhale.yml
deleted file mode 100644
index 9e81dbf0dd..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/ditchCoreEachPastWhale.yml
+++ /dev/null
@@ -1,39 +0,0 @@
-languageId: plaintext
-command:
-  spokenForm: ditch core each past whale
-  version: 2
-  targets:
-    - type: range
-      anchor:
-        type: primitive
-        modifiers:
-          - {type: interiorOnly}
-        mark: {type: decoratedSymbol, symbolColor: default, character: e}
-      active:
-        type: primitive
-        mark: {type: decoratedSymbol, symbolColor: default, character: w}
-      excludeAnchor: false
-      excludeActive: false
-  usePrePhraseSnapshot: true
-  action: {name: remove}
-initialState:
-  documentContents: |
-    ( hello world )
-    ( hello world )
-  selections:
-    - anchor: {line: 2, character: 0}
-      active: {line: 2, character: 0}
-  marks:
-    default.e:
-      start: {line: 0, character: 2}
-      end: {line: 0, character: 7}
-    default.w:
-      start: {line: 1, character: 8}
-      end: {line: 1, character: 13}
-finalState:
-  documentContents: |
-    ()
-  selections:
-    - anchor: {line: 1, character: 0}
-      active: {line: 1, character: 0}
-fullTargets: [{type: range, excludeAnchor: false, excludeActive: false, rangeType: continuous, anchor: {type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: e}, modifiers: [{type: interiorOnly}]}, active: {type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: w}, modifiers: [{type: interiorOnly}]}}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/html/clearBoundsBatt.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/html/clearBoundsBatt.yml
deleted file mode 100644
index c08599d8b7..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/html/clearBoundsBatt.yml
+++ /dev/null
@@ -1,36 +0,0 @@
-languageId: html
-command:
-  version: 1
-  spokenForm: clear bounds batt
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: surroundingPair, delimiter: any, delimiterInclusion: excludeInterior}
-      mark: {type: decoratedSymbol, symbolColor: default, character: b}
-initialState:
-  documentContents: |-
-    <html>
-        <body>
-            <hr/>
-        </body>
-    </html>
-  selections:
-    - anchor: {line: 4, character: 7}
-      active: {line: 4, character: 7}
-  marks:
-    default.b:
-      start: {line: 3, character: 6}
-      end: {line: 3, character: 10}
-finalState:
-  documentContents: |-
-    <html>
-        <body>
-            <hr/>
-        body
-    </html>
-  selections:
-    - anchor: {line: 3, character: 4}
-      active: {line: 3, character: 4}
-    - anchor: {line: 3, character: 8}
-      active: {line: 3, character: 8}
-fullTargets: [{type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: b}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: surroundingPair, delimiter: any, delimiterInclusion: excludeInterior}}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/html/clearBoundsEach.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/html/clearBoundsEach.yml
deleted file mode 100644
index cdeadc9091..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/html/clearBoundsEach.yml
+++ /dev/null
@@ -1,30 +0,0 @@
-languageId: html
-command:
-  version: 1
-  spokenForm: clear bounds each
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: surroundingPair, delimiter: any, delimiterInclusion: excludeInterior}
-      mark: {type: decoratedSymbol, symbolColor: default, character: e}
-initialState:
-  documentContents: |-
-    <html id="(hello)">
-    </html>
-  selections:
-    - anchor: {line: 1, character: 0}
-      active: {line: 1, character: 0}
-  marks:
-    default.e:
-      start: {line: 0, character: 11}
-      end: {line: 0, character: 16}
-finalState:
-  documentContents: |-
-    <html id="hello">
-    </html>
-  selections:
-    - anchor: {line: 0, character: 10}
-      active: {line: 0, character: 10}
-    - anchor: {line: 0, character: 15}
-      active: {line: 0, character: 15}
-fullTargets: [{type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: e}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: surroundingPair, delimiter: any, delimiterInclusion: excludeInterior}, isImplicit: false}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/html/clearBoundsHarp.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/html/clearBoundsHarp.yml
deleted file mode 100644
index 550accd5e6..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/html/clearBoundsHarp.yml
+++ /dev/null
@@ -1,32 +0,0 @@
-languageId: html
-command:
-  version: 1
-  spokenForm: clear bounds harp
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: surroundingPair, delimiter: any, delimiterInclusion: excludeInterior}
-      mark: {type: decoratedSymbol, symbolColor: default, character: h}
-initialState:
-  documentContents: |-
-    <html id="(hello)">
-        <!-- (hello) -->
-    </html>
-  selections:
-    - anchor: {line: 2, character: 7}
-      active: {line: 2, character: 7}
-  marks:
-    default.h:
-      start: {line: 1, character: 10}
-      end: {line: 1, character: 15}
-finalState:
-  documentContents: |-
-    <html id="(hello)">
-        <!-- hello -->
-    </html>
-  selections:
-    - anchor: {line: 1, character: 9}
-      active: {line: 1, character: 9}
-    - anchor: {line: 1, character: 14}
-      active: {line: 1, character: 14}
-fullTargets: [{type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: h}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: surroundingPair, delimiter: any, delimiterInclusion: excludeInterior}}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/html/clearBoundsOx.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/html/clearBoundsOx.yml
deleted file mode 100644
index f8c4adb153..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/html/clearBoundsOx.yml
+++ /dev/null
@@ -1,36 +0,0 @@
-languageId: html
-command:
-  version: 1
-  spokenForm: clear bounds ox
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: surroundingPair, delimiter: any, delimiterInclusion: excludeInterior}
-      mark: {type: decoratedSymbol, symbolColor: default, character: o}
-initialState:
-  documentContents: |-
-    <html>
-        <body>
-            <hr/>
-        </body>
-    </html>
-  selections:
-    - anchor: {line: 4, character: 7}
-      active: {line: 4, character: 7}
-  marks:
-    default.o:
-      start: {line: 1, character: 5}
-      end: {line: 1, character: 9}
-finalState:
-  documentContents: |-
-    <html>
-        body
-            <hr/>
-        </body>
-    </html>
-  selections:
-    - anchor: {line: 1, character: 4}
-      active: {line: 1, character: 4}
-    - anchor: {line: 1, character: 8}
-      active: {line: 1, character: 8}
-fullTargets: [{type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: o}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: surroundingPair, delimiter: any, delimiterInclusion: excludeInterior}}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/html/clearBoundsRam.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/html/clearBoundsRam.yml
deleted file mode 100644
index 7c186dbdac..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/html/clearBoundsRam.yml
+++ /dev/null
@@ -1,36 +0,0 @@
-languageId: html
-command:
-  version: 1
-  spokenForm: clear bounds ram
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: surroundingPair, delimiter: any, delimiterInclusion: excludeInterior}
-      mark: {type: decoratedSymbol, symbolColor: default, character: r}
-initialState:
-  documentContents: |-
-    <html>
-        <body>
-            <hr/>
-        </body>
-    </html>
-  selections:
-    - anchor: {line: 4, character: 7}
-      active: {line: 4, character: 7}
-  marks:
-    default.r:
-      start: {line: 2, character: 9}
-      end: {line: 2, character: 11}
-finalState:
-  documentContents: |-
-    <html>
-        <body>
-            hr
-        </body>
-    </html>
-  selections:
-    - anchor: {line: 2, character: 8}
-      active: {line: 2, character: 8}
-    - anchor: {line: 2, character: 10}
-      active: {line: 2, character: 10}
-fullTargets: [{type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: r}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: surroundingPair, delimiter: any, delimiterInclusion: excludeInterior}}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/html/clearCurly.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/html/clearCurly.yml
deleted file mode 100644
index ff6e1fbc60..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/html/clearCurly.yml
+++ /dev/null
@@ -1,34 +0,0 @@
-languageId: html
-command:
-  version: 1
-  spokenForm: clear curly
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: surroundingPair, delimiter: curlyBrackets}
-initialState:
-  documentContents: |
-    <html>
-      <head>
-        <style>
-          body { color: red; }
-        </style>
-      </head>
-    </html>
-  selections:
-    - anchor: {line: 3, character: 16}
-      active: {line: 3, character: 16}
-  marks: {}
-finalState:
-  documentContents: |
-    <html>
-      <head>
-        <style>
-          body 
-        </style>
-      </head>
-    </html>
-  selections:
-    - anchor: {line: 3, character: 11}
-      active: {line: 3, character: 11}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: surroundingPair, delimiter: curlyBrackets}, isImplicit: false}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/html/clearPair.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/html/clearPair.yml
deleted file mode 100644
index e052727500..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/html/clearPair.yml
+++ /dev/null
@@ -1,20 +0,0 @@
-languageId: html
-command:
-  version: 1
-  spokenForm: clear pair
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: surroundingPair, delimiter: any}
-initialState:
-  documentContents: <hello/>
-  selections:
-    - anchor: {line: 0, character: 5}
-      active: {line: 0, character: 5}
-  marks: {}
-finalState:
-  documentContents: ""
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: surroundingPair, delimiter: any}}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/html/clearPair10.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/html/clearPair10.yml
deleted file mode 100644
index 0ec4cd065d..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/html/clearPair10.yml
+++ /dev/null
@@ -1,20 +0,0 @@
-languageId: html
-command:
-  version: 1
-  spokenForm: clear pair
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: surroundingPair, delimiter: any}
-initialState:
-  documentContents: <hello> <hello/>
-  selections:
-    - anchor: {line: 0, character: 4}
-      active: {line: 0, character: 4}
-  marks: {}
-finalState:
-  documentContents: " <hello/>"
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: surroundingPair, delimiter: any}}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/html/clearPair11.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/html/clearPair11.yml
deleted file mode 100644
index 09f1d4bb9b..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/html/clearPair11.yml
+++ /dev/null
@@ -1,20 +0,0 @@
-languageId: html
-command:
-  version: 1
-  spokenForm: clear pair
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: surroundingPair, delimiter: any}
-initialState:
-  documentContents: <hello> <hello/>
-  selections:
-    - anchor: {line: 0, character: 1}
-      active: {line: 0, character: 1}
-  marks: {}
-finalState:
-  documentContents: " <hello/>"
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: surroundingPair, delimiter: any}}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/html/clearPair12.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/html/clearPair12.yml
deleted file mode 100644
index 30c7fdcf3e..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/html/clearPair12.yml
+++ /dev/null
@@ -1,20 +0,0 @@
-languageId: html
-command:
-  version: 1
-  spokenForm: clear pair
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: surroundingPair, delimiter: any}
-initialState:
-  documentContents: <hello> <hello/>
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-  marks: {}
-finalState:
-  documentContents: " <hello/>"
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: surroundingPair, delimiter: any}}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/html/clearPair13.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/html/clearPair13.yml
deleted file mode 100644
index aa2cb3fe70..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/html/clearPair13.yml
+++ /dev/null
@@ -1,20 +0,0 @@
-languageId: html
-command:
-  version: 1
-  spokenForm: clear pair
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: surroundingPair, delimiter: any}
-initialState:
-  documentContents: <hello> <hello/>
-  selections:
-    - anchor: {line: 0, character: 9}
-      active: {line: 0, character: 9}
-  marks: {}
-finalState:
-  documentContents: "<hello> "
-  selections:
-    - anchor: {line: 0, character: 8}
-      active: {line: 0, character: 8}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: surroundingPair, delimiter: any}}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/html/clearPair14.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/html/clearPair14.yml
deleted file mode 100644
index e8adf0f694..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/html/clearPair14.yml
+++ /dev/null
@@ -1,20 +0,0 @@
-languageId: html
-command:
-  version: 1
-  spokenForm: clear pair
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: surroundingPair, delimiter: any}
-initialState:
-  documentContents: <hello> <hello/>
-  selections:
-    - anchor: {line: 0, character: 11}
-      active: {line: 0, character: 11}
-  marks: {}
-finalState:
-  documentContents: "<hello> "
-  selections:
-    - anchor: {line: 0, character: 8}
-      active: {line: 0, character: 8}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: surroundingPair, delimiter: any}}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/html/clearPair15.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/html/clearPair15.yml
deleted file mode 100644
index b583522e6f..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/html/clearPair15.yml
+++ /dev/null
@@ -1,20 +0,0 @@
-languageId: html
-command:
-  version: 1
-  spokenForm: clear pair
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: surroundingPair, delimiter: any}
-initialState:
-  documentContents: <hello> <hello/>
-  selections:
-    - anchor: {line: 0, character: 14}
-      active: {line: 0, character: 14}
-  marks: {}
-finalState:
-  documentContents: "<hello> "
-  selections:
-    - anchor: {line: 0, character: 8}
-      active: {line: 0, character: 8}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: surroundingPair, delimiter: any}}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/html/clearPair16.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/html/clearPair16.yml
deleted file mode 100644
index 6b94c31173..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/html/clearPair16.yml
+++ /dev/null
@@ -1,20 +0,0 @@
-languageId: html
-command:
-  version: 1
-  spokenForm: clear pair
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: surroundingPair, delimiter: any}
-initialState:
-  documentContents: <hello> <hello/>
-  selections:
-    - anchor: {line: 0, character: 15}
-      active: {line: 0, character: 15}
-  marks: {}
-finalState:
-  documentContents: "<hello> "
-  selections:
-    - anchor: {line: 0, character: 8}
-      active: {line: 0, character: 8}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: surroundingPair, delimiter: any}}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/html/clearPair17.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/html/clearPair17.yml
deleted file mode 100644
index 499225feab..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/html/clearPair17.yml
+++ /dev/null
@@ -1,20 +0,0 @@
-languageId: html
-command:
-  version: 1
-  spokenForm: clear pair
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: surroundingPair, delimiter: any}
-initialState:
-  documentContents: <hello> <hello/>
-  selections:
-    - anchor: {line: 0, character: 16}
-      active: {line: 0, character: 16}
-  marks: {}
-finalState:
-  documentContents: "<hello> "
-  selections:
-    - anchor: {line: 0, character: 8}
-      active: {line: 0, character: 8}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: surroundingPair, delimiter: any}}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/html/clearPair2.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/html/clearPair2.yml
deleted file mode 100644
index a89d49487a..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/html/clearPair2.yml
+++ /dev/null
@@ -1,20 +0,0 @@
-languageId: html
-command:
-  version: 1
-  spokenForm: clear pair
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: surroundingPair, delimiter: any}
-initialState:
-  documentContents: <hello/>
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-  marks: {}
-finalState:
-  documentContents: ""
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: surroundingPair, delimiter: any}}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/html/clearPair3.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/html/clearPair3.yml
deleted file mode 100644
index 330aebede9..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/html/clearPair3.yml
+++ /dev/null
@@ -1,20 +0,0 @@
-languageId: html
-command:
-  version: 1
-  spokenForm: clear pair
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: surroundingPair, delimiter: any}
-initialState:
-  documentContents: <hello/>
-  selections:
-    - anchor: {line: 0, character: 1}
-      active: {line: 0, character: 1}
-  marks: {}
-finalState:
-  documentContents: ""
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: surroundingPair, delimiter: any}}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/html/clearPair4.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/html/clearPair4.yml
deleted file mode 100644
index 6f222c2a0a..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/html/clearPair4.yml
+++ /dev/null
@@ -1,20 +0,0 @@
-languageId: html
-command:
-  version: 1
-  spokenForm: clear pair
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: surroundingPair, delimiter: any}
-initialState:
-  documentContents: <hello/>
-  selections:
-    - anchor: {line: 0, character: 6}
-      active: {line: 0, character: 6}
-  marks: {}
-finalState:
-  documentContents: ""
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: surroundingPair, delimiter: any}}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/html/clearPair5.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/html/clearPair5.yml
deleted file mode 100644
index 674b1a29fb..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/html/clearPair5.yml
+++ /dev/null
@@ -1,20 +0,0 @@
-languageId: html
-command:
-  version: 1
-  spokenForm: clear pair
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: surroundingPair, delimiter: any}
-initialState:
-  documentContents: <hello/>
-  selections:
-    - anchor: {line: 0, character: 7}
-      active: {line: 0, character: 7}
-  marks: {}
-finalState:
-  documentContents: ""
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: surroundingPair, delimiter: any}}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/html/clearPair6.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/html/clearPair6.yml
deleted file mode 100644
index db4e3a5a54..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/html/clearPair6.yml
+++ /dev/null
@@ -1,20 +0,0 @@
-languageId: html
-command:
-  version: 1
-  spokenForm: clear pair
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: surroundingPair, delimiter: any}
-initialState:
-  documentContents: <hello/>
-  selections:
-    - anchor: {line: 0, character: 8}
-      active: {line: 0, character: 8}
-  marks: {}
-finalState:
-  documentContents: ""
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: surroundingPair, delimiter: any}}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/html/clearPair7.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/html/clearPair7.yml
deleted file mode 100644
index f2c10e343c..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/html/clearPair7.yml
+++ /dev/null
@@ -1,20 +0,0 @@
-languageId: html
-command:
-  version: 1
-  spokenForm: clear pair
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: surroundingPair, delimiter: any}
-initialState:
-  documentContents: <hello><hello/>
-  selections:
-    - anchor: {line: 0, character: 7}
-      active: {line: 0, character: 7}
-  marks: {}
-finalState:
-  documentContents: <hello>
-  selections:
-    - anchor: {line: 0, character: 7}
-      active: {line: 0, character: 7}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: surroundingPair, delimiter: any}}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/html/clearPair8.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/html/clearPair8.yml
deleted file mode 100644
index 36a39c52de..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/html/clearPair8.yml
+++ /dev/null
@@ -1,20 +0,0 @@
-languageId: html
-command:
-  version: 1
-  spokenForm: clear pair
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: surroundingPair, delimiter: any}
-initialState:
-  documentContents: <hello> <hello/>
-  selections:
-    - anchor: {line: 0, character: 7}
-      active: {line: 0, character: 7}
-  marks: {}
-finalState:
-  documentContents: " <hello/>"
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: surroundingPair, delimiter: any}}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/html/clearPair9.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/html/clearPair9.yml
deleted file mode 100644
index b8cef13060..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/html/clearPair9.yml
+++ /dev/null
@@ -1,20 +0,0 @@
-languageId: html
-command:
-  version: 1
-  spokenForm: clear pair
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: surroundingPair, delimiter: any}
-initialState:
-  documentContents: <hello> <hello/>
-  selections:
-    - anchor: {line: 0, character: 6}
-      active: {line: 0, character: 6}
-  marks: {}
-finalState:
-  documentContents: " <hello/>"
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: surroundingPair, delimiter: any}}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/html/clearPairBatt.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/html/clearPairBatt.yml
deleted file mode 100644
index 8181a8c6d2..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/html/clearPairBatt.yml
+++ /dev/null
@@ -1,34 +0,0 @@
-languageId: html
-command:
-  version: 1
-  spokenForm: clear pair batt
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: surroundingPair, delimiter: any}
-      mark: {type: decoratedSymbol, symbolColor: default, character: b}
-initialState:
-  documentContents: |-
-    <html>
-        <body>
-            <hr/>
-        </body>
-    </html>
-  selections:
-    - anchor: {line: 4, character: 7}
-      active: {line: 4, character: 7}
-  marks:
-    default.b:
-      start: {line: 3, character: 6}
-      end: {line: 3, character: 10}
-finalState:
-  documentContents: |-
-    <html>
-        <body>
-            <hr/>
-        
-    </html>
-  selections:
-    - anchor: {line: 3, character: 4}
-      active: {line: 3, character: 4}
-fullTargets: [{type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: b}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: surroundingPair, delimiter: any}}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/html/clearPairOx.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/html/clearPairOx.yml
deleted file mode 100644
index f3d4a52e1b..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/html/clearPairOx.yml
+++ /dev/null
@@ -1,34 +0,0 @@
-languageId: html
-command:
-  version: 1
-  spokenForm: clear pair ox
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: surroundingPair, delimiter: any}
-      mark: {type: decoratedSymbol, symbolColor: default, character: o}
-initialState:
-  documentContents: |-
-    <html>
-        <body>
-            <hr/>
-        </body>
-    </html>
-  selections:
-    - anchor: {line: 4, character: 7}
-      active: {line: 4, character: 7}
-  marks:
-    default.o:
-      start: {line: 1, character: 5}
-      end: {line: 1, character: 9}
-finalState:
-  documentContents: |-
-    <html>
-        
-            <hr/>
-        </body>
-    </html>
-  selections:
-    - anchor: {line: 1, character: 4}
-      active: {line: 1, character: 4}
-fullTargets: [{type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: o}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: surroundingPair, delimiter: any}}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/html/clearPairRam.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/html/clearPairRam.yml
deleted file mode 100644
index b8daf9f5bc..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/html/clearPairRam.yml
+++ /dev/null
@@ -1,34 +0,0 @@
-languageId: html
-command:
-  version: 1
-  spokenForm: clear pair ram
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: surroundingPair, delimiter: any}
-      mark: {type: decoratedSymbol, symbolColor: default, character: r}
-initialState:
-  documentContents: |-
-    <html>
-        <body>
-            <hr/>
-        </body>
-    </html>
-  selections:
-    - anchor: {line: 4, character: 7}
-      active: {line: 4, character: 7}
-  marks:
-    default.r:
-      start: {line: 2, character: 9}
-      end: {line: 2, character: 11}
-finalState:
-  documentContents: |-
-    <html>
-        <body>
-            
-        </body>
-    </html>
-  selections:
-    - anchor: {line: 2, character: 8}
-      active: {line: 2, character: 8}
-fullTargets: [{type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: r}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: surroundingPair, delimiter: any}}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/html/clearRound.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/html/clearRound.yml
deleted file mode 100644
index ac7d4f89e0..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/html/clearRound.yml
+++ /dev/null
@@ -1,30 +0,0 @@
-languageId: html
-command:
-  version: 1
-  spokenForm: clear round
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: surroundingPair, delimiter: parentheses}
-initialState:
-  documentContents: |-
-    <html>
-        <body>
-            (hello)
-        </body>
-    </html>
-  selections:
-    - anchor: {line: 2, character: 11}
-      active: {line: 2, character: 11}
-  marks: {}
-finalState:
-  documentContents: |-
-    <html>
-        <body>
-            
-        </body>
-    </html>
-  selections:
-    - anchor: {line: 2, character: 8}
-      active: {line: 2, character: 8}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: surroundingPair, delimiter: parentheses}, isImplicit: false}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/html/clearRound2.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/html/clearRound2.yml
deleted file mode 100644
index c948a0ec4e..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/html/clearRound2.yml
+++ /dev/null
@@ -1,30 +0,0 @@
-languageId: html
-command:
-  version: 1
-  spokenForm: clear round
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: surroundingPair, delimiter: parentheses}
-initialState:
-  documentContents: |-
-    <html>
-        <head>
-            <script>(hello)</script>
-        </head>
-    </html>
-  selections:
-    - anchor: {line: 2, character: 19}
-      active: {line: 2, character: 19}
-  marks: {}
-finalState:
-  documentContents: |-
-    <html>
-        <head>
-            <script></script>
-        </head>
-    </html>
-  selections:
-    - anchor: {line: 2, character: 16}
-      active: {line: 2, character: 16}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: surroundingPair, delimiter: parentheses}, isImplicit: false}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/parseTree/clojure/clearBound.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/parseTree/clojure/clearBound.yml
deleted file mode 100644
index 49dc89cf65..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/parseTree/clojure/clearBound.yml
+++ /dev/null
@@ -1,22 +0,0 @@
-languageId: clojure
-command:
-  version: 1
-  spokenForm: clear bound
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: surroundingPair, delimiter: any, delimiterInclusion: excludeInterior}
-initialState:
-  documentContents: (hello)
-  selections:
-    - anchor: {line: 0, character: 5}
-      active: {line: 0, character: 5}
-  marks: {}
-finalState:
-  documentContents: hello
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-    - anchor: {line: 0, character: 5}
-      active: {line: 0, character: 5}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: surroundingPair, delimiter: any, delimiterInclusion: excludeInterior}}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/parseTree/clojure/clearCore.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/parseTree/clojure/clearCore.yml
deleted file mode 100644
index ca17ceb217..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/parseTree/clojure/clearCore.yml
+++ /dev/null
@@ -1,20 +0,0 @@
-languageId: clojure
-command:
-  version: 1
-  spokenForm: clear core
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: surroundingPair, delimiter: any, delimiterInclusion: interiorOnly}
-initialState:
-  documentContents: (hello)
-  selections:
-    - anchor: {line: 0, character: 5}
-      active: {line: 0, character: 5}
-  marks: {}
-finalState:
-  documentContents: ()
-  selections:
-    - anchor: {line: 0, character: 1}
-      active: {line: 0, character: 1}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: surroundingPair, delimiter: any, delimiterInclusion: interiorOnly}}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/parseTree/clojure/clearCore2.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/parseTree/clojure/clearCore2.yml
deleted file mode 100644
index 417f041584..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/parseTree/clojure/clearCore2.yml
+++ /dev/null
@@ -1,20 +0,0 @@
-languageId: clojure
-command:
-  version: 1
-  spokenForm: clear core
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: surroundingPair, delimiter: any, delimiterInclusion: interiorOnly}
-initialState:
-  documentContents: "\"hello\""
-  selections:
-    - anchor: {line: 0, character: 4}
-      active: {line: 0, character: 4}
-  marks: {}
-finalState:
-  documentContents: "\"\""
-  selections:
-    - anchor: {line: 0, character: 1}
-      active: {line: 0, character: 1}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: surroundingPair, delimiter: any, delimiterInclusion: interiorOnly}}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/parseTree/clojure/clearPair.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/parseTree/clojure/clearPair.yml
deleted file mode 100644
index c8fc489027..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/parseTree/clojure/clearPair.yml
+++ /dev/null
@@ -1,20 +0,0 @@
-languageId: clojure
-command:
-  version: 1
-  spokenForm: clear pair
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: surroundingPair, delimiter: any}
-initialState:
-  documentContents: ;; (hello)
-  selections:
-    - anchor: {line: 0, character: 7}
-      active: {line: 0, character: 7}
-  marks: {}
-finalState:
-  documentContents: ";; "
-  selections:
-    - anchor: {line: 0, character: 3}
-      active: {line: 0, character: 3}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: surroundingPair, delimiter: any}}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/parseTree/clojure/clearPair2.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/parseTree/clojure/clearPair2.yml
deleted file mode 100644
index b694700bb4..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/parseTree/clojure/clearPair2.yml
+++ /dev/null
@@ -1,20 +0,0 @@
-languageId: clojure
-command:
-  version: 1
-  spokenForm: clear pair
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: surroundingPair, delimiter: any}
-initialState:
-  documentContents: (hello)
-  selections:
-    - anchor: {line: 0, character: 5}
-      active: {line: 0, character: 5}
-  marks: {}
-finalState:
-  documentContents: ""
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: surroundingPair, delimiter: any}}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/parseTree/clojure/clearPair3.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/parseTree/clojure/clearPair3.yml
deleted file mode 100644
index 356c5b570e..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/parseTree/clojure/clearPair3.yml
+++ /dev/null
@@ -1,20 +0,0 @@
-languageId: clojure
-command:
-  version: 1
-  spokenForm: clear pair
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: surroundingPair, delimiter: any}
-initialState:
-  documentContents: "\"hello\""
-  selections:
-    - anchor: {line: 0, character: 4}
-      active: {line: 0, character: 4}
-  marks: {}
-finalState:
-  documentContents: ""
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: surroundingPair, delimiter: any}}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/parseTree/clojure/clearPair4.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/parseTree/clojure/clearPair4.yml
deleted file mode 100644
index fdf388eddc..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/parseTree/clojure/clearPair4.yml
+++ /dev/null
@@ -1,20 +0,0 @@
-languageId: clojure
-command:
-  version: 1
-  spokenForm: clear pair
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: surroundingPair, delimiter: any}
-initialState:
-  documentContents: "\"(hello)\""
-  selections:
-    - anchor: {line: 0, character: 6}
-      active: {line: 0, character: 6}
-  marks: {}
-finalState:
-  documentContents: "\"\""
-  selections:
-    - anchor: {line: 0, character: 1}
-      active: {line: 0, character: 1}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: surroundingPair, delimiter: any}}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/parseTree/cpp/clearOutside.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/parseTree/cpp/clearOutside.yml
deleted file mode 100644
index 8f953ad4d1..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/parseTree/cpp/clearOutside.yml
+++ /dev/null
@@ -1,20 +0,0 @@
-languageId: cpp
-command:
-  version: 1
-  spokenForm: clear outside
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: surroundingPair, delimiter: any}
-initialState:
-  documentContents: "\"hello\""
-  selections:
-    - anchor: {line: 0, character: 4}
-      active: {line: 0, character: 4}
-  marks: {}
-finalState:
-  documentContents: ""
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: surroundingPair, delimiter: null, delimiterInclusion: includeDelimiters}}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/parseTree/cpp/clearRound8.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/parseTree/cpp/clearRound8.yml
deleted file mode 100644
index aff2fd1fee..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/parseTree/cpp/clearRound8.yml
+++ /dev/null
@@ -1,20 +0,0 @@
-languageId: cpp
-command:
-  version: 1
-  spokenForm: clear round
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: surroundingPair, delimiter: parentheses}
-initialState:
-  documentContents: "\"(hello)\""
-  selections:
-    - anchor: {line: 0, character: 5}
-      active: {line: 0, character: 5}
-  marks: {}
-finalState:
-  documentContents: "\"\""
-  selections:
-    - anchor: {line: 0, character: 1}
-      active: {line: 0, character: 1}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: surroundingPair, delimiter: parentheses, delimiterInclusion: includeDelimiters}}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/parseTree/java/clearQuad3.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/parseTree/java/clearQuad3.yml
deleted file mode 100644
index 27f8c44b05..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/parseTree/java/clearQuad3.yml
+++ /dev/null
@@ -1,20 +0,0 @@
-languageId: java
-command:
-  version: 1
-  spokenForm: clear quad
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: surroundingPair, delimiter: doubleQuotes}
-initialState:
-  documentContents: "\"hello\""
-  selections:
-    - anchor: {line: 0, character: 4}
-      active: {line: 0, character: 4}
-  marks: {}
-finalState:
-  documentContents: ""
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: surroundingPair, delimiter: doubleQuotes, delimiterInclusion: includeDelimiters}}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/parseTree/java/clearRound10.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/parseTree/java/clearRound10.yml
deleted file mode 100644
index 9d1c6f520b..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/parseTree/java/clearRound10.yml
+++ /dev/null
@@ -1,20 +0,0 @@
-languageId: java
-command:
-  version: 1
-  spokenForm: clear round
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: surroundingPair, delimiter: parentheses}
-initialState:
-  documentContents: "\"(hello)\""
-  selections:
-    - anchor: {line: 0, character: 5}
-      active: {line: 0, character: 5}
-  marks: {}
-finalState:
-  documentContents: "\"\""
-  selections:
-    - anchor: {line: 0, character: 1}
-      active: {line: 0, character: 1}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: surroundingPair, delimiter: parentheses, delimiterInclusion: includeDelimiters}}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/parseTree/java/clearRound11.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/parseTree/java/clearRound11.yml
deleted file mode 100644
index e1610a4ce0..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/parseTree/java/clearRound11.yml
+++ /dev/null
@@ -1,20 +0,0 @@
-languageId: java
-command:
-  version: 1
-  spokenForm: clear round
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: surroundingPair, delimiter: parentheses}
-initialState:
-  documentContents: ("hello")
-  selections:
-    - anchor: {line: 0, character: 5}
-      active: {line: 0, character: 5}
-  marks: {}
-finalState:
-  documentContents: ""
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: surroundingPair, delimiter: parentheses, delimiterInclusion: includeDelimiters}}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/parseTree/json/clearPair.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/parseTree/json/clearPair.yml
deleted file mode 100644
index 23ed10cc95..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/parseTree/json/clearPair.yml
+++ /dev/null
@@ -1,20 +0,0 @@
-languageId: json
-command:
-  version: 1
-  spokenForm: clear pair
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: surroundingPair, delimiter: any}
-initialState:
-  documentContents: "\"(hello)\""
-  selections:
-    - anchor: {line: 0, character: 5}
-      active: {line: 0, character: 5}
-  marks: {}
-finalState:
-  documentContents: "\"\""
-  selections:
-    - anchor: {line: 0, character: 1}
-      active: {line: 0, character: 1}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: surroundingPair, delimiter: any}}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/parseTree/json/clearPair2.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/parseTree/json/clearPair2.yml
deleted file mode 100644
index 75c3405488..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/parseTree/json/clearPair2.yml
+++ /dev/null
@@ -1,20 +0,0 @@
-languageId: json
-command:
-  version: 1
-  spokenForm: clear pair
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: surroundingPair, delimiter: any}
-initialState:
-  documentContents: "\"(hello)\""
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-  marks: {}
-finalState:
-  documentContents: ""
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: surroundingPair, delimiter: any}}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/parseTree/json/clearRound.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/parseTree/json/clearRound.yml
deleted file mode 100644
index a0eb2bc92d..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/parseTree/json/clearRound.yml
+++ /dev/null
@@ -1,20 +0,0 @@
-languageId: json
-command:
-  version: 1
-  spokenForm: clear round
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: surroundingPair, delimiter: parentheses}
-initialState:
-  documentContents: "\"(hello)\""
-  selections:
-    - anchor: {line: 0, character: 5}
-      active: {line: 0, character: 5}
-  marks: {}
-finalState:
-  documentContents: "\"\""
-  selections:
-    - anchor: {line: 0, character: 1}
-      active: {line: 0, character: 1}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: surroundingPair, delimiter: parentheses}}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/parseTree/json/clearRound2.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/parseTree/json/clearRound2.yml
deleted file mode 100644
index 90848884af..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/parseTree/json/clearRound2.yml
+++ /dev/null
@@ -1,20 +0,0 @@
-languageId: json
-command:
-  version: 1
-  spokenForm: clear round
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: surroundingPair, delimiter: parentheses}
-initialState:
-  documentContents: // (hello)
-  selections:
-    - anchor: {line: 0, character: 7}
-      active: {line: 0, character: 7}
-  marks: {}
-finalState:
-  documentContents: "// "
-  selections:
-    - anchor: {line: 0, character: 3}
-      active: {line: 0, character: 3}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: surroundingPair, delimiter: parentheses}}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/parseTree/python/chuckMatching.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/parseTree/python/chuckMatching.yml
deleted file mode 100644
index dab811f217..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/parseTree/python/chuckMatching.yml
+++ /dev/null
@@ -1,20 +0,0 @@
-languageId: python
-command:
-  version: 1
-  spokenForm: clear matching
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: surroundingPair, delimiter: any}
-initialState:
-  documentContents: f"j{fdfhjkd}lkjlkj"
-  selections:
-    - anchor: {line: 0, character: 15}
-      active: {line: 0, character: 15}
-  marks: {}
-finalState:
-  documentContents: ""
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, modifier: {type: surroundingPair, delimiter: null, delimitersOnly: false}, insideOutsideType: outside}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/parseTree/python/chuckMatching2.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/parseTree/python/chuckMatching2.yml
deleted file mode 100644
index 7052d7e529..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/parseTree/python/chuckMatching2.yml
+++ /dev/null
@@ -1,24 +0,0 @@
-languageId: python
-command:
-  version: 1
-  spokenForm: clear matching
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: surroundingPair, delimiter: any}
-initialState:
-  documentContents: |
-    def fff(x, y):
-        pass
-  selections:
-    - anchor: {line: 0, character: 10}
-      active: {line: 0, character: 10}
-  marks: {}
-finalState:
-  documentContents: |
-    def fff:
-        pass
-  selections:
-    - anchor: {line: 0, character: 7}
-      active: {line: 0, character: 7}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, modifier: {type: surroundingPair, delimiter: null, delimitersOnly: false}, insideOutsideType: outside}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/parseTree/python/chuckMatching3.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/parseTree/python/chuckMatching3.yml
deleted file mode 100644
index fc05652a54..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/parseTree/python/chuckMatching3.yml
+++ /dev/null
@@ -1,24 +0,0 @@
-languageId: python
-command:
-  version: 1
-  spokenForm: clear matching
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: surroundingPair, delimiter: any}
-initialState:
-  documentContents: |-
-    """fds
-
-    dfsd
-    """
-  selections:
-    - anchor: {line: 1, character: 0}
-      active: {line: 1, character: 0}
-  marks: {}
-finalState:
-  documentContents: ""
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, modifier: {type: surroundingPair, delimiter: null, delimitersOnly: false}, insideOutsideType: outside}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/parseTree/python/chuckPair.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/parseTree/python/chuckPair.yml
deleted file mode 100644
index a778012e7d..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/parseTree/python/chuckPair.yml
+++ /dev/null
@@ -1,22 +0,0 @@
-languageId: python
-command:
-  version: 1
-  spokenForm: clear pair
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: surroundingPair, delimiter: any, delimiterInclusion: excludeInterior}
-initialState:
-  documentContents: "{1: [(1), (2), (3)]}"
-  selections:
-    - anchor: {line: 0, character: 3}
-      active: {line: 0, character: 3}
-  marks: {}
-finalState:
-  documentContents: "1: [(1), (2), (3)]"
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-    - anchor: {line: 0, character: 18}
-      active: {line: 0, character: 18}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, modifier: {type: surroundingPair, delimiter: null, delimitersOnly: true}, insideOutsideType: outside}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/parseTree/python/chuckRound.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/parseTree/python/chuckRound.yml
deleted file mode 100644
index 8a80106d48..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/parseTree/python/chuckRound.yml
+++ /dev/null
@@ -1,24 +0,0 @@
-languageId: python
-command:
-  version: 1
-  spokenForm: clear round
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: surroundingPair, delimiter: parentheses}
-initialState:
-  documentContents: |
-    class a(object):
-        pass
-  selections:
-    - anchor: {line: 0, character: 12}
-      active: {line: 0, character: 12}
-  marks: {}
-finalState:
-  documentContents: |
-    class a:
-        pass
-  selections:
-    - anchor: {line: 0, character: 7}
-      active: {line: 0, character: 7}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, modifier: {type: surroundingPair, delimiter: parentheses, delimitersOnly: false}, insideOutsideType: outside}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/parseTree/python/clearCurly.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/parseTree/python/clearCurly.yml
deleted file mode 100644
index e578db0df2..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/parseTree/python/clearCurly.yml
+++ /dev/null
@@ -1,20 +0,0 @@
-languageId: python
-command:
-  version: 1
-  spokenForm: clear curly
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: surroundingPair, delimiter: curlyBrackets, delimiterInclusion: interiorOnly}
-initialState:
-  documentContents: "{1: [(1), (2), (3)]}"
-  selections:
-    - anchor: {line: 0, character: 9}
-      active: {line: 0, character: 9}
-  marks: {}
-finalState:
-  documentContents: "{}"
-  selections:
-    - anchor: {line: 0, character: 1}
-      active: {line: 0, character: 1}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, modifier: {type: surroundingPair, delimiter: curlyBrackets, delimitersOnly: false}, insideOutsideType: inside}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/parseTree/python/clearCurly3.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/parseTree/python/clearCurly3.yml
deleted file mode 100644
index d773730682..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/parseTree/python/clearCurly3.yml
+++ /dev/null
@@ -1,28 +0,0 @@
-languageId: python
-command:
-  version: 1
-  spokenForm: clear curly
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: surroundingPair, delimiter: curlyBrackets}
-initialState:
-  documentContents: |-
-    """
-    {
-        hello
-    }
-    """
-  selections:
-    - anchor: {line: 2, character: 7}
-      active: {line: 2, character: 7}
-  marks: {}
-finalState:
-  documentContents: |-
-    """
-
-    """
-  selections:
-    - anchor: {line: 1, character: 0}
-      active: {line: 1, character: 0}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: surroundingPair, delimiter: curlyBrackets, delimiterInclusion: includeDelimiters}}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/parseTree/python/clearInside.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/parseTree/python/clearInside.yml
deleted file mode 100644
index 0322659820..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/parseTree/python/clearInside.yml
+++ /dev/null
@@ -1,26 +0,0 @@
-languageId: python
-command:
-  version: 1
-  spokenForm: clear inside
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: surroundingPair, delimiter: any, delimiterInclusion: interiorOnly}
-initialState:
-  documentContents: |-
-    """fds
-
-    dfsd
-    """
-  selections:
-    - anchor: {line: 1, character: 0}
-      active: {line: 1, character: 0}
-  marks: {}
-finalState:
-  documentContents: |-
-    """
-    """
-  selections:
-    - anchor: {line: 0, character: 3}
-      active: {line: 0, character: 3}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, modifier: {type: surroundingPair, delimiter: null, delimitersOnly: false}, insideOutsideType: inside}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/parseTree/python/clearMatching.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/parseTree/python/clearMatching.yml
deleted file mode 100644
index 763b7b4068..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/parseTree/python/clearMatching.yml
+++ /dev/null
@@ -1,24 +0,0 @@
-languageId: python
-command:
-  version: 1
-  spokenForm: clear matching
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: surroundingPair, delimiter: any, delimiterInclusion: interiorOnly}
-initialState:
-  documentContents: |
-    class a(object):
-        pass
-  selections:
-    - anchor: {line: 0, character: 11}
-      active: {line: 0, character: 11}
-  marks: {}
-finalState:
-  documentContents: |
-    class a():
-        pass
-  selections:
-    - anchor: {line: 0, character: 8}
-      active: {line: 0, character: 8}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, modifier: {type: surroundingPair, delimiter: null, delimitersOnly: false}, insideOutsideType: inside}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/parseTree/python/clearMatching10.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/parseTree/python/clearMatching10.yml
deleted file mode 100644
index ce9c7ea141..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/parseTree/python/clearMatching10.yml
+++ /dev/null
@@ -1,24 +0,0 @@
-languageId: python
-command:
-  version: 1
-  spokenForm: clear matching
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: surroundingPair, delimiter: any, delimiterInclusion: interiorOnly}
-initialState:
-  documentContents: |-
-
-    "'jlkjl' 'fsd'"
-  selections:
-    - anchor: {line: 1, character: 8}
-      active: {line: 1, character: 8}
-  marks: {}
-finalState:
-  documentContents: |-
-
-    "'' 'fsd'"
-  selections:
-    - anchor: {line: 1, character: 2}
-      active: {line: 1, character: 2}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, modifier: {type: surroundingPair, delimiter: null, delimitersOnly: false}, insideOutsideType: inside}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/parseTree/python/clearMatching11.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/parseTree/python/clearMatching11.yml
deleted file mode 100644
index fead8a3e6d..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/parseTree/python/clearMatching11.yml
+++ /dev/null
@@ -1,24 +0,0 @@
-languageId: python
-command:
-  version: 1
-  spokenForm: clear matching
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: surroundingPair, delimiter: any, delimiterInclusion: interiorOnly}
-initialState:
-  documentContents: |-
-
-    "'jlkjl' 'fsd'"
-  selections:
-    - anchor: {line: 1, character: 4}
-      active: {line: 1, character: 4}
-  marks: {}
-finalState:
-  documentContents: |-
-
-    "'' 'fsd'"
-  selections:
-    - anchor: {line: 1, character: 2}
-      active: {line: 1, character: 2}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, modifier: {type: surroundingPair, delimiter: null, delimitersOnly: false}, insideOutsideType: inside}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/parseTree/python/clearMatching2.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/parseTree/python/clearMatching2.yml
deleted file mode 100644
index 3e40895f6f..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/parseTree/python/clearMatching2.yml
+++ /dev/null
@@ -1,22 +0,0 @@
-languageId: python
-command:
-  version: 1
-  spokenForm: clear matching
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: surroundingPair, delimiter: any, delimiterInclusion: interiorOnly}
-initialState:
-  documentContents: |
-    a[222]
-  selections:
-    - anchor: {line: 0, character: 3}
-      active: {line: 0, character: 3}
-  marks: {}
-finalState:
-  documentContents: |
-    a[]
-  selections:
-    - anchor: {line: 0, character: 2}
-      active: {line: 0, character: 2}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, modifier: {type: surroundingPair, delimiter: null, delimitersOnly: false}, insideOutsideType: inside}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/parseTree/python/clearMatching3.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/parseTree/python/clearMatching3.yml
deleted file mode 100644
index 4ed56dd18a..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/parseTree/python/clearMatching3.yml
+++ /dev/null
@@ -1,22 +0,0 @@
-languageId: python
-command:
-  version: 1
-  spokenForm: clear matching
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: surroundingPair, delimiter: any, delimiterInclusion: interiorOnly}
-initialState:
-  documentContents: |
-    a[222]
-  selections:
-    - anchor: {line: 0, character: 2}
-      active: {line: 0, character: 2}
-  marks: {}
-finalState:
-  documentContents: |
-    a[]
-  selections:
-    - anchor: {line: 0, character: 2}
-      active: {line: 0, character: 2}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, modifier: {type: surroundingPair, delimiter: null, delimitersOnly: false}, insideOutsideType: inside}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/parseTree/python/clearMatching4.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/parseTree/python/clearMatching4.yml
deleted file mode 100644
index 3ee0c1d76c..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/parseTree/python/clearMatching4.yml
+++ /dev/null
@@ -1,22 +0,0 @@
-languageId: python
-command:
-  version: 1
-  spokenForm: clear matching
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: surroundingPair, delimiter: any, delimiterInclusion: interiorOnly}
-initialState:
-  documentContents: |
-    a[222]
-  selections:
-    - anchor: {line: 0, character: 5}
-      active: {line: 0, character: 5}
-  marks: {}
-finalState:
-  documentContents: |
-    a[]
-  selections:
-    - anchor: {line: 0, character: 2}
-      active: {line: 0, character: 2}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, modifier: {type: surroundingPair, delimiter: null, delimitersOnly: false}, insideOutsideType: inside}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/parseTree/python/clearMatching5.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/parseTree/python/clearMatching5.yml
deleted file mode 100644
index 73c1e3e108..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/parseTree/python/clearMatching5.yml
+++ /dev/null
@@ -1,20 +0,0 @@
-languageId: python
-command:
-  version: 1
-  spokenForm: clear matching
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: surroundingPair, delimiter: any, delimiterInclusion: interiorOnly}
-initialState:
-  documentContents: f"j{fdfhjkd}lkjlkj"
-  selections:
-    - anchor: {line: 0, character: 8}
-      active: {line: 0, character: 8}
-  marks: {}
-finalState:
-  documentContents: f"j{}lkjlkj"
-  selections:
-    - anchor: {line: 0, character: 4}
-      active: {line: 0, character: 4}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, modifier: {type: surroundingPair, delimiter: null, delimitersOnly: false}, insideOutsideType: inside}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/parseTree/python/clearMatching6.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/parseTree/python/clearMatching6.yml
deleted file mode 100644
index 7a3f9b117f..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/parseTree/python/clearMatching6.yml
+++ /dev/null
@@ -1,20 +0,0 @@
-languageId: python
-command:
-  version: 1
-  spokenForm: clear matching
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: surroundingPair, delimiter: any, delimiterInclusion: interiorOnly}
-initialState:
-  documentContents: f"j{fdfhjkd}lkjlkj"
-  selections:
-    - anchor: {line: 0, character: 2}
-      active: {line: 0, character: 2}
-  marks: {}
-finalState:
-  documentContents: f""
-  selections:
-    - anchor: {line: 0, character: 2}
-      active: {line: 0, character: 2}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, modifier: {type: surroundingPair, delimiter: null, delimitersOnly: false}, insideOutsideType: inside}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/parseTree/python/clearMatching7.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/parseTree/python/clearMatching7.yml
deleted file mode 100644
index f0e7c05a10..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/parseTree/python/clearMatching7.yml
+++ /dev/null
@@ -1,20 +0,0 @@
-languageId: python
-command:
-  version: 1
-  spokenForm: clear matching
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: surroundingPair, delimiter: any, delimiterInclusion: interiorOnly}
-initialState:
-  documentContents: f"j{fdfhjkd}lkjlkj"
-  selections:
-    - anchor: {line: 0, character: 15}
-      active: {line: 0, character: 15}
-  marks: {}
-finalState:
-  documentContents: f""
-  selections:
-    - anchor: {line: 0, character: 2}
-      active: {line: 0, character: 2}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, modifier: {type: surroundingPair, delimiter: null, delimitersOnly: false}, insideOutsideType: inside}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/parseTree/python/clearMatching8.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/parseTree/python/clearMatching8.yml
deleted file mode 100644
index 58e6232bfb..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/parseTree/python/clearMatching8.yml
+++ /dev/null
@@ -1,24 +0,0 @@
-languageId: python
-command:
-  version: 1
-  spokenForm: clear matching
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: surroundingPair, delimiter: any, delimiterInclusion: interiorOnly}
-initialState:
-  documentContents: |
-    def fff(x, y):
-        pass
-  selections:
-    - anchor: {line: 0, character: 10}
-      active: {line: 0, character: 10}
-  marks: {}
-finalState:
-  documentContents: |
-    def fff():
-        pass
-  selections:
-    - anchor: {line: 0, character: 8}
-      active: {line: 0, character: 8}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, modifier: {type: surroundingPair, delimiter: null, delimitersOnly: false}, insideOutsideType: inside}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/parseTree/python/clearOutside7.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/parseTree/python/clearOutside7.yml
deleted file mode 100644
index b68c69739e..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/parseTree/python/clearOutside7.yml
+++ /dev/null
@@ -1,20 +0,0 @@
-languageId: python
-command:
-  version: 1
-  spokenForm: clear outside
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: surroundingPair, delimiter: any}
-initialState:
-  documentContents: f"Hello, {name + 's'}!"
-  selections:
-    - anchor: {line: 0, character: 18}
-      active: {line: 0, character: 18}
-  marks: {}
-finalState:
-  documentContents: f"Hello, {name + }!"
-  selections:
-    - anchor: {line: 0, character: 17}
-      active: {line: 0, character: 17}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: surroundingPair, delimiter: null, delimiterInclusion: includeDelimiters}}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/parseTree/python/clearOutside8.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/parseTree/python/clearOutside8.yml
deleted file mode 100644
index f9c9d91fb1..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/parseTree/python/clearOutside8.yml
+++ /dev/null
@@ -1,20 +0,0 @@
-languageId: python
-command:
-  version: 1
-  spokenForm: clear outside
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: surroundingPair, delimiter: any}
-initialState:
-  documentContents: f"Hello, {name + 's'}!"
-  selections:
-    - anchor: {line: 0, character: 16}
-      active: {line: 0, character: 16}
-  marks: {}
-finalState:
-  documentContents: f"Hello, !"
-  selections:
-    - anchor: {line: 0, character: 9}
-      active: {line: 0, character: 9}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: surroundingPair, delimiter: null, delimiterInclusion: includeDelimiters}}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/parseTree/python/clearPair.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/parseTree/python/clearPair.yml
deleted file mode 100644
index 83623752a9..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/parseTree/python/clearPair.yml
+++ /dev/null
@@ -1,22 +0,0 @@
-languageId: python
-command:
-  version: 1
-  spokenForm: clear pair
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: surroundingPair, delimiter: any, delimiterInclusion: excludeInterior}
-initialState:
-  documentContents: "{1: [(1), (2), (3)]}"
-  selections:
-    - anchor: {line: 0, character: 9}
-      active: {line: 0, character: 9}
-  marks: {}
-finalState:
-  documentContents: "{1: (1), (2), (3)}"
-  selections:
-    - anchor: {line: 0, character: 4}
-      active: {line: 0, character: 4}
-    - anchor: {line: 0, character: 17}
-      active: {line: 0, character: 17}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, modifier: {type: surroundingPair, delimiter: null, delimitersOnly: true}, insideOutsideType: inside}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/parseTree/python/clearPair2.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/parseTree/python/clearPair2.yml
deleted file mode 100644
index 83623752a9..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/parseTree/python/clearPair2.yml
+++ /dev/null
@@ -1,22 +0,0 @@
-languageId: python
-command:
-  version: 1
-  spokenForm: clear pair
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: surroundingPair, delimiter: any, delimiterInclusion: excludeInterior}
-initialState:
-  documentContents: "{1: [(1), (2), (3)]}"
-  selections:
-    - anchor: {line: 0, character: 9}
-      active: {line: 0, character: 9}
-  marks: {}
-finalState:
-  documentContents: "{1: (1), (2), (3)}"
-  selections:
-    - anchor: {line: 0, character: 4}
-      active: {line: 0, character: 4}
-    - anchor: {line: 0, character: 17}
-      active: {line: 0, character: 17}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, modifier: {type: surroundingPair, delimiter: null, delimitersOnly: true}, insideOutsideType: inside}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/parseTree/python/clearPair3.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/parseTree/python/clearPair3.yml
deleted file mode 100644
index 50bb989126..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/parseTree/python/clearPair3.yml
+++ /dev/null
@@ -1,22 +0,0 @@
-languageId: python
-command:
-  version: 1
-  spokenForm: clear pair
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: surroundingPair, delimiter: any, delimiterInclusion: excludeInterior}
-initialState:
-  documentContents: f"j{fdfhjkd}lkjlkj"
-  selections:
-    - anchor: {line: 0, character: 14}
-      active: {line: 0, character: 14}
-  marks: {}
-finalState:
-  documentContents: j{fdfhjkd}lkjlkj
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-    - anchor: {line: 0, character: 16}
-      active: {line: 0, character: 16}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, modifier: {type: surroundingPair, delimiter: null, delimitersOnly: true}, insideOutsideType: inside}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/parseTree/python/clearPair4.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/parseTree/python/clearPair4.yml
deleted file mode 100644
index 7956a61360..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/parseTree/python/clearPair4.yml
+++ /dev/null
@@ -1,26 +0,0 @@
-languageId: python
-command:
-  version: 1
-  spokenForm: clear pair
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: surroundingPair, delimiter: any, delimiterInclusion: excludeInterior}
-initialState:
-  documentContents: |
-    def fff(x, y):
-        pass
-  selections:
-    - anchor: {line: 0, character: 10}
-      active: {line: 0, character: 10}
-  marks: {}
-finalState:
-  documentContents: |
-    def fffx, y:
-        pass
-  selections:
-    - anchor: {line: 0, character: 7}
-      active: {line: 0, character: 7}
-    - anchor: {line: 0, character: 11}
-      active: {line: 0, character: 11}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, modifier: {type: surroundingPair, delimiter: null, delimitersOnly: true}, insideOutsideType: inside}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/parseTree/python/clearPairCurly.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/parseTree/python/clearPairCurly.yml
deleted file mode 100644
index e9c8b2962b..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/parseTree/python/clearPairCurly.yml
+++ /dev/null
@@ -1,22 +0,0 @@
-languageId: python
-command:
-  version: 1
-  spokenForm: clear pair curly
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: surroundingPair, delimiter: curlyBrackets, delimiterInclusion: excludeInterior}
-initialState:
-  documentContents: "{1: [(1), (2), (3)]}"
-  selections:
-    - anchor: {line: 0, character: 9}
-      active: {line: 0, character: 9}
-  marks: {}
-finalState:
-  documentContents: "1: [(1), (2), (3)]"
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-    - anchor: {line: 0, character: 18}
-      active: {line: 0, character: 18}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, modifier: {type: surroundingPair, delimiter: curlyBrackets, delimitersOnly: true}, insideOutsideType: inside}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/parseTree/python/clearQuad2.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/parseTree/python/clearQuad2.yml
deleted file mode 100644
index 545c23dc9b..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/parseTree/python/clearQuad2.yml
+++ /dev/null
@@ -1,25 +0,0 @@
-languageId: python
-command:
-  version: 1
-  spokenForm: clear quad
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: surroundingPair, delimiter: doubleQuotes}
-initialState:
-  documentContents: |-
-    """
-    {
-        hello
-    }
-    """
-  selections:
-    - anchor: {line: 2, character: 7}
-      active: {line: 2, character: 7}
-  marks: {}
-finalState:
-  documentContents: ""
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: surroundingPair, delimiter: doubleQuotes, delimiterInclusion: includeDelimiters}}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/parseTree/python/clearQuad4.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/parseTree/python/clearQuad4.yml
deleted file mode 100644
index 7cced12c47..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/parseTree/python/clearQuad4.yml
+++ /dev/null
@@ -1,20 +0,0 @@
-languageId: python
-command:
-  version: 1
-  spokenForm: clear quad
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: surroundingPair, delimiter: doubleQuotes}
-initialState:
-  documentContents: f"Hello, {name}!"
-  selections:
-    - anchor: {line: 0, character: 12}
-      active: {line: 0, character: 12}
-  marks: {}
-finalState:
-  documentContents: ""
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: surroundingPair, delimiter: doubleQuotes, delimiterInclusion: includeDelimiters}}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/parseTree/python/clearRound.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/parseTree/python/clearRound.yml
deleted file mode 100644
index f5dfebeb11..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/parseTree/python/clearRound.yml
+++ /dev/null
@@ -1,24 +0,0 @@
-languageId: python
-command:
-  version: 1
-  spokenForm: clear round
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: surroundingPair, delimiter: parentheses, delimiterInclusion: interiorOnly}
-initialState:
-  documentContents: |
-    class a(object):
-        pass
-  selections:
-    - anchor: {line: 0, character: 11}
-      active: {line: 0, character: 11}
-  marks: {}
-finalState:
-  documentContents: |
-    class a():
-        pass
-  selections:
-    - anchor: {line: 0, character: 8}
-      active: {line: 0, character: 8}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, modifier: {type: surroundingPair, delimiter: parentheses, delimitersOnly: false}, insideOutsideType: inside}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/parseTree/python/clearRound5.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/parseTree/python/clearRound5.yml
deleted file mode 100644
index 985b293ab2..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/parseTree/python/clearRound5.yml
+++ /dev/null
@@ -1,20 +0,0 @@
-languageId: python
-command:
-  version: 1
-  spokenForm: clear round
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: surroundingPair, delimiter: parentheses}
-initialState:
-  documentContents: "'(hello)'"
-  selections:
-    - anchor: {line: 0, character: 5}
-      active: {line: 0, character: 5}
-  marks: {}
-finalState:
-  documentContents: "''"
-  selections:
-    - anchor: {line: 0, character: 1}
-      active: {line: 0, character: 1}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: surroundingPair, delimiter: parentheses, delimiterInclusion: includeDelimiters}}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/parseTree/python/clearRound6.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/parseTree/python/clearRound6.yml
deleted file mode 100644
index 536683b306..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/parseTree/python/clearRound6.yml
+++ /dev/null
@@ -1,20 +0,0 @@
-languageId: python
-command:
-  version: 1
-  spokenForm: clear round
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: surroundingPair, delimiter: parentheses}
-initialState:
-  documentContents: "\"(hello)\""
-  selections:
-    - anchor: {line: 0, character: 4}
-      active: {line: 0, character: 4}
-  marks: {}
-finalState:
-  documentContents: "\"\""
-  selections:
-    - anchor: {line: 0, character: 1}
-      active: {line: 0, character: 1}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: surroundingPair, delimiter: parentheses, delimiterInclusion: includeDelimiters}}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/parseTree/python/clearRound7.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/parseTree/python/clearRound7.yml
deleted file mode 100644
index af5a01765c..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/parseTree/python/clearRound7.yml
+++ /dev/null
@@ -1,20 +0,0 @@
-languageId: python
-command:
-  version: 1
-  spokenForm: clear round
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: surroundingPair, delimiter: parentheses}
-initialState:
-  documentContents: f"(hello)"
-  selections:
-    - anchor: {line: 0, character: 5}
-      active: {line: 0, character: 5}
-  marks: {}
-finalState:
-  documentContents: f""
-  selections:
-    - anchor: {line: 0, character: 2}
-      active: {line: 0, character: 2}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: surroundingPair, delimiter: parentheses, delimiterInclusion: includeDelimiters}}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/parseTree/python/clearSquare.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/parseTree/python/clearSquare.yml
deleted file mode 100644
index bfc43eaf33..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/parseTree/python/clearSquare.yml
+++ /dev/null
@@ -1,22 +0,0 @@
-languageId: python
-command:
-  version: 1
-  spokenForm: clear square
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: surroundingPair, delimiter: squareBrackets, delimiterInclusion: interiorOnly}
-initialState:
-  documentContents: |
-    a[222]
-  selections:
-    - anchor: {line: 0, character: 3}
-      active: {line: 0, character: 3}
-  marks: {}
-finalState:
-  documentContents: |
-    a[]
-  selections:
-    - anchor: {line: 0, character: 2}
-      active: {line: 0, character: 2}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, modifier: {type: surroundingPair, delimiter: squareBrackets, delimitersOnly: false}, insideOutsideType: inside}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/parseTree/python/clearSquare2.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/parseTree/python/clearSquare2.yml
deleted file mode 100644
index a72bc8b54b..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/parseTree/python/clearSquare2.yml
+++ /dev/null
@@ -1,20 +0,0 @@
-languageId: python
-command:
-  version: 1
-  spokenForm: clear square
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: surroundingPair, delimiter: squareBrackets, delimiterInclusion: interiorOnly}
-initialState:
-  documentContents: "{1: [(1), (2), (3)]}"
-  selections:
-    - anchor: {line: 0, character: 9}
-      active: {line: 0, character: 9}
-  marks: {}
-finalState:
-  documentContents: "{1: []}"
-  selections:
-    - anchor: {line: 0, character: 5}
-      active: {line: 0, character: 5}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, modifier: {type: surroundingPair, delimiter: squareBrackets, delimitersOnly: false}, insideOutsideType: inside}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/parseTree/shellscript/clearCurly4.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/parseTree/shellscript/clearCurly4.yml
deleted file mode 100644
index 52aaae7ec0..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/parseTree/shellscript/clearCurly4.yml
+++ /dev/null
@@ -1,20 +0,0 @@
-languageId: shellscript
-command:
-  version: 1
-  spokenForm: clear curly
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: surroundingPair, delimiter: curlyBrackets}
-initialState:
-  documentContents: "\"${hello}\""
-  selections:
-    - anchor: {line: 0, character: 6}
-      active: {line: 0, character: 6}
-  marks: {}
-finalState:
-  documentContents: "\"\""
-  selections:
-    - anchor: {line: 0, character: 1}
-      active: {line: 0, character: 1}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: surroundingPair, delimiter: curlyBrackets, delimiterInclusion: includeDelimiters}}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/parseTree/shellscript/clearOutside23.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/parseTree/shellscript/clearOutside23.yml
deleted file mode 100644
index e239b5433d..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/parseTree/shellscript/clearOutside23.yml
+++ /dev/null
@@ -1,20 +0,0 @@
-languageId: shellscript
-command:
-  version: 1
-  spokenForm: clear outside
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: surroundingPair, delimiter: any}
-initialState:
-  documentContents: "\"${hello}\""
-  selections:
-    - anchor: {line: 0, character: 6}
-      active: {line: 0, character: 6}
-  marks: {}
-finalState:
-  documentContents: "\"\""
-  selections:
-    - anchor: {line: 0, character: 1}
-      active: {line: 0, character: 1}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: surroundingPair, delimiter: any, delimiterInclusion: includeDelimiters}}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/parseTree/shellscript/clearPair.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/parseTree/shellscript/clearPair.yml
deleted file mode 100644
index 2975470bb1..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/parseTree/shellscript/clearPair.yml
+++ /dev/null
@@ -1,20 +0,0 @@
-languageId: shellscript
-command:
-  version: 1
-  spokenForm: clear pair
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: surroundingPair, delimiter: any}
-initialState:
-  documentContents: "\"$(hello)\""
-  selections:
-    - anchor: {line: 0, character: 6}
-      active: {line: 0, character: 6}
-  marks: {}
-finalState:
-  documentContents: "\"\""
-  selections:
-    - anchor: {line: 0, character: 1}
-      active: {line: 0, character: 1}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: surroundingPair, delimiter: any}}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/parseTree/shellscript/clearString5.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/parseTree/shellscript/clearString5.yml
deleted file mode 100644
index ad2f4ec5e6..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/parseTree/shellscript/clearString5.yml
+++ /dev/null
@@ -1,20 +0,0 @@
-languageId: shellscript
-command:
-  version: 1
-  spokenForm: clear string
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: surroundingPair, delimiter: string}
-initialState:
-  documentContents: "\"${hello}\""
-  selections:
-    - anchor: {line: 0, character: 6}
-      active: {line: 0, character: 6}
-  marks: {}
-finalState:
-  documentContents: ""
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: surroundingPair, delimiter: string, delimiterInclusion: includeDelimiters}}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/parseTree/tsx/clearPair10.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/parseTree/tsx/clearPair10.yml
deleted file mode 100644
index ed92b7e143..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/parseTree/tsx/clearPair10.yml
+++ /dev/null
@@ -1,20 +0,0 @@
-languageId: typescriptreact
-command:
-  version: 1
-  spokenForm: clear pair
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: surroundingPair, delimiter: any}
-initialState:
-  documentContents: (<hello></hello> )
-  selections:
-    - anchor: {line: 0, character: 1}
-      active: {line: 0, character: 1}
-  marks: {}
-finalState:
-  documentContents: (</hello> )
-  selections:
-    - anchor: {line: 0, character: 1}
-      active: {line: 0, character: 1}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: surroundingPair, delimiter: any}}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/parseTree/tsx/clearPair11.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/parseTree/tsx/clearPair11.yml
deleted file mode 100644
index ceb5b3d7a3..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/parseTree/tsx/clearPair11.yml
+++ /dev/null
@@ -1,20 +0,0 @@
-languageId: typescriptreact
-command:
-  version: 1
-  spokenForm: clear pair
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: surroundingPair, delimiter: any}
-initialState:
-  documentContents: (<hello></hello> )
-  selections:
-    - anchor: {line: 0, character: 2}
-      active: {line: 0, character: 2}
-  marks: {}
-finalState:
-  documentContents: (</hello> )
-  selections:
-    - anchor: {line: 0, character: 1}
-      active: {line: 0, character: 1}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: surroundingPair, delimiter: any}}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/parseTree/tsx/clearPair12.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/parseTree/tsx/clearPair12.yml
deleted file mode 100644
index 77ec16dda0..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/parseTree/tsx/clearPair12.yml
+++ /dev/null
@@ -1,20 +0,0 @@
-languageId: typescriptreact
-command:
-  version: 1
-  spokenForm: clear pair
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: surroundingPair, delimiter: any}
-initialState:
-  documentContents: (<hello></hello> )
-  selections:
-    - anchor: {line: 0, character: 4}
-      active: {line: 0, character: 4}
-  marks: {}
-finalState:
-  documentContents: (</hello> )
-  selections:
-    - anchor: {line: 0, character: 1}
-      active: {line: 0, character: 1}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: surroundingPair, delimiter: any}}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/parseTree/tsx/clearPair13.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/parseTree/tsx/clearPair13.yml
deleted file mode 100644
index 8e8e745d00..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/parseTree/tsx/clearPair13.yml
+++ /dev/null
@@ -1,20 +0,0 @@
-languageId: typescriptreact
-command:
-  version: 1
-  spokenForm: clear pair
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: surroundingPair, delimiter: any}
-initialState:
-  documentContents: (<hello></hello> )
-  selections:
-    - anchor: {line: 0, character: 7}
-      active: {line: 0, character: 7}
-  marks: {}
-finalState:
-  documentContents: (</hello> )
-  selections:
-    - anchor: {line: 0, character: 1}
-      active: {line: 0, character: 1}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: surroundingPair, delimiter: any}}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/parseTree/tsx/clearPair14.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/parseTree/tsx/clearPair14.yml
deleted file mode 100644
index 6356eae671..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/parseTree/tsx/clearPair14.yml
+++ /dev/null
@@ -1,20 +0,0 @@
-languageId: typescriptreact
-command:
-  version: 1
-  spokenForm: clear pair
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: surroundingPair, delimiter: any}
-initialState:
-  documentContents: (<hello> </hello> )
-  selections:
-    - anchor: {line: 0, character: 8}
-      active: {line: 0, character: 8}
-  marks: {}
-finalState:
-  documentContents: ( </hello> )
-  selections:
-    - anchor: {line: 0, character: 1}
-      active: {line: 0, character: 1}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: surroundingPair, delimiter: any}}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/parseTree/tsx/clearPair15.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/parseTree/tsx/clearPair15.yml
deleted file mode 100644
index ee4226c70a..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/parseTree/tsx/clearPair15.yml
+++ /dev/null
@@ -1,20 +0,0 @@
-languageId: typescriptreact
-command:
-  version: 1
-  spokenForm: clear pair
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: surroundingPair, delimiter: any}
-initialState:
-  documentContents: (<hello></hello> )
-  selections:
-    - anchor: {line: 0, character: 8}
-      active: {line: 0, character: 8}
-  marks: {}
-finalState:
-  documentContents: (<hello> )
-  selections:
-    - anchor: {line: 0, character: 8}
-      active: {line: 0, character: 8}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: surroundingPair, delimiter: any}}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/parseTree/tsx/clearPair16.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/parseTree/tsx/clearPair16.yml
deleted file mode 100644
index 5c3b81f9b3..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/parseTree/tsx/clearPair16.yml
+++ /dev/null
@@ -1,20 +0,0 @@
-languageId: typescriptreact
-command:
-  version: 1
-  spokenForm: clear pair
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: surroundingPair, delimiter: any}
-initialState:
-  documentContents: (<hello></hello> )
-  selections:
-    - anchor: {line: 0, character: 9}
-      active: {line: 0, character: 9}
-  marks: {}
-finalState:
-  documentContents: (<hello> )
-  selections:
-    - anchor: {line: 0, character: 8}
-      active: {line: 0, character: 8}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: surroundingPair, delimiter: any}}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/parseTree/tsx/clearPair17.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/parseTree/tsx/clearPair17.yml
deleted file mode 100644
index 92ae1868b9..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/parseTree/tsx/clearPair17.yml
+++ /dev/null
@@ -1,20 +0,0 @@
-languageId: typescriptreact
-command:
-  version: 1
-  spokenForm: clear pair
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: surroundingPair, delimiter: any}
-initialState:
-  documentContents: (<hello></hello> )
-  selections:
-    - anchor: {line: 0, character: 10}
-      active: {line: 0, character: 10}
-  marks: {}
-finalState:
-  documentContents: (<hello> )
-  selections:
-    - anchor: {line: 0, character: 8}
-      active: {line: 0, character: 8}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: surroundingPair, delimiter: any}}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/parseTree/tsx/clearPair18.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/parseTree/tsx/clearPair18.yml
deleted file mode 100644
index 382ef62ea7..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/parseTree/tsx/clearPair18.yml
+++ /dev/null
@@ -1,20 +0,0 @@
-languageId: typescriptreact
-command:
-  version: 1
-  spokenForm: clear pair
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: surroundingPair, delimiter: any}
-initialState:
-  documentContents: (<hello></hello> )
-  selections:
-    - anchor: {line: 0, character: 12}
-      active: {line: 0, character: 12}
-  marks: {}
-finalState:
-  documentContents: (<hello> )
-  selections:
-    - anchor: {line: 0, character: 8}
-      active: {line: 0, character: 8}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: surroundingPair, delimiter: any}}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/parseTree/tsx/clearPair19.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/parseTree/tsx/clearPair19.yml
deleted file mode 100644
index bd6ca0efea..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/parseTree/tsx/clearPair19.yml
+++ /dev/null
@@ -1,20 +0,0 @@
-languageId: typescriptreact
-command:
-  version: 1
-  spokenForm: clear pair
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: surroundingPair, delimiter: any}
-initialState:
-  documentContents: (<hello></hello> )
-  selections:
-    - anchor: {line: 0, character: 15}
-      active: {line: 0, character: 15}
-  marks: {}
-finalState:
-  documentContents: (<hello> )
-  selections:
-    - anchor: {line: 0, character: 8}
-      active: {line: 0, character: 8}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: surroundingPair, delimiter: any}}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/parseTree/tsx/clearPair20.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/parseTree/tsx/clearPair20.yml
deleted file mode 100644
index 9a41b4e85e..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/parseTree/tsx/clearPair20.yml
+++ /dev/null
@@ -1,20 +0,0 @@
-languageId: typescriptreact
-command:
-  version: 1
-  spokenForm: clear pair
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: surroundingPair, delimiter: any}
-initialState:
-  documentContents: (<hello></hello> )
-  selections:
-    - anchor: {line: 0, character: 16}
-      active: {line: 0, character: 16}
-  marks: {}
-finalState:
-  documentContents: (<hello> )
-  selections:
-    - anchor: {line: 0, character: 8}
-      active: {line: 0, character: 8}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: surroundingPair, delimiter: any}}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/parseTree/tsx/clearPair21.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/parseTree/tsx/clearPair21.yml
deleted file mode 100644
index a9efc0c8a3..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/parseTree/tsx/clearPair21.yml
+++ /dev/null
@@ -1,20 +0,0 @@
-languageId: typescriptreact
-command:
-  version: 1
-  spokenForm: clear pair
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: surroundingPair, delimiter: any}
-initialState:
-  documentContents: (<hello></hello>)
-  selections:
-    - anchor: {line: 0, character: 16}
-      active: {line: 0, character: 16}
-  marks: {}
-finalState:
-  documentContents: ""
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: surroundingPair, delimiter: any}}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/parseTree/tsx/clearPair23.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/parseTree/tsx/clearPair23.yml
deleted file mode 100644
index 98fd3f5562..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/parseTree/tsx/clearPair23.yml
+++ /dev/null
@@ -1,20 +0,0 @@
-languageId: typescriptreact
-command:
-  version: 1
-  spokenForm: clear pair
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: surroundingPair, delimiter: any}
-initialState:
-  documentContents: (<hello></ hello > )
-  selections:
-    - anchor: {line: 0, character: 16}
-      active: {line: 0, character: 16}
-  marks: {}
-finalState:
-  documentContents: (<hello> )
-  selections:
-    - anchor: {line: 0, character: 8}
-      active: {line: 0, character: 8}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: surroundingPair, delimiter: any}}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/parseTree/tsx/clearPair4.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/parseTree/tsx/clearPair4.yml
deleted file mode 100644
index 22b9a78f99..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/parseTree/tsx/clearPair4.yml
+++ /dev/null
@@ -1,20 +0,0 @@
-languageId: typescriptreact
-command:
-  version: 1
-  spokenForm: clear pair
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: surroundingPair, delimiter: any}
-initialState:
-  documentContents: (<hello/>)
-  selections:
-    - anchor: {line: 0, character: 5}
-      active: {line: 0, character: 5}
-  marks: {}
-finalState:
-  documentContents: ()
-  selections:
-    - anchor: {line: 0, character: 1}
-      active: {line: 0, character: 1}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: surroundingPair, delimiter: any}}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/parseTree/tsx/clearPair5.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/parseTree/tsx/clearPair5.yml
deleted file mode 100644
index 60b1a52f75..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/parseTree/tsx/clearPair5.yml
+++ /dev/null
@@ -1,20 +0,0 @@
-languageId: typescriptreact
-command:
-  version: 1
-  spokenForm: clear pair
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: surroundingPair, delimiter: any}
-initialState:
-  documentContents: (<hello/>)
-  selections:
-    - anchor: {line: 0, character: 1}
-      active: {line: 0, character: 1}
-  marks: {}
-finalState:
-  documentContents: ()
-  selections:
-    - anchor: {line: 0, character: 1}
-      active: {line: 0, character: 1}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: surroundingPair, delimiter: any}}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/parseTree/tsx/clearPair6.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/parseTree/tsx/clearPair6.yml
deleted file mode 100644
index b891d2a35d..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/parseTree/tsx/clearPair6.yml
+++ /dev/null
@@ -1,20 +0,0 @@
-languageId: typescriptreact
-command:
-  version: 1
-  spokenForm: clear pair
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: surroundingPair, delimiter: any}
-initialState:
-  documentContents: (<hello/>)
-  selections:
-    - anchor: {line: 0, character: 2}
-      active: {line: 0, character: 2}
-  marks: {}
-finalState:
-  documentContents: ()
-  selections:
-    - anchor: {line: 0, character: 1}
-      active: {line: 0, character: 1}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: surroundingPair, delimiter: any}}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/parseTree/tsx/clearPair7.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/parseTree/tsx/clearPair7.yml
deleted file mode 100644
index 90e9fb457f..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/parseTree/tsx/clearPair7.yml
+++ /dev/null
@@ -1,20 +0,0 @@
-languageId: typescriptreact
-command:
-  version: 1
-  spokenForm: clear pair
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: surroundingPair, delimiter: any}
-initialState:
-  documentContents: (<hello/>)
-  selections:
-    - anchor: {line: 0, character: 7}
-      active: {line: 0, character: 7}
-  marks: {}
-finalState:
-  documentContents: ()
-  selections:
-    - anchor: {line: 0, character: 1}
-      active: {line: 0, character: 1}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: surroundingPair, delimiter: any}}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/parseTree/tsx/clearPair8.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/parseTree/tsx/clearPair8.yml
deleted file mode 100644
index 2e85ff91d8..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/parseTree/tsx/clearPair8.yml
+++ /dev/null
@@ -1,20 +0,0 @@
-languageId: typescriptreact
-command:
-  version: 1
-  spokenForm: clear pair
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: surroundingPair, delimiter: any}
-initialState:
-  documentContents: (<hello/>)
-  selections:
-    - anchor: {line: 0, character: 8}
-      active: {line: 0, character: 8}
-  marks: {}
-finalState:
-  documentContents: ()
-  selections:
-    - anchor: {line: 0, character: 1}
-      active: {line: 0, character: 1}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: surroundingPair, delimiter: any}}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/parseTree/tsx/clearPair9.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/parseTree/tsx/clearPair9.yml
deleted file mode 100644
index f4f2e0b21b..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/parseTree/tsx/clearPair9.yml
+++ /dev/null
@@ -1,20 +0,0 @@
-languageId: typescriptreact
-command:
-  version: 1
-  spokenForm: clear pair
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: surroundingPair, delimiter: any}
-initialState:
-  documentContents: (<hello/> )
-  selections:
-    - anchor: {line: 0, character: 9}
-      active: {line: 0, character: 9}
-  marks: {}
-finalState:
-  documentContents: ( )
-  selections:
-    - anchor: {line: 0, character: 1}
-      active: {line: 0, character: 1}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: surroundingPair, delimiter: any}}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/parseTree/typescript/clearMatching14.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/parseTree/typescript/clearMatching14.yml
deleted file mode 100644
index 3890f3fea4..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/parseTree/typescript/clearMatching14.yml
+++ /dev/null
@@ -1,20 +0,0 @@
-languageId: typescript
-command:
-  version: 1
-  spokenForm: clear matching
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: surroundingPair, delimiter: any, delimiterInclusion: interiorOnly}
-initialState:
-  documentContents: "{const [bongo, baz] = [foo, bar]}"
-  selections:
-    - anchor: {line: 0, character: 17}
-      active: {line: 0, character: 20}
-  marks: {}
-finalState:
-  documentContents: "{}"
-  selections:
-    - anchor: {line: 0, character: 1}
-      active: {line: 0, character: 1}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, modifier: {type: surroundingPair, delimiter: null, delimitersOnly: false}, insideOutsideType: inside}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/parseTree/typescript/clearMatching15.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/parseTree/typescript/clearMatching15.yml
deleted file mode 100644
index c883d503a8..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/parseTree/typescript/clearMatching15.yml
+++ /dev/null
@@ -1,20 +0,0 @@
-languageId: typescript
-command:
-  version: 1
-  spokenForm: clear matching
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: surroundingPair, delimiter: any, delimiterInclusion: interiorOnly}
-initialState:
-  documentContents: "{const [bongo, baz] = [foo, bar]}"
-  selections:
-    - anchor: {line: 0, character: 21}
-      active: {line: 0, character: 24}
-  marks: {}
-finalState:
-  documentContents: "{}"
-  selections:
-    - anchor: {line: 0, character: 1}
-      active: {line: 0, character: 1}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, modifier: {type: surroundingPair, delimiter: null, delimitersOnly: false}, insideOutsideType: inside}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/parseTree/typescript/clearOutside10.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/parseTree/typescript/clearOutside10.yml
deleted file mode 100644
index 66f5b5d383..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/parseTree/typescript/clearOutside10.yml
+++ /dev/null
@@ -1,20 +0,0 @@
-languageId: typescript
-command:
-  version: 1
-  spokenForm: clear outside
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: surroundingPair, delimiter: any}
-initialState:
-  documentContents: "`Hello, ${name}!`"
-  selections:
-    - anchor: {line: 0, character: 1}
-      active: {line: 0, character: 1}
-  marks: {}
-finalState:
-  documentContents: ""
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: surroundingPair, delimiter: null, delimiterInclusion: includeDelimiters}}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/parseTree/typescript/clearOutside11.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/parseTree/typescript/clearOutside11.yml
deleted file mode 100644
index c84431dce6..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/parseTree/typescript/clearOutside11.yml
+++ /dev/null
@@ -1,20 +0,0 @@
-languageId: typescript
-command:
-  version: 1
-  spokenForm: clear outside
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: surroundingPair, delimiter: any}
-initialState:
-  documentContents: "`Hello, ${name}!`"
-  selections:
-    - anchor: {line: 0, character: 3}
-      active: {line: 0, character: 3}
-  marks: {}
-finalState:
-  documentContents: ""
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: surroundingPair, delimiter: null, delimiterInclusion: includeDelimiters}}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/parseTree/typescript/clearOutside12.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/parseTree/typescript/clearOutside12.yml
deleted file mode 100644
index 80e3a47291..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/parseTree/typescript/clearOutside12.yml
+++ /dev/null
@@ -1,20 +0,0 @@
-languageId: typescript
-command:
-  version: 1
-  spokenForm: clear outside
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: surroundingPair, delimiter: any}
-initialState:
-  documentContents: "`Hello, ${name}!`"
-  selections:
-    - anchor: {line: 0, character: 8}
-      active: {line: 0, character: 8}
-  marks: {}
-finalState:
-  documentContents: "`Hello, !`"
-  selections:
-    - anchor: {line: 0, character: 8}
-      active: {line: 0, character: 8}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: surroundingPair, delimiter: null, delimiterInclusion: includeDelimiters}}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/parseTree/typescript/clearOutside13.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/parseTree/typescript/clearOutside13.yml
deleted file mode 100644
index aa07aa69c6..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/parseTree/typescript/clearOutside13.yml
+++ /dev/null
@@ -1,20 +0,0 @@
-languageId: typescript
-command:
-  version: 1
-  spokenForm: clear outside
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: surroundingPair, delimiter: any}
-initialState:
-  documentContents: "`Hello, ${name}!`"
-  selections:
-    - anchor: {line: 0, character: 9}
-      active: {line: 0, character: 9}
-  marks: {}
-finalState:
-  documentContents: "`Hello, !`"
-  selections:
-    - anchor: {line: 0, character: 8}
-      active: {line: 0, character: 8}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: surroundingPair, delimiter: null, delimiterInclusion: includeDelimiters}}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/parseTree/typescript/clearOutside14.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/parseTree/typescript/clearOutside14.yml
deleted file mode 100644
index 60c9e2bd92..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/parseTree/typescript/clearOutside14.yml
+++ /dev/null
@@ -1,20 +0,0 @@
-languageId: typescript
-command:
-  version: 1
-  spokenForm: clear outside
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: surroundingPair, delimiter: any}
-initialState:
-  documentContents: "`Hello, ${name}!`"
-  selections:
-    - anchor: {line: 0, character: 10}
-      active: {line: 0, character: 10}
-  marks: {}
-finalState:
-  documentContents: "`Hello, !`"
-  selections:
-    - anchor: {line: 0, character: 8}
-      active: {line: 0, character: 8}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: surroundingPair, delimiter: null, delimiterInclusion: includeDelimiters}}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/parseTree/typescript/clearOutside15.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/parseTree/typescript/clearOutside15.yml
deleted file mode 100644
index e0747542ce..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/parseTree/typescript/clearOutside15.yml
+++ /dev/null
@@ -1,20 +0,0 @@
-languageId: typescript
-command:
-  version: 1
-  spokenForm: clear outside
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: surroundingPair, delimiter: any}
-initialState:
-  documentContents: "`Hello, ${name}!`"
-  selections:
-    - anchor: {line: 0, character: 11}
-      active: {line: 0, character: 11}
-  marks: {}
-finalState:
-  documentContents: "`Hello, !`"
-  selections:
-    - anchor: {line: 0, character: 8}
-      active: {line: 0, character: 8}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: surroundingPair, delimiter: null, delimiterInclusion: includeDelimiters}}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/parseTree/typescript/clearOutside16.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/parseTree/typescript/clearOutside16.yml
deleted file mode 100644
index 0c776ba83e..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/parseTree/typescript/clearOutside16.yml
+++ /dev/null
@@ -1,20 +0,0 @@
-languageId: typescript
-command:
-  version: 1
-  spokenForm: clear outside
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: surroundingPair, delimiter: any}
-initialState:
-  documentContents: "`Hello, ${name}!`"
-  selections:
-    - anchor: {line: 0, character: 14}
-      active: {line: 0, character: 14}
-  marks: {}
-finalState:
-  documentContents: "`Hello, !`"
-  selections:
-    - anchor: {line: 0, character: 8}
-      active: {line: 0, character: 8}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: surroundingPair, delimiter: null, delimiterInclusion: includeDelimiters}}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/parseTree/typescript/clearOutside17.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/parseTree/typescript/clearOutside17.yml
deleted file mode 100644
index 470c09f6e8..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/parseTree/typescript/clearOutside17.yml
+++ /dev/null
@@ -1,20 +0,0 @@
-languageId: typescript
-command:
-  version: 1
-  spokenForm: clear outside
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: surroundingPair, delimiter: any}
-initialState:
-  documentContents: "`Hello, ${name}!`"
-  selections:
-    - anchor: {line: 0, character: 15}
-      active: {line: 0, character: 15}
-  marks: {}
-finalState:
-  documentContents: "`Hello, !`"
-  selections:
-    - anchor: {line: 0, character: 8}
-      active: {line: 0, character: 8}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: surroundingPair, delimiter: null, delimiterInclusion: includeDelimiters}}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/parseTree/typescript/clearOutside18.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/parseTree/typescript/clearOutside18.yml
deleted file mode 100644
index ed69a378d6..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/parseTree/typescript/clearOutside18.yml
+++ /dev/null
@@ -1,20 +0,0 @@
-languageId: typescript
-command:
-  version: 1
-  spokenForm: clear outside
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: surroundingPair, delimiter: any}
-initialState:
-  documentContents: "`Hello, ${name}!`"
-  selections:
-    - anchor: {line: 0, character: 16}
-      active: {line: 0, character: 16}
-  marks: {}
-finalState:
-  documentContents: ""
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: surroundingPair, delimiter: null, delimiterInclusion: includeDelimiters}}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/parseTree/typescript/clearOutside19.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/parseTree/typescript/clearOutside19.yml
deleted file mode 100644
index 4f86452d9d..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/parseTree/typescript/clearOutside19.yml
+++ /dev/null
@@ -1,20 +0,0 @@
-languageId: typescript
-command:
-  version: 1
-  spokenForm: clear outside
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: surroundingPair, delimiter: any}
-initialState:
-  documentContents: "`Hello, ${name}!`"
-  selections:
-    - anchor: {line: 0, character: 17}
-      active: {line: 0, character: 17}
-  marks: {}
-finalState:
-  documentContents: ""
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: surroundingPair, delimiter: null, delimiterInclusion: includeDelimiters}}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/parseTree/typescript/clearOutside2.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/parseTree/typescript/clearOutside2.yml
deleted file mode 100644
index 5b5f78dfdc..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/parseTree/typescript/clearOutside2.yml
+++ /dev/null
@@ -1,20 +0,0 @@
-languageId: typescript
-command:
-  version: 1
-  spokenForm: clear outside
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: surroundingPair, delimiter: any}
-initialState:
-  documentContents: "[\"hello\",  \"world\"]"
-  selections:
-    - anchor: {line: 0, character: 10}
-      active: {line: 0, character: 10}
-  marks: {}
-finalState:
-  documentContents: ""
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: surroundingPair, delimiter: null, delimiterInclusion: includeDelimiters}}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/parseTree/typescript/clearOutside20.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/parseTree/typescript/clearOutside20.yml
deleted file mode 100644
index 11c87a9908..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/parseTree/typescript/clearOutside20.yml
+++ /dev/null
@@ -1,20 +0,0 @@
-languageId: typescript
-command:
-  version: 1
-  spokenForm: clear outside
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: surroundingPair, delimiter: any}
-initialState:
-  documentContents: "`Hello, ${name + 's'}!`"
-  selections:
-    - anchor: {line: 0, character: 18}
-      active: {line: 0, character: 18}
-  marks: {}
-finalState:
-  documentContents: "`Hello, ${name + }!`"
-  selections:
-    - anchor: {line: 0, character: 17}
-      active: {line: 0, character: 17}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: surroundingPair, delimiter: null, delimiterInclusion: includeDelimiters}}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/parseTree/typescript/clearOutside21.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/parseTree/typescript/clearOutside21.yml
deleted file mode 100644
index 6516d523d4..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/parseTree/typescript/clearOutside21.yml
+++ /dev/null
@@ -1,20 +0,0 @@
-languageId: typescript
-command:
-  version: 1
-  spokenForm: clear outside
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: surroundingPair, delimiter: any}
-initialState:
-  documentContents: "`Hello, ${name + 's'}!`"
-  selections:
-    - anchor: {line: 0, character: 16}
-      active: {line: 0, character: 16}
-  marks: {}
-finalState:
-  documentContents: "`Hello, !`"
-  selections:
-    - anchor: {line: 0, character: 8}
-      active: {line: 0, character: 8}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: surroundingPair, delimiter: null, delimiterInclusion: includeDelimiters}}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/parseTree/typescript/clearOutside22.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/parseTree/typescript/clearOutside22.yml
deleted file mode 100644
index a808920e07..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/parseTree/typescript/clearOutside22.yml
+++ /dev/null
@@ -1,20 +0,0 @@
-languageId: typescript
-command:
-  version: 1
-  spokenForm: clear outside
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: surroundingPair, delimiter: any}
-initialState:
-  documentContents: "`Hello, \\${name}!`"
-  selections:
-    - anchor: {line: 0, character: 13}
-      active: {line: 0, character: 13}
-  marks: {}
-finalState:
-  documentContents: "`Hello, \\$!`"
-  selections:
-    - anchor: {line: 0, character: 10}
-      active: {line: 0, character: 10}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: surroundingPair, delimiter: null, delimiterInclusion: includeDelimiters}}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/parseTree/typescript/clearOutside3.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/parseTree/typescript/clearOutside3.yml
deleted file mode 100644
index 3ad4a458dd..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/parseTree/typescript/clearOutside3.yml
+++ /dev/null
@@ -1,20 +0,0 @@
-languageId: typescript
-command:
-  version: 1
-  spokenForm: clear outside
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: surroundingPair, delimiter: any}
-initialState:
-  documentContents: "[\"hello\",  \"world\"]"
-  selections:
-    - anchor: {line: 0, character: 7}
-      active: {line: 0, character: 7}
-  marks: {}
-finalState:
-  documentContents: "[,  \"world\"]"
-  selections:
-    - anchor: {line: 0, character: 1}
-      active: {line: 0, character: 1}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: surroundingPair, delimiter: null, delimiterInclusion: includeDelimiters}}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/parseTree/typescript/clearOutside4.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/parseTree/typescript/clearOutside4.yml
deleted file mode 100644
index 96697efeb4..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/parseTree/typescript/clearOutside4.yml
+++ /dev/null
@@ -1,20 +0,0 @@
-languageId: typescript
-command:
-  version: 1
-  spokenForm: clear outside
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: surroundingPair, delimiter: any}
-initialState:
-  documentContents: "[\"hello\",  \"world\"]"
-  selections:
-    - anchor: {line: 0, character: 8}
-      active: {line: 0, character: 8}
-  marks: {}
-finalState:
-  documentContents: "[,  \"world\"]"
-  selections:
-    - anchor: {line: 0, character: 1}
-      active: {line: 0, character: 1}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: surroundingPair, delimiter: null, delimiterInclusion: includeDelimiters}}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/parseTree/typescript/clearOutside5.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/parseTree/typescript/clearOutside5.yml
deleted file mode 100644
index 86e1b53283..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/parseTree/typescript/clearOutside5.yml
+++ /dev/null
@@ -1,20 +0,0 @@
-languageId: typescript
-command:
-  version: 1
-  spokenForm: clear outside
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: surroundingPair, delimiter: any}
-initialState:
-  documentContents: "[\"hello\",  \"world\"]"
-  selections:
-    - anchor: {line: 0, character: 11}
-      active: {line: 0, character: 11}
-  marks: {}
-finalState:
-  documentContents: "[\"hello\",  ]"
-  selections:
-    - anchor: {line: 0, character: 11}
-      active: {line: 0, character: 11}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: surroundingPair, delimiter: null, delimiterInclusion: includeDelimiters}}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/parseTree/typescript/clearOutside6.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/parseTree/typescript/clearOutside6.yml
deleted file mode 100644
index 4030308f21..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/parseTree/typescript/clearOutside6.yml
+++ /dev/null
@@ -1,20 +0,0 @@
-languageId: typescript
-command:
-  version: 1
-  spokenForm: clear outside
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: surroundingPair, delimiter: any}
-initialState:
-  documentContents: "[\"hello\",  \"world\"]"
-  selections:
-    - anchor: {line: 0, character: 12}
-      active: {line: 0, character: 12}
-  marks: {}
-finalState:
-  documentContents: "[\"hello\",  ]"
-  selections:
-    - anchor: {line: 0, character: 11}
-      active: {line: 0, character: 11}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: surroundingPair, delimiter: null, delimiterInclusion: includeDelimiters}}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/parseTree/typescript/clearOutside9.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/parseTree/typescript/clearOutside9.yml
deleted file mode 100644
index 787061d371..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/parseTree/typescript/clearOutside9.yml
+++ /dev/null
@@ -1,20 +0,0 @@
-languageId: typescript
-command:
-  version: 1
-  spokenForm: clear outside
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: surroundingPair, delimiter: any}
-initialState:
-  documentContents: "`Hello, ${name}!`"
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-  marks: {}
-finalState:
-  documentContents: ""
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: surroundingPair, delimiter: null, delimiterInclusion: includeDelimiters}}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/parseTree/typescript/clearPair.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/parseTree/typescript/clearPair.yml
deleted file mode 100644
index 5b8d0a8de6..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/parseTree/typescript/clearPair.yml
+++ /dev/null
@@ -1,20 +0,0 @@
-languageId: typescript
-command:
-  version: 1
-  spokenForm: clear pair
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: surroundingPair, delimiter: any}
-initialState:
-  documentContents: if (foo > 0) {}
-  selections:
-    - anchor: {line: 0, character: 7}
-      active: {line: 0, character: 7}
-  marks: {}
-finalState:
-  documentContents: if  {}
-  selections:
-    - anchor: {line: 0, character: 3}
-      active: {line: 0, character: 3}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: surroundingPair, delimiter: any}}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/parseTree/typescript/clearPair10.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/parseTree/typescript/clearPair10.yml
deleted file mode 100644
index ada3e55da7..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/parseTree/typescript/clearPair10.yml
+++ /dev/null
@@ -1,20 +0,0 @@
-languageId: typescript
-command:
-  version: 1
-  spokenForm: clear pair
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: surroundingPair, delimiter: any}
-initialState:
-  documentContents: foo<bar>
-  selections:
-    - anchor: {line: 0, character: 6}
-      active: {line: 0, character: 6}
-  marks: {}
-finalState:
-  documentContents: foo
-  selections:
-    - anchor: {line: 0, character: 3}
-      active: {line: 0, character: 3}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: surroundingPair, delimiter: any}, isImplicit: false}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/parseTree/typescript/clearPair2.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/parseTree/typescript/clearPair2.yml
deleted file mode 100644
index 45b67c00c4..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/parseTree/typescript/clearPair2.yml
+++ /dev/null
@@ -1,20 +0,0 @@
-languageId: typescript
-command:
-  version: 1
-  spokenForm: clear pair
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: surroundingPair, delimiter: any}
-initialState:
-  documentContents: if (foo > 0) {}
-  selections:
-    - anchor: {line: 0, character: 8}
-      active: {line: 0, character: 8}
-  marks: {}
-finalState:
-  documentContents: if  {}
-  selections:
-    - anchor: {line: 0, character: 3}
-      active: {line: 0, character: 3}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: surroundingPair, delimiter: any}}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/parseTree/typescript/clearPair3.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/parseTree/typescript/clearPair3.yml
deleted file mode 100644
index bbde9c4bc7..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/parseTree/typescript/clearPair3.yml
+++ /dev/null
@@ -1,20 +0,0 @@
-languageId: typescript
-command:
-  version: 1
-  spokenForm: clear pair
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: surroundingPair, delimiter: any}
-initialState:
-  documentContents: if (foo > 0) {}
-  selections:
-    - anchor: {line: 0, character: 9}
-      active: {line: 0, character: 9}
-  marks: {}
-finalState:
-  documentContents: if  {}
-  selections:
-    - anchor: {line: 0, character: 3}
-      active: {line: 0, character: 3}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: surroundingPair, delimiter: any}}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/parseTree/typescript/clearPair4.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/parseTree/typescript/clearPair4.yml
deleted file mode 100644
index 80752781ee..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/parseTree/typescript/clearPair4.yml
+++ /dev/null
@@ -1,20 +0,0 @@
-languageId: typescript
-command:
-  version: 1
-  spokenForm: clear pair
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: surroundingPair, delimiter: any}
-initialState:
-  documentContents: "const {hello} = {hello: \"world\"}"
-  selections:
-    - anchor: {line: 0, character: 23}
-      active: {line: 0, character: 23}
-  marks: {}
-finalState:
-  documentContents: "const {hello} = "
-  selections:
-    - anchor: {line: 0, character: 16}
-      active: {line: 0, character: 16}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: surroundingPair, delimiter: any}}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/parseTree/typescript/clearPair5.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/parseTree/typescript/clearPair5.yml
deleted file mode 100644
index ef30092f4c..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/parseTree/typescript/clearPair5.yml
+++ /dev/null
@@ -1,20 +0,0 @@
-languageId: typescript
-command:
-  version: 1
-  spokenForm: clear pair
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: surroundingPair, delimiter: any}
-initialState:
-  documentContents: "const {hello} = {hello: \"world\"}"
-  selections:
-    - anchor: {line: 0, character: 28}
-      active: {line: 0, character: 28}
-  marks: {}
-finalState:
-  documentContents: "const {hello} = {hello: }"
-  selections:
-    - anchor: {line: 0, character: 24}
-      active: {line: 0, character: 24}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: surroundingPair, delimiter: any}}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/parseTree/typescript/clearPair6.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/parseTree/typescript/clearPair6.yml
deleted file mode 100644
index 9fc5715922..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/parseTree/typescript/clearPair6.yml
+++ /dev/null
@@ -1,20 +0,0 @@
-languageId: typescript
-command:
-  version: 1
-  spokenForm: clear pair
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: surroundingPair, delimiter: any}
-initialState:
-  documentContents: "const {hello} = {hello: \"world\"}"
-  selections:
-    - anchor: {line: 0, character: 10}
-      active: {line: 0, character: 10}
-  marks: {}
-finalState:
-  documentContents: "const  = {hello: \"world\"}"
-  selections:
-    - anchor: {line: 0, character: 6}
-      active: {line: 0, character: 6}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: surroundingPair, delimiter: any}}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/parseTree/typescript/clearPair7.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/parseTree/typescript/clearPair7.yml
deleted file mode 100644
index 9457b43e48..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/parseTree/typescript/clearPair7.yml
+++ /dev/null
@@ -1,20 +0,0 @@
-languageId: typescript
-command:
-  version: 1
-  spokenForm: clear pair
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: surroundingPair, delimiter: any}
-initialState:
-  documentContents: () => {return 0;}
-  selections:
-    - anchor: {line: 0, character: 12}
-      active: {line: 0, character: 12}
-  marks: {}
-finalState:
-  documentContents: "() => "
-  selections:
-    - anchor: {line: 0, character: 6}
-      active: {line: 0, character: 6}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: surroundingPair, delimiter: any}}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/parseTree/typescript/clearPair8.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/parseTree/typescript/clearPair8.yml
deleted file mode 100644
index cf0a35ad4c..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/parseTree/typescript/clearPair8.yml
+++ /dev/null
@@ -1,20 +0,0 @@
-languageId: typescript
-command:
-  version: 1
-  spokenForm: clear pair
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: surroundingPair, delimiter: any}
-initialState:
-  documentContents: function hello<Foo>() {}
-  selections:
-    - anchor: {line: 0, character: 17}
-      active: {line: 0, character: 17}
-  marks: {}
-finalState:
-  documentContents: function hello() {}
-  selections:
-    - anchor: {line: 0, character: 14}
-      active: {line: 0, character: 14}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: surroundingPair, delimiter: any}}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/parseTree/typescript/clearPair9.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/parseTree/typescript/clearPair9.yml
deleted file mode 100644
index 0bffe87360..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/parseTree/typescript/clearPair9.yml
+++ /dev/null
@@ -1,20 +0,0 @@
-languageId: typescript
-command:
-  version: 1
-  spokenForm: clear pair
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: surroundingPair, delimiter: any}
-initialState:
-  documentContents: foo<>
-  selections:
-    - anchor: {line: 0, character: 4}
-      active: {line: 0, character: 4}
-  marks: {}
-finalState:
-  documentContents: foo
-  selections:
-    - anchor: {line: 0, character: 3}
-      active: {line: 0, character: 3}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: surroundingPair, delimiter: any}, isImplicit: false}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/parseTree/typescript/clearQuad.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/parseTree/typescript/clearQuad.yml
deleted file mode 100644
index 1d66930c1c..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/parseTree/typescript/clearQuad.yml
+++ /dev/null
@@ -1,20 +0,0 @@
-languageId: typescript
-command:
-  version: 1
-  spokenForm: clear quad
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: surroundingPair, delimiter: doubleQuotes}
-initialState:
-  documentContents: // "(hello)"
-  selections:
-    - anchor: {line: 0, character: 7}
-      active: {line: 0, character: 7}
-  marks: {}
-finalState:
-  documentContents: "// "
-  selections:
-    - anchor: {line: 0, character: 3}
-      active: {line: 0, character: 3}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: surroundingPair, delimiter: doubleQuotes, delimiterInclusion: includeDelimiters}}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/parseTree/typescript/clearRound2.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/parseTree/typescript/clearRound2.yml
deleted file mode 100644
index 5219a5501f..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/parseTree/typescript/clearRound2.yml
+++ /dev/null
@@ -1,20 +0,0 @@
-languageId: typescript
-command:
-  version: 1
-  spokenForm: clear round
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: surroundingPair, delimiter: parentheses}
-initialState:
-  documentContents: "\"(hello)\""
-  selections:
-    - anchor: {line: 0, character: 6}
-      active: {line: 0, character: 6}
-  marks: {}
-finalState:
-  documentContents: "\"\""
-  selections:
-    - anchor: {line: 0, character: 1}
-      active: {line: 0, character: 1}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: surroundingPair, delimiter: parentheses, delimiterInclusion: includeDelimiters}}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/parseTree/typescript/clearRound3.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/parseTree/typescript/clearRound3.yml
deleted file mode 100644
index ff44bcd9f3..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/parseTree/typescript/clearRound3.yml
+++ /dev/null
@@ -1,20 +0,0 @@
-languageId: typescript
-command:
-  version: 1
-  spokenForm: clear round
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: surroundingPair, delimiter: parentheses}
-initialState:
-  documentContents: // "(hello)"
-  selections:
-    - anchor: {line: 0, character: 7}
-      active: {line: 0, character: 7}
-  marks: {}
-finalState:
-  documentContents: // ""
-  selections:
-    - anchor: {line: 0, character: 4}
-      active: {line: 0, character: 4}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: surroundingPair, delimiter: parentheses, delimiterInclusion: includeDelimiters}}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/parseTree/typescript/clearRound4.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/parseTree/typescript/clearRound4.yml
deleted file mode 100644
index 9451d77428..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/parseTree/typescript/clearRound4.yml
+++ /dev/null
@@ -1,20 +0,0 @@
-languageId: typescript
-command:
-  version: 1
-  spokenForm: clear round
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: surroundingPair, delimiter: parentheses}
-initialState:
-  documentContents: "'(hello)'"
-  selections:
-    - anchor: {line: 0, character: 5}
-      active: {line: 0, character: 5}
-  marks: {}
-finalState:
-  documentContents: "''"
-  selections:
-    - anchor: {line: 0, character: 1}
-      active: {line: 0, character: 1}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: surroundingPair, delimiter: parentheses, delimiterInclusion: includeDelimiters}}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/parseTree/typescript/clearSkis.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/parseTree/typescript/clearSkis.yml
deleted file mode 100644
index ff4a9c96fb..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/parseTree/typescript/clearSkis.yml
+++ /dev/null
@@ -1,20 +0,0 @@
-languageId: typescript
-command:
-  version: 1
-  spokenForm: clear skis
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: surroundingPair, delimiter: backtickQuotes}
-initialState:
-  documentContents: "`Hello, ${name}!`"
-  selections:
-    - anchor: {line: 0, character: 12}
-      active: {line: 0, character: 12}
-  marks: {}
-finalState:
-  documentContents: ""
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: surroundingPair, delimiter: backtickQuotes, delimiterInclusion: includeDelimiters}}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/parseTree/typescript/clearSquare3.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/parseTree/typescript/clearSquare3.yml
deleted file mode 100644
index 9373f02092..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/parseTree/typescript/clearSquare3.yml
+++ /dev/null
@@ -1,20 +0,0 @@
-languageId: typescript
-command:
-  version: 1
-  spokenForm: clear square
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: surroundingPair, delimiter: squareBrackets, delimiterInclusion: interiorOnly}
-initialState:
-  documentContents: const [bongo, baz] = [foo, bar]
-  selections:
-    - anchor: {line: 0, character: 22}
-      active: {line: 0, character: 22}
-  marks: {}
-finalState:
-  documentContents: const [bongo, baz] = []
-  selections:
-    - anchor: {line: 0, character: 22}
-      active: {line: 0, character: 22}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, modifier: {type: surroundingPair, delimiter: squareBrackets, delimitersOnly: false}, insideOutsideType: inside}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/parseTree/typescript/clearSquare4.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/parseTree/typescript/clearSquare4.yml
deleted file mode 100644
index 494e3a5e4e..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/parseTree/typescript/clearSquare4.yml
+++ /dev/null
@@ -1,20 +0,0 @@
-languageId: typescript
-command:
-  version: 1
-  spokenForm: clear square
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: surroundingPair, delimiter: squareBrackets, delimiterInclusion: interiorOnly}
-initialState:
-  documentContents: const [bongo, baz] = [foo, bar]
-  selections:
-    - anchor: {line: 0, character: 21}
-      active: {line: 0, character: 21}
-  marks: {}
-finalState:
-  documentContents: const [bongo, baz] = []
-  selections:
-    - anchor: {line: 0, character: 22}
-      active: {line: 0, character: 22}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, modifier: {type: surroundingPair, delimiter: squareBrackets, delimitersOnly: false}, insideOutsideType: inside}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/parseTree/typescript/clearSquare5.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/parseTree/typescript/clearSquare5.yml
deleted file mode 100644
index d930e47e29..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/parseTree/typescript/clearSquare5.yml
+++ /dev/null
@@ -1,20 +0,0 @@
-languageId: typescript
-command:
-  version: 1
-  spokenForm: clear square
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: surroundingPair, delimiter: squareBrackets, delimiterInclusion: interiorOnly}
-initialState:
-  documentContents: const [bongo, baz] = [foo, bar]
-  selections:
-    - anchor: {line: 0, character: 30}
-      active: {line: 0, character: 30}
-  marks: {}
-finalState:
-  documentContents: const [bongo, baz] = []
-  selections:
-    - anchor: {line: 0, character: 22}
-      active: {line: 0, character: 22}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, modifier: {type: surroundingPair, delimiter: squareBrackets, delimitersOnly: false}, insideOutsideType: inside}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/parseTree/typescript/clearSquareLack.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/parseTree/typescript/clearSquareLack.yml
deleted file mode 100644
index 7ff926eedd..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/parseTree/typescript/clearSquareLack.yml
+++ /dev/null
@@ -1,24 +0,0 @@
-languageId: typescript
-command:
-  version: 1
-  spokenForm: clear square lack
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: surroundingPair, delimiter: squareBrackets, delimiterInclusion: interiorOnly}
-      mark: {type: decoratedSymbol, symbolColor: default, character: '['}
-initialState:
-  documentContents: const [bongo, baz] = [foo, bar]
-  selections:
-    - anchor: {line: 0, character: 26}
-      active: {line: 0, character: 26}
-  marks:
-    default.[:
-      start: {line: 0, character: 21}
-      end: {line: 0, character: 22}
-finalState:
-  documentContents: const [bongo, baz] = []
-  selections:
-    - anchor: {line: 0, character: 22}
-      active: {line: 0, character: 22}
-fullTargets: [{type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: '['}, selectionType: token, position: contents, modifier: {type: surroundingPair, delimiter: squareBrackets, delimitersOnly: false}, insideOutsideType: inside}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/parseTree/typescript/clearSquareRack.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/parseTree/typescript/clearSquareRack.yml
deleted file mode 100644
index 4549bd941b..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/parseTree/typescript/clearSquareRack.yml
+++ /dev/null
@@ -1,24 +0,0 @@
-languageId: typescript
-command:
-  version: 1
-  spokenForm: clear square rack
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: surroundingPair, delimiter: squareBrackets, delimiterInclusion: interiorOnly}
-      mark: {type: decoratedSymbol, symbolColor: default, character: ']'}
-initialState:
-  documentContents: const [bongo, baz] = [foo, bar]
-  selections:
-    - anchor: {line: 0, character: 26}
-      active: {line: 0, character: 26}
-  marks:
-    default.]:
-      start: {line: 0, character: 30}
-      end: {line: 0, character: 31}
-finalState:
-  documentContents: const [bongo, baz] = []
-  selections:
-    - anchor: {line: 0, character: 22}
-      active: {line: 0, character: 22}
-fullTargets: [{type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: ']'}, selectionType: token, position: contents, modifier: {type: surroundingPair, delimiter: squareBrackets, delimitersOnly: false}, insideOutsideType: inside}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/parseTree/typescript/clearString.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/parseTree/typescript/clearString.yml
deleted file mode 100644
index 78eb963d53..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/parseTree/typescript/clearString.yml
+++ /dev/null
@@ -1,20 +0,0 @@
-languageId: typescript
-command:
-  version: 1
-  spokenForm: clear string
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: surroundingPair, delimiter: string}
-initialState:
-  documentContents: "\"(hello)\""
-  selections:
-    - anchor: {line: 0, character: 5}
-      active: {line: 0, character: 5}
-  marks: {}
-finalState:
-  documentContents: ""
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: surroundingPair, delimiter: string, delimiterInclusion: includeDelimiters}}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/parseTree/typescript/clearString2.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/parseTree/typescript/clearString2.yml
deleted file mode 100644
index cfa5c83a41..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/parseTree/typescript/clearString2.yml
+++ /dev/null
@@ -1,20 +0,0 @@
-languageId: typescript
-command:
-  version: 1
-  spokenForm: clear string
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: surroundingPair, delimiter: string}
-initialState:
-  documentContents: "'(hello)'"
-  selections:
-    - anchor: {line: 0, character: 5}
-      active: {line: 0, character: 5}
-  marks: {}
-finalState:
-  documentContents: ""
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: surroundingPair, delimiter: string, delimiterInclusion: includeDelimiters}}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/parseTree/typescript/clearString3.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/parseTree/typescript/clearString3.yml
deleted file mode 100644
index 2ac8b5c5b9..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/parseTree/typescript/clearString3.yml
+++ /dev/null
@@ -1,20 +0,0 @@
-languageId: typescript
-command:
-  version: 1
-  spokenForm: clear string
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: surroundingPair, delimiter: string}
-initialState:
-  documentContents: "`(hello)`"
-  selections:
-    - anchor: {line: 0, character: 5}
-      active: {line: 0, character: 5}
-  marks: {}
-finalState:
-  documentContents: ""
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: surroundingPair, delimiter: string, delimiterInclusion: includeDelimiters}}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/parseTree/typescript/takeCore.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/parseTree/typescript/takeCore.yml
deleted file mode 100644
index 4d934a4c3e..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/parseTree/typescript/takeCore.yml
+++ /dev/null
@@ -1,34 +0,0 @@
-languageId: typescript
-command:
-  spokenForm: take core
-  version: 2
-  targets:
-    - type: primitive
-      modifiers:
-        - {type: interiorOnly}
-        - type: containingScope
-          scopeType: {type: surroundingPair, delimiter: any}
-  usePrePhraseSnapshot: true
-  action: {name: setSelection}
-initialState:
-  documentContents: |
-    async (editor, targets) => {
-        const edits = targets.map((target, i) =>(
-        text: i%2 === 0?left:right
-        )
-    }
-  selections:
-    - anchor: {line: 2, character: 8}
-      active: {line: 2, character: 8}
-  marks: {}
-finalState:
-  documentContents: |
-    async (editor, targets) => {
-        const edits = targets.map((target, i) =>(
-        text: i%2 === 0?left:right
-        )
-    }
-  selections:
-    - anchor: {line: 2, character: 4}
-      active: {line: 2, character: 30}
-fullTargets: [{type: primitive, mark: {type: cursor}, modifiers: [{type: containingScope, scopeType: {type: surroundingPair, delimiter: any}}, {type: interiorOnly}]}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/parseTree/typescript/takePairBatt.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/parseTree/typescript/takePairBatt.yml
deleted file mode 100644
index 81d24209b6..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/parseTree/typescript/takePairBatt.yml
+++ /dev/null
@@ -1,24 +0,0 @@
-languageId: typescript
-command:
-  version: 1
-  spokenForm: take pair batt
-  action: setSelection
-  targets:
-    - type: primitive
-      modifier: {type: surroundingPair, delimiter: any}
-      mark: {type: decoratedSymbol, symbolColor: default, character: b}
-initialState:
-  documentContents: const r = /a[b]*/;
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-  marks:
-    default.b:
-      start: {line: 0, character: 13}
-      end: {line: 0, character: 14}
-finalState:
-  documentContents: const r = /a[b]*/;
-  selections:
-    - anchor: {line: 0, character: 12}
-      active: {line: 0, character: 15}
-fullTargets: [{type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: b}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: surroundingPair, delimiter: any}, isImplicit: false}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/parseTreeParity/chuckInsideRound.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/parseTreeParity/chuckInsideRound.yml
deleted file mode 100644
index 4a20603a29..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/parseTreeParity/chuckInsideRound.yml
+++ /dev/null
@@ -1,20 +0,0 @@
-languageId: typescript
-command:
-  version: 1
-  spokenForm: chuck inside round
-  action: remove
-  targets:
-    - type: primitive
-      modifier: {type: surroundingPair, delimiter: parentheses, delimiterInclusion: interiorOnly}
-initialState:
-  documentContents: (hello)
-  selections:
-    - anchor: {line: 0, character: 5}
-      active: {line: 0, character: 5}
-  marks: {}
-finalState:
-  documentContents: ()
-  selections:
-    - anchor: {line: 0, character: 1}
-      active: {line: 0, character: 1}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: outside, modifier: {type: surroundingPair, delimiter: parentheses, delimiterInclusion: excludeDelimiters}}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/parseTreeParity/chuckPairRound.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/parseTreeParity/chuckPairRound.yml
deleted file mode 100644
index d7cef4454b..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/parseTreeParity/chuckPairRound.yml
+++ /dev/null
@@ -1,20 +0,0 @@
-languageId: typescript
-command:
-  version: 1
-  spokenForm: chuck pair round
-  action: remove
-  targets:
-    - type: primitive
-      modifier: {type: surroundingPair, delimiter: parentheses, delimiterInclusion: excludeInterior}
-initialState:
-  documentContents: (hello)
-  selections:
-    - anchor: {line: 0, character: 5}
-      active: {line: 0, character: 5}
-  marks: {}
-finalState:
-  documentContents: hello
-  selections:
-    - anchor: {line: 0, character: 4}
-      active: {line: 0, character: 4}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: outside, modifier: {type: surroundingPair, delimiter: parentheses, delimiterInclusion: delimitersOnly}}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/parseTreeParity/chuckRound2.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/parseTreeParity/chuckRound2.yml
deleted file mode 100644
index 3c8cf08d8f..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/parseTreeParity/chuckRound2.yml
+++ /dev/null
@@ -1,20 +0,0 @@
-languageId: typescript
-command:
-  version: 1
-  spokenForm: chuck round
-  action: remove
-  targets:
-    - type: primitive
-      modifier: {type: surroundingPair, delimiter: parentheses}
-initialState:
-  documentContents: (hello)
-  selections:
-    - anchor: {line: 0, character: 5}
-      active: {line: 0, character: 5}
-  marks: {}
-finalState:
-  documentContents: ""
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: outside, modifier: {type: surroundingPair, delimiter: parentheses, delimiterInclusion: includeDelimiters}}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/parseTreeParity/clearBoundsDouble.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/parseTreeParity/clearBoundsDouble.yml
deleted file mode 100644
index af725d85db..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/parseTreeParity/clearBoundsDouble.yml
+++ /dev/null
@@ -1,20 +0,0 @@
-languageId: typescript
-command:
-  version: 1
-  spokenForm: clear bounds double
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: surroundingPair, delimiter: any, delimiterInclusion: excludeInterior}
-      mark: {type: decoratedSymbol, symbolColor: default, character: '"'}
-initialState:
-  documentContents: "\"\""
-  selections:
-    - anchor: {line: 0, character: 1}
-      active: {line: 0, character: 1}
-finalState:
-  documentContents: ""
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-fullTargets: [{type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: '"'}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: surroundingPair, delimiter: null, delimiterInclusion: delimitersOnly}}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/parseTreeParity/clearBoundsRound.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/parseTreeParity/clearBoundsRound.yml
deleted file mode 100644
index 04cd032dc5..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/parseTreeParity/clearBoundsRound.yml
+++ /dev/null
@@ -1,19 +0,0 @@
-languageId: typescript
-command:
-  version: 1
-  spokenForm: clear bounds round
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: surroundingPair, delimiter: parentheses, delimiterInclusion: excludeInterior}
-initialState:
-  documentContents: ()
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-finalState:
-  documentContents: ""
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: surroundingPair, delimiter: parentheses, delimiterInclusion: delimitersOnly}}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/parseTreeParity/clearBoundsRound2.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/parseTreeParity/clearBoundsRound2.yml
deleted file mode 100644
index 183e795c77..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/parseTreeParity/clearBoundsRound2.yml
+++ /dev/null
@@ -1,21 +0,0 @@
-languageId: typescript
-command:
-  version: 1
-  spokenForm: clear bounds round
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: surroundingPair, delimiter: parentheses, delimiterInclusion: excludeInterior}
-initialState:
-  documentContents: (hello)
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-finalState:
-  documentContents: hello
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-    - anchor: {line: 0, character: 5}
-      active: {line: 0, character: 5}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: surroundingPair, delimiter: parentheses, delimiterInclusion: delimitersOnly}}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/parseTreeParity/clearCurly2.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/parseTreeParity/clearCurly2.yml
deleted file mode 100644
index 90b0a7f53a..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/parseTreeParity/clearCurly2.yml
+++ /dev/null
@@ -1,23 +0,0 @@
-languageId: typescript
-command:
-  version: 1
-  spokenForm: clear curly
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: surroundingPair, delimiter: curlyBrackets}
-initialState:
-  documentContents: |-
-    {
-        hello
-    }
-  selections:
-    - anchor: {line: 1, character: 7}
-      active: {line: 1, character: 7}
-  marks: {}
-finalState:
-  documentContents: ""
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: surroundingPair, delimiter: curlyBrackets, delimiterInclusion: includeDelimiters}}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/parseTreeParity/clearOutsideGreenDouble.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/parseTreeParity/clearOutsideGreenDouble.yml
deleted file mode 100644
index c2e42ad15d..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/parseTreeParity/clearOutsideGreenDouble.yml
+++ /dev/null
@@ -1,24 +0,0 @@
-languageId: typescript
-command:
-  version: 1
-  spokenForm: clear outside blue double
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: surroundingPair, delimiter: any}
-      mark: {type: decoratedSymbol, symbolColor: blue, character: '"'}
-initialState:
-  documentContents: "\"\""
-  selections:
-    - anchor: {line: 0, character: 1}
-      active: {line: 0, character: 1}
-  marks:
-    blue.":
-      start: {line: 0, character: 0}
-      end: {line: 0, character: 1}
-finalState:
-  documentContents: ""
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-fullTargets: [{type: primitive, mark: {type: decoratedSymbol, symbolColor: green, character: '"', usePrePhraseSnapshot: true}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: surroundingPair, delimiter: null, delimiterInclusion: includeDelimiters}}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/parseTreeParity/clearRound9.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/parseTreeParity/clearRound9.yml
deleted file mode 100644
index 10d0cb780a..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/parseTreeParity/clearRound9.yml
+++ /dev/null
@@ -1,27 +0,0 @@
-languageId: typescript
-command:
-  version: 1
-  spokenForm: clear round
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: surroundingPair, delimiter: parentheses}
-initialState:
-  documentContents: |-
-    (hello)
-    (hello)
-  selections:
-    - anchor: {line: 0, character: 4}
-      active: {line: 0, character: 4}
-    - anchor: {line: 1, character: 4}
-      active: {line: 1, character: 4}
-  marks: {}
-finalState:
-  documentContents: |+
-
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-    - anchor: {line: 1, character: 0}
-      active: {line: 1, character: 0}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: surroundingPair, delimiter: parentheses, delimiterInclusion: includeDelimiters}}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeInsideRound.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeInsideRound.yml
deleted file mode 100644
index daae6ecd2e..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeInsideRound.yml
+++ /dev/null
@@ -1,19 +0,0 @@
-languageId: typescript
-command:
-  version: 1
-  spokenForm: clear inside round
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: surroundingPair, delimiter: parentheses, delimiterInclusion: interiorOnly}
-initialState:
-  documentContents: ()
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-finalState:
-  documentContents: ()
-  selections:
-    - anchor: {line: 0, character: 1}
-      active: {line: 0, character: 1}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: surroundingPair, delimiter: parentheses, delimiterInclusion: excludeDelimiters}}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeInsideRound2.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeInsideRound2.yml
deleted file mode 100644
index d50c14644e..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeInsideRound2.yml
+++ /dev/null
@@ -1,19 +0,0 @@
-languageId: typescript
-command:
-  version: 1
-  spokenForm: clear inside round
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: surroundingPair, delimiter: parentheses, delimiterInclusion: interiorOnly}
-initialState:
-  documentContents: (hello)
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-finalState:
-  documentContents: ()
-  selections:
-    - anchor: {line: 0, character: 1}
-      active: {line: 0, character: 1}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: surroundingPair, delimiter: parentheses, delimiterInclusion: excludeDelimiters}}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeOutside.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeOutside.yml
deleted file mode 100644
index 55ed747327..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeOutside.yml
+++ /dev/null
@@ -1,19 +0,0 @@
-languageId: typescript
-command:
-  version: 1
-  spokenForm: clear outside
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: surroundingPair, delimiter: any}
-initialState:
-  documentContents: ()
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-finalState:
-  documentContents: ""
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: surroundingPair, delimiter: null, delimiterInclusion: includeDelimiters}}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeOutside11.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeOutside11.yml
deleted file mode 100644
index 5df0660699..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeOutside11.yml
+++ /dev/null
@@ -1,20 +0,0 @@
-languageId: typescript
-command:
-  version: 1
-  spokenForm: clear outside
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: surroundingPair, delimiter: any}
-initialState:
-  documentContents: (  [  )  ]
-  selections:
-    - anchor: {line: 0, character: 1}
-      active: {line: 0, character: 1}
-  marks: {}
-finalState:
-  documentContents: "  ]"
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: surroundingPair, delimiter: null, delimiterInclusion: includeDelimiters}}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeOutside12.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeOutside12.yml
deleted file mode 100644
index a50a5fb5f1..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeOutside12.yml
+++ /dev/null
@@ -1,20 +0,0 @@
-languageId: typescript
-command:
-  version: 1
-  spokenForm: clear outside
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: surroundingPair, delimiter: any}
-initialState:
-  documentContents: (  [  )  ]
-  selections:
-    - anchor: {line: 0, character: 2}
-      active: {line: 0, character: 2}
-  marks: {}
-finalState:
-  documentContents: "  ]"
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: surroundingPair, delimiter: null, delimiterInclusion: includeDelimiters}}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeOutside13.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeOutside13.yml
deleted file mode 100644
index 19f4afe84d..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeOutside13.yml
+++ /dev/null
@@ -1,20 +0,0 @@
-languageId: typescript
-command:
-  version: 1
-  spokenForm: clear outside
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: surroundingPair, delimiter: any}
-initialState:
-  documentContents: (  [  )  ]
-  selections:
-    - anchor: {line: 0, character: 3}
-      active: {line: 0, character: 3}
-  marks: {}
-finalState:
-  documentContents: "(  "
-  selections:
-    - anchor: {line: 0, character: 3}
-      active: {line: 0, character: 3}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: surroundingPair, delimiter: null, delimiterInclusion: includeDelimiters}}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeOutside14.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeOutside14.yml
deleted file mode 100644
index 05dd16fa6e..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeOutside14.yml
+++ /dev/null
@@ -1,20 +0,0 @@
-languageId: typescript
-command:
-  version: 1
-  spokenForm: clear outside
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: surroundingPair, delimiter: any}
-initialState:
-  documentContents: (  [  )  ]
-  selections:
-    - anchor: {line: 0, character: 5}
-      active: {line: 0, character: 5}
-  marks: {}
-finalState:
-  documentContents: "  ]"
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: surroundingPair, delimiter: null, delimiterInclusion: includeDelimiters}}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeOutside15.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeOutside15.yml
deleted file mode 100644
index 8cebfd2c4f..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeOutside15.yml
+++ /dev/null
@@ -1,20 +0,0 @@
-languageId: typescript
-command:
-  version: 1
-  spokenForm: clear outside
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: surroundingPair, delimiter: any}
-initialState:
-  documentContents: (  [  )  ]
-  selections:
-    - anchor: {line: 0, character: 7}
-      active: {line: 0, character: 7}
-  marks: {}
-finalState:
-  documentContents: "  ]"
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: surroundingPair, delimiter: null, delimiterInclusion: includeDelimiters}}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeOutside16.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeOutside16.yml
deleted file mode 100644
index f8c7290aca..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeOutside16.yml
+++ /dev/null
@@ -1,20 +0,0 @@
-languageId: typescript
-command:
-  version: 1
-  spokenForm: clear outside
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: surroundingPair, delimiter: any}
-initialState:
-  documentContents: (  [  )  ]
-  selections:
-    - anchor: {line: 0, character: 8}
-      active: {line: 0, character: 8}
-  marks: {}
-finalState:
-  documentContents: "(  "
-  selections:
-    - anchor: {line: 0, character: 3}
-      active: {line: 0, character: 3}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: surroundingPair, delimiter: null, delimiterInclusion: includeDelimiters}}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeOutside17.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeOutside17.yml
deleted file mode 100644
index b83eb85df5..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeOutside17.yml
+++ /dev/null
@@ -1,20 +0,0 @@
-languageId: typescript
-command:
-  version: 1
-  spokenForm: clear outside
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: surroundingPair, delimiter: any}
-initialState:
-  documentContents: "[  (  ]  )"
-  selections:
-    - anchor: {line: 0, character: 2}
-      active: {line: 0, character: 2}
-  marks: {}
-finalState:
-  documentContents: "  )"
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: surroundingPair, delimiter: null, delimiterInclusion: includeDelimiters}}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeOutside18.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeOutside18.yml
deleted file mode 100644
index 312585a762..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeOutside18.yml
+++ /dev/null
@@ -1,20 +0,0 @@
-languageId: typescript
-command:
-  version: 1
-  spokenForm: clear outside
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: surroundingPair, delimiter: any}
-initialState:
-  documentContents: "{   (  ]  )"
-  selections:
-    - anchor: {line: 0, character: 9}
-      active: {line: 0, character: 9}
-  marks: {}
-finalState:
-  documentContents: "{   "
-  selections:
-    - anchor: {line: 0, character: 4}
-      active: {line: 0, character: 4}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: surroundingPair, delimiter: null, delimiterInclusion: includeDelimiters}}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeOutside19.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeOutside19.yml
deleted file mode 100644
index 83954b635c..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeOutside19.yml
+++ /dev/null
@@ -1,20 +0,0 @@
-languageId: typescript
-command:
-  version: 1
-  spokenForm: clear outside
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: surroundingPair, delimiter: any}
-initialState:
-  documentContents: "{   (  } ]  )"
-  selections:
-    - anchor: {line: 0, character: 8}
-      active: {line: 0, character: 8}
-  marks: {}
-finalState:
-  documentContents: " ]  )"
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: surroundingPair, delimiter: null, delimiterInclusion: includeDelimiters}}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeOutside2.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeOutside2.yml
deleted file mode 100644
index b01dfd909a..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeOutside2.yml
+++ /dev/null
@@ -1,19 +0,0 @@
-languageId: typescript
-command:
-  version: 1
-  spokenForm: clear outside
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: surroundingPair, delimiter: any}
-initialState:
-  documentContents: ([])
-  selections:
-    - anchor: {line: 0, character: 3}
-      active: {line: 0, character: 3}
-finalState:
-  documentContents: ""
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: surroundingPair, delimiter: null, delimiterInclusion: includeDelimiters}}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeOutside20.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeOutside20.yml
deleted file mode 100644
index 58e083e91a..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeOutside20.yml
+++ /dev/null
@@ -1,20 +0,0 @@
-languageId: typescript
-command:
-  version: 1
-  spokenForm: clear outside
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: surroundingPair, delimiter: any}
-initialState:
-  documentContents: "[ {   ( { } ]  )"
-  selections:
-    - anchor: {line: 0, character: 5}
-      active: {line: 0, character: 5}
-  marks: {}
-finalState:
-  documentContents: "  )"
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: surroundingPair, delimiter: null, delimiterInclusion: includeDelimiters}}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeOutside21.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeOutside21.yml
deleted file mode 100644
index b86d1a35e5..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeOutside21.yml
+++ /dev/null
@@ -1,20 +0,0 @@
-languageId: typescript
-command:
-  version: 1
-  spokenForm: clear outside
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: surroundingPair, delimiter: any}
-initialState:
-  documentContents: "{ [  ( { } ]  )"
-  selections:
-    - anchor: {line: 0, character: 4}
-      active: {line: 0, character: 4}
-  marks: {}
-finalState:
-  documentContents: "{   )"
-  selections:
-    - anchor: {line: 0, character: 2}
-      active: {line: 0, character: 2}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: surroundingPair, delimiter: null, delimiterInclusion: includeDelimiters}}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeOutside22.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeOutside22.yml
deleted file mode 100644
index 4547ed4a66..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeOutside22.yml
+++ /dev/null
@@ -1,20 +0,0 @@
-languageId: typescript
-command:
-  version: 1
-  spokenForm: clear outside
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: surroundingPair, delimiter: any}
-initialState:
-  documentContents: "{ [  (  } ]  )"
-  selections:
-    - anchor: {line: 0, character: 7}
-      active: {line: 0, character: 7}
-  marks: {}
-finalState:
-  documentContents: " ]  )"
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: surroundingPair, delimiter: null, delimiterInclusion: includeDelimiters}}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeOutside23.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeOutside23.yml
deleted file mode 100644
index 1abe90282a..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeOutside23.yml
+++ /dev/null
@@ -1,20 +0,0 @@
-languageId: typescript
-command:
-  version: 1
-  spokenForm: clear outside
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: surroundingPair, delimiter: any}
-initialState:
-  documentContents: "{[  ( } ]  )"
-  selections:
-    - anchor: {line: 0, character: 3}
-      active: {line: 0, character: 3}
-  marks: {}
-finalState:
-  documentContents: " ]  )"
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: surroundingPair, delimiter: null, delimiterInclusion: includeDelimiters}}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeOutside24.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeOutside24.yml
deleted file mode 100644
index 1db562d91a..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeOutside24.yml
+++ /dev/null
@@ -1,20 +0,0 @@
-languageId: typescript
-command:
-  version: 1
-  spokenForm: clear outside
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: surroundingPair, delimiter: any}
-initialState:
-  documentContents: ([)]
-  selections:
-    - anchor: {line: 0, character: 2}
-      active: {line: 0, character: 2}
-  marks: {}
-finalState:
-  documentContents: "]"
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: surroundingPair, delimiter: null, delimiterInclusion: includeDelimiters}}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeOutside25.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeOutside25.yml
deleted file mode 100644
index bbecf5ff1c..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeOutside25.yml
+++ /dev/null
@@ -1,20 +0,0 @@
-languageId: typescript
-command:
-  version: 1
-  spokenForm: clear outside
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: surroundingPair, delimiter: any}
-initialState:
-  documentContents: ([)]
-  selections:
-    - anchor: {line: 0, character: 1}
-      active: {line: 0, character: 1}
-  marks: {}
-finalState:
-  documentContents: (
-  selections:
-    - anchor: {line: 0, character: 1}
-      active: {line: 0, character: 1}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: surroundingPair, delimiter: null, delimiterInclusion: includeDelimiters}}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeOutside26.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeOutside26.yml
deleted file mode 100644
index bf9fc894ce..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeOutside26.yml
+++ /dev/null
@@ -1,20 +0,0 @@
-languageId: typescript
-command:
-  version: 1
-  spokenForm: clear outside
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: surroundingPair, delimiter: any}
-initialState:
-  documentContents: (<user.foo>  <user.bar>)
-  selections:
-    - anchor: {line: 0, character: 12}
-      active: {line: 0, character: 12}
-  marks: {}
-finalState:
-  documentContents: ""
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: surroundingPair, delimiter: null, delimiterInclusion: includeDelimiters}}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeOutside3.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeOutside3.yml
deleted file mode 100644
index 05cac94047..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeOutside3.yml
+++ /dev/null
@@ -1,19 +0,0 @@
-languageId: typescript
-command:
-  version: 1
-  spokenForm: clear outside
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: surroundingPair, delimiter: any}
-initialState:
-  documentContents: (hello)
-  selections:
-    - anchor: {line: 0, character: 4}
-      active: {line: 0, character: 4}
-finalState:
-  documentContents: ""
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: surroundingPair, delimiter: null, delimiterInclusion: includeDelimiters}}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeOutside4.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeOutside4.yml
deleted file mode 100644
index 4f7ba59ae5..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeOutside4.yml
+++ /dev/null
@@ -1,19 +0,0 @@
-languageId: typescript
-command:
-  version: 1
-  spokenForm: clear outside
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: surroundingPair, delimiter: any}
-initialState:
-  documentContents: "[(hello)]"
-  selections:
-    - anchor: {line: 0, character: 8}
-      active: {line: 0, character: 5}
-finalState:
-  documentContents: "[]"
-  selections:
-    - anchor: {line: 0, character: 1}
-      active: {line: 0, character: 1}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: surroundingPair, delimiter: null, delimiterInclusion: includeDelimiters}}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeOutside5.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeOutside5.yml
deleted file mode 100644
index ec4eb27761..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeOutside5.yml
+++ /dev/null
@@ -1,19 +0,0 @@
-languageId: typescript
-command:
-  version: 1
-  spokenForm: clear outside
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: surroundingPair, delimiter: any}
-initialState:
-  documentContents: "[(hello)]"
-  selections:
-    - anchor: {line: 0, character: 1}
-      active: {line: 0, character: 4}
-finalState:
-  documentContents: "[]"
-  selections:
-    - anchor: {line: 0, character: 1}
-      active: {line: 0, character: 1}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: surroundingPair, delimiter: null, delimiterInclusion: includeDelimiters}}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeOutside6.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeOutside6.yml
deleted file mode 100644
index ced7f157a7..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeOutside6.yml
+++ /dev/null
@@ -1,19 +0,0 @@
-languageId: typescript
-command:
-  version: 1
-  spokenForm: clear outside
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: surroundingPair, delimiter: any}
-initialState:
-  documentContents: "[(hello)]"
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 3}
-finalState:
-  documentContents: ""
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: surroundingPair, delimiter: null, delimiterInclusion: includeDelimiters}}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeOutside7.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeOutside7.yml
deleted file mode 100644
index 5158d0c9ca..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeOutside7.yml
+++ /dev/null
@@ -1,19 +0,0 @@
-languageId: typescript
-command:
-  version: 1
-  spokenForm: clear outside
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: surroundingPair, delimiter: any}
-initialState:
-  documentContents: "[(hello)  (whatever)]"
-  selections:
-    - anchor: {line: 0, character: 9}
-      active: {line: 0, character: 11}
-finalState:
-  documentContents: ""
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: surroundingPair, delimiter: null, delimiterInclusion: includeDelimiters}}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeOutside8.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeOutside8.yml
deleted file mode 100644
index ba4b27da12..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeOutside8.yml
+++ /dev/null
@@ -1,19 +0,0 @@
-languageId: typescript
-command:
-  version: 1
-  spokenForm: clear outside
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: surroundingPair, delimiter: any}
-initialState:
-  documentContents: "[(hello)  (whatever)]"
-  selections:
-    - anchor: {line: 0, character: 9}
-      active: {line: 0, character: 9}
-finalState:
-  documentContents: ""
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: surroundingPair, delimiter: null, delimiterInclusion: includeDelimiters}}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeOutside9.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeOutside9.yml
deleted file mode 100644
index 2b7b6a671c..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeOutside9.yml
+++ /dev/null
@@ -1,19 +0,0 @@
-languageId: typescript
-command:
-  version: 1
-  spokenForm: clear outside
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: surroundingPair, delimiter: any}
-initialState:
-  documentContents: "[hello  (whatever)]"
-  selections:
-    - anchor: {line: 0, character: 7}
-      active: {line: 0, character: 7}
-finalState:
-  documentContents: ""
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: surroundingPair, delimiter: null, delimiterInclusion: includeDelimiters}}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeOutsideLeper.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeOutsideLeper.yml
deleted file mode 100644
index 77d39fc88d..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeOutsideLeper.yml
+++ /dev/null
@@ -1,22 +0,0 @@
-languageId: typescript
-command:
-  version: 1
-  spokenForm: clear outside leper
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: surroundingPair, delimiter: any}
-      mark: {type: decoratedSymbol, symbolColor: default, character: (}
-initialState:
-  documentContents: |
-    [(hello)  (whatever)]
-  selections:
-    - anchor: {line: 1, character: 0}
-      active: {line: 1, character: 0}
-finalState:
-  documentContents: |
-    [  (whatever)]
-  selections:
-    - anchor: {line: 0, character: 1}
-      active: {line: 0, character: 1}
-fullTargets: [{type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: (}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: surroundingPair, delimiter: null, delimiterInclusion: includeDelimiters}}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeOutsideRack.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeOutsideRack.yml
deleted file mode 100644
index 929a4523b6..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeOutsideRack.yml
+++ /dev/null
@@ -1,22 +0,0 @@
-languageId: typescript
-command:
-  version: 1
-  spokenForm: clear outside rack
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: surroundingPair, delimiter: any}
-      mark: {type: decoratedSymbol, symbolColor: default, character: ']'}
-initialState:
-  documentContents: |
-    [(hello)  (whatever)]
-  selections:
-    - anchor: {line: 1, character: 0}
-      active: {line: 1, character: 0}
-finalState:
-  documentContents: |+
-
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-fullTargets: [{type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: ']'}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: surroundingPair, delimiter: null, delimiterInclusion: includeDelimiters}}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeQuad.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeQuad.yml
deleted file mode 100644
index 2031d5b6d9..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeQuad.yml
+++ /dev/null
@@ -1,19 +0,0 @@
-languageId: typescript
-command:
-  version: 1
-  spokenForm: clear quad
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: surroundingPair, delimiter: doubleQuotes}
-initialState:
-  documentContents: "\"\""
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-finalState:
-  documentContents: ""
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: surroundingPair, delimiter: doubleQuotes, delimiterInclusion: includeDelimiters}}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeQuad2.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeQuad2.yml
deleted file mode 100644
index dc3cbdc9bf..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeQuad2.yml
+++ /dev/null
@@ -1,19 +0,0 @@
-languageId: typescript
-command:
-  version: 1
-  spokenForm: clear quad
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: surroundingPair, delimiter: doubleQuotes}
-initialState:
-  documentContents: "\"\""
-  selections:
-    - anchor: {line: 0, character: 1}
-      active: {line: 0, character: 1}
-finalState:
-  documentContents: ""
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: surroundingPair, delimiter: doubleQuotes, delimiterInclusion: includeDelimiters}}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeQuad3.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeQuad3.yml
deleted file mode 100644
index 375494bc0b..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeQuad3.yml
+++ /dev/null
@@ -1,19 +0,0 @@
-languageId: typescript
-command:
-  version: 1
-  spokenForm: clear quad
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: surroundingPair, delimiter: doubleQuotes}
-initialState:
-  documentContents: "\"\""
-  selections:
-    - anchor: {line: 0, character: 2}
-      active: {line: 0, character: 2}
-finalState:
-  documentContents: ""
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: surroundingPair, delimiter: doubleQuotes, delimiterInclusion: includeDelimiters}}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeQuad4.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeQuad4.yml
deleted file mode 100644
index ce33fc7b42..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeQuad4.yml
+++ /dev/null
@@ -1,19 +0,0 @@
-languageId: typescript
-command:
-  version: 1
-  spokenForm: clear quad
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: surroundingPair, delimiter: doubleQuotes}
-initialState:
-  documentContents: "\"()\""
-  selections:
-    - anchor: {line: 0, character: 3}
-      active: {line: 0, character: 3}
-finalState:
-  documentContents: ""
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: surroundingPair, delimiter: doubleQuotes, delimiterInclusion: includeDelimiters}}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeQuad5.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeQuad5.yml
deleted file mode 100644
index 6862c55e0b..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeQuad5.yml
+++ /dev/null
@@ -1,19 +0,0 @@
-languageId: typescript
-command:
-  version: 1
-  spokenForm: clear quad
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: surroundingPair, delimiter: doubleQuotes}
-initialState:
-  documentContents: "\"hello\""
-  selections:
-    - anchor: {line: 0, character: 6}
-      active: {line: 0, character: 6}
-finalState:
-  documentContents: ""
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: surroundingPair, delimiter: doubleQuotes, delimiterInclusion: includeDelimiters}}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeQuad6.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeQuad6.yml
deleted file mode 100644
index d6334a100d..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeQuad6.yml
+++ /dev/null
@@ -1,19 +0,0 @@
-languageId: typescript
-command:
-  version: 1
-  spokenForm: clear quad
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: surroundingPair, delimiter: doubleQuotes}
-initialState:
-  documentContents: "\"\\\"\\\"\""
-  selections:
-    - anchor: {line: 0, character: 5}
-      active: {line: 0, character: 5}
-finalState:
-  documentContents: ""
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: surroundingPair, delimiter: doubleQuotes, delimiterInclusion: includeDelimiters}}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeRound.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeRound.yml
deleted file mode 100644
index 0498884611..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeRound.yml
+++ /dev/null
@@ -1,19 +0,0 @@
-languageId: typescript
-command:
-  version: 1
-  spokenForm: clear round
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: surroundingPair, delimiter: parentheses}
-initialState:
-  documentContents: ()
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-finalState:
-  documentContents: ""
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: surroundingPair, delimiter: parentheses, delimiterInclusion: includeDelimiters}}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeRound10.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeRound10.yml
deleted file mode 100644
index fe2303f386..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeRound10.yml
+++ /dev/null
@@ -1,19 +0,0 @@
-languageId: typescript
-command:
-  version: 1
-  spokenForm: clear round
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: surroundingPair, delimiter: parentheses}
-initialState:
-  documentContents: ((hello))
-  selections:
-    - anchor: {line: 0, character: 7}
-      active: {line: 0, character: 7}
-finalState:
-  documentContents: ()
-  selections:
-    - anchor: {line: 0, character: 1}
-      active: {line: 0, character: 1}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: surroundingPair, delimiter: parentheses, delimiterInclusion: includeDelimiters}}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeRound11.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeRound11.yml
deleted file mode 100644
index 83d9b62dbf..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeRound11.yml
+++ /dev/null
@@ -1,19 +0,0 @@
-languageId: typescript
-command:
-  version: 1
-  spokenForm: clear round
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: surroundingPair, delimiter: parentheses}
-initialState:
-  documentContents: ((hello))
-  selections:
-    - anchor: {line: 0, character: 8}
-      active: {line: 0, character: 8}
-finalState:
-  documentContents: ""
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: surroundingPair, delimiter: parentheses, delimiterInclusion: includeDelimiters}}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeRound12.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeRound12.yml
deleted file mode 100644
index ff25c5091a..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeRound12.yml
+++ /dev/null
@@ -1,19 +0,0 @@
-languageId: typescript
-command:
-  version: 1
-  spokenForm: clear round
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: surroundingPair, delimiter: parentheses}
-initialState:
-  documentContents: ((hello))
-  selections:
-    - anchor: {line: 0, character: 9}
-      active: {line: 0, character: 9}
-finalState:
-  documentContents: ""
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: surroundingPair, delimiter: parentheses, delimiterInclusion: includeDelimiters}}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeRound13.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeRound13.yml
deleted file mode 100644
index 5293dca756..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeRound13.yml
+++ /dev/null
@@ -1,19 +0,0 @@
-languageId: typescript
-command:
-  version: 1
-  spokenForm: clear round
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: surroundingPair, delimiter: parentheses}
-initialState:
-  documentContents: ((hello) () )
-  selections:
-    - anchor: {line: 0, character: 12}
-      active: {line: 0, character: 12}
-finalState:
-  documentContents: ""
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: surroundingPair, delimiter: parentheses, delimiterInclusion: includeDelimiters}}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeRound14.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeRound14.yml
deleted file mode 100644
index 0a4f1e8d16..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeRound14.yml
+++ /dev/null
@@ -1,19 +0,0 @@
-languageId: typescript
-command:
-  version: 1
-  spokenForm: clear round
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: surroundingPair, delimiter: parentheses}
-initialState:
-  documentContents: ((hello) () )
-  selections:
-    - anchor: {line: 0, character: 11}
-      active: {line: 0, character: 11}
-finalState:
-  documentContents: ((hello)  )
-  selections:
-    - anchor: {line: 0, character: 9}
-      active: {line: 0, character: 9}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: surroundingPair, delimiter: parentheses, delimiterInclusion: includeDelimiters}}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeRound15.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeRound15.yml
deleted file mode 100644
index 736c196abb..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeRound15.yml
+++ /dev/null
@@ -1,19 +0,0 @@
-languageId: typescript
-command:
-  version: 1
-  spokenForm: clear round
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: surroundingPair, delimiter: parentheses}
-initialState:
-  documentContents: ((hello) [] )
-  selections:
-    - anchor: {line: 0, character: 12}
-      active: {line: 0, character: 12}
-finalState:
-  documentContents: ""
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: surroundingPair, delimiter: parentheses, delimiterInclusion: includeDelimiters}}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeRound16.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeRound16.yml
deleted file mode 100644
index 91dad47eae..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeRound16.yml
+++ /dev/null
@@ -1,19 +0,0 @@
-languageId: typescript
-command:
-  version: 1
-  spokenForm: clear round
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: surroundingPair, delimiter: parentheses}
-initialState:
-  documentContents: ()()
-  selections:
-    - anchor: {line: 0, character: 2}
-      active: {line: 0, character: 2}
-finalState:
-  documentContents: ()
-  selections:
-    - anchor: {line: 0, character: 2}
-      active: {line: 0, character: 2}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: surroundingPair, delimiter: parentheses, delimiterInclusion: includeDelimiters}}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeRound17.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeRound17.yml
deleted file mode 100644
index bb83723c45..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeRound17.yml
+++ /dev/null
@@ -1,19 +0,0 @@
-languageId: typescript
-command:
-  version: 1
-  spokenForm: clear round
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: surroundingPair, delimiter: parentheses}
-initialState:
-  documentContents: ()(
-  selections:
-    - anchor: {line: 0, character: 2}
-      active: {line: 0, character: 2}
-finalState:
-  documentContents: (
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: surroundingPair, delimiter: parentheses, delimiterInclusion: includeDelimiters}}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeRound18.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeRound18.yml
deleted file mode 100644
index ae36707de5..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeRound18.yml
+++ /dev/null
@@ -1,19 +0,0 @@
-languageId: typescript
-command:
-  version: 1
-  spokenForm: clear round
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: surroundingPair, delimiter: parentheses}
-initialState:
-  documentContents: (\(hello\))
-  selections:
-    - anchor: {line: 0, character: 1}
-      active: {line: 0, character: 1}
-finalState:
-  documentContents: ""
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: surroundingPair, delimiter: parentheses, delimiterInclusion: includeDelimiters}}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeRound19.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeRound19.yml
deleted file mode 100644
index 7017ebfb0f..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeRound19.yml
+++ /dev/null
@@ -1,19 +0,0 @@
-languageId: typescript
-command:
-  version: 1
-  spokenForm: clear round
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: surroundingPair, delimiter: parentheses}
-initialState:
-  documentContents: (hello)
-  selections:
-    - anchor: {line: 0, character: 4}
-      active: {line: 0, character: 4}
-finalState:
-  documentContents: ""
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: surroundingPair, delimiter: parentheses, delimiterInclusion: includeDelimiters}}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeRound2.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeRound2.yml
deleted file mode 100644
index 9097299964..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeRound2.yml
+++ /dev/null
@@ -1,19 +0,0 @@
-languageId: typescript
-command:
-  version: 1
-  spokenForm: clear round
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: surroundingPair, delimiter: parentheses}
-initialState:
-  documentContents: (hello)
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-finalState:
-  documentContents: ""
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: surroundingPair, delimiter: parentheses, delimiterInclusion: includeDelimiters}}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeRound20.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeRound20.yml
deleted file mode 100644
index b7131083d8..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeRound20.yml
+++ /dev/null
@@ -1,19 +0,0 @@
-languageId: typescript
-command:
-  version: 1
-  spokenForm: clear round
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: surroundingPair, delimiter: parentheses}
-initialState:
-  documentContents: (hello  (whatever))
-  selections:
-    - anchor: {line: 0, character: 7}
-      active: {line: 0, character: 7}
-finalState:
-  documentContents: ""
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: surroundingPair, delimiter: parentheses, delimiterInclusion: includeDelimiters}}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeRound21.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeRound21.yml
deleted file mode 100644
index 23eccf6776..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeRound21.yml
+++ /dev/null
@@ -1,19 +0,0 @@
-languageId: typescript
-command:
-  version: 1
-  spokenForm: clear round
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: surroundingPair, delimiter: parentheses}
-initialState:
-  documentContents: (hello ()  )
-  selections:
-    - anchor: {line: 0, character: 10}
-      active: {line: 0, character: 10}
-finalState:
-  documentContents: ""
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: surroundingPair, delimiter: parentheses, delimiterInclusion: includeDelimiters}}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeRound22.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeRound22.yml
deleted file mode 100644
index 40e7455c3f..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeRound22.yml
+++ /dev/null
@@ -1,19 +0,0 @@
-languageId: typescript
-command:
-  version: 1
-  spokenForm: clear round
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: surroundingPair, delimiter: parentheses}
-initialState:
-  documentContents: (hello  () (whatever))
-  selections:
-    - anchor: {line: 0, character: 7}
-      active: {line: 0, character: 7}
-finalState:
-  documentContents: ""
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: surroundingPair, delimiter: parentheses, delimiterInclusion: includeDelimiters}}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeRound23.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeRound23.yml
deleted file mode 100644
index c00af7ad2b..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeRound23.yml
+++ /dev/null
@@ -1,19 +0,0 @@
-languageId: typescript
-command:
-  version: 1
-  spokenForm: clear round
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: surroundingPair, delimiter: parentheses}
-initialState:
-  documentContents: (\(hello\))
-  selections:
-    - anchor: {line: 0, character: 6}
-      active: {line: 0, character: 6}
-finalState:
-  documentContents: ""
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: surroundingPair, delimiter: parentheses, delimiterInclusion: includeDelimiters}}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeRound3.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeRound3.yml
deleted file mode 100644
index 3b736778aa..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeRound3.yml
+++ /dev/null
@@ -1,19 +0,0 @@
-languageId: typescript
-command:
-  version: 1
-  spokenForm: clear round
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: surroundingPair, delimiter: parentheses}
-initialState:
-  documentContents: (hello)
-  selections:
-    - anchor: {line: 0, character: 6}
-      active: {line: 0, character: 6}
-finalState:
-  documentContents: ""
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: surroundingPair, delimiter: parentheses, delimiterInclusion: includeDelimiters}}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeRound4.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeRound4.yml
deleted file mode 100644
index 9434129b56..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeRound4.yml
+++ /dev/null
@@ -1,19 +0,0 @@
-languageId: typescript
-command:
-  version: 1
-  spokenForm: clear round
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: surroundingPair, delimiter: parentheses}
-initialState:
-  documentContents: (hello)
-  selections:
-    - anchor: {line: 0, character: 7}
-      active: {line: 0, character: 7}
-finalState:
-  documentContents: ""
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: surroundingPair, delimiter: parentheses, delimiterInclusion: includeDelimiters}}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeRound5.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeRound5.yml
deleted file mode 100644
index 5c23c962e2..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeRound5.yml
+++ /dev/null
@@ -1,19 +0,0 @@
-languageId: typescript
-command:
-  version: 1
-  spokenForm: clear round
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: surroundingPair, delimiter: parentheses}
-initialState:
-  documentContents: (hello)
-  selections:
-    - anchor: {line: 0, character: 1}
-      active: {line: 0, character: 1}
-finalState:
-  documentContents: ""
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: surroundingPair, delimiter: parentheses, delimiterInclusion: includeDelimiters}}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeRound6.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeRound6.yml
deleted file mode 100644
index 4a3c3de72d..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeRound6.yml
+++ /dev/null
@@ -1,19 +0,0 @@
-languageId: typescript
-command:
-  version: 1
-  spokenForm: clear round
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: surroundingPair, delimiter: parentheses}
-initialState:
-  documentContents: ()
-  selections:
-    - anchor: {line: 0, character: 1}
-      active: {line: 0, character: 1}
-finalState:
-  documentContents: ""
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: surroundingPair, delimiter: parentheses, delimiterInclusion: includeDelimiters}}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeRound7.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeRound7.yml
deleted file mode 100644
index 4dfa203f47..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeRound7.yml
+++ /dev/null
@@ -1,19 +0,0 @@
-languageId: typescript
-command:
-  version: 1
-  spokenForm: clear round
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: surroundingPair, delimiter: parentheses}
-initialState:
-  documentContents: (())
-  selections:
-    - anchor: {line: 0, character: 2}
-      active: {line: 0, character: 2}
-finalState:
-  documentContents: ()
-  selections:
-    - anchor: {line: 0, character: 1}
-      active: {line: 0, character: 1}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: surroundingPair, delimiter: parentheses, delimiterInclusion: includeDelimiters}}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeRound8.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeRound8.yml
deleted file mode 100644
index 7e0a6d4334..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeRound8.yml
+++ /dev/null
@@ -1,19 +0,0 @@
-languageId: typescript
-command:
-  version: 1
-  spokenForm: clear round
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: surroundingPair, delimiter: parentheses}
-initialState:
-  documentContents: (())
-  selections:
-    - anchor: {line: 0, character: 3}
-      active: {line: 0, character: 3}
-finalState:
-  documentContents: ""
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: surroundingPair, delimiter: parentheses, delimiterInclusion: includeDelimiters}}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeRound9.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeRound9.yml
deleted file mode 100644
index 6bf27cf593..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeRound9.yml
+++ /dev/null
@@ -1,19 +0,0 @@
-languageId: typescript
-command:
-  version: 1
-  spokenForm: clear round
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: surroundingPair, delimiter: parentheses}
-initialState:
-  documentContents: (())
-  selections:
-    - anchor: {line: 0, character: 1}
-      active: {line: 0, character: 1}
-finalState:
-  documentContents: ()
-  selections:
-    - anchor: {line: 0, character: 1}
-      active: {line: 0, character: 1}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: surroundingPair, delimiter: parentheses, delimiterInclusion: includeDelimiters}}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeRoundLeper.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeRoundLeper.yml
deleted file mode 100644
index 2dfed1fe5a..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeRoundLeper.yml
+++ /dev/null
@@ -1,20 +0,0 @@
-languageId: typescript
-command:
-  version: 1
-  spokenForm: clear round leper
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: surroundingPair, delimiter: parentheses}
-      mark: {type: decoratedSymbol, symbolColor: default, character: (}
-initialState:
-  documentContents: (hello)
-  selections:
-    - anchor: {line: 0, character: 4}
-      active: {line: 0, character: 4}
-finalState:
-  documentContents: ""
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-fullTargets: [{type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: (}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: surroundingPair, delimiter: parentheses, delimiterInclusion: includeDelimiters}}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeRoundRepper.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeRoundRepper.yml
deleted file mode 100644
index fe2e025109..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeRoundRepper.yml
+++ /dev/null
@@ -1,20 +0,0 @@
-languageId: typescript
-command:
-  version: 1
-  spokenForm: clear round repper
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: surroundingPair, delimiter: parentheses}
-      mark: {type: decoratedSymbol, symbolColor: default, character: )}
-initialState:
-  documentContents: (hello)
-  selections:
-    - anchor: {line: 0, character: 4}
-      active: {line: 0, character: 4}
-finalState:
-  documentContents: ""
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-fullTargets: [{type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: )}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: surroundingPair, delimiter: parentheses, delimiterInclusion: includeDelimiters}}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeSquare.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeSquare.yml
deleted file mode 100644
index 1cbfbd8b5d..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/parseTreeParity/takeSquare.yml
+++ /dev/null
@@ -1,19 +0,0 @@
-languageId: typescript
-command:
-  version: 1
-  spokenForm: clear square
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: surroundingPair, delimiter: squareBrackets}
-initialState:
-  documentContents: "[(hello)]"
-  selections:
-    - anchor: {line: 0, character: 5}
-      active: {line: 0, character: 5}
-finalState:
-  documentContents: ""
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: surroundingPair, delimiter: squareBrackets, delimiterInclusion: includeDelimiters}}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/takeCore.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/takeCore.yml
deleted file mode 100644
index 240fb123ce..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/takeCore.yml
+++ /dev/null
@@ -1,30 +0,0 @@
-languageId: typescript
-command:
-  spokenForm: take core
-  version: 2
-  targets:
-    - type: primitive
-      modifiers:
-        - {type: interiorOnly}
-  usePrePhraseSnapshot: true
-  action: {name: setSelection}
-initialState:
-  documentContents: |-
-    [
-        "foo",
-        "bar"
-    ]
-  selections:
-    - anchor: {line: 1, character: 10}
-      active: {line: 1, character: 10}
-  marks: {}
-finalState:
-  documentContents: |-
-    [
-        "foo",
-        "bar"
-    ]
-  selections:
-    - anchor: {line: 1, character: 4}
-      active: {line: 2, character: 9}
-fullTargets: [{type: primitive, mark: {type: cursor}, modifiers: [{type: interiorOnly}]}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/takeCore2.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/takeCore2.yml
deleted file mode 100644
index 14e08ae783..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/takeCore2.yml
+++ /dev/null
@@ -1,22 +0,0 @@
-languageId: plaintext
-command:
-  spokenForm: take core
-  version: 2
-  targets:
-    - type: primitive
-      modifiers:
-        - {type: interiorOnly}
-  usePrePhraseSnapshot: true
-  action: {name: setSelection}
-initialState:
-  documentContents: ( hello )
-  selections:
-    - anchor: {line: 0, character: 6}
-      active: {line: 0, character: 6}
-  marks: {}
-finalState:
-  documentContents: ( hello )
-  selections:
-    - anchor: {line: 0, character: 2}
-      active: {line: 0, character: 7}
-fullTargets: [{type: primitive, mark: {type: cursor}, modifiers: [{type: interiorOnly}]}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/takeCoreRiskPastJustHarp.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/takeCoreRiskPastJustHarp.yml
deleted file mode 100644
index a613278096..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/takeCoreRiskPastJustHarp.yml
+++ /dev/null
@@ -1,42 +0,0 @@
-languageId: plaintext
-command:
-  spokenForm: take core risk past just harp
-  version: 2
-  targets:
-    - type: range
-      anchor:
-        type: primitive
-        modifiers:
-          - {type: interiorOnly}
-        mark: {type: decoratedSymbol, symbolColor: default, character: r}
-      active:
-        type: primitive
-        modifiers:
-          - {type: toRawSelection}
-        mark: {type: decoratedSymbol, symbolColor: default, character: h}
-      excludeAnchor: false
-      excludeActive: false
-  usePrePhraseSnapshot: true
-  action: {name: setSelection}
-initialState:
-  documentContents: |-
-    ( hello world )
-    (hello world)
-  selections:
-    - anchor: {line: 1, character: 13}
-      active: {line: 1, character: 13}
-  marks:
-    default.r:
-      start: {line: 0, character: 8}
-      end: {line: 0, character: 13}
-    default.h:
-      start: {line: 1, character: 1}
-      end: {line: 1, character: 6}
-finalState:
-  documentContents: |-
-    ( hello world )
-    (hello world)
-  selections:
-    - anchor: {line: 0, character: 2}
-      active: {line: 1, character: 6}
-fullTargets: [{type: range, excludeAnchor: false, excludeActive: false, rangeType: continuous, anchor: {type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: r}, modifiers: [{type: interiorOnly}]}, active: {type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: h}, modifiers: [{type: toRawSelection}]}}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/textual/chuckInsideRound.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/textual/chuckInsideRound.yml
deleted file mode 100644
index c51b67b43e..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/textual/chuckInsideRound.yml
+++ /dev/null
@@ -1,20 +0,0 @@
-languageId: plaintext
-command:
-  version: 1
-  spokenForm: chuck inside round
-  action: remove
-  targets:
-    - type: primitive
-      modifier: {type: surroundingPair, delimiter: parentheses, delimiterInclusion: interiorOnly}
-initialState:
-  documentContents: (hello)
-  selections:
-    - anchor: {line: 0, character: 5}
-      active: {line: 0, character: 5}
-  marks: {}
-finalState:
-  documentContents: ()
-  selections:
-    - anchor: {line: 0, character: 1}
-      active: {line: 0, character: 1}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: outside, modifier: {type: surroundingPair, delimiter: parentheses, delimiterInclusion: excludeDelimiters}}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/textual/chuckPairHarp.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/textual/chuckPairHarp.yml
deleted file mode 100644
index 96f05d1a79..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/textual/chuckPairHarp.yml
+++ /dev/null
@@ -1,26 +0,0 @@
-languageId: plaintext
-command:
-  version: 1
-  spokenForm: chuck pair harp
-  action: remove
-  targets:
-    - type: primitive
-      modifier: {type: surroundingPair, delimiter: any}
-      mark: {type: decoratedSymbol, symbolColor: default, character: h}
-initialState:
-  documentContents: |
-    (hello) (there)
-  selections:
-    - anchor: {line: 0, character: 13}
-      active: {line: 0, character: 13}
-  marks:
-    default.h:
-      start: {line: 0, character: 1}
-      end: {line: 0, character: 6}
-finalState:
-  documentContents: |
-    (there)
-  selections:
-    - anchor: {line: 0, character: 5}
-      active: {line: 0, character: 5}
-fullTargets: [{type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: h}, selectionType: token, position: contents, insideOutsideType: outside, modifier: {type: surroundingPair, delimiter: any}}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/textual/chuckPairRound.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/textual/chuckPairRound.yml
deleted file mode 100644
index fd9885463a..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/textual/chuckPairRound.yml
+++ /dev/null
@@ -1,20 +0,0 @@
-languageId: plaintext
-command:
-  version: 1
-  spokenForm: chuck pair round
-  action: remove
-  targets:
-    - type: primitive
-      modifier: {type: surroundingPair, delimiter: parentheses, delimiterInclusion: excludeInterior}
-initialState:
-  documentContents: (hello)
-  selections:
-    - anchor: {line: 0, character: 5}
-      active: {line: 0, character: 5}
-  marks: {}
-finalState:
-  documentContents: hello
-  selections:
-    - anchor: {line: 0, character: 4}
-      active: {line: 0, character: 4}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: outside, modifier: {type: surroundingPair, delimiter: parentheses, delimiterInclusion: delimitersOnly}}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/textual/chuckRound2.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/textual/chuckRound2.yml
deleted file mode 100644
index e841c7e2ff..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/textual/chuckRound2.yml
+++ /dev/null
@@ -1,20 +0,0 @@
-languageId: plaintext
-command:
-  version: 1
-  spokenForm: chuck round
-  action: remove
-  targets:
-    - type: primitive
-      modifier: {type: surroundingPair, delimiter: parentheses}
-initialState:
-  documentContents: (hello)
-  selections:
-    - anchor: {line: 0, character: 5}
-      active: {line: 0, character: 5}
-  marks: {}
-finalState:
-  documentContents: ""
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: outside, modifier: {type: surroundingPair, delimiter: parentheses, delimiterInclusion: includeDelimiters}}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/textual/clearBoundsBatt2.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/textual/clearBoundsBatt2.yml
deleted file mode 100644
index 36ee31fede..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/textual/clearBoundsBatt2.yml
+++ /dev/null
@@ -1,36 +0,0 @@
-languageId: plaintext
-command:
-  version: 1
-  spokenForm: clear bounds batt
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: surroundingPair, delimiter: any, delimiterInclusion: excludeInterior}
-      mark: {type: decoratedSymbol, symbolColor: default, character: b}
-initialState:
-  documentContents: |-
-    <html>
-        <body>
-            <hr/>
-        </body>
-    </html>
-  selections:
-    - anchor: {line: 4, character: 7}
-      active: {line: 4, character: 7}
-  marks:
-    default.b:
-      start: {line: 3, character: 6}
-      end: {line: 3, character: 10}
-finalState:
-  documentContents: |-
-    <html>
-        <body>
-            <hr/>
-        body
-    </html>
-  selections:
-    - anchor: {line: 3, character: 4}
-      active: {line: 3, character: 4}
-    - anchor: {line: 3, character: 8}
-      active: {line: 3, character: 8}
-fullTargets: [{type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: b}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: surroundingPair, delimiter: any, delimiterInclusion: excludeInterior}}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/textual/clearBoundsDouble.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/textual/clearBoundsDouble.yml
deleted file mode 100644
index 28ce661085..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/textual/clearBoundsDouble.yml
+++ /dev/null
@@ -1,20 +0,0 @@
-languageId: plaintext
-command:
-  version: 1
-  spokenForm: clear bounds double
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: surroundingPair, delimiter: any, delimiterInclusion: excludeInterior}
-      mark: {type: decoratedSymbol, symbolColor: default, character: '"'}
-initialState:
-  documentContents: "\"\""
-  selections:
-    - anchor: {line: 0, character: 1}
-      active: {line: 0, character: 1}
-finalState:
-  documentContents: ""
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-fullTargets: [{type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: '"'}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: surroundingPair, delimiter: null, delimiterInclusion: delimitersOnly}}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/textual/clearBoundsEach2.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/textual/clearBoundsEach2.yml
deleted file mode 100644
index 5e5b1a866e..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/textual/clearBoundsEach2.yml
+++ /dev/null
@@ -1,30 +0,0 @@
-languageId: plaintext
-command:
-  version: 1
-  spokenForm: clear bounds each
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: surroundingPair, delimiter: any, delimiterInclusion: excludeInterior}
-      mark: {type: decoratedSymbol, symbolColor: default, character: e}
-initialState:
-  documentContents: |-
-    <html id="(hello)">
-    </html>
-  selections:
-    - anchor: {line: 1, character: 0}
-      active: {line: 1, character: 0}
-  marks:
-    default.e:
-      start: {line: 0, character: 11}
-      end: {line: 0, character: 16}
-finalState:
-  documentContents: |-
-    <html id="hello">
-    </html>
-  selections:
-    - anchor: {line: 0, character: 10}
-      active: {line: 0, character: 10}
-    - anchor: {line: 0, character: 15}
-      active: {line: 0, character: 15}
-fullTargets: [{type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: e}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: surroundingPair, delimiter: any, delimiterInclusion: excludeInterior}, isImplicit: false}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/textual/clearBoundsOx2.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/textual/clearBoundsOx2.yml
deleted file mode 100644
index 409a779659..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/textual/clearBoundsOx2.yml
+++ /dev/null
@@ -1,36 +0,0 @@
-languageId: plaintext
-command:
-  version: 1
-  spokenForm: clear bounds ox
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: surroundingPair, delimiter: any, delimiterInclusion: excludeInterior}
-      mark: {type: decoratedSymbol, symbolColor: default, character: o}
-initialState:
-  documentContents: |-
-    <html>
-        <body>
-            <hr/>
-        </body>
-    </html>
-  selections:
-    - anchor: {line: 4, character: 7}
-      active: {line: 4, character: 7}
-  marks:
-    default.o:
-      start: {line: 1, character: 5}
-      end: {line: 1, character: 9}
-finalState:
-  documentContents: |-
-    <html>
-        body
-            <hr/>
-        </body>
-    </html>
-  selections:
-    - anchor: {line: 1, character: 4}
-      active: {line: 1, character: 4}
-    - anchor: {line: 1, character: 8}
-      active: {line: 1, character: 8}
-fullTargets: [{type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: o}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: surroundingPair, delimiter: any, delimiterInclusion: excludeInterior}}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/textual/clearBoundsRam2.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/textual/clearBoundsRam2.yml
deleted file mode 100644
index 5424e436a6..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/textual/clearBoundsRam2.yml
+++ /dev/null
@@ -1,36 +0,0 @@
-languageId: plaintext
-command:
-  version: 1
-  spokenForm: clear bounds ram
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: surroundingPair, delimiter: any, delimiterInclusion: excludeInterior}
-      mark: {type: decoratedSymbol, symbolColor: default, character: r}
-initialState:
-  documentContents: |-
-    <html>
-        <body>
-            <hr/>
-        </body>
-    </html>
-  selections:
-    - anchor: {line: 4, character: 7}
-      active: {line: 4, character: 7}
-  marks:
-    default.r:
-      start: {line: 2, character: 9}
-      end: {line: 2, character: 11}
-finalState:
-  documentContents: |-
-    <html>
-        <body>
-            hr
-        </body>
-    </html>
-  selections:
-    - anchor: {line: 2, character: 8}
-      active: {line: 2, character: 8}
-    - anchor: {line: 2, character: 10}
-      active: {line: 2, character: 10}
-fullTargets: [{type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: r}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: surroundingPair, delimiter: any, delimiterInclusion: excludeInterior}}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/textual/clearBoundsRound.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/textual/clearBoundsRound.yml
deleted file mode 100644
index 28bde0ede5..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/textual/clearBoundsRound.yml
+++ /dev/null
@@ -1,19 +0,0 @@
-languageId: plaintext
-command:
-  version: 1
-  spokenForm: clear bounds round
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: surroundingPair, delimiter: parentheses, delimiterInclusion: excludeInterior}
-initialState:
-  documentContents: ()
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-finalState:
-  documentContents: ""
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: surroundingPair, delimiter: parentheses, delimiterInclusion: delimitersOnly}}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/textual/clearBoundsRound2.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/textual/clearBoundsRound2.yml
deleted file mode 100644
index 8bbc5447c1..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/textual/clearBoundsRound2.yml
+++ /dev/null
@@ -1,21 +0,0 @@
-languageId: plaintext
-command:
-  version: 1
-  spokenForm: clear bounds round
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: surroundingPair, delimiter: parentheses, delimiterInclusion: excludeInterior}
-initialState:
-  documentContents: (hello)
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-finalState:
-  documentContents: hello
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-    - anchor: {line: 0, character: 5}
-      active: {line: 0, character: 5}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: surroundingPair, delimiter: parentheses, delimiterInclusion: delimitersOnly}}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/textual/clearCurly2.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/textual/clearCurly2.yml
deleted file mode 100644
index 9ec4cca7a6..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/textual/clearCurly2.yml
+++ /dev/null
@@ -1,23 +0,0 @@
-languageId: plaintext
-command:
-  version: 1
-  spokenForm: clear curly
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: surroundingPair, delimiter: curlyBrackets}
-initialState:
-  documentContents: |-
-    {
-        hello
-    }
-  selections:
-    - anchor: {line: 1, character: 7}
-      active: {line: 1, character: 7}
-  marks: {}
-finalState:
-  documentContents: ""
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: surroundingPair, delimiter: curlyBrackets, delimiterInclusion: includeDelimiters}}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/textual/clearEscapedSquare.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/textual/clearEscapedSquare.yml
deleted file mode 100644
index 36e8a982aa..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/textual/clearEscapedSquare.yml
+++ /dev/null
@@ -1,20 +0,0 @@
-languageId: markdown
-command:
-  version: 1
-  spokenForm: clear escaped square
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: surroundingPair, delimiter: escapedSquareBrackets}
-initialState:
-  documentContents: \[foo\]
-  selections:
-    - anchor: {line: 0, character: 4}
-      active: {line: 0, character: 4}
-  marks: {}
-finalState:
-  documentContents: ""
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: surroundingPair, delimiter: escapedSquareBrackets}, isImplicit: false}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/textual/clearOutsideGreenDouble.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/textual/clearOutsideGreenDouble.yml
deleted file mode 100644
index 7d1d1d72e4..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/textual/clearOutsideGreenDouble.yml
+++ /dev/null
@@ -1,24 +0,0 @@
-languageId: plaintext
-command:
-  version: 1
-  spokenForm: clear outside blue double
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: surroundingPair, delimiter: any}
-      mark: {type: decoratedSymbol, symbolColor: blue, character: '"'}
-initialState:
-  documentContents: "\"\""
-  selections:
-    - anchor: {line: 0, character: 1}
-      active: {line: 0, character: 1}
-  marks:
-    blue.":
-      start: {line: 0, character: 0}
-      end: {line: 0, character: 1}
-finalState:
-  documentContents: ""
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-fullTargets: [{type: primitive, mark: {type: decoratedSymbol, symbolColor: green, character: '"', usePrePhraseSnapshot: true}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: surroundingPair, delimiter: null, delimiterInclusion: includeDelimiters}}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/textual/clearPair.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/textual/clearPair.yml
deleted file mode 100644
index b59382f31a..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/textual/clearPair.yml
+++ /dev/null
@@ -1,20 +0,0 @@
-languageId: plaintext
-command:
-  version: 1
-  spokenForm: clear pair
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: surroundingPair, delimiter: any}
-initialState:
-  documentContents: ("hello",  "world")
-  selections:
-    - anchor: {line: 0, character: 10}
-      active: {line: 0, character: 10}
-  marks: {}
-finalState:
-  documentContents: ""
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: surroundingPair, delimiter: any}}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/textual/clearPair10.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/textual/clearPair10.yml
deleted file mode 100644
index f15335a595..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/textual/clearPair10.yml
+++ /dev/null
@@ -1,20 +0,0 @@
-languageId: plaintext
-command:
-  version: 1
-  spokenForm: clear pair
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: surroundingPair, delimiter: any}
-initialState:
-  documentContents: ("hello",  "world")
-  selections:
-    - anchor: {line: 0, character: 17}
-      active: {line: 0, character: 17}
-  marks: {}
-finalState:
-  documentContents: ("hello",  )
-  selections:
-    - anchor: {line: 0, character: 11}
-      active: {line: 0, character: 11}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: surroundingPair, delimiter: any}}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/textual/clearPair11.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/textual/clearPair11.yml
deleted file mode 100644
index 3b5f6ef5b1..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/textual/clearPair11.yml
+++ /dev/null
@@ -1,20 +0,0 @@
-languageId: plaintext
-command:
-  version: 1
-  spokenForm: clear pair
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: surroundingPair, delimiter: any}
-initialState:
-  documentContents: ("hello",  "world")
-  selections:
-    - anchor: {line: 0, character: 18}
-      active: {line: 0, character: 18}
-  marks: {}
-finalState:
-  documentContents: ""
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: surroundingPair, delimiter: any}}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/textual/clearPair12.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/textual/clearPair12.yml
deleted file mode 100644
index 8d2379664a..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/textual/clearPair12.yml
+++ /dev/null
@@ -1,20 +0,0 @@
-languageId: plaintext
-command:
-  version: 1
-  spokenForm: clear pair
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: surroundingPair, delimiter: any}
-initialState:
-  documentContents: ("hello",  "world")
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-  marks: {}
-finalState:
-  documentContents: ""
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: surroundingPair, delimiter: any}}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/textual/clearPair13.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/textual/clearPair13.yml
deleted file mode 100644
index 250d7d14e5..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/textual/clearPair13.yml
+++ /dev/null
@@ -1,20 +0,0 @@
-languageId: plaintext
-command:
-  version: 1
-  spokenForm: clear pair
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: surroundingPair, delimiter: any}
-initialState:
-  documentContents: ('"hello",  "world"')
-  selections:
-    - anchor: {line: 0, character: 11}
-      active: {line: 0, character: 11}
-  marks: {}
-finalState:
-  documentContents: ()
-  selections:
-    - anchor: {line: 0, character: 1}
-      active: {line: 0, character: 1}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: surroundingPair, delimiter: any}}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/textual/clearPair14.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/textual/clearPair14.yml
deleted file mode 100644
index e377dd8cff..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/textual/clearPair14.yml
+++ /dev/null
@@ -1,23 +0,0 @@
-languageId: plaintext
-command:
-  version: 1
-  spokenForm: clear pair
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: surroundingPair, delimiter: any}
-initialState:
-  documentContents: |-
-    "
-    ("hello",  "world")
-  selections:
-    - anchor: {line: 1, character: 10}
-      active: {line: 1, character: 10}
-  marks: {}
-finalState:
-  documentContents: |
-    "
-  selections:
-    - anchor: {line: 1, character: 0}
-      active: {line: 1, character: 0}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: surroundingPair, delimiter: any}}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/textual/clearPair15.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/textual/clearPair15.yml
deleted file mode 100644
index 1e3a97d0fc..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/textual/clearPair15.yml
+++ /dev/null
@@ -1,20 +0,0 @@
-languageId: markdown
-command:
-  version: 1
-  spokenForm: clear pair
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: surroundingPair, delimiter: any}
-initialState:
-  documentContents: \[foo\]
-  selections:
-    - anchor: {line: 0, character: 4}
-      active: {line: 0, character: 4}
-  marks: {}
-finalState:
-  documentContents: ""
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: surroundingPair, delimiter: any}, isImplicit: false}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/textual/clearPair16.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/textual/clearPair16.yml
deleted file mode 100644
index cbbca6430e..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/textual/clearPair16.yml
+++ /dev/null
@@ -1,20 +0,0 @@
-languageId: markdown
-command:
-  version: 1
-  spokenForm: clear pair
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: surroundingPair, delimiter: any}
-initialState:
-  documentContents: "[\\[foo\\]]"
-  selections:
-    - anchor: {line: 0, character: 5}
-      active: {line: 0, character: 5}
-  marks: {}
-finalState:
-  documentContents: "[]"
-  selections:
-    - anchor: {line: 0, character: 1}
-      active: {line: 0, character: 1}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: surroundingPair, delimiter: any}, isImplicit: false}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/textual/clearPair2.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/textual/clearPair2.yml
deleted file mode 100644
index 052066d5fd..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/textual/clearPair2.yml
+++ /dev/null
@@ -1,20 +0,0 @@
-languageId: plaintext
-command:
-  version: 1
-  spokenForm: clear pair
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: surroundingPair, delimiter: any}
-initialState:
-  documentContents: ("hello",  "world")
-  selections:
-    - anchor: {line: 0, character: 1}
-      active: {line: 0, character: 1}
-  marks: {}
-finalState:
-  documentContents: (,  "world")
-  selections:
-    - anchor: {line: 0, character: 1}
-      active: {line: 0, character: 1}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: surroundingPair, delimiter: any}}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/textual/clearPair3.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/textual/clearPair3.yml
deleted file mode 100644
index 51efe03af2..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/textual/clearPair3.yml
+++ /dev/null
@@ -1,20 +0,0 @@
-languageId: plaintext
-command:
-  version: 1
-  spokenForm: clear pair
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: surroundingPair, delimiter: any}
-initialState:
-  documentContents: ("hello",  "world")
-  selections:
-    - anchor: {line: 0, character: 2}
-      active: {line: 0, character: 2}
-  marks: {}
-finalState:
-  documentContents: (,  "world")
-  selections:
-    - anchor: {line: 0, character: 1}
-      active: {line: 0, character: 1}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: surroundingPair, delimiter: any}}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/textual/clearPair4.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/textual/clearPair4.yml
deleted file mode 100644
index 85c5a04134..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/textual/clearPair4.yml
+++ /dev/null
@@ -1,20 +0,0 @@
-languageId: plaintext
-command:
-  version: 1
-  spokenForm: clear pair
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: surroundingPair, delimiter: any}
-initialState:
-  documentContents: ("hello",  "world")
-  selections:
-    - anchor: {line: 0, character: 3}
-      active: {line: 0, character: 3}
-  marks: {}
-finalState:
-  documentContents: (,  "world")
-  selections:
-    - anchor: {line: 0, character: 1}
-      active: {line: 0, character: 1}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: surroundingPair, delimiter: any}}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/textual/clearPair5.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/textual/clearPair5.yml
deleted file mode 100644
index 7c9822916e..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/textual/clearPair5.yml
+++ /dev/null
@@ -1,20 +0,0 @@
-languageId: plaintext
-command:
-  version: 1
-  spokenForm: clear pair
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: surroundingPair, delimiter: any}
-initialState:
-  documentContents: ("hello",  "world")
-  selections:
-    - anchor: {line: 0, character: 7}
-      active: {line: 0, character: 7}
-  marks: {}
-finalState:
-  documentContents: (,  "world")
-  selections:
-    - anchor: {line: 0, character: 1}
-      active: {line: 0, character: 1}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: surroundingPair, delimiter: any}}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/textual/clearPair6.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/textual/clearPair6.yml
deleted file mode 100644
index 1f8103dba0..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/textual/clearPair6.yml
+++ /dev/null
@@ -1,20 +0,0 @@
-languageId: plaintext
-command:
-  version: 1
-  spokenForm: clear pair
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: surroundingPair, delimiter: any}
-initialState:
-  documentContents: ("hello",  "world")
-  selections:
-    - anchor: {line: 0, character: 8}
-      active: {line: 0, character: 8}
-  marks: {}
-finalState:
-  documentContents: (,  "world")
-  selections:
-    - anchor: {line: 0, character: 1}
-      active: {line: 0, character: 1}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: surroundingPair, delimiter: any}}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/textual/clearPair7.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/textual/clearPair7.yml
deleted file mode 100644
index f85ecd2aee..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/textual/clearPair7.yml
+++ /dev/null
@@ -1,20 +0,0 @@
-languageId: plaintext
-command:
-  version: 1
-  spokenForm: clear pair
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: surroundingPair, delimiter: any}
-initialState:
-  documentContents: ("hello",  "world")
-  selections:
-    - anchor: {line: 0, character: 11}
-      active: {line: 0, character: 11}
-  marks: {}
-finalState:
-  documentContents: ("hello",  )
-  selections:
-    - anchor: {line: 0, character: 11}
-      active: {line: 0, character: 11}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: surroundingPair, delimiter: any}}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/textual/clearPair8.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/textual/clearPair8.yml
deleted file mode 100644
index 9951c0f772..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/textual/clearPair8.yml
+++ /dev/null
@@ -1,20 +0,0 @@
-languageId: plaintext
-command:
-  version: 1
-  spokenForm: clear pair
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: surroundingPair, delimiter: any}
-initialState:
-  documentContents: ("hello",  "world")
-  selections:
-    - anchor: {line: 0, character: 12}
-      active: {line: 0, character: 12}
-  marks: {}
-finalState:
-  documentContents: ("hello",  )
-  selections:
-    - anchor: {line: 0, character: 11}
-      active: {line: 0, character: 11}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: surroundingPair, delimiter: any}}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/textual/clearPair9.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/textual/clearPair9.yml
deleted file mode 100644
index 827c614a6d..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/textual/clearPair9.yml
+++ /dev/null
@@ -1,20 +0,0 @@
-languageId: plaintext
-command:
-  version: 1
-  spokenForm: clear pair
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: surroundingPair, delimiter: any}
-initialState:
-  documentContents: ("hello",  "world")
-  selections:
-    - anchor: {line: 0, character: 13}
-      active: {line: 0, character: 13}
-  marks: {}
-finalState:
-  documentContents: ("hello",  )
-  selections:
-    - anchor: {line: 0, character: 11}
-      active: {line: 0, character: 11}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: surroundingPair, delimiter: any}}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/textual/clearRound.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/textual/clearRound.yml
deleted file mode 100644
index 73d2664fb0..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/textual/clearRound.yml
+++ /dev/null
@@ -1,318 +0,0 @@
-languageId: plaintext
-command:
-  version: 1
-  spokenForm: clear round
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: surroundingPair, delimiter: parentheses}
-initialState:
-  documentContents: |-
-    (
-        a
-        a
-        a
-        a
-        a
-        a
-        a
-        a
-        a
-        a
-        a
-        a
-        a
-        a
-        a
-        a
-        a
-        a
-        a
-        a
-        a
-        a
-        a
-        a
-        a
-        a
-        a
-        a
-        a
-        a
-        a
-        a
-        a
-        a
-        a
-        a
-        a
-        a
-        a
-        a
-        a
-        a
-        a
-        a
-        a
-        a
-        a
-        a
-        a
-        a
-        a
-        a
-        a
-        a
-        a
-        a
-        a
-        a
-        a
-        a
-        a
-        a
-        a
-        a
-        a
-        a
-        a
-        a
-        a
-        a
-        a
-        a
-        a
-        a
-        a
-        a
-        a
-        a
-        a
-        a
-        a
-        a
-        a
-        a
-        a
-        a
-        a
-        a
-        a
-        a
-        a
-        a
-        a
-        a
-        a
-        a
-        a
-        a
-        a
-        a
-        a
-        a
-        a
-        a
-        a
-        a
-        a
-        a
-        a
-        a
-        a
-        a
-        a
-        a
-        a
-        a
-        a
-        a
-        a
-        a
-        a
-        a
-        a
-        a
-        a
-        a
-        a
-        a
-        a
-        a
-        a
-        a
-        a
-        a
-        a
-        a
-        a
-        a
-        a
-        a
-        a
-        a
-        a
-        a
-        a
-        a
-        a
-        a
-        a
-        a
-        a
-        a
-        a
-        a
-        a
-        a
-        a
-        a
-        a
-        a
-        a
-        a
-        a
-        a
-        a
-        a
-        a
-        a
-        a
-        a
-        a
-        a
-        a
-        a
-        a
-        a
-        a
-        a
-        a
-        a
-        a
-        a
-        a
-        a
-        a
-        a
-        a
-        a
-        a
-        a
-        a
-        a
-        a
-        a
-        a
-        a
-        a
-        a
-        a
-        a
-        a
-        a
-        a
-        a
-        a
-        a
-        a
-        a
-        a
-        a
-        a
-        a
-        a
-        a
-        a
-        a
-        a
-        a
-        a
-        a
-        a
-        a
-        a
-        a
-        a
-        a
-        a
-        a
-        a
-        a
-        a
-        a
-        a
-        a
-        a
-        a
-        a
-        a
-        a
-        a
-        a
-        a
-        a
-        a
-        a
-        a
-        a
-        a
-        a
-        a
-        a
-        a
-        a
-        a
-        a
-        a
-        a
-        a
-        a
-        a
-        a
-        a
-        a
-        a
-        a
-        a
-        a
-        a
-        a
-        a
-        a
-        a
-        a
-        a
-        a
-        a
-        a
-        a
-        a
-        a
-        a
-        a
-        a
-        a
-        a
-        a
-        a
-        a
-        a
-        a
-        a
-        a
-        a
-        a
-        a
-        a
-    )
-  selections:
-    - anchor: {line: 266, character: 5}
-      active: {line: 266, character: 5}
-  marks: {}
-finalState:
-  documentContents: ""
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: surroundingPair, delimiter: parentheses, delimiterInclusion: includeDelimiters}}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/textual/clearRound9.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/textual/clearRound9.yml
deleted file mode 100644
index 2ea6f2362a..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/textual/clearRound9.yml
+++ /dev/null
@@ -1,27 +0,0 @@
-languageId: plaintext
-command:
-  version: 1
-  spokenForm: clear round
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: surroundingPair, delimiter: parentheses}
-initialState:
-  documentContents: |-
-    (hello)
-    (hello)
-  selections:
-    - anchor: {line: 0, character: 4}
-      active: {line: 0, character: 4}
-    - anchor: {line: 1, character: 4}
-      active: {line: 1, character: 4}
-  marks: {}
-finalState:
-  documentContents: |+
-
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-    - anchor: {line: 1, character: 0}
-      active: {line: 1, character: 0}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: surroundingPair, delimiter: parentheses, delimiterInclusion: includeDelimiters}}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/textual/clearSquare.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/textual/clearSquare.yml
deleted file mode 100644
index 6ec358fa10..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/textual/clearSquare.yml
+++ /dev/null
@@ -1,20 +0,0 @@
-languageId: markdown
-command:
-  version: 1
-  spokenForm: clear square
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: surroundingPair, delimiter: squareBrackets}
-initialState:
-  documentContents: "[\\[foo\\]]"
-  selections:
-    - anchor: {line: 0, character: 5}
-      active: {line: 0, character: 5}
-  marks: {}
-finalState:
-  documentContents: ""
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: surroundingPair, delimiter: squareBrackets}, isImplicit: false}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/textual/clearString4.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/textual/clearString4.yml
deleted file mode 100644
index e820226f26..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/textual/clearString4.yml
+++ /dev/null
@@ -1,20 +0,0 @@
-languageId: plaintext
-command:
-  version: 1
-  spokenForm: clear string
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: surroundingPair, delimiter: string}
-initialState:
-  documentContents: "\"(hello)\""
-  selections:
-    - anchor: {line: 0, character: 5}
-      active: {line: 0, character: 5}
-  marks: {}
-finalState:
-  documentContents: ""
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: surroundingPair, delimiter: string, delimiterInclusion: includeDelimiters}}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/textual/tailTakeEscapedQuad.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/textual/tailTakeEscapedQuad.yml
deleted file mode 100644
index ef0032f0a7..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/textual/tailTakeEscapedQuad.yml
+++ /dev/null
@@ -1,19 +0,0 @@
-languageId: plaintext
-command:
-  version: 1
-  spokenForm: clear escaped quad
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: surroundingPair, delimiter: escapedDoubleQuotes}
-initialState:
-  documentContents: \"\"
-  selections:
-    - anchor: {line: 0, character: 4}
-      active: {line: 0, character: 4}
-finalState:
-  documentContents: ""
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: surroundingPair, delimiter: escapedDoubleQuotes, delimiterInclusion: includeDelimiters}}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/textual/takeEscapedQuad.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/textual/takeEscapedQuad.yml
deleted file mode 100644
index c789746254..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/textual/takeEscapedQuad.yml
+++ /dev/null
@@ -1,19 +0,0 @@
-languageId: plaintext
-command:
-  version: 1
-  spokenForm: clear escaped quad
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: surroundingPair, delimiter: escapedDoubleQuotes}
-initialState:
-  documentContents: \"\"
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-finalState:
-  documentContents: ""
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: surroundingPair, delimiter: escapedDoubleQuotes, delimiterInclusion: includeDelimiters}}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/textual/takeEscapedQuad2.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/textual/takeEscapedQuad2.yml
deleted file mode 100644
index 06bc230468..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/textual/takeEscapedQuad2.yml
+++ /dev/null
@@ -1,19 +0,0 @@
-languageId: plaintext
-command:
-  version: 1
-  spokenForm: clear escaped quad
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: surroundingPair, delimiter: escapedDoubleQuotes}
-initialState:
-  documentContents: \"\"
-  selections:
-    - anchor: {line: 0, character: 1}
-      active: {line: 0, character: 1}
-finalState:
-  documentContents: ""
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: surroundingPair, delimiter: escapedDoubleQuotes, delimiterInclusion: includeDelimiters}}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/textual/takeEscapedQuad3.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/textual/takeEscapedQuad3.yml
deleted file mode 100644
index 3892dc6248..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/textual/takeEscapedQuad3.yml
+++ /dev/null
@@ -1,19 +0,0 @@
-languageId: plaintext
-command:
-  version: 1
-  spokenForm: clear escaped quad
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: surroundingPair, delimiter: escapedDoubleQuotes}
-initialState:
-  documentContents: \"\"
-  selections:
-    - anchor: {line: 0, character: 2}
-      active: {line: 0, character: 2}
-finalState:
-  documentContents: ""
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: surroundingPair, delimiter: escapedDoubleQuotes, delimiterInclusion: includeDelimiters}}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/textual/takeEscapedQuad4.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/textual/takeEscapedQuad4.yml
deleted file mode 100644
index 86608593ca..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/textual/takeEscapedQuad4.yml
+++ /dev/null
@@ -1,19 +0,0 @@
-languageId: plaintext
-command:
-  version: 1
-  spokenForm: clear escaped quad
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: surroundingPair, delimiter: escapedDoubleQuotes}
-initialState:
-  documentContents: \"\"
-  selections:
-    - anchor: {line: 0, character: 3}
-      active: {line: 0, character: 3}
-finalState:
-  documentContents: ""
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: surroundingPair, delimiter: escapedDoubleQuotes, delimiterInclusion: includeDelimiters}}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/textual/takeEscapedQuad5.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/textual/takeEscapedQuad5.yml
deleted file mode 100644
index ef810b1a62..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/textual/takeEscapedQuad5.yml
+++ /dev/null
@@ -1,19 +0,0 @@
-languageId: plaintext
-command:
-  version: 1
-  spokenForm: clear escaped quad
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: surroundingPair, delimiter: escapedDoubleQuotes}
-initialState:
-  documentContents: \"hello\"
-  selections:
-    - anchor: {line: 0, character: 7}
-      active: {line: 0, character: 7}
-finalState:
-  documentContents: ""
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: surroundingPair, delimiter: escapedDoubleQuotes, delimiterInclusion: includeDelimiters}}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/textual/takeInsideRound.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/textual/takeInsideRound.yml
deleted file mode 100644
index 9e79b45cde..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/textual/takeInsideRound.yml
+++ /dev/null
@@ -1,19 +0,0 @@
-languageId: plaintext
-command:
-  version: 1
-  spokenForm: clear inside round
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: surroundingPair, delimiter: parentheses, delimiterInclusion: interiorOnly}
-initialState:
-  documentContents: ()
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-finalState:
-  documentContents: ()
-  selections:
-    - anchor: {line: 0, character: 1}
-      active: {line: 0, character: 1}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: surroundingPair, delimiter: parentheses, delimiterInclusion: excludeDelimiters}}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/textual/takeInsideRound2.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/textual/takeInsideRound2.yml
deleted file mode 100644
index f8164951c9..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/textual/takeInsideRound2.yml
+++ /dev/null
@@ -1,19 +0,0 @@
-languageId: plaintext
-command:
-  version: 1
-  spokenForm: clear inside round
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: surroundingPair, delimiter: parentheses, delimiterInclusion: interiorOnly}
-initialState:
-  documentContents: (hello)
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-finalState:
-  documentContents: ()
-  selections:
-    - anchor: {line: 0, character: 1}
-      active: {line: 0, character: 1}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: surroundingPair, delimiter: parentheses, delimiterInclusion: excludeDelimiters}}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/textual/takeLeftQuad.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/textual/takeLeftQuad.yml
deleted file mode 100644
index 8571738f8a..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/textual/takeLeftQuad.yml
+++ /dev/null
@@ -1,24 +0,0 @@
-languageId: plaintext
-command:
-  version: 1
-  spokenForm: take left quad
-  action: setSelection
-  targets:
-    - type: primitive
-      modifier: {type: surroundingPair, delimiter: doubleQuotes, forceDirection: left}
-initialState:
-  documentContents: |-
-    hello world whatever "testing testing testing
-    this is another" test "whatever" whatever
-  selections:
-    - anchor: {line: 0, character: 26}
-      active: {line: 0, character: 26}
-  marks: {}
-finalState:
-  documentContents: |-
-    hello world whatever "testing testing testing
-    this is another" test "whatever" whatever
-  selections:
-    - anchor: {line: 0, character: 21}
-      active: {line: 1, character: 16}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: surroundingPair, delimiter: doubleQuotes, forceDirection: left}}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/textual/takeLeftQuad2.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/textual/takeLeftQuad2.yml
deleted file mode 100644
index ec6a75c577..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/textual/takeLeftQuad2.yml
+++ /dev/null
@@ -1,24 +0,0 @@
-languageId: plaintext
-command:
-  version: 1
-  spokenForm: take left quad
-  action: setSelection
-  targets:
-    - type: primitive
-      modifier: {type: surroundingPair, delimiter: doubleQuotes, forceDirection: left}
-initialState:
-  documentContents: |-
-    hello world whatever "testing testing testing
-    this is another" test "whatever" whatever
-  selections:
-    - anchor: {line: 1, character: 15}
-      active: {line: 1, character: 15}
-  marks: {}
-finalState:
-  documentContents: |-
-    hello world whatever "testing testing testing
-    this is another" test "whatever" whatever
-  selections:
-    - anchor: {line: 0, character: 21}
-      active: {line: 1, character: 16}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: surroundingPair, delimiter: doubleQuotes, forceDirection: left}}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/textual/takeLeftQuad3.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/textual/takeLeftQuad3.yml
deleted file mode 100644
index 28f0481cff..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/textual/takeLeftQuad3.yml
+++ /dev/null
@@ -1,24 +0,0 @@
-languageId: plaintext
-command:
-  version: 1
-  spokenForm: take left quad
-  action: setSelection
-  targets:
-    - type: primitive
-      modifier: {type: surroundingPair, delimiter: doubleQuotes, forceDirection: left}
-initialState:
-  documentContents: |-
-    hello world whatever "testing testing testing
-    this is another" test "whatever" whatever
-  selections:
-    - anchor: {line: 1, character: 16}
-      active: {line: 1, character: 16}
-  marks: {}
-finalState:
-  documentContents: |-
-    hello world whatever "testing testing testing
-    this is another" test "whatever" whatever
-  selections:
-    - anchor: {line: 0, character: 21}
-      active: {line: 1, character: 16}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: surroundingPair, delimiter: doubleQuotes, forceDirection: left}}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/textual/takeLeftQuad4.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/textual/takeLeftQuad4.yml
deleted file mode 100644
index b75af6ea9f..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/textual/takeLeftQuad4.yml
+++ /dev/null
@@ -1,24 +0,0 @@
-languageId: plaintext
-command:
-  version: 1
-  spokenForm: take left quad
-  action: setSelection
-  targets:
-    - type: primitive
-      modifier: {type: surroundingPair, delimiter: doubleQuotes, forceDirection: left}
-initialState:
-  documentContents: |-
-    hello world whatever "testing testing testing
-    this is another" test "whatever" whatever
-  selections:
-    - anchor: {line: 1, character: 12}
-      active: {line: 1, character: 12}
-  marks: {}
-finalState:
-  documentContents: |-
-    hello world whatever "testing testing testing
-    this is another" test "whatever" whatever
-  selections:
-    - anchor: {line: 0, character: 21}
-      active: {line: 1, character: 16}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: surroundingPair, delimiter: doubleQuotes, forceDirection: left}}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/textual/takeLeftQuad5.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/textual/takeLeftQuad5.yml
deleted file mode 100644
index 99fa17c0c7..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/textual/takeLeftQuad5.yml
+++ /dev/null
@@ -1,24 +0,0 @@
-languageId: plaintext
-command:
-  version: 1
-  spokenForm: take left quad
-  action: setSelection
-  targets:
-    - type: primitive
-      modifier: {type: surroundingPair, delimiter: doubleQuotes, forceDirection: left}
-initialState:
-  documentContents: |-
-    hello world whatever "testing testing testing
-    this is another" test "whatever" whatever
-  selections:
-    - anchor: {line: 1, character: 26}
-      active: {line: 1, character: 26}
-  marks: {}
-finalState:
-  documentContents: |-
-    hello world whatever "testing testing testing
-    this is another" test "whatever" whatever
-  selections:
-    - anchor: {line: 1, character: 22}
-      active: {line: 1, character: 32}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: surroundingPair, delimiter: doubleQuotes, forceDirection: left}}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/textual/takeLeftQuad6.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/textual/takeLeftQuad6.yml
deleted file mode 100644
index 759218df7a..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/textual/takeLeftQuad6.yml
+++ /dev/null
@@ -1,24 +0,0 @@
-languageId: plaintext
-command:
-  version: 1
-  spokenForm: take left quad
-  action: setSelection
-  targets:
-    - type: primitive
-      modifier: {type: surroundingPair, delimiter: doubleQuotes, forceDirection: left}
-initialState:
-  documentContents: |-
-    hello world whatever "testing testing testing
-    this is another" test "whatever" whatever
-  selections:
-    - anchor: {line: 1, character: 31}
-      active: {line: 1, character: 31}
-  marks: {}
-finalState:
-  documentContents: |-
-    hello world whatever "testing testing testing
-    this is another" test "whatever" whatever
-  selections:
-    - anchor: {line: 1, character: 22}
-      active: {line: 1, character: 32}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: surroundingPair, delimiter: doubleQuotes, forceDirection: left}}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/textual/takeLeftQuad7.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/textual/takeLeftQuad7.yml
deleted file mode 100644
index 41f360b22f..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/textual/takeLeftQuad7.yml
+++ /dev/null
@@ -1,24 +0,0 @@
-languageId: plaintext
-command:
-  version: 1
-  spokenForm: take left quad
-  action: setSelection
-  targets:
-    - type: primitive
-      modifier: {type: surroundingPair, delimiter: doubleQuotes, forceDirection: left}
-initialState:
-  documentContents: |-
-    hello world whatever "testing testing testing
-    this is another" test "whatever" whatever
-  selections:
-    - anchor: {line: 1, character: 32}
-      active: {line: 1, character: 32}
-  marks: {}
-finalState:
-  documentContents: |-
-    hello world whatever "testing testing testing
-    this is another" test "whatever" whatever
-  selections:
-    - anchor: {line: 1, character: 22}
-      active: {line: 1, character: 32}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: surroundingPair, delimiter: doubleQuotes, forceDirection: left}}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/textual/takeOutside.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/textual/takeOutside.yml
deleted file mode 100644
index 4e75efeeb3..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/textual/takeOutside.yml
+++ /dev/null
@@ -1,19 +0,0 @@
-languageId: plaintext
-command:
-  version: 1
-  spokenForm: clear outside
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: surroundingPair, delimiter: any}
-initialState:
-  documentContents: ()
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-finalState:
-  documentContents: ""
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: surroundingPair, delimiter: null, delimiterInclusion: includeDelimiters}}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/textual/takeOutside10.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/textual/takeOutside10.yml
deleted file mode 100644
index bc92c36413..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/textual/takeOutside10.yml
+++ /dev/null
@@ -1,19 +0,0 @@
-languageId: plaintext
-command:
-  version: 1
-  spokenForm: clear outside
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: surroundingPair, delimiter: any}
-initialState:
-  documentContents: (\(hello\))
-  selections:
-    - anchor: {line: 0, character: 6}
-      active: {line: 0, character: 6}
-finalState:
-  documentContents: ()
-  selections:
-    - anchor: {line: 0, character: 1}
-      active: {line: 0, character: 1}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: surroundingPair, delimiter: null, delimiterInclusion: includeDelimiters}}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/textual/takeOutside11.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/textual/takeOutside11.yml
deleted file mode 100644
index 06f09e875b..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/textual/takeOutside11.yml
+++ /dev/null
@@ -1,20 +0,0 @@
-languageId: plaintext
-command:
-  version: 1
-  spokenForm: clear outside
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: surroundingPair, delimiter: any}
-initialState:
-  documentContents: (  [  )  ]
-  selections:
-    - anchor: {line: 0, character: 1}
-      active: {line: 0, character: 1}
-  marks: {}
-finalState:
-  documentContents: "  ]"
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: surroundingPair, delimiter: null, delimiterInclusion: includeDelimiters}}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/textual/takeOutside12.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/textual/takeOutside12.yml
deleted file mode 100644
index 6032e34b14..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/textual/takeOutside12.yml
+++ /dev/null
@@ -1,20 +0,0 @@
-languageId: plaintext
-command:
-  version: 1
-  spokenForm: clear outside
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: surroundingPair, delimiter: any}
-initialState:
-  documentContents: (  [  )  ]
-  selections:
-    - anchor: {line: 0, character: 2}
-      active: {line: 0, character: 2}
-  marks: {}
-finalState:
-  documentContents: "  ]"
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: surroundingPair, delimiter: null, delimiterInclusion: includeDelimiters}}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/textual/takeOutside13.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/textual/takeOutside13.yml
deleted file mode 100644
index 8d99819192..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/textual/takeOutside13.yml
+++ /dev/null
@@ -1,20 +0,0 @@
-languageId: plaintext
-command:
-  version: 1
-  spokenForm: clear outside
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: surroundingPair, delimiter: any}
-initialState:
-  documentContents: (  [  )  ]
-  selections:
-    - anchor: {line: 0, character: 3}
-      active: {line: 0, character: 3}
-  marks: {}
-finalState:
-  documentContents: "(  "
-  selections:
-    - anchor: {line: 0, character: 3}
-      active: {line: 0, character: 3}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: surroundingPair, delimiter: null, delimiterInclusion: includeDelimiters}}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/textual/takeOutside14.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/textual/takeOutside14.yml
deleted file mode 100644
index a4e759e5a7..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/textual/takeOutside14.yml
+++ /dev/null
@@ -1,20 +0,0 @@
-languageId: plaintext
-command:
-  version: 1
-  spokenForm: clear outside
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: surroundingPair, delimiter: any}
-initialState:
-  documentContents: (  [  )  ]
-  selections:
-    - anchor: {line: 0, character: 5}
-      active: {line: 0, character: 5}
-  marks: {}
-finalState:
-  documentContents: "  ]"
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: surroundingPair, delimiter: null, delimiterInclusion: includeDelimiters}}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/textual/takeOutside15.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/textual/takeOutside15.yml
deleted file mode 100644
index b66ae8ed5d..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/textual/takeOutside15.yml
+++ /dev/null
@@ -1,20 +0,0 @@
-languageId: plaintext
-command:
-  version: 1
-  spokenForm: clear outside
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: surroundingPair, delimiter: any}
-initialState:
-  documentContents: (  [  )  ]
-  selections:
-    - anchor: {line: 0, character: 7}
-      active: {line: 0, character: 7}
-  marks: {}
-finalState:
-  documentContents: "  ]"
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: surroundingPair, delimiter: null, delimiterInclusion: includeDelimiters}}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/textual/takeOutside16.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/textual/takeOutside16.yml
deleted file mode 100644
index ffc7bcbfa0..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/textual/takeOutside16.yml
+++ /dev/null
@@ -1,20 +0,0 @@
-languageId: plaintext
-command:
-  version: 1
-  spokenForm: clear outside
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: surroundingPair, delimiter: any}
-initialState:
-  documentContents: (  [  )  ]
-  selections:
-    - anchor: {line: 0, character: 8}
-      active: {line: 0, character: 8}
-  marks: {}
-finalState:
-  documentContents: "(  "
-  selections:
-    - anchor: {line: 0, character: 3}
-      active: {line: 0, character: 3}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: surroundingPair, delimiter: null, delimiterInclusion: includeDelimiters}}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/textual/takeOutside17.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/textual/takeOutside17.yml
deleted file mode 100644
index 569ff05e9b..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/textual/takeOutside17.yml
+++ /dev/null
@@ -1,20 +0,0 @@
-languageId: plaintext
-command:
-  version: 1
-  spokenForm: clear outside
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: surroundingPair, delimiter: any}
-initialState:
-  documentContents: "[  (  ]  )"
-  selections:
-    - anchor: {line: 0, character: 2}
-      active: {line: 0, character: 2}
-  marks: {}
-finalState:
-  documentContents: "  )"
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: surroundingPair, delimiter: null, delimiterInclusion: includeDelimiters}}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/textual/takeOutside18.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/textual/takeOutside18.yml
deleted file mode 100644
index 0c5ce8b058..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/textual/takeOutside18.yml
+++ /dev/null
@@ -1,20 +0,0 @@
-languageId: plaintext
-command:
-  version: 1
-  spokenForm: clear outside
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: surroundingPair, delimiter: any}
-initialState:
-  documentContents: "{   (  ]  )"
-  selections:
-    - anchor: {line: 0, character: 9}
-      active: {line: 0, character: 9}
-  marks: {}
-finalState:
-  documentContents: "{   "
-  selections:
-    - anchor: {line: 0, character: 4}
-      active: {line: 0, character: 4}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: surroundingPair, delimiter: null, delimiterInclusion: includeDelimiters}}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/textual/takeOutside19.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/textual/takeOutside19.yml
deleted file mode 100644
index ce60242cde..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/textual/takeOutside19.yml
+++ /dev/null
@@ -1,20 +0,0 @@
-languageId: plaintext
-command:
-  version: 1
-  spokenForm: clear outside
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: surroundingPair, delimiter: any}
-initialState:
-  documentContents: "{   (  } ]  )"
-  selections:
-    - anchor: {line: 0, character: 8}
-      active: {line: 0, character: 8}
-  marks: {}
-finalState:
-  documentContents: " ]  )"
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: surroundingPair, delimiter: null, delimiterInclusion: includeDelimiters}}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/textual/takeOutside2.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/textual/takeOutside2.yml
deleted file mode 100644
index e149c8c342..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/textual/takeOutside2.yml
+++ /dev/null
@@ -1,19 +0,0 @@
-languageId: plaintext
-command:
-  version: 1
-  spokenForm: clear outside
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: surroundingPair, delimiter: any}
-initialState:
-  documentContents: ([])
-  selections:
-    - anchor: {line: 0, character: 3}
-      active: {line: 0, character: 3}
-finalState:
-  documentContents: ""
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: surroundingPair, delimiter: null, delimiterInclusion: includeDelimiters}}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/textual/takeOutside20.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/textual/takeOutside20.yml
deleted file mode 100644
index c68137f438..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/textual/takeOutside20.yml
+++ /dev/null
@@ -1,20 +0,0 @@
-languageId: plaintext
-command:
-  version: 1
-  spokenForm: clear outside
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: surroundingPair, delimiter: any}
-initialState:
-  documentContents: "[ {   ( { } ]  )"
-  selections:
-    - anchor: {line: 0, character: 5}
-      active: {line: 0, character: 5}
-  marks: {}
-finalState:
-  documentContents: "  )"
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: surroundingPair, delimiter: null, delimiterInclusion: includeDelimiters}}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/textual/takeOutside21.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/textual/takeOutside21.yml
deleted file mode 100644
index b247be9803..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/textual/takeOutside21.yml
+++ /dev/null
@@ -1,20 +0,0 @@
-languageId: plaintext
-command:
-  version: 1
-  spokenForm: clear outside
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: surroundingPair, delimiter: any}
-initialState:
-  documentContents: "{ [  ( { } ]  )"
-  selections:
-    - anchor: {line: 0, character: 4}
-      active: {line: 0, character: 4}
-  marks: {}
-finalState:
-  documentContents: "{   )"
-  selections:
-    - anchor: {line: 0, character: 2}
-      active: {line: 0, character: 2}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: surroundingPair, delimiter: null, delimiterInclusion: includeDelimiters}}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/textual/takeOutside22.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/textual/takeOutside22.yml
deleted file mode 100644
index 011be3556b..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/textual/takeOutside22.yml
+++ /dev/null
@@ -1,20 +0,0 @@
-languageId: plaintext
-command:
-  version: 1
-  spokenForm: clear outside
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: surroundingPair, delimiter: any}
-initialState:
-  documentContents: "{ [  (  } ]  )"
-  selections:
-    - anchor: {line: 0, character: 7}
-      active: {line: 0, character: 7}
-  marks: {}
-finalState:
-  documentContents: " ]  )"
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: surroundingPair, delimiter: null, delimiterInclusion: includeDelimiters}}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/textual/takeOutside23.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/textual/takeOutside23.yml
deleted file mode 100644
index d588864d28..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/textual/takeOutside23.yml
+++ /dev/null
@@ -1,20 +0,0 @@
-languageId: plaintext
-command:
-  version: 1
-  spokenForm: clear outside
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: surroundingPair, delimiter: any}
-initialState:
-  documentContents: "{[  ( } ]  )"
-  selections:
-    - anchor: {line: 0, character: 3}
-      active: {line: 0, character: 3}
-  marks: {}
-finalState:
-  documentContents: " ]  )"
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: surroundingPair, delimiter: null, delimiterInclusion: includeDelimiters}}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/textual/takeOutside24.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/textual/takeOutside24.yml
deleted file mode 100644
index 4c421463d4..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/textual/takeOutside24.yml
+++ /dev/null
@@ -1,20 +0,0 @@
-languageId: plaintext
-command:
-  version: 1
-  spokenForm: clear outside
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: surroundingPair, delimiter: any}
-initialState:
-  documentContents: ([)]
-  selections:
-    - anchor: {line: 0, character: 2}
-      active: {line: 0, character: 2}
-  marks: {}
-finalState:
-  documentContents: "]"
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: surroundingPair, delimiter: null, delimiterInclusion: includeDelimiters}}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/textual/takeOutside25.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/textual/takeOutside25.yml
deleted file mode 100644
index d2e7b65a29..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/textual/takeOutside25.yml
+++ /dev/null
@@ -1,20 +0,0 @@
-languageId: plaintext
-command:
-  version: 1
-  spokenForm: clear outside
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: surroundingPair, delimiter: any}
-initialState:
-  documentContents: ([)]
-  selections:
-    - anchor: {line: 0, character: 1}
-      active: {line: 0, character: 1}
-  marks: {}
-finalState:
-  documentContents: (
-  selections:
-    - anchor: {line: 0, character: 1}
-      active: {line: 0, character: 1}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: surroundingPair, delimiter: null, delimiterInclusion: includeDelimiters}}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/textual/takeOutside26.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/textual/takeOutside26.yml
deleted file mode 100644
index 50f46cd5b5..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/textual/takeOutside26.yml
+++ /dev/null
@@ -1,20 +0,0 @@
-languageId: plaintext
-command:
-  version: 1
-  spokenForm: clear outside
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: surroundingPair, delimiter: any}
-initialState:
-  documentContents: (<user.foo>  <user.bar>)
-  selections:
-    - anchor: {line: 0, character: 12}
-      active: {line: 0, character: 12}
-  marks: {}
-finalState:
-  documentContents: ""
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: surroundingPair, delimiter: null, delimiterInclusion: includeDelimiters}}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/textual/takeOutside27.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/textual/takeOutside27.yml
deleted file mode 100644
index 87d7e62acc..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/textual/takeOutside27.yml
+++ /dev/null
@@ -1,20 +0,0 @@
-languageId: plaintext
-command:
-  version: 1
-  spokenForm: clear outside
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: surroundingPair, delimiter: any}
-initialState:
-  documentContents: (<user.foo>  <user.bar>)
-  selections:
-    - anchor: {line: 0, character: 7}
-      active: {line: 0, character: 18}
-  marks: {}
-finalState:
-  documentContents: ""
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: surroundingPair, delimiter: null, delimiterInclusion: includeDelimiters}}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/textual/takeOutside3.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/textual/takeOutside3.yml
deleted file mode 100644
index 30e8e40fc5..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/textual/takeOutside3.yml
+++ /dev/null
@@ -1,19 +0,0 @@
-languageId: plaintext
-command:
-  version: 1
-  spokenForm: clear outside
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: surroundingPair, delimiter: any}
-initialState:
-  documentContents: (hello)
-  selections:
-    - anchor: {line: 0, character: 4}
-      active: {line: 0, character: 4}
-finalState:
-  documentContents: ""
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: surroundingPair, delimiter: null, delimiterInclusion: includeDelimiters}}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/textual/takeOutside4.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/textual/takeOutside4.yml
deleted file mode 100644
index a85e9e7baf..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/textual/takeOutside4.yml
+++ /dev/null
@@ -1,19 +0,0 @@
-languageId: plaintext
-command:
-  version: 1
-  spokenForm: clear outside
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: surroundingPair, delimiter: any}
-initialState:
-  documentContents: "[(hello)]"
-  selections:
-    - anchor: {line: 0, character: 8}
-      active: {line: 0, character: 5}
-finalState:
-  documentContents: "[]"
-  selections:
-    - anchor: {line: 0, character: 1}
-      active: {line: 0, character: 1}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: surroundingPair, delimiter: null, delimiterInclusion: includeDelimiters}}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/textual/takeOutside5.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/textual/takeOutside5.yml
deleted file mode 100644
index 53bc6db355..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/textual/takeOutside5.yml
+++ /dev/null
@@ -1,19 +0,0 @@
-languageId: plaintext
-command:
-  version: 1
-  spokenForm: clear outside
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: surroundingPair, delimiter: any}
-initialState:
-  documentContents: "[(hello)]"
-  selections:
-    - anchor: {line: 0, character: 1}
-      active: {line: 0, character: 4}
-finalState:
-  documentContents: "[]"
-  selections:
-    - anchor: {line: 0, character: 1}
-      active: {line: 0, character: 1}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: surroundingPair, delimiter: null, delimiterInclusion: includeDelimiters}}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/textual/takeOutside6.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/textual/takeOutside6.yml
deleted file mode 100644
index 884179493c..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/textual/takeOutside6.yml
+++ /dev/null
@@ -1,19 +0,0 @@
-languageId: plaintext
-command:
-  version: 1
-  spokenForm: clear outside
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: surroundingPair, delimiter: any}
-initialState:
-  documentContents: "[(hello)]"
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 3}
-finalState:
-  documentContents: ""
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: surroundingPair, delimiter: null, delimiterInclusion: includeDelimiters}}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/textual/takeOutside7.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/textual/takeOutside7.yml
deleted file mode 100644
index 251f3efcef..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/textual/takeOutside7.yml
+++ /dev/null
@@ -1,19 +0,0 @@
-languageId: plaintext
-command:
-  version: 1
-  spokenForm: clear outside
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: surroundingPair, delimiter: any}
-initialState:
-  documentContents: "[(hello)  (whatever)]"
-  selections:
-    - anchor: {line: 0, character: 9}
-      active: {line: 0, character: 11}
-finalState:
-  documentContents: ""
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: surroundingPair, delimiter: null, delimiterInclusion: includeDelimiters}}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/textual/takeOutside8.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/textual/takeOutside8.yml
deleted file mode 100644
index 5adb85163d..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/textual/takeOutside8.yml
+++ /dev/null
@@ -1,19 +0,0 @@
-languageId: plaintext
-command:
-  version: 1
-  spokenForm: clear outside
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: surroundingPair, delimiter: any}
-initialState:
-  documentContents: "[(hello)  (whatever)]"
-  selections:
-    - anchor: {line: 0, character: 9}
-      active: {line: 0, character: 9}
-finalState:
-  documentContents: ""
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: surroundingPair, delimiter: null, delimiterInclusion: includeDelimiters}}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/textual/takeOutside9.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/textual/takeOutside9.yml
deleted file mode 100644
index d1a54f4826..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/textual/takeOutside9.yml
+++ /dev/null
@@ -1,19 +0,0 @@
-languageId: plaintext
-command:
-  version: 1
-  spokenForm: clear outside
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: surroundingPair, delimiter: any}
-initialState:
-  documentContents: "[hello  (whatever)]"
-  selections:
-    - anchor: {line: 0, character: 7}
-      active: {line: 0, character: 7}
-finalState:
-  documentContents: ""
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: surroundingPair, delimiter: null, delimiterInclusion: includeDelimiters}}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/textual/takeOutsideFine.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/textual/takeOutsideFine.yml
deleted file mode 100644
index 082b46e972..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/textual/takeOutsideFine.yml
+++ /dev/null
@@ -1,24 +0,0 @@
-languageId: plaintext
-command:
-  version: 1
-  spokenForm: clear outside fine
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: surroundingPair, delimiter: any}
-      mark: {type: decoratedSymbol, symbolColor: default, character: f}
-initialState:
-  documentContents: (<user.foo>  <user.bar>)
-  selections:
-    - anchor: {line: 0, character: 13}
-      active: {line: 0, character: 23}
-  marks:
-    default.f:
-      start: {line: 0, character: 7}
-      end: {line: 0, character: 10}
-finalState:
-  documentContents: (  <user.bar>)
-  selections:
-    - anchor: {line: 0, character: 1}
-      active: {line: 0, character: 1}
-fullTargets: [{type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: f, usePrePhraseSnapshot: true}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: surroundingPair, delimiter: null, delimiterInclusion: includeDelimiters}}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/textual/takeOutsideLeper.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/textual/takeOutsideLeper.yml
deleted file mode 100644
index 7878ccad83..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/textual/takeOutsideLeper.yml
+++ /dev/null
@@ -1,22 +0,0 @@
-languageId: plaintext
-command:
-  version: 1
-  spokenForm: clear outside leper
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: surroundingPair, delimiter: any}
-      mark: {type: decoratedSymbol, symbolColor: default, character: (}
-initialState:
-  documentContents: |
-    [(hello)  (whatever)]
-  selections:
-    - anchor: {line: 1, character: 0}
-      active: {line: 1, character: 0}
-finalState:
-  documentContents: |
-    [  (whatever)]
-  selections:
-    - anchor: {line: 0, character: 1}
-      active: {line: 0, character: 1}
-fullTargets: [{type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: (}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: surroundingPair, delimiter: null, delimiterInclusion: includeDelimiters}}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/textual/takeOutsideRack.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/textual/takeOutsideRack.yml
deleted file mode 100644
index 98e5068577..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/textual/takeOutsideRack.yml
+++ /dev/null
@@ -1,22 +0,0 @@
-languageId: plaintext
-command:
-  version: 1
-  spokenForm: clear outside rack
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: surroundingPair, delimiter: any}
-      mark: {type: decoratedSymbol, symbolColor: default, character: ']'}
-initialState:
-  documentContents: |
-    [(hello)  (whatever)]
-  selections:
-    - anchor: {line: 1, character: 0}
-      active: {line: 1, character: 0}
-finalState:
-  documentContents: |+
-
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-fullTargets: [{type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: ']'}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: surroundingPair, delimiter: null, delimiterInclusion: includeDelimiters}}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/textual/takeOutsideUrge.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/textual/takeOutsideUrge.yml
deleted file mode 100644
index 60749d52e4..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/textual/takeOutsideUrge.yml
+++ /dev/null
@@ -1,24 +0,0 @@
-languageId: plaintext
-command:
-  version: 1
-  spokenForm: clear outside urge
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: surroundingPair, delimiter: any}
-      mark: {type: decoratedSymbol, symbolColor: default, character: u}
-initialState:
-  documentContents: (<user.foo>  <user.bar>)
-  selections:
-    - anchor: {line: 0, character: 12}
-      active: {line: 0, character: 12}
-  marks:
-    default.u:
-      start: {line: 0, character: 14}
-      end: {line: 0, character: 18}
-finalState:
-  documentContents: (<user.foo>  )
-  selections:
-    - anchor: {line: 0, character: 13}
-      active: {line: 0, character: 13}
-fullTargets: [{type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: u, usePrePhraseSnapshot: true}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: surroundingPair, delimiter: null, delimiterInclusion: includeDelimiters}}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/textual/takeQuad.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/textual/takeQuad.yml
deleted file mode 100644
index 94840cec68..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/textual/takeQuad.yml
+++ /dev/null
@@ -1,19 +0,0 @@
-languageId: plaintext
-command:
-  version: 1
-  spokenForm: clear quad
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: surroundingPair, delimiter: doubleQuotes}
-initialState:
-  documentContents: "\"\""
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-finalState:
-  documentContents: ""
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: surroundingPair, delimiter: doubleQuotes, delimiterInclusion: includeDelimiters}}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/textual/takeQuad2.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/textual/takeQuad2.yml
deleted file mode 100644
index 67df8f3426..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/textual/takeQuad2.yml
+++ /dev/null
@@ -1,19 +0,0 @@
-languageId: plaintext
-command:
-  version: 1
-  spokenForm: clear quad
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: surroundingPair, delimiter: doubleQuotes}
-initialState:
-  documentContents: "\"\""
-  selections:
-    - anchor: {line: 0, character: 1}
-      active: {line: 0, character: 1}
-finalState:
-  documentContents: ""
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: surroundingPair, delimiter: doubleQuotes, delimiterInclusion: includeDelimiters}}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/textual/takeQuad3.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/textual/takeQuad3.yml
deleted file mode 100644
index ce0eb155bb..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/textual/takeQuad3.yml
+++ /dev/null
@@ -1,19 +0,0 @@
-languageId: plaintext
-command:
-  version: 1
-  spokenForm: clear quad
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: surroundingPair, delimiter: doubleQuotes}
-initialState:
-  documentContents: "\"\""
-  selections:
-    - anchor: {line: 0, character: 2}
-      active: {line: 0, character: 2}
-finalState:
-  documentContents: ""
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: surroundingPair, delimiter: doubleQuotes, delimiterInclusion: includeDelimiters}}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/textual/takeQuad4.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/textual/takeQuad4.yml
deleted file mode 100644
index f9facf0e15..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/textual/takeQuad4.yml
+++ /dev/null
@@ -1,19 +0,0 @@
-languageId: plaintext
-command:
-  version: 1
-  spokenForm: clear quad
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: surroundingPair, delimiter: doubleQuotes}
-initialState:
-  documentContents: "\"()\""
-  selections:
-    - anchor: {line: 0, character: 3}
-      active: {line: 0, character: 3}
-finalState:
-  documentContents: ""
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: surroundingPair, delimiter: doubleQuotes, delimiterInclusion: includeDelimiters}}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/textual/takeQuad5.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/textual/takeQuad5.yml
deleted file mode 100644
index 6f6ae0d993..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/textual/takeQuad5.yml
+++ /dev/null
@@ -1,19 +0,0 @@
-languageId: plaintext
-command:
-  version: 1
-  spokenForm: clear quad
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: surroundingPair, delimiter: doubleQuotes}
-initialState:
-  documentContents: "\"hello\""
-  selections:
-    - anchor: {line: 0, character: 6}
-      active: {line: 0, character: 6}
-finalState:
-  documentContents: ""
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: surroundingPair, delimiter: doubleQuotes, delimiterInclusion: includeDelimiters}}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/textual/takeQuad6.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/textual/takeQuad6.yml
deleted file mode 100644
index 148cbc49f2..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/textual/takeQuad6.yml
+++ /dev/null
@@ -1,19 +0,0 @@
-languageId: plaintext
-command:
-  version: 1
-  spokenForm: clear quad
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: surroundingPair, delimiter: doubleQuotes}
-initialState:
-  documentContents: "\"\\\"\\\"\""
-  selections:
-    - anchor: {line: 0, character: 5}
-      active: {line: 0, character: 5}
-finalState:
-  documentContents: ""
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: surroundingPair, delimiter: doubleQuotes, delimiterInclusion: includeDelimiters}}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/textual/takeRightQuad.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/textual/takeRightQuad.yml
deleted file mode 100644
index fea08d6d18..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/textual/takeRightQuad.yml
+++ /dev/null
@@ -1,24 +0,0 @@
-languageId: plaintext
-command:
-  version: 1
-  spokenForm: take right quad
-  action: setSelection
-  targets:
-    - type: primitive
-      modifier: {type: surroundingPair, delimiter: doubleQuotes, forceDirection: right}
-initialState:
-  documentContents: |-
-    hello world whatever "testing testing testing
-    this is another" test "whatever" whatever
-  selections:
-    - anchor: {line: 0, character: 21}
-      active: {line: 0, character: 21}
-  marks: {}
-finalState:
-  documentContents: |-
-    hello world whatever "testing testing testing
-    this is another" test "whatever" whatever
-  selections:
-    - anchor: {line: 0, character: 21}
-      active: {line: 1, character: 16}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: surroundingPair, delimiter: doubleQuotes, forceDirection: right}}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/textual/takeRightQuad2.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/textual/takeRightQuad2.yml
deleted file mode 100644
index 02cbc3e703..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/textual/takeRightQuad2.yml
+++ /dev/null
@@ -1,24 +0,0 @@
-languageId: plaintext
-command:
-  version: 1
-  spokenForm: take right quad
-  action: setSelection
-  targets:
-    - type: primitive
-      modifier: {type: surroundingPair, delimiter: doubleQuotes, forceDirection: right}
-initialState:
-  documentContents: |-
-    hello world whatever "testing testing testing
-    this is another" test "whatever" whatever
-  selections:
-    - anchor: {line: 0, character: 22}
-      active: {line: 0, character: 22}
-  marks: {}
-finalState:
-  documentContents: |-
-    hello world whatever "testing testing testing
-    this is another" test "whatever" whatever
-  selections:
-    - anchor: {line: 0, character: 21}
-      active: {line: 1, character: 16}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: surroundingPair, delimiter: doubleQuotes, forceDirection: right}}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/textual/takeRightQuad3.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/textual/takeRightQuad3.yml
deleted file mode 100644
index b2f5f1a430..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/textual/takeRightQuad3.yml
+++ /dev/null
@@ -1,24 +0,0 @@
-languageId: plaintext
-command:
-  version: 1
-  spokenForm: take right quad
-  action: setSelection
-  targets:
-    - type: primitive
-      modifier: {type: surroundingPair, delimiter: doubleQuotes, forceDirection: right}
-initialState:
-  documentContents: |-
-    hello world whatever "testing testing testing
-    this is another" test "whatever" whatever
-  selections:
-    - anchor: {line: 0, character: 26}
-      active: {line: 0, character: 26}
-  marks: {}
-finalState:
-  documentContents: |-
-    hello world whatever "testing testing testing
-    this is another" test "whatever" whatever
-  selections:
-    - anchor: {line: 0, character: 21}
-      active: {line: 1, character: 16}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: surroundingPair, delimiter: doubleQuotes, forceDirection: right}}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/textual/takeRightQuad4.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/textual/takeRightQuad4.yml
deleted file mode 100644
index 971ae7d6c5..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/textual/takeRightQuad4.yml
+++ /dev/null
@@ -1,24 +0,0 @@
-languageId: plaintext
-command:
-  version: 1
-  spokenForm: take right quad
-  action: setSelection
-  targets:
-    - type: primitive
-      modifier: {type: surroundingPair, delimiter: doubleQuotes, forceDirection: right}
-initialState:
-  documentContents: |-
-    hello world whatever "testing testing testing
-    this is another" test "whatever" whatever
-  selections:
-    - anchor: {line: 1, character: 22}
-      active: {line: 1, character: 22}
-  marks: {}
-finalState:
-  documentContents: |-
-    hello world whatever "testing testing testing
-    this is another" test "whatever" whatever
-  selections:
-    - anchor: {line: 1, character: 22}
-      active: {line: 1, character: 32}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: surroundingPair, delimiter: doubleQuotes, forceDirection: right}}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/textual/takeRightQuad5.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/textual/takeRightQuad5.yml
deleted file mode 100644
index 8d9e88ee69..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/textual/takeRightQuad5.yml
+++ /dev/null
@@ -1,24 +0,0 @@
-languageId: plaintext
-command:
-  version: 1
-  spokenForm: take right quad
-  action: setSelection
-  targets:
-    - type: primitive
-      modifier: {type: surroundingPair, delimiter: doubleQuotes, forceDirection: right}
-initialState:
-  documentContents: |-
-    hello world whatever "testing testing testing
-    this is another" test "whatever" whatever
-  selections:
-    - anchor: {line: 1, character: 23}
-      active: {line: 1, character: 23}
-  marks: {}
-finalState:
-  documentContents: |-
-    hello world whatever "testing testing testing
-    this is another" test "whatever" whatever
-  selections:
-    - anchor: {line: 1, character: 22}
-      active: {line: 1, character: 32}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: surroundingPair, delimiter: doubleQuotes, forceDirection: right}}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/textual/takeRightQuad6.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/textual/takeRightQuad6.yml
deleted file mode 100644
index 2710d2ffeb..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/textual/takeRightQuad6.yml
+++ /dev/null
@@ -1,24 +0,0 @@
-languageId: plaintext
-command:
-  version: 1
-  spokenForm: take right quad
-  action: setSelection
-  targets:
-    - type: primitive
-      modifier: {type: surroundingPair, delimiter: doubleQuotes, forceDirection: right}
-initialState:
-  documentContents: |-
-    hello world whatever "testing testing testing
-    this is another" test "whatever" whatever
-  selections:
-    - anchor: {line: 1, character: 12}
-      active: {line: 1, character: 12}
-  marks: {}
-finalState:
-  documentContents: |-
-    hello world whatever "testing testing testing
-    this is another" test "whatever" whatever
-  selections:
-    - anchor: {line: 0, character: 21}
-      active: {line: 1, character: 16}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: surroundingPair, delimiter: doubleQuotes, forceDirection: right}}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/textual/takeRightQuad7.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/textual/takeRightQuad7.yml
deleted file mode 100644
index 31903509c4..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/textual/takeRightQuad7.yml
+++ /dev/null
@@ -1,24 +0,0 @@
-languageId: plaintext
-command:
-  version: 1
-  spokenForm: take right quad
-  action: setSelection
-  targets:
-    - type: primitive
-      modifier: {type: surroundingPair, delimiter: doubleQuotes, forceDirection: right}
-initialState:
-  documentContents: |-
-    hello world whatever "testing testing testing
-    this is another" test "whatever" whatever
-  selections:
-    - anchor: {line: 1, character: 26}
-      active: {line: 1, character: 26}
-  marks: {}
-finalState:
-  documentContents: |-
-    hello world whatever "testing testing testing
-    this is another" test "whatever" whatever
-  selections:
-    - anchor: {line: 1, character: 22}
-      active: {line: 1, character: 32}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: surroundingPair, delimiter: doubleQuotes, forceDirection: right}}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/textual/takeRound.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/textual/takeRound.yml
deleted file mode 100644
index ce9e0cb45f..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/textual/takeRound.yml
+++ /dev/null
@@ -1,19 +0,0 @@
-languageId: plaintext
-command:
-  version: 1
-  spokenForm: clear round
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: surroundingPair, delimiter: parentheses}
-initialState:
-  documentContents: ()
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-finalState:
-  documentContents: ""
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: surroundingPair, delimiter: parentheses, delimiterInclusion: includeDelimiters}}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/textual/takeRound10.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/textual/takeRound10.yml
deleted file mode 100644
index d727c30535..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/textual/takeRound10.yml
+++ /dev/null
@@ -1,19 +0,0 @@
-languageId: plaintext
-command:
-  version: 1
-  spokenForm: clear round
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: surroundingPair, delimiter: parentheses}
-initialState:
-  documentContents: ((hello))
-  selections:
-    - anchor: {line: 0, character: 7}
-      active: {line: 0, character: 7}
-finalState:
-  documentContents: ()
-  selections:
-    - anchor: {line: 0, character: 1}
-      active: {line: 0, character: 1}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: surroundingPair, delimiter: parentheses, delimiterInclusion: includeDelimiters}}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/textual/takeRound11.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/textual/takeRound11.yml
deleted file mode 100644
index 252c7c1a71..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/textual/takeRound11.yml
+++ /dev/null
@@ -1,19 +0,0 @@
-languageId: plaintext
-command:
-  version: 1
-  spokenForm: clear round
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: surroundingPair, delimiter: parentheses}
-initialState:
-  documentContents: ((hello))
-  selections:
-    - anchor: {line: 0, character: 8}
-      active: {line: 0, character: 8}
-finalState:
-  documentContents: ""
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: surroundingPair, delimiter: parentheses, delimiterInclusion: includeDelimiters}}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/textual/takeRound12.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/textual/takeRound12.yml
deleted file mode 100644
index 7bef5aae70..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/textual/takeRound12.yml
+++ /dev/null
@@ -1,19 +0,0 @@
-languageId: plaintext
-command:
-  version: 1
-  spokenForm: clear round
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: surroundingPair, delimiter: parentheses}
-initialState:
-  documentContents: ((hello))
-  selections:
-    - anchor: {line: 0, character: 9}
-      active: {line: 0, character: 9}
-finalState:
-  documentContents: ""
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: surroundingPair, delimiter: parentheses, delimiterInclusion: includeDelimiters}}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/textual/takeRound13.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/textual/takeRound13.yml
deleted file mode 100644
index 3b45acedd1..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/textual/takeRound13.yml
+++ /dev/null
@@ -1,19 +0,0 @@
-languageId: plaintext
-command:
-  version: 1
-  spokenForm: clear round
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: surroundingPair, delimiter: parentheses}
-initialState:
-  documentContents: ((hello) () )
-  selections:
-    - anchor: {line: 0, character: 12}
-      active: {line: 0, character: 12}
-finalState:
-  documentContents: ""
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: surroundingPair, delimiter: parentheses, delimiterInclusion: includeDelimiters}}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/textual/takeRound14.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/textual/takeRound14.yml
deleted file mode 100644
index abd61f1c10..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/textual/takeRound14.yml
+++ /dev/null
@@ -1,19 +0,0 @@
-languageId: plaintext
-command:
-  version: 1
-  spokenForm: clear round
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: surroundingPair, delimiter: parentheses}
-initialState:
-  documentContents: ((hello) () )
-  selections:
-    - anchor: {line: 0, character: 11}
-      active: {line: 0, character: 11}
-finalState:
-  documentContents: ((hello)  )
-  selections:
-    - anchor: {line: 0, character: 9}
-      active: {line: 0, character: 9}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: surroundingPair, delimiter: parentheses, delimiterInclusion: includeDelimiters}}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/textual/takeRound15.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/textual/takeRound15.yml
deleted file mode 100644
index 02d84cd796..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/textual/takeRound15.yml
+++ /dev/null
@@ -1,19 +0,0 @@
-languageId: plaintext
-command:
-  version: 1
-  spokenForm: clear round
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: surroundingPair, delimiter: parentheses}
-initialState:
-  documentContents: ((hello) [] )
-  selections:
-    - anchor: {line: 0, character: 12}
-      active: {line: 0, character: 12}
-finalState:
-  documentContents: ""
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: surroundingPair, delimiter: parentheses, delimiterInclusion: includeDelimiters}}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/textual/takeRound16.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/textual/takeRound16.yml
deleted file mode 100644
index 2f7f636498..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/textual/takeRound16.yml
+++ /dev/null
@@ -1,19 +0,0 @@
-languageId: plaintext
-command:
-  version: 1
-  spokenForm: clear round
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: surroundingPair, delimiter: parentheses}
-initialState:
-  documentContents: ()()
-  selections:
-    - anchor: {line: 0, character: 2}
-      active: {line: 0, character: 2}
-finalState:
-  documentContents: ()
-  selections:
-    - anchor: {line: 0, character: 2}
-      active: {line: 0, character: 2}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: surroundingPair, delimiter: parentheses, delimiterInclusion: includeDelimiters}}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/textual/takeRound17.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/textual/takeRound17.yml
deleted file mode 100644
index af4e37dab9..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/textual/takeRound17.yml
+++ /dev/null
@@ -1,19 +0,0 @@
-languageId: plaintext
-command:
-  version: 1
-  spokenForm: clear round
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: surroundingPair, delimiter: parentheses}
-initialState:
-  documentContents: ()(
-  selections:
-    - anchor: {line: 0, character: 2}
-      active: {line: 0, character: 2}
-finalState:
-  documentContents: (
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: surroundingPair, delimiter: parentheses, delimiterInclusion: includeDelimiters}}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/textual/takeRound18.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/textual/takeRound18.yml
deleted file mode 100644
index 32f72459d3..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/textual/takeRound18.yml
+++ /dev/null
@@ -1,19 +0,0 @@
-languageId: plaintext
-command:
-  version: 1
-  spokenForm: clear round
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: surroundingPair, delimiter: parentheses}
-initialState:
-  documentContents: (\(hello\))
-  selections:
-    - anchor: {line: 0, character: 1}
-      active: {line: 0, character: 1}
-finalState:
-  documentContents: ""
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: surroundingPair, delimiter: parentheses, delimiterInclusion: includeDelimiters}}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/textual/takeRound19.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/textual/takeRound19.yml
deleted file mode 100644
index 9159cf3cce..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/textual/takeRound19.yml
+++ /dev/null
@@ -1,19 +0,0 @@
-languageId: plaintext
-command:
-  version: 1
-  spokenForm: clear round
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: surroundingPair, delimiter: parentheses}
-initialState:
-  documentContents: (hello)
-  selections:
-    - anchor: {line: 0, character: 4}
-      active: {line: 0, character: 4}
-finalState:
-  documentContents: ""
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: surroundingPair, delimiter: parentheses, delimiterInclusion: includeDelimiters}}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/textual/takeRound2.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/textual/takeRound2.yml
deleted file mode 100644
index d77b5ef557..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/textual/takeRound2.yml
+++ /dev/null
@@ -1,19 +0,0 @@
-languageId: plaintext
-command:
-  version: 1
-  spokenForm: clear round
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: surroundingPair, delimiter: parentheses}
-initialState:
-  documentContents: (hello)
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-finalState:
-  documentContents: ""
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: surroundingPair, delimiter: parentheses, delimiterInclusion: includeDelimiters}}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/textual/takeRound20.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/textual/takeRound20.yml
deleted file mode 100644
index fcde2ec83f..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/textual/takeRound20.yml
+++ /dev/null
@@ -1,19 +0,0 @@
-languageId: plaintext
-command:
-  version: 1
-  spokenForm: clear round
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: surroundingPair, delimiter: parentheses}
-initialState:
-  documentContents: (hello  (whatever))
-  selections:
-    - anchor: {line: 0, character: 7}
-      active: {line: 0, character: 7}
-finalState:
-  documentContents: ""
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: surroundingPair, delimiter: parentheses, delimiterInclusion: includeDelimiters}}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/textual/takeRound21.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/textual/takeRound21.yml
deleted file mode 100644
index 2151bfae13..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/textual/takeRound21.yml
+++ /dev/null
@@ -1,19 +0,0 @@
-languageId: plaintext
-command:
-  version: 1
-  spokenForm: clear round
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: surroundingPair, delimiter: parentheses}
-initialState:
-  documentContents: (hello ()  )
-  selections:
-    - anchor: {line: 0, character: 10}
-      active: {line: 0, character: 10}
-finalState:
-  documentContents: ""
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: surroundingPair, delimiter: parentheses, delimiterInclusion: includeDelimiters}}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/textual/takeRound22.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/textual/takeRound22.yml
deleted file mode 100644
index 0baebf9244..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/textual/takeRound22.yml
+++ /dev/null
@@ -1,19 +0,0 @@
-languageId: plaintext
-command:
-  version: 1
-  spokenForm: clear round
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: surroundingPair, delimiter: parentheses}
-initialState:
-  documentContents: (hello  () (whatever))
-  selections:
-    - anchor: {line: 0, character: 7}
-      active: {line: 0, character: 7}
-finalState:
-  documentContents: ""
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: surroundingPair, delimiter: parentheses, delimiterInclusion: includeDelimiters}}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/textual/takeRound23.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/textual/takeRound23.yml
deleted file mode 100644
index ea18d479a7..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/textual/takeRound23.yml
+++ /dev/null
@@ -1,19 +0,0 @@
-languageId: plaintext
-command:
-  version: 1
-  spokenForm: clear round
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: surroundingPair, delimiter: parentheses}
-initialState:
-  documentContents: (\(hello\))
-  selections:
-    - anchor: {line: 0, character: 6}
-      active: {line: 0, character: 6}
-finalState:
-  documentContents: ""
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: surroundingPair, delimiter: parentheses, delimiterInclusion: includeDelimiters}}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/textual/takeRound3.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/textual/takeRound3.yml
deleted file mode 100644
index 338f42eca4..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/textual/takeRound3.yml
+++ /dev/null
@@ -1,19 +0,0 @@
-languageId: plaintext
-command:
-  version: 1
-  spokenForm: clear round
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: surroundingPair, delimiter: parentheses}
-initialState:
-  documentContents: (hello)
-  selections:
-    - anchor: {line: 0, character: 6}
-      active: {line: 0, character: 6}
-finalState:
-  documentContents: ""
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: surroundingPair, delimiter: parentheses, delimiterInclusion: includeDelimiters}}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/textual/takeRound4.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/textual/takeRound4.yml
deleted file mode 100644
index b4c9808502..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/textual/takeRound4.yml
+++ /dev/null
@@ -1,19 +0,0 @@
-languageId: plaintext
-command:
-  version: 1
-  spokenForm: clear round
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: surroundingPair, delimiter: parentheses}
-initialState:
-  documentContents: (hello)
-  selections:
-    - anchor: {line: 0, character: 7}
-      active: {line: 0, character: 7}
-finalState:
-  documentContents: ""
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: surroundingPair, delimiter: parentheses, delimiterInclusion: includeDelimiters}}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/textual/takeRound5.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/textual/takeRound5.yml
deleted file mode 100644
index 365eb7eda3..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/textual/takeRound5.yml
+++ /dev/null
@@ -1,19 +0,0 @@
-languageId: plaintext
-command:
-  version: 1
-  spokenForm: clear round
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: surroundingPair, delimiter: parentheses}
-initialState:
-  documentContents: (hello)
-  selections:
-    - anchor: {line: 0, character: 1}
-      active: {line: 0, character: 1}
-finalState:
-  documentContents: ""
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: surroundingPair, delimiter: parentheses, delimiterInclusion: includeDelimiters}}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/textual/takeRound6.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/textual/takeRound6.yml
deleted file mode 100644
index fef20ace68..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/textual/takeRound6.yml
+++ /dev/null
@@ -1,19 +0,0 @@
-languageId: plaintext
-command:
-  version: 1
-  spokenForm: clear round
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: surroundingPair, delimiter: parentheses}
-initialState:
-  documentContents: ()
-  selections:
-    - anchor: {line: 0, character: 1}
-      active: {line: 0, character: 1}
-finalState:
-  documentContents: ""
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: surroundingPair, delimiter: parentheses, delimiterInclusion: includeDelimiters}}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/textual/takeRound7.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/textual/takeRound7.yml
deleted file mode 100644
index db7e51cba2..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/textual/takeRound7.yml
+++ /dev/null
@@ -1,19 +0,0 @@
-languageId: plaintext
-command:
-  version: 1
-  spokenForm: clear round
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: surroundingPair, delimiter: parentheses}
-initialState:
-  documentContents: (())
-  selections:
-    - anchor: {line: 0, character: 2}
-      active: {line: 0, character: 2}
-finalState:
-  documentContents: ()
-  selections:
-    - anchor: {line: 0, character: 1}
-      active: {line: 0, character: 1}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: surroundingPair, delimiter: parentheses, delimiterInclusion: includeDelimiters}}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/textual/takeRound8.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/textual/takeRound8.yml
deleted file mode 100644
index d5fb37f195..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/textual/takeRound8.yml
+++ /dev/null
@@ -1,19 +0,0 @@
-languageId: plaintext
-command:
-  version: 1
-  spokenForm: clear round
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: surroundingPair, delimiter: parentheses}
-initialState:
-  documentContents: (())
-  selections:
-    - anchor: {line: 0, character: 3}
-      active: {line: 0, character: 3}
-finalState:
-  documentContents: ""
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: surroundingPair, delimiter: parentheses, delimiterInclusion: includeDelimiters}}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/textual/takeRound9.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/textual/takeRound9.yml
deleted file mode 100644
index 7300ffee44..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/textual/takeRound9.yml
+++ /dev/null
@@ -1,19 +0,0 @@
-languageId: plaintext
-command:
-  version: 1
-  spokenForm: clear round
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: surroundingPair, delimiter: parentheses}
-initialState:
-  documentContents: (())
-  selections:
-    - anchor: {line: 0, character: 1}
-      active: {line: 0, character: 1}
-finalState:
-  documentContents: ()
-  selections:
-    - anchor: {line: 0, character: 1}
-      active: {line: 0, character: 1}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: surroundingPair, delimiter: parentheses, delimiterInclusion: includeDelimiters}}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/textual/takeRoundLeper.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/textual/takeRoundLeper.yml
deleted file mode 100644
index 0da4467c7c..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/textual/takeRoundLeper.yml
+++ /dev/null
@@ -1,20 +0,0 @@
-languageId: plaintext
-command:
-  version: 1
-  spokenForm: clear round leper
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: surroundingPair, delimiter: parentheses}
-      mark: {type: decoratedSymbol, symbolColor: default, character: (}
-initialState:
-  documentContents: (hello)
-  selections:
-    - anchor: {line: 0, character: 4}
-      active: {line: 0, character: 4}
-finalState:
-  documentContents: ""
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-fullTargets: [{type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: (}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: surroundingPair, delimiter: parentheses, delimiterInclusion: includeDelimiters}}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/textual/takeRoundRepper.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/textual/takeRoundRepper.yml
deleted file mode 100644
index 5953ef0cb0..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/textual/takeRoundRepper.yml
+++ /dev/null
@@ -1,20 +0,0 @@
-languageId: plaintext
-command:
-  version: 1
-  spokenForm: clear round repper
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: surroundingPair, delimiter: parentheses}
-      mark: {type: decoratedSymbol, symbolColor: default, character: )}
-initialState:
-  documentContents: (hello)
-  selections:
-    - anchor: {line: 0, character: 4}
-      active: {line: 0, character: 4}
-finalState:
-  documentContents: ""
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-fullTargets: [{type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: )}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: surroundingPair, delimiter: parentheses, delimiterInclusion: includeDelimiters}}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/textual/takeSquare.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/textual/takeSquare.yml
deleted file mode 100644
index 447e2f4171..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/surroundingPair/textual/takeSquare.yml
+++ /dev/null
@@ -1,19 +0,0 @@
-languageId: plaintext
-command:
-  version: 1
-  spokenForm: clear square
-  action: clearAndSetSelection
-  targets:
-    - type: primitive
-      modifier: {type: surroundingPair, delimiter: squareBrackets}
-initialState:
-  documentContents: "[(hello)]"
-  selections:
-    - anchor: {line: 0, character: 5}
-      active: {line: 0, character: 5}
-finalState:
-  documentContents: ""
-  selections:
-    - anchor: {line: 0, character: 0}
-      active: {line: 0, character: 0}
-fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: surroundingPair, delimiter: squareBrackets, delimiterInclusion: includeDelimiters}}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/targets/scopeType/bringSectionMadeAfterThis.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/targets/scopeType/bringSectionMadeAfterThis.yml
deleted file mode 100644
index ed3584b8c5..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/targets/scopeType/bringSectionMadeAfterThis.yml
+++ /dev/null
@@ -1,49 +0,0 @@
-languageId: markdown
-command:
-  spokenForm: bring section made after this
-  version: 3
-  targets:
-    - type: primitive
-      modifiers:
-        - type: containingScope
-          scopeType: {type: section}
-      mark: {type: decoratedSymbol, symbolColor: default, character: m}
-    - type: primitive
-      mark: {type: cursor}
-      modifiers:
-        - {type: position, position: after}
-  usePrePhraseSnapshot: true
-  action: {name: replaceWithTarget}
-initialState:
-  documentContents: |-
-    # Some section
-
-    Some text
-
-    # Another section
-
-    Another text
-  selections:
-    - anchor: {line: 4, character: 9}
-      active: {line: 4, character: 9}
-  marks:
-    default.m:
-      start: {line: 2, character: 0}
-      end: {line: 2, character: 4}
-finalState:
-  documentContents: |-
-    # Some section
-
-    Some text
-
-    # Another section
-
-    Another text
-
-    # Some section
-
-    Some text
-  selections:
-    - anchor: {line: 4, character: 9}
-      active: {line: 4, character: 9}
-fullTargets: [{type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: m}, modifiers: [&ref_0 {type: containingScope, scopeType: {type: section}}]}, {type: primitive, mark: {type: cursor}, modifiers: [*ref_0], positionModifier: {type: position, position: after}}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/targets/scopeType/pourComment.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/targets/scopeType/pourComment.yml
deleted file mode 100644
index 91adc31c48..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/targets/scopeType/pourComment.yml
+++ /dev/null
@@ -1,24 +0,0 @@
-languageId: typescript
-command:
-  spokenForm: pour comment
-  version: 3
-  targets:
-    - type: primitive
-      modifiers:
-        - type: containingScope
-          scopeType: {type: comment}
-  usePrePhraseSnapshot: true
-  action: {name: editNewLineAfter}
-initialState:
-  documentContents: // Testing comment
-  selections:
-    - anchor: {line: 0, character: 17}
-      active: {line: 0, character: 17}
-  marks: {}
-finalState:
-  documentContents: |
-    // Testing comment
-  selections:
-    - anchor: {line: 1, character: 0}
-      active: {line: 1, character: 0}
-fullTargets: [{type: primitive, mark: {type: cursor}, modifiers: [{type: containingScope, scopeType: {type: comment}}]}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/targets/scopeType/pourElm.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/targets/scopeType/pourElm.yml
deleted file mode 100644
index 1ef26b0ea2..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/targets/scopeType/pourElm.yml
+++ /dev/null
@@ -1,29 +0,0 @@
-languageId: html
-command:
-  spokenForm: pour elm
-  version: 3
-  targets:
-    - type: primitive
-      modifiers:
-        - type: containingScope
-          scopeType: {type: xmlElement}
-  usePrePhraseSnapshot: true
-  action: {name: editNewLineAfter}
-initialState:
-  documentContents: |-
-    <html>
-        
-    </html>
-  selections:
-    - anchor: {line: 1, character: 4}
-      active: {line: 1, character: 4}
-  marks: {}
-finalState:
-  documentContents: |
-    <html>
-        
-    </html>
-  selections:
-    - anchor: {line: 3, character: 0}
-      active: {line: 3, character: 0}
-fullTargets: [{type: primitive, mark: {type: cursor}, modifiers: [{type: containingScope, scopeType: {type: xmlElement}}]}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/targets/scopeType/pourEntry.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/targets/scopeType/pourEntry.yml
deleted file mode 100644
index e6b7ca8ccb..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/targets/scopeType/pourEntry.yml
+++ /dev/null
@@ -1,28 +0,0 @@
-languageId: markdown
-command:
-  spokenForm: pour entry
-  version: 3
-  targets:
-    - type: primitive
-      modifiers:
-        - type: containingScope
-          scopeType: {type: collectionItem}
-  usePrePhraseSnapshot: true
-  action: {name: editNewLineAfter}
-initialState:
-  documentContents: |-
-    - Testing
-    - Another test
-  selections:
-    - anchor: {line: 0, character: 5}
-      active: {line: 0, character: 5}
-  marks: {}
-finalState:
-  documentContents: |-
-    - Testing
-
-    - Another test
-  selections:
-    - anchor: {line: 1, character: 0}
-      active: {line: 1, character: 0}
-fullTargets: [{type: primitive, mark: {type: cursor}, modifiers: [{type: containingScope, scopeType: {type: collectionItem}}]}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/targets/scopeType/pourIfState.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/targets/scopeType/pourIfState.yml
deleted file mode 100644
index ca22b124c9..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/targets/scopeType/pourIfState.yml
+++ /dev/null
@@ -1,29 +0,0 @@
-languageId: typescript
-command:
-  spokenForm: pour if state
-  version: 3
-  targets:
-    - type: primitive
-      modifiers:
-        - type: containingScope
-          scopeType: {type: ifStatement}
-  usePrePhraseSnapshot: true
-  action: {name: editNewLineAfter}
-initialState:
-  documentContents: |-
-    if (false) {
-        
-    }
-  selections:
-    - anchor: {line: 1, character: 4}
-      active: {line: 1, character: 4}
-  marks: {}
-finalState:
-  documentContents: |
-    if (false) {
-        
-    }
-  selections:
-    - anchor: {line: 3, character: 0}
-      active: {line: 3, character: 0}
-fullTargets: [{type: primitive, mark: {type: cursor}, modifiers: [{type: containingScope, scopeType: {type: ifStatement}}]}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/targets/scopeType/pourSection.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/targets/scopeType/pourSection.yml
deleted file mode 100644
index 4d532c3025..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/targets/scopeType/pourSection.yml
+++ /dev/null
@@ -1,30 +0,0 @@
-languageId: markdown
-command:
-  spokenForm: pour section
-  version: 3
-  targets:
-    - type: primitive
-      modifiers:
-        - type: containingScope
-          scopeType: {type: section}
-  usePrePhraseSnapshot: true
-  action: {name: editNewLineAfter}
-initialState:
-  documentContents: |-
-    # Some section
-
-    Some text
-  selections:
-    - anchor: {line: 2, character: 8}
-      active: {line: 2, character: 8}
-  marks: {}
-finalState:
-  documentContents: |+
-    # Some section
-
-    Some text
-
-  selections:
-    - anchor: {line: 4, character: 0}
-      active: {line: 4, character: 0}
-fullTargets: [{type: primitive, mark: {type: cursor}, modifiers: [{type: containingScope, scopeType: {type: section}}]}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/updateSelections/bringFine.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/updateSelections/bringFine.yml
deleted file mode 100644
index 2bd6ebbb79..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/updateSelections/bringFine.yml
+++ /dev/null
@@ -1,24 +0,0 @@
-languageId: plaintext
-command:
-  version: 1
-  spokenForm: bring fine
-  action: replaceWithTarget
-  targets:
-    - type: primitive
-      mark: {type: decoratedSymbol, symbolColor: default, character: f}
-    - {type: primitive, isImplicit: true}
-initialState:
-  documentContents: foo world
-  selections:
-    - anchor: {line: 0, character: 4}
-      active: {line: 0, character: 4}
-  marks:
-    default.f:
-      start: {line: 0, character: 0}
-      end: {line: 0, character: 3}
-finalState:
-  documentContents: foo fooworld
-  selections:
-    - anchor: {line: 0, character: 7}
-      active: {line: 0, character: 7}
-fullTargets: [{type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: f}, selectionType: token, position: contents, insideOutsideType: null, modifier: {type: identity}}, {type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: identity}}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/updateSelections/bringFineAfterThirdCarThis.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/updateSelections/bringFineAfterThirdCarThis.yml
deleted file mode 100644
index e9cef306e1..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/updateSelections/bringFineAfterThirdCarThis.yml
+++ /dev/null
@@ -1,28 +0,0 @@
-languageId: plaintext
-command:
-  version: 1
-  spokenForm: bring fine after third car this
-  action: replaceWithTarget
-  targets:
-    - type: primitive
-      mark: {type: decoratedSymbol, symbolColor: default, character: f}
-    - type: primitive
-      selectionType: token
-      modifier: {type: subpiece, pieceType: character, anchor: 2, active: 2, excludeAnchor: false, excludeActive: false}
-      mark: {type: cursor}
-      position: after
-initialState:
-  documentContents: foo world whatever
-  selections:
-    - anchor: {line: 0, character: 4}
-      active: {line: 0, character: 9}
-  marks:
-    default.f:
-      start: {line: 0, character: 0}
-      end: {line: 0, character: 3}
-finalState:
-  documentContents: foo worfoold whatever
-  selections:
-    - anchor: {line: 0, character: 4}
-      active: {line: 0, character: 12}
-fullTargets: [{type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: f}, selectionType: token, position: contents, insideOutsideType: null, modifier: {type: identity}}, {type: primitive, mark: {type: cursor}, selectionType: token, position: after, insideOutsideType: null, modifier: {type: subpiece, pieceType: character, anchor: 2, active: 2, excludeAnchor: false, excludeActive: false}}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/updateSelections/bringFineAfterThis.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/updateSelections/bringFineAfterThis.yml
deleted file mode 100644
index 0916a15c40..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/updateSelections/bringFineAfterThis.yml
+++ /dev/null
@@ -1,26 +0,0 @@
-languageId: plaintext
-command:
-  version: 1
-  spokenForm: bring fine after this
-  action: replaceWithTarget
-  targets:
-    - type: primitive
-      mark: {type: decoratedSymbol, symbolColor: default, character: f}
-    - type: primitive
-      mark: {type: cursor}
-      position: after
-initialState:
-  documentContents: foo world
-  selections:
-    - anchor: {line: 0, character: 4}
-      active: {line: 0, character: 4}
-  marks:
-    default.f:
-      start: {line: 0, character: 0}
-      end: {line: 0, character: 3}
-finalState:
-  documentContents: foo  fooworld
-  selections:
-    - anchor: {line: 0, character: 4}
-      active: {line: 0, character: 4}
-fullTargets: [{type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: f}, selectionType: token, position: contents, insideOutsideType: null, modifier: {type: identity}}, {type: primitive, mark: {type: cursor}, selectionType: token, position: after, insideOutsideType: null, modifier: {type: identity}}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/updateSelections/bringFineAfterThis2.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/updateSelections/bringFineAfterThis2.yml
deleted file mode 100644
index 59f1c76ba5..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/updateSelections/bringFineAfterThis2.yml
+++ /dev/null
@@ -1,26 +0,0 @@
-languageId: plaintext
-command:
-  version: 1
-  spokenForm: bring fine after this
-  action: replaceWithTarget
-  targets:
-    - type: primitive
-      mark: {type: decoratedSymbol, symbolColor: default, character: f}
-    - type: primitive
-      mark: {type: cursor}
-      position: after
-initialState:
-  documentContents: foo world
-  selections:
-    - anchor: {line: 0, character: 9}
-      active: {line: 0, character: 9}
-  marks:
-    default.f:
-      start: {line: 0, character: 0}
-      end: {line: 0, character: 3}
-finalState:
-  documentContents: foo world foo
-  selections:
-    - anchor: {line: 0, character: 9}
-      active: {line: 0, character: 9}
-fullTargets: [{type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: f}, selectionType: token, position: contents, insideOutsideType: null, modifier: {type: identity}}, {type: primitive, mark: {type: cursor}, selectionType: token, position: after, insideOutsideType: null, modifier: {type: identity}}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/updateSelections/bringFineBeforeThis.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/updateSelections/bringFineBeforeThis.yml
deleted file mode 100644
index 4966024446..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/updateSelections/bringFineBeforeThis.yml
+++ /dev/null
@@ -1,26 +0,0 @@
-languageId: plaintext
-command:
-  version: 1
-  spokenForm: bring fine before this
-  action: replaceWithTarget
-  targets:
-    - type: primitive
-      mark: {type: decoratedSymbol, symbolColor: default, character: f}
-    - type: primitive
-      mark: {type: cursor}
-      position: before
-initialState:
-  documentContents: foo world
-  selections:
-    - anchor: {line: 0, character: 4}
-      active: {line: 0, character: 4}
-  marks:
-    default.f:
-      start: {line: 0, character: 0}
-      end: {line: 0, character: 3}
-finalState:
-  documentContents: foo foo world
-  selections:
-    - anchor: {line: 0, character: 8}
-      active: {line: 0, character: 8}
-fullTargets: [{type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: f}, selectionType: token, position: contents, insideOutsideType: null, modifier: {type: identity}}, {type: primitive, mark: {type: cursor}, selectionType: token, position: before, insideOutsideType: null, modifier: {type: identity}}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/updateSelections/bringFineToFirstCarWhale.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/updateSelections/bringFineToFirstCarWhale.yml
deleted file mode 100644
index cfecf3c1ca..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/updateSelections/bringFineToFirstCarWhale.yml
+++ /dev/null
@@ -1,30 +0,0 @@
-languageId: plaintext
-command:
-  version: 1
-  spokenForm: bring fine to first car whale
-  action: replaceWithTarget
-  targets:
-    - type: primitive
-      mark: {type: decoratedSymbol, symbolColor: default, character: f}
-    - type: primitive
-      selectionType: token
-      modifier: {type: subpiece, pieceType: character, anchor: 0, active: 0, excludeAnchor: false, excludeActive: false}
-      mark: {type: decoratedSymbol, symbolColor: default, character: w}
-initialState:
-  documentContents: foo world whatever
-  selections:
-    - anchor: {line: 0, character: 5}
-      active: {line: 0, character: 8}
-  marks:
-    default.f:
-      start: {line: 0, character: 0}
-      end: {line: 0, character: 3}
-    default.w:
-      start: {line: 0, character: 4}
-      end: {line: 0, character: 9}
-finalState:
-  documentContents: foo fooorld whatever
-  selections:
-    - anchor: {line: 0, character: 7}
-      active: {line: 0, character: 10}
-fullTargets: [{type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: f}, selectionType: token, position: contents, insideOutsideType: null, modifier: {type: identity}}, {type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: w}, selectionType: token, position: contents, insideOutsideType: null, modifier: {type: subpiece, pieceType: character, anchor: 0, active: 0, excludeAnchor: false, excludeActive: false}}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/updateSelections/bringFineToFirstTwoCar.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/updateSelections/bringFineToFirstTwoCar.yml
deleted file mode 100644
index 7d352bfcce..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/updateSelections/bringFineToFirstTwoCar.yml
+++ /dev/null
@@ -1,26 +0,0 @@
-languageId: plaintext
-command:
-  version: 1
-  spokenForm: bring fine to first two car
-  action: replaceWithTarget
-  targets:
-    - type: primitive
-      mark: {type: decoratedSymbol, symbolColor: default, character: f}
-    - type: primitive
-      selectionType: token
-      modifier: {type: subpiece, pieceType: character, anchor: 0, active: 1}
-initialState:
-  documentContents: foo world whatever
-  selections:
-    - anchor: {line: 0, character: 4}
-      active: {line: 0, character: 9}
-  marks:
-    default.f:
-      start: {line: 0, character: 0}
-      end: {line: 0, character: 3}
-finalState:
-  documentContents: foo foorld whatever
-  selections:
-    - anchor: {line: 0, character: 4}
-      active: {line: 0, character: 10}
-fullTargets: [{type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: f}, selectionType: token, position: contents, insideOutsideType: null, modifier: {type: identity}}, {type: primitive, mark: {type: cursorToken}, selectionType: token, position: contents, insideOutsideType: null, modifier: {type: subpiece, pieceType: character, anchor: 0, active: 1}}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/updateSelections/bringFineToLastCarWhale.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/updateSelections/bringFineToLastCarWhale.yml
deleted file mode 100644
index e3cac3009e..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/updateSelections/bringFineToLastCarWhale.yml
+++ /dev/null
@@ -1,30 +0,0 @@
-languageId: plaintext
-command:
-  version: 1
-  spokenForm: bring fine to last car whale
-  action: replaceWithTarget
-  targets:
-    - type: primitive
-      mark: {type: decoratedSymbol, symbolColor: default, character: f}
-    - type: primitive
-      selectionType: token
-      modifier: {type: subpiece, pieceType: character, anchor: -1, active: -1, excludeAnchor: false, excludeActive: false}
-      mark: {type: decoratedSymbol, symbolColor: default, character: w}
-initialState:
-  documentContents: foo world whatever
-  selections:
-    - anchor: {line: 0, character: 5}
-      active: {line: 0, character: 8}
-  marks:
-    default.f:
-      start: {line: 0, character: 0}
-      end: {line: 0, character: 3}
-    default.w:
-      start: {line: 0, character: 4}
-      end: {line: 0, character: 9}
-finalState:
-  documentContents: foo worlfoo whatever
-  selections:
-    - anchor: {line: 0, character: 5}
-      active: {line: 0, character: 8}
-fullTargets: [{type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: f}, selectionType: token, position: contents, insideOutsideType: null, modifier: {type: identity}}, {type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: w}, selectionType: token, position: contents, insideOutsideType: null, modifier: {type: subpiece, pieceType: character, anchor: -1, active: -1, excludeAnchor: false, excludeActive: false}}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/updateSelections/bringFineToLastTwoCar.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/updateSelections/bringFineToLastTwoCar.yml
deleted file mode 100644
index 566f05e14a..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/updateSelections/bringFineToLastTwoCar.yml
+++ /dev/null
@@ -1,26 +0,0 @@
-languageId: plaintext
-command:
-  version: 1
-  spokenForm: bring fine to last two car
-  action: replaceWithTarget
-  targets:
-    - type: primitive
-      mark: {type: decoratedSymbol, symbolColor: default, character: f}
-    - type: primitive
-      selectionType: token
-      modifier: {type: subpiece, pieceType: character, anchor: -2, active: -1}
-initialState:
-  documentContents: foo world whatever
-  selections:
-    - anchor: {line: 0, character: 4}
-      active: {line: 0, character: 9}
-  marks:
-    default.f:
-      start: {line: 0, character: 0}
-      end: {line: 0, character: 3}
-finalState:
-  documentContents: foo worfoo whatever
-  selections:
-    - anchor: {line: 0, character: 4}
-      active: {line: 0, character: 10}
-fullTargets: [{type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: f}, selectionType: token, position: contents, insideOutsideType: null, modifier: {type: identity}}, {type: primitive, mark: {type: cursorToken}, selectionType: token, position: contents, insideOutsideType: null, modifier: {type: subpiece, pieceType: character, anchor: -2, active: -1}}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/updateSelections/bringFineToThirdCarWhale.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/updateSelections/bringFineToThirdCarWhale.yml
deleted file mode 100644
index 58fbcf7c59..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/updateSelections/bringFineToThirdCarWhale.yml
+++ /dev/null
@@ -1,30 +0,0 @@
-languageId: plaintext
-command:
-  version: 1
-  spokenForm: bring fine to third car whale
-  action: replaceWithTarget
-  targets:
-    - type: primitive
-      mark: {type: decoratedSymbol, symbolColor: default, character: f}
-    - type: primitive
-      selectionType: token
-      modifier: {type: subpiece, pieceType: character, anchor: 2, active: 2, excludeAnchor: false, excludeActive: false}
-      mark: {type: decoratedSymbol, symbolColor: default, character: w}
-initialState:
-  documentContents: foo world whatever
-  selections:
-    - anchor: {line: 0, character: 4}
-      active: {line: 0, character: 9}
-  marks:
-    default.f:
-      start: {line: 0, character: 0}
-      end: {line: 0, character: 3}
-    default.w:
-      start: {line: 0, character: 4}
-      end: {line: 0, character: 9}
-finalState:
-  documentContents: foo wofoold whatever
-  selections:
-    - anchor: {line: 0, character: 4}
-      active: {line: 0, character: 11}
-fullTargets: [{type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: f}, selectionType: token, position: contents, insideOutsideType: null, modifier: {type: identity}}, {type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: w}, selectionType: token, position: contents, insideOutsideType: null, modifier: {type: subpiece, pieceType: character, anchor: 2, active: 2, excludeAnchor: false, excludeActive: false}}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/updateSelections/bringFineToWhale.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/updateSelections/bringFineToWhale.yml
deleted file mode 100644
index 22d11042c5..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/updateSelections/bringFineToWhale.yml
+++ /dev/null
@@ -1,28 +0,0 @@
-languageId: plaintext
-command:
-  version: 1
-  spokenForm: bring fine to whale
-  action: replaceWithTarget
-  targets:
-    - type: primitive
-      mark: {type: decoratedSymbol, symbolColor: default, character: f}
-    - type: primitive
-      mark: {type: decoratedSymbol, symbolColor: default, character: w}
-initialState:
-  documentContents: foo world
-  selections:
-    - anchor: {line: 0, character: 4}
-      active: {line: 0, character: 4}
-  marks:
-    default.f:
-      start: {line: 0, character: 0}
-      end: {line: 0, character: 3}
-    default.w:
-      start: {line: 0, character: 4}
-      end: {line: 0, character: 9}
-finalState:
-  documentContents: foo foo
-  selections:
-    - anchor: {line: 0, character: 4}
-      active: {line: 0, character: 4}
-fullTargets: [{type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: f}, selectionType: token, position: contents, insideOutsideType: null, modifier: {type: identity}}, {type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: w}, selectionType: token, position: contents, insideOutsideType: null, modifier: {type: identity}}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/updateSelections/bringFineToWhale2.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/updateSelections/bringFineToWhale2.yml
deleted file mode 100644
index b8843f4324..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/updateSelections/bringFineToWhale2.yml
+++ /dev/null
@@ -1,28 +0,0 @@
-languageId: plaintext
-command:
-  version: 1
-  spokenForm: bring fine to whale
-  action: replaceWithTarget
-  targets:
-    - type: primitive
-      mark: {type: decoratedSymbol, symbolColor: default, character: f}
-    - type: primitive
-      mark: {type: decoratedSymbol, symbolColor: default, character: w}
-initialState:
-  documentContents: foo world
-  selections:
-    - anchor: {line: 0, character: 5}
-      active: {line: 0, character: 5}
-  marks:
-    default.f:
-      start: {line: 0, character: 0}
-      end: {line: 0, character: 3}
-    default.w:
-      start: {line: 0, character: 4}
-      end: {line: 0, character: 9}
-finalState:
-  documentContents: foo foo
-  selections:
-    - anchor: {line: 0, character: 5}
-      active: {line: 0, character: 5}
-fullTargets: [{type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: f}, selectionType: token, position: contents, insideOutsideType: null, modifier: {type: identity}}, {type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: w}, selectionType: token, position: contents, insideOutsideType: null, modifier: {type: identity}}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/updateSelections/bringFineToWhale3.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/updateSelections/bringFineToWhale3.yml
deleted file mode 100644
index a5e704ed75..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/updateSelections/bringFineToWhale3.yml
+++ /dev/null
@@ -1,28 +0,0 @@
-languageId: plaintext
-command:
-  version: 1
-  spokenForm: bring fine to whale
-  action: replaceWithTarget
-  targets:
-    - type: primitive
-      mark: {type: decoratedSymbol, symbolColor: default, character: f}
-    - type: primitive
-      mark: {type: decoratedSymbol, symbolColor: default, character: w}
-initialState:
-  documentContents: foo world
-  selections:
-    - anchor: {line: 0, character: 9}
-      active: {line: 0, character: 9}
-  marks:
-    default.f:
-      start: {line: 0, character: 0}
-      end: {line: 0, character: 3}
-    default.w:
-      start: {line: 0, character: 4}
-      end: {line: 0, character: 9}
-finalState:
-  documentContents: foo foo
-  selections:
-    - anchor: {line: 0, character: 7}
-      active: {line: 0, character: 7}
-fullTargets: [{type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: f}, selectionType: token, position: contents, insideOutsideType: null, modifier: {type: identity}}, {type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: w}, selectionType: token, position: contents, insideOutsideType: null, modifier: {type: identity}}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/updateSelections/bringFineToWhale4.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/updateSelections/bringFineToWhale4.yml
deleted file mode 100644
index da774e8e50..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/updateSelections/bringFineToWhale4.yml
+++ /dev/null
@@ -1,28 +0,0 @@
-languageId: plaintext
-command:
-  version: 1
-  spokenForm: bring fine to whale
-  action: replaceWithTarget
-  targets:
-    - type: primitive
-      mark: {type: decoratedSymbol, symbolColor: default, character: f}
-    - type: primitive
-      mark: {type: decoratedSymbol, symbolColor: default, character: w}
-initialState:
-  documentContents: foo world
-  selections:
-    - anchor: {line: 0, character: 5}
-      active: {line: 0, character: 7}
-  marks:
-    default.f:
-      start: {line: 0, character: 0}
-      end: {line: 0, character: 3}
-    default.w:
-      start: {line: 0, character: 4}
-      end: {line: 0, character: 9}
-finalState:
-  documentContents: foo foo
-  selections:
-    - anchor: {line: 0, character: 5}
-      active: {line: 0, character: 7}
-fullTargets: [{type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: f}, selectionType: token, position: contents, insideOutsideType: null, modifier: {type: identity}}, {type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: w}, selectionType: token, position: contents, insideOutsideType: null, modifier: {type: identity}}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/updateSelections/bringFineToWhale5.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/updateSelections/bringFineToWhale5.yml
deleted file mode 100644
index c21597ff0a..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/updateSelections/bringFineToWhale5.yml
+++ /dev/null
@@ -1,28 +0,0 @@
-languageId: plaintext
-command:
-  version: 1
-  spokenForm: bring fine to whale
-  action: replaceWithTarget
-  targets:
-    - type: primitive
-      mark: {type: decoratedSymbol, symbolColor: default, character: f}
-    - type: primitive
-      mark: {type: decoratedSymbol, symbolColor: default, character: w}
-initialState:
-  documentContents: foo world whatever
-  selections:
-    - anchor: {line: 0, character: 5}
-      active: {line: 0, character: 8}
-  marks:
-    default.f:
-      start: {line: 0, character: 0}
-      end: {line: 0, character: 3}
-    default.w:
-      start: {line: 0, character: 4}
-      end: {line: 0, character: 9}
-finalState:
-  documentContents: foo foo whatever
-  selections:
-    - anchor: {line: 0, character: 5}
-      active: {line: 0, character: 7}
-fullTargets: [{type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: f}, selectionType: token, position: contents, insideOutsideType: null, modifier: {type: identity}}, {type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: w}, selectionType: token, position: contents, insideOutsideType: null, modifier: {type: identity}}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/updateSelections/bringHarpToEndOfWhale.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/updateSelections/bringHarpToEndOfWhale.yml
deleted file mode 100644
index 0f39ce9f4d..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/updateSelections/bringHarpToEndOfWhale.yml
+++ /dev/null
@@ -1,30 +0,0 @@
-languageId: plaintext
-command:
-  version: 1
-  spokenForm: bring harp to end of whale
-  action: replaceWithTarget
-  targets:
-    - type: primitive
-      mark: {type: decoratedSymbol, symbolColor: default, character: h}
-    - type: primitive
-      position: after
-      insideOutsideType: inside
-      mark: {type: decoratedSymbol, symbolColor: default, character: w}
-initialState:
-  documentContents: foo world whatever
-  selections:
-    - anchor: {line: 0, character: 4}
-      active: {line: 0, character: 9}
-  marks:
-    default.h:
-      start: {line: 0, character: 10}
-      end: {line: 0, character: 18}
-    default.w:
-      start: {line: 0, character: 4}
-      end: {line: 0, character: 9}
-finalState:
-  documentContents: foo worldwhatever whatever
-  selections:
-    - anchor: {line: 0, character: 4}
-      active: {line: 0, character: 9}
-fullTargets: [{type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: h}, selectionType: token, position: contents, insideOutsideType: null, modifier: {type: identity}}, {type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: w}, selectionType: token, position: after, insideOutsideType: inside, modifier: {type: identity}}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/updateSelections/bringHarpToFourthCarWhalePastSecondCarHarp.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/updateSelections/bringHarpToFourthCarWhalePastSecondCarHarp.yml
deleted file mode 100644
index fe65518284..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/updateSelections/bringHarpToFourthCarWhalePastSecondCarHarp.yml
+++ /dev/null
@@ -1,39 +0,0 @@
-languageId: plaintext
-command:
-  version: 1
-  spokenForm: bring harp to fourth car whale past second car harp
-  action: replaceWithTarget
-  targets:
-    - type: primitive
-      mark: {type: decoratedSymbol, symbolColor: default, character: h}
-    - type: range
-      start:
-        type: primitive
-        selectionType: token
-        modifier: {type: subpiece, pieceType: character, anchor: 3, active: 3, excludeAnchor: false, excludeActive: false}
-        mark: {type: decoratedSymbol, symbolColor: default, character: w}
-      end:
-        type: primitive
-        selectionType: token
-        modifier: {type: subpiece, pieceType: character, anchor: 1, active: 1, excludeAnchor: false, excludeActive: false}
-        mark: {type: decoratedSymbol, symbolColor: default, character: h}
-      excludeStart: false
-      excludeEnd: false
-initialState:
-  documentContents: foo world whatever
-  selections:
-    - anchor: {line: 0, character: 4}
-      active: {line: 0, character: 9}
-  marks:
-    default.h:
-      start: {line: 0, character: 10}
-      end: {line: 0, character: 18}
-    default.w:
-      start: {line: 0, character: 4}
-      end: {line: 0, character: 9}
-finalState:
-  documentContents: foo worwhateveratever
-  selections:
-    - anchor: {line: 0, character: 4}
-      active: {line: 0, character: 9}
-fullTargets: [{type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: h}, selectionType: token, position: contents, insideOutsideType: null, modifier: {type: identity}}, {type: range, excludeAnchor: false, excludeActive: false, anchor: {type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: w}, selectionType: token, position: contents, insideOutsideType: null, modifier: {type: subpiece, pieceType: character, anchor: 3, active: 3, excludeAnchor: false, excludeActive: false}}, active: {type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: h}, selectionType: token, position: contents, insideOutsideType: null, modifier: {type: subpiece, pieceType: character, anchor: 1, active: 1, excludeAnchor: false, excludeActive: false}}}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/updateSelections/bringHarpToSecondCarFinePastThirdCarHarp.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/updateSelections/bringHarpToSecondCarFinePastThirdCarHarp.yml
deleted file mode 100644
index 278e4a2e72..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/updateSelections/bringHarpToSecondCarFinePastThirdCarHarp.yml
+++ /dev/null
@@ -1,39 +0,0 @@
-languageId: plaintext
-command:
-  version: 1
-  spokenForm: bring harp to second car fine past third car harp
-  action: replaceWithTarget
-  targets:
-    - type: primitive
-      mark: {type: decoratedSymbol, symbolColor: default, character: h}
-    - type: range
-      start:
-        type: primitive
-        selectionType: token
-        modifier: {type: subpiece, pieceType: character, anchor: 1, active: 1, excludeAnchor: false, excludeActive: false}
-        mark: {type: decoratedSymbol, symbolColor: default, character: f}
-      end:
-        type: primitive
-        selectionType: token
-        modifier: {type: subpiece, pieceType: character, anchor: 2, active: 2, excludeAnchor: false, excludeActive: false}
-        mark: {type: decoratedSymbol, symbolColor: default, character: h}
-      excludeStart: false
-      excludeEnd: false
-initialState:
-  documentContents: foo world whateverspaghetti
-  selections:
-    - anchor: {line: 0, character: 4}
-      active: {line: 0, character: 9}
-  marks:
-    default.h:
-      start: {line: 0, character: 10}
-      end: {line: 0, character: 27}
-    default.f:
-      start: {line: 0, character: 0}
-      end: {line: 0, character: 3}
-finalState:
-  documentContents: fwhateverspaghettiteverspaghetti
-  selections:
-    - anchor: {line: 0, character: 4}
-      active: {line: 0, character: 9}
-fullTargets: [{type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: h}, selectionType: token, position: contents, insideOutsideType: null, modifier: {type: identity}}, {type: range, excludeAnchor: false, excludeActive: false, anchor: {type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: f}, selectionType: token, position: contents, insideOutsideType: null, modifier: {type: subpiece, pieceType: character, anchor: 1, active: 1, excludeAnchor: false, excludeActive: false}}, active: {type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: h}, selectionType: token, position: contents, insideOutsideType: null, modifier: {type: subpiece, pieceType: character, anchor: 2, active: 2, excludeAnchor: false, excludeActive: false}}}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/updateSelections/bringHarpToSecondCarFinePastThirdCarWhale.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/updateSelections/bringHarpToSecondCarFinePastThirdCarWhale.yml
deleted file mode 100644
index 0d0e62721c..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/updateSelections/bringHarpToSecondCarFinePastThirdCarWhale.yml
+++ /dev/null
@@ -1,42 +0,0 @@
-languageId: plaintext
-command:
-  version: 1
-  spokenForm: bring harp to second car fine past third car whale
-  action: replaceWithTarget
-  targets:
-    - type: primitive
-      mark: {type: decoratedSymbol, symbolColor: default, character: h}
-    - type: range
-      start:
-        type: primitive
-        selectionType: token
-        modifier: {type: subpiece, pieceType: character, anchor: 1, active: 1, excludeAnchor: false, excludeActive: false}
-        mark: {type: decoratedSymbol, symbolColor: default, character: f}
-      end:
-        type: primitive
-        selectionType: token
-        modifier: {type: subpiece, pieceType: character, anchor: 2, active: 2, excludeAnchor: false, excludeActive: false}
-        mark: {type: decoratedSymbol, symbolColor: default, character: w}
-      excludeStart: false
-      excludeEnd: false
-initialState:
-  documentContents: foo world whatever
-  selections:
-    - anchor: {line: 0, character: 4}
-      active: {line: 0, character: 9}
-  marks:
-    default.h:
-      start: {line: 0, character: 10}
-      end: {line: 0, character: 18}
-    default.f:
-      start: {line: 0, character: 0}
-      end: {line: 0, character: 3}
-    default.w:
-      start: {line: 0, character: 4}
-      end: {line: 0, character: 9}
-finalState:
-  documentContents: fwhateverld whatever
-  selections:
-    - anchor: {line: 0, character: 4}
-      active: {line: 0, character: 11}
-fullTargets: [{type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: h}, selectionType: token, position: contents, insideOutsideType: null, modifier: {type: identity}}, {type: range, excludeAnchor: false, excludeActive: false, anchor: {type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: f}, selectionType: token, position: contents, insideOutsideType: null, modifier: {type: subpiece, pieceType: character, anchor: 1, active: 1, excludeAnchor: false, excludeActive: false}}, active: {type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: w}, selectionType: token, position: contents, insideOutsideType: null, modifier: {type: subpiece, pieceType: character, anchor: 2, active: 2, excludeAnchor: false, excludeActive: false}}}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/updateSelections/bringHarpToStartOfWhale.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/updateSelections/bringHarpToStartOfWhale.yml
deleted file mode 100644
index 5336cfcc4c..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/updateSelections/bringHarpToStartOfWhale.yml
+++ /dev/null
@@ -1,30 +0,0 @@
-languageId: plaintext
-command:
-  version: 1
-  spokenForm: bring harp to start of whale
-  action: replaceWithTarget
-  targets:
-    - type: primitive
-      mark: {type: decoratedSymbol, symbolColor: default, character: h}
-    - type: primitive
-      position: before
-      insideOutsideType: inside
-      mark: {type: decoratedSymbol, symbolColor: default, character: w}
-initialState:
-  documentContents: foo world whatever
-  selections:
-    - anchor: {line: 0, character: 4}
-      active: {line: 0, character: 9}
-  marks:
-    default.h:
-      start: {line: 0, character: 10}
-      end: {line: 0, character: 18}
-    default.w:
-      start: {line: 0, character: 4}
-      end: {line: 0, character: 9}
-finalState:
-  documentContents: foo whateverworld whatever
-  selections:
-    - anchor: {line: 0, character: 12}
-      active: {line: 0, character: 17}
-fullTargets: [{type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: h}, selectionType: token, position: contents, insideOutsideType: null, modifier: {type: identity}}, {type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: w}, selectionType: token, position: before, insideOutsideType: inside, modifier: {type: identity}}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/updateSelections/bringWhale.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/updateSelections/bringWhale.yml
deleted file mode 100644
index f92da52a39..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/updateSelections/bringWhale.yml
+++ /dev/null
@@ -1,24 +0,0 @@
-languageId: plaintext
-command:
-  version: 1
-  spokenForm: bring whale
-  action: replaceWithTarget
-  targets:
-    - type: primitive
-      mark: {type: decoratedSymbol, symbolColor: default, character: w}
-    - {type: primitive, isImplicit: true}
-initialState:
-  documentContents: foo world
-  selections:
-    - anchor: {line: 0, character: 3}
-      active: {line: 0, character: 3}
-  marks:
-    default.w:
-      start: {line: 0, character: 4}
-      end: {line: 0, character: 9}
-finalState:
-  documentContents: fooworld world
-  selections:
-    - anchor: {line: 0, character: 8}
-      active: {line: 0, character: 8}
-fullTargets: [{type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: w}, selectionType: token, position: contents, insideOutsideType: null, modifier: {type: identity}}, {type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: identity}}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/updateSelections/bringWhaleAfterFine.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/updateSelections/bringWhaleAfterFine.yml
deleted file mode 100644
index a5f4616f62..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/updateSelections/bringWhaleAfterFine.yml
+++ /dev/null
@@ -1,29 +0,0 @@
-languageId: plaintext
-command:
-  version: 1
-  spokenForm: bring whale after fine
-  action: replaceWithTarget
-  targets:
-    - type: primitive
-      mark: {type: decoratedSymbol, symbolColor: default, character: w}
-    - type: primitive
-      mark: {type: decoratedSymbol, symbolColor: default, character: f}
-      position: after
-initialState:
-  documentContents: foo world
-  selections:
-    - anchor: {line: 0, character: 3}
-      active: {line: 0, character: 3}
-  marks:
-    default.w:
-      start: {line: 0, character: 4}
-      end: {line: 0, character: 9}
-    default.f:
-      start: {line: 0, character: 0}
-      end: {line: 0, character: 3}
-finalState:
-  documentContents: foo world world
-  selections:
-    - anchor: {line: 0, character: 3}
-      active: {line: 0, character: 3}
-fullTargets: [{type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: w}, selectionType: token, position: contents, insideOutsideType: null, modifier: {type: identity}}, {type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: f}, selectionType: token, position: after, insideOutsideType: null, modifier: {type: identity}}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/updateSelections/bringWhaleAfterThis.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/updateSelections/bringWhaleAfterThis.yml
deleted file mode 100644
index 0823adfe30..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/updateSelections/bringWhaleAfterThis.yml
+++ /dev/null
@@ -1,26 +0,0 @@
-languageId: plaintext
-command:
-  version: 1
-  spokenForm: bring whale after this
-  action: replaceWithTarget
-  targets:
-    - type: primitive
-      mark: {type: decoratedSymbol, symbolColor: default, character: w}
-    - type: primitive
-      mark: {type: cursor}
-      position: after
-initialState:
-  documentContents: foo world
-  selections:
-    - anchor: {line: 0, character: 3}
-      active: {line: 0, character: 3}
-  marks:
-    default.w:
-      start: {line: 0, character: 4}
-      end: {line: 0, character: 9}
-finalState:
-  documentContents: foo world world
-  selections:
-    - anchor: {line: 0, character: 3}
-      active: {line: 0, character: 3}
-fullTargets: [{type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: w}, selectionType: token, position: contents, insideOutsideType: null, modifier: {type: identity}}, {type: primitive, mark: {type: cursor}, selectionType: token, position: after, insideOutsideType: null, modifier: {type: identity}}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/updateSelections/bringWhaleAfterThis2.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/updateSelections/bringWhaleAfterThis2.yml
deleted file mode 100644
index 0823adfe30..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/updateSelections/bringWhaleAfterThis2.yml
+++ /dev/null
@@ -1,26 +0,0 @@
-languageId: plaintext
-command:
-  version: 1
-  spokenForm: bring whale after this
-  action: replaceWithTarget
-  targets:
-    - type: primitive
-      mark: {type: decoratedSymbol, symbolColor: default, character: w}
-    - type: primitive
-      mark: {type: cursor}
-      position: after
-initialState:
-  documentContents: foo world
-  selections:
-    - anchor: {line: 0, character: 3}
-      active: {line: 0, character: 3}
-  marks:
-    default.w:
-      start: {line: 0, character: 4}
-      end: {line: 0, character: 9}
-finalState:
-  documentContents: foo world world
-  selections:
-    - anchor: {line: 0, character: 3}
-      active: {line: 0, character: 3}
-fullTargets: [{type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: w}, selectionType: token, position: contents, insideOutsideType: null, modifier: {type: identity}}, {type: primitive, mark: {type: cursor}, selectionType: token, position: after, insideOutsideType: null, modifier: {type: identity}}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/updateSelections/bringWhaleBeforeThis.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/updateSelections/bringWhaleBeforeThis.yml
deleted file mode 100644
index a6fd1913c6..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/updateSelections/bringWhaleBeforeThis.yml
+++ /dev/null
@@ -1,26 +0,0 @@
-languageId: plaintext
-command:
-  version: 1
-  spokenForm: bring whale before this
-  action: replaceWithTarget
-  targets:
-    - type: primitive
-      mark: {type: decoratedSymbol, symbolColor: default, character: w}
-    - type: primitive
-      mark: {type: cursor}
-      position: before
-initialState:
-  documentContents: foo world
-  selections:
-    - anchor: {line: 0, character: 3}
-      active: {line: 0, character: 3}
-  marks:
-    default.w:
-      start: {line: 0, character: 4}
-      end: {line: 0, character: 9}
-finalState:
-  documentContents: fooworld  world
-  selections:
-    - anchor: {line: 0, character: 9}
-      active: {line: 0, character: 9}
-fullTargets: [{type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: w}, selectionType: token, position: contents, insideOutsideType: null, modifier: {type: identity}}, {type: primitive, mark: {type: cursor}, selectionType: token, position: before, insideOutsideType: null, modifier: {type: identity}}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/updateSelections/bringWhaleToEndOfFine.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/updateSelections/bringWhaleToEndOfFine.yml
deleted file mode 100644
index f1735f6561..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/updateSelections/bringWhaleToEndOfFine.yml
+++ /dev/null
@@ -1,30 +0,0 @@
-languageId: plaintext
-command:
-  version: 1
-  spokenForm: bring whale to end of fine
-  action: replaceWithTarget
-  targets:
-    - type: primitive
-      mark: {type: decoratedSymbol, symbolColor: default, character: w}
-    - type: primitive
-      position: after
-      insideOutsideType: inside
-      mark: {type: decoratedSymbol, symbolColor: default, character: f}
-initialState:
-  documentContents: foo world
-  selections:
-    - anchor: {line: 0, character: 3}
-      active: {line: 0, character: 3}
-  marks:
-    default.w:
-      start: {line: 0, character: 4}
-      end: {line: 0, character: 9}
-    default.f:
-      start: {line: 0, character: 0}
-      end: {line: 0, character: 3}
-finalState:
-  documentContents: fooworld world
-  selections:
-    - anchor: {line: 0, character: 8}
-      active: {line: 0, character: 8}
-fullTargets: [{type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: w}, selectionType: token, position: contents, insideOutsideType: null, modifier: {type: identity}}, {type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: f}, selectionType: token, position: after, insideOutsideType: inside, modifier: {type: identity}}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/updateSelections/bringWhaleToFine.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/updateSelections/bringWhaleToFine.yml
deleted file mode 100644
index 39953d07b2..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/updateSelections/bringWhaleToFine.yml
+++ /dev/null
@@ -1,28 +0,0 @@
-languageId: plaintext
-command:
-  version: 1
-  spokenForm: bring whale to fine
-  action: replaceWithTarget
-  targets:
-    - type: primitive
-      mark: {type: decoratedSymbol, symbolColor: default, character: w}
-    - type: primitive
-      mark: {type: decoratedSymbol, symbolColor: default, character: f}
-initialState:
-  documentContents: foo world
-  selections:
-    - anchor: {line: 0, character: 3}
-      active: {line: 0, character: 3}
-  marks:
-    default.w:
-      start: {line: 0, character: 4}
-      end: {line: 0, character: 9}
-    default.f:
-      start: {line: 0, character: 0}
-      end: {line: 0, character: 3}
-finalState:
-  documentContents: world world
-  selections:
-    - anchor: {line: 0, character: 5}
-      active: {line: 0, character: 5}
-fullTargets: [{type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: w}, selectionType: token, position: contents, insideOutsideType: null, modifier: {type: identity}}, {type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: f}, selectionType: token, position: contents, insideOutsideType: null, modifier: {type: identity}}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/updateSelections/chuckFirstCarWhale.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/updateSelections/chuckFirstCarWhale.yml
deleted file mode 100644
index 7c9cd9e0e6..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/updateSelections/chuckFirstCarWhale.yml
+++ /dev/null
@@ -1,25 +0,0 @@
-languageId: plaintext
-command:
-  version: 1
-  spokenForm: chuck first car whale
-  action: remove
-  targets:
-    - type: primitive
-      selectionType: token
-      modifier: {type: subpiece, pieceType: character, anchor: 0, active: 0, excludeAnchor: false, excludeActive: false}
-      mark: {type: decoratedSymbol, symbolColor: default, character: w}
-initialState:
-  documentContents: foo world whatever
-  selections:
-    - anchor: {line: 0, character: 5}
-      active: {line: 0, character: 8}
-  marks:
-    default.w:
-      start: {line: 0, character: 4}
-      end: {line: 0, character: 9}
-finalState:
-  documentContents: foo orld whatever
-  selections:
-    - anchor: {line: 0, character: 4}
-      active: {line: 0, character: 7}
-fullTargets: [{type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: w}, selectionType: token, position: contents, insideOutsideType: outside, modifier: {type: subpiece, pieceType: character, anchor: 0, active: 0, excludeAnchor: false, excludeActive: false}}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/updateSelections/chuckFirstPastSecondCar.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/updateSelections/chuckFirstPastSecondCar.yml
deleted file mode 100644
index a28b20deb6..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/updateSelections/chuckFirstPastSecondCar.yml
+++ /dev/null
@@ -1,21 +0,0 @@
-languageId: plaintext
-command:
-  version: 1
-  spokenForm: chuck first past second car
-  action: remove
-  targets:
-    - type: primitive
-      selectionType: token
-      modifier: {type: subpiece, pieceType: character, anchor: 0, active: 1, excludeAnchor: false, excludeActive: false}
-initialState:
-  documentContents: foo world whatever
-  selections:
-    - anchor: {line: 0, character: 4}
-      active: {line: 0, character: 9}
-  marks: {}
-finalState:
-  documentContents: foo rld whatever
-  selections:
-    - anchor: {line: 0, character: 4}
-      active: {line: 0, character: 7}
-fullTargets: [{type: primitive, mark: {type: cursorToken}, selectionType: token, position: contents, insideOutsideType: outside, modifier: {type: subpiece, pieceType: character, anchor: 0, active: 1, excludeAnchor: false, excludeActive: false}}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/updateSelections/chuckFourthPastFifthCar.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/updateSelections/chuckFourthPastFifthCar.yml
deleted file mode 100644
index 57ca41862a..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/updateSelections/chuckFourthPastFifthCar.yml
+++ /dev/null
@@ -1,21 +0,0 @@
-languageId: plaintext
-command:
-  version: 1
-  spokenForm: chuck fourth past fifth car
-  action: remove
-  targets:
-    - type: primitive
-      selectionType: token
-      modifier: {type: subpiece, pieceType: character, anchor: 3, active: 4, excludeAnchor: false, excludeActive: false}
-initialState:
-  documentContents: foo world whatever
-  selections:
-    - anchor: {line: 0, character: 4}
-      active: {line: 0, character: 9}
-  marks: {}
-finalState:
-  documentContents: foo wor whatever
-  selections:
-    - anchor: {line: 0, character: 4}
-      active: {line: 0, character: 7}
-fullTargets: [{type: primitive, mark: {type: cursorToken}, selectionType: token, position: contents, insideOutsideType: outside, modifier: {type: subpiece, pieceType: character, anchor: 3, active: 4, excludeAnchor: false, excludeActive: false}}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/updateSelections/chuckLastCarWhale.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/updateSelections/chuckLastCarWhale.yml
deleted file mode 100644
index 3e2009ed53..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/updateSelections/chuckLastCarWhale.yml
+++ /dev/null
@@ -1,25 +0,0 @@
-languageId: plaintext
-command:
-  version: 1
-  spokenForm: chuck last car whale
-  action: remove
-  targets:
-    - type: primitive
-      selectionType: token
-      modifier: {type: subpiece, pieceType: character, anchor: -1, active: -1, excludeAnchor: false, excludeActive: false}
-      mark: {type: decoratedSymbol, symbolColor: default, character: w}
-initialState:
-  documentContents: foo world whatever
-  selections:
-    - anchor: {line: 0, character: 5}
-      active: {line: 0, character: 8}
-  marks:
-    default.w:
-      start: {line: 0, character: 4}
-      end: {line: 0, character: 9}
-finalState:
-  documentContents: foo worl whatever
-  selections:
-    - anchor: {line: 0, character: 5}
-      active: {line: 0, character: 8}
-fullTargets: [{type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: w}, selectionType: token, position: contents, insideOutsideType: outside, modifier: {type: subpiece, pieceType: character, anchor: -1, active: -1, excludeAnchor: false, excludeActive: false}}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/updateSelections/chuckSecondCarFinePastThirdCarWhale.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/updateSelections/chuckSecondCarFinePastThirdCarWhale.yml
deleted file mode 100644
index ba0bfb737d..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/updateSelections/chuckSecondCarFinePastThirdCarWhale.yml
+++ /dev/null
@@ -1,37 +0,0 @@
-languageId: plaintext
-command:
-  version: 1
-  spokenForm: chuck second car fine past third car whale
-  action: remove
-  targets:
-    - type: range
-      start:
-        type: primitive
-        selectionType: token
-        modifier: {type: subpiece, pieceType: character, anchor: 1, active: 1, excludeAnchor: false, excludeActive: false}
-        mark: {type: decoratedSymbol, symbolColor: default, character: f}
-      end:
-        type: primitive
-        selectionType: token
-        modifier: {type: subpiece, pieceType: character, anchor: 2, active: 2, excludeAnchor: false, excludeActive: false}
-        mark: {type: decoratedSymbol, symbolColor: default, character: w}
-      excludeStart: false
-      excludeEnd: false
-initialState:
-  documentContents: foo world whatever
-  selections:
-    - anchor: {line: 0, character: 4}
-      active: {line: 0, character: 9}
-  marks:
-    default.f:
-      start: {line: 0, character: 0}
-      end: {line: 0, character: 3}
-    default.w:
-      start: {line: 0, character: 4}
-      end: {line: 0, character: 9}
-finalState:
-  documentContents: fld whatever
-  selections:
-    - anchor: {line: 0, character: 1}
-      active: {line: 0, character: 3}
-fullTargets: [{type: range, excludeAnchor: false, excludeActive: false, anchor: {type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: f}, selectionType: token, position: contents, insideOutsideType: outside, modifier: {type: subpiece, pieceType: character, anchor: 1, active: 1, excludeAnchor: false, excludeActive: false}}, active: {type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: w}, selectionType: token, position: contents, insideOutsideType: outside, modifier: {type: subpiece, pieceType: character, anchor: 2, active: 2, excludeAnchor: false, excludeActive: false}}}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/updateSelections/chuckSecondPastThirdCar.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/updateSelections/chuckSecondPastThirdCar.yml
deleted file mode 100644
index 99230c6fdd..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/updateSelections/chuckSecondPastThirdCar.yml
+++ /dev/null
@@ -1,21 +0,0 @@
-languageId: plaintext
-command:
-  version: 1
-  spokenForm: chuck second past third car
-  action: remove
-  targets:
-    - type: primitive
-      selectionType: token
-      modifier: {type: subpiece, pieceType: character, anchor: 1, active: 2, excludeAnchor: false, excludeActive: false}
-initialState:
-  documentContents: foo world whatever
-  selections:
-    - anchor: {line: 0, character: 4}
-      active: {line: 0, character: 9}
-  marks: {}
-finalState:
-  documentContents: foo wld whatever
-  selections:
-    - anchor: {line: 0, character: 4}
-      active: {line: 0, character: 7}
-fullTargets: [{type: primitive, mark: {type: cursorToken}, selectionType: token, position: contents, insideOutsideType: outside, modifier: {type: subpiece, pieceType: character, anchor: 1, active: 2, excludeAnchor: false, excludeActive: false}}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/updateSelections/chuckThirdCarWhalePastSecondCarHarp.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/updateSelections/chuckThirdCarWhalePastSecondCarHarp.yml
deleted file mode 100644
index c7b453124b..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/updateSelections/chuckThirdCarWhalePastSecondCarHarp.yml
+++ /dev/null
@@ -1,37 +0,0 @@
-languageId: plaintext
-command:
-  version: 1
-  spokenForm: chuck third car whale past second car harp
-  action: remove
-  targets:
-    - type: range
-      start:
-        type: primitive
-        selectionType: token
-        modifier: {type: subpiece, pieceType: character, anchor: 2, active: 2, excludeAnchor: false, excludeActive: false}
-        mark: {type: decoratedSymbol, symbolColor: default, character: w}
-      end:
-        type: primitive
-        selectionType: token
-        modifier: {type: subpiece, pieceType: character, anchor: 1, active: 1, excludeAnchor: false, excludeActive: false}
-        mark: {type: decoratedSymbol, symbolColor: default, character: h}
-      excludeStart: false
-      excludeEnd: false
-initialState:
-  documentContents: foo world whatever
-  selections:
-    - anchor: {line: 0, character: 4}
-      active: {line: 0, character: 9}
-  marks:
-    default.w:
-      start: {line: 0, character: 4}
-      end: {line: 0, character: 9}
-    default.h:
-      start: {line: 0, character: 10}
-      end: {line: 0, character: 18}
-finalState:
-  documentContents: foo woatever
-  selections:
-    - anchor: {line: 0, character: 4}
-      active: {line: 0, character: 6}
-fullTargets: [{type: range, excludeAnchor: false, excludeActive: false, anchor: {type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: w}, selectionType: token, position: contents, insideOutsideType: outside, modifier: {type: subpiece, pieceType: character, anchor: 2, active: 2, excludeAnchor: false, excludeActive: false}}, active: {type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: h}, selectionType: token, position: contents, insideOutsideType: outside, modifier: {type: subpiece, pieceType: character, anchor: 1, active: 1, excludeAnchor: false, excludeActive: false}}}]
diff --git a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/updateSelections/commentTrap.yml b/packages/cursorless-vscode-e2e/suite/fixtures/recorded/updateSelections/commentTrap.yml
deleted file mode 100644
index cd6fb0a61e..0000000000
--- a/packages/cursorless-vscode-e2e/suite/fixtures/recorded/updateSelections/commentTrap.yml
+++ /dev/null
@@ -1,27 +0,0 @@
-languageId: typescript
-command:
-  version: 1
-  spokenForm: comment trap
-  action: toggleLineComment
-  targets:
-    - type: primitive
-      mark: {type: decoratedSymbol, symbolColor: default, character: t}
-initialState:
-  documentContents: |-
-    'hello'
-    'there'
-  selections:
-    - anchor: {line: 0, character: 1}
-      active: {line: 1, character: 6}
-  marks:
-    default.t:
-      start: {line: 1, character: 1}
-      end: {line: 1, character: 6}
-finalState:
-  documentContents: |-
-    'hello'
-    // 'there'
-  selections:
-    - anchor: {line: 0, character: 1}
-      active: {line: 1, character: 9}
-fullTargets: [{type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: t}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: identity}}]
diff --git a/packages/cursorless-vscode/extension.ts b/packages/cursorless-vscode/src/extension.ts
similarity index 100%
rename from packages/cursorless-vscode/extension.ts
rename to packages/cursorless-vscode/src/extension.ts
diff --git a/packages/cursorless-vscode/registerCommands.ts b/packages/cursorless-vscode/src/registerCommands.ts
similarity index 100%
rename from packages/cursorless-vscode/registerCommands.ts
rename to packages/cursorless-vscode/src/registerCommands.ts
diff --git a/packages/test-harness/runners/README.md b/packages/test-harness/src/runners/README.md
similarity index 100%
rename from packages/test-harness/runners/README.md
rename to packages/test-harness/src/runners/README.md
diff --git a/packages/test-harness/scripts/runUnitTestsOnly.ts b/packages/test-harness/src/scripts/runUnitTestsOnly.ts
similarity index 100%
rename from packages/test-harness/scripts/runUnitTestsOnly.ts
rename to packages/test-harness/src/scripts/runUnitTestsOnly.ts
diff --git a/packages/test-harness/util/runAllTestsInDir.ts b/packages/test-harness/src/util/runAllTestsInDir.ts
similarity index 100%
rename from packages/test-harness/util/runAllTestsInDir.ts
rename to packages/test-harness/src/util/runAllTestsInDir.ts
diff --git a/packages/vscode-common/index.ts b/packages/vscode-common/src/index.ts
similarity index 100%
rename from packages/vscode-common/index.ts
rename to packages/vscode-common/src/index.ts
diff --git a/packages/vscode-common/notebook.ts b/packages/vscode-common/src/notebook.ts
similarity index 100%
rename from packages/vscode-common/notebook.ts
rename to packages/vscode-common/src/notebook.ts
diff --git a/packages/vscode-common/runCommand.ts b/packages/vscode-common/src/runCommand.ts
similarity index 100%
rename from packages/vscode-common/runCommand.ts
rename to packages/vscode-common/src/runCommand.ts
diff --git a/packages/vscode-common/testUtil/openNewEditor.ts b/packages/vscode-common/src/testUtil/openNewEditor.ts
similarity index 100%
rename from packages/vscode-common/testUtil/openNewEditor.ts
rename to packages/vscode-common/src/testUtil/openNewEditor.ts
diff --git a/packages/vscode-common/vscodeUtil.ts b/packages/vscode-common/src/vscodeUtil.ts
similarity index 100%
rename from packages/vscode-common/vscodeUtil.ts
rename to packages/vscode-common/src/vscodeUtil.ts