diff --git a/OpenRA.Game/Orders/UnitOrderGenerator.cs b/OpenRA.Game/Orders/UnitOrderGenerator.cs
index 958c85d8b3..198b8fc0dd 100644
--- a/OpenRA.Game/Orders/UnitOrderGenerator.cs
+++ b/OpenRA.Game/Orders/UnitOrderGenerator.cs
@@ -17,34 +17,41 @@ namespace OpenRA.Orders
 {
 	class UnitOrderGenerator : IOrderGenerator
 	{
-		public IEnumerable<Order> Order(World world, CPos xy, MouseInput mi)
+		static Target TargetForInput(World world, CPos xy, MouseInput mi)
 		{
-			var underCursor = world.ScreenMap.ActorsAt(mi)
+			var actor = world.ScreenMap.ActorsAt(mi)
 				.Where(a => !world.FogObscures(a) && a.Info.HasTraitInfo<ITargetableInfo>())
 				.WithHighestSelectionPriority();
 
-			Target target;
-			if (underCursor != null)
-				target = Target.FromActor(underCursor);
-			else
-			{
-				var frozen = world.ScreenMap.FrozenActorsAt(world.RenderPlayer, mi)
-					.Where(a => a.Info.HasTraitInfo<ITargetableInfo>() && a.Visible && a.HasRenderables)
-					.WithHighestSelectionPriority();
-				target = frozen != null ? Target.FromFrozenActor(frozen) : Target.FromCell(world, xy);
-			}
+			if (actor != null)
+				return Target.FromActor(actor);
 
+			var frozen = world.ScreenMap.FrozenActorsAt(world.RenderPlayer, mi)
+				.Where(a => a.Info.HasTraitInfo<ITargetableInfo>() && a.Visible && a.HasRenderables)
+				.WithHighestSelectionPriority();
+
+			if (frozen != null)
+				return Target.FromFrozenActor(frozen);
+
+			return Target.FromCell(world, xy);
+		}
+
+		public IEnumerable<Order> Order(World world, CPos xy, MouseInput mi)
+		{
+			var target = TargetForInput(world, xy, mi);
 			var orders = world.Selection.Actors
 				.Select(a => OrderForUnit(a, target, mi))
 				.Where(o => o != null)
 				.ToList();
 
 			var actorsInvolved = orders.Select(o => o.Actor).Distinct();
-			if (actorsInvolved.Any())
-				yield return new Order("CreateGroup", actorsInvolved.First().Owner.PlayerActor, false)
-				{
-					TargetString = actorsInvolved.Select(a => a.ActorID).JoinWith(",")
-				};
+			if (!actorsInvolved.Any())
+				yield break;
+
+			yield return new Order("CreateGroup", actorsInvolved.First().Owner.PlayerActor, false)
+			{
+				TargetString = actorsInvolved.Select(a => a.ActorID).JoinWith(",")
+			};
 
 			foreach (var o in orders)
 				yield return CheckSameOrder(o.Order, o.Trait.IssueOrder(o.Actor, o.Order, o.Target, mi.Modifiers.HasModifier(Modifiers.Shift)));
@@ -57,26 +64,10 @@ namespace OpenRA.Orders
 		public string GetCursor(World world, CPos xy, MouseInput mi)
 		{
 			var useSelect = false;
-			var underCursor = world.ScreenMap.ActorsAt(mi)
-				.Where(a => !world.FogObscures(a) && a.Info.HasTraitInfo<ITargetableInfo>())
-				.WithHighestSelectionPriority();
-
-			if (underCursor != null && (mi.Modifiers.HasModifier(Modifiers.Shift) || !world.Selection.Actors.Any()))
-			{
-				if (underCursor.Info.HasTraitInfo<SelectableInfo>())
-					useSelect = true;
-			}
-
-			Target target;
-			if (underCursor != null)
-				target = Target.FromActor(underCursor);
-			else
-			{
-				var frozen = world.ScreenMap.FrozenActorsAt(world.RenderPlayer, mi)
-					.Where(a => a.Info.HasTraitInfo<ITargetableInfo>() && a.Visible && a.HasRenderables)
-					.WithHighestSelectionPriority();
-				target = frozen != null ? Target.FromFrozenActor(frozen) : Target.FromCell(world, xy);
-			}
+			var target = TargetForInput(world, xy, mi);
+			if (target.Type == TargetType.Actor && target.Actor.Info.HasTraitInfo<SelectableInfo>() &&
+					(mi.Modifiers.HasModifier(Modifiers.Shift) || !world.Selection.Actors.Any()))
+				useSelect = true;
 
 			var ordersWithCursor = world.Selection.Actors
 				.Select(a => OrderForUnit(a, target, mi))
@@ -94,7 +85,6 @@ namespace OpenRA.Orders
 			var underCursor = world.Selection.Actors.WithHighestSelectionPriority();
 
 			var o = OrderForUnit(underCursor, target, mi);
-
 			if (o != null && o.Order.OverrideSelection)
 				return false;
 
@@ -103,6 +93,9 @@ namespace OpenRA.Orders
 
 		static UnitOrderResult OrderForUnit(Actor self, Target target, MouseInput mi)
 		{
+			if (mi.Button != Game.Settings.Game.MouseButtonPreference.Action)
+				return null;
+
 			if (self.Owner != self.World.LocalPlayer)
 				return null;
 
@@ -112,27 +105,25 @@ namespace OpenRA.Orders
 			if (self.Disposed || !target.IsValidFor(self))
 				return null;
 
-			if (mi.Button == Game.Settings.Game.MouseButtonPreference.Action)
+			var modifiers = TargetModifiers.None;
+			if (mi.Modifiers.HasModifier(Modifiers.Ctrl))
+				modifiers |= TargetModifiers.ForceAttack;
+			if (mi.Modifiers.HasModifier(Modifiers.Shift))
+				modifiers |= TargetModifiers.ForceQueue;
+			if (mi.Modifiers.HasModifier(Modifiers.Alt))
+				modifiers |= TargetModifiers.ForceMove;
+
+			var actorsAt = self.World.ActorMap.GetActorsAt(self.World.Map.CellContaining(target.CenterPosition)).ToList();
+
+			foreach (var o in self.TraitsImplementing<IIssueOrder>()
+				.SelectMany(trait => trait.Orders
+					.Select(x => new { Trait = trait, Order = x }))
+				.OrderByDescending(x => x.Order.OrderPriority))
 			{
-				foreach (var o in self.TraitsImplementing<IIssueOrder>()
-					.SelectMany(trait => trait.Orders
-						.Select(x => new { Trait = trait, Order = x }))
-					.OrderByDescending(x => x.Order.OrderPriority))
-				{
-					var actorsAt = self.World.ActorMap.GetActorsAt(self.World.Map.CellContaining(target.CenterPosition)).ToList();
-
-					var modifiers = TargetModifiers.None;
-					if (mi.Modifiers.HasModifier(Modifiers.Ctrl))
-						modifiers |= TargetModifiers.ForceAttack;
-					if (mi.Modifiers.HasModifier(Modifiers.Shift))
-						modifiers |= TargetModifiers.ForceQueue;
-					if (mi.Modifiers.HasModifier(Modifiers.Alt))
-						modifiers |= TargetModifiers.ForceMove;
-
-					string cursor = null;
-					if (o.Order.CanTarget(self, target, actorsAt, ref modifiers, ref cursor))
-						return new UnitOrderResult(self, o.Order, o.Trait, cursor, target);
-				}
+				var localModifiers = modifiers;
+				string cursor = null;
+				if (o.Order.CanTarget(self, target, actorsAt, ref localModifiers, ref cursor))
+					return new UnitOrderResult(self, o.Order, o.Trait, cursor, target);
 			}
 
 			return null;