Fix selection of ranged sets. Again.
Get rid of extra fallback code.
Add CombatForm and CombatWeapon to ranged set selection.