Streamline/Consolidate Weapon Variant Options

I find the weapon options inconsistent in their presentation on the loadout screen. The Tactical class has access to separate weapon types for Auto, Stalker, and standard Bolt Rifles, but the Carbine has a marksman variant in its progression tree. The Oculus Carbine available to the Vanguard behaves similarly to the standard one, yet they're considered not only separate weapons but exclusive to separate classes. Etc.

I propose that similar/variant weapons be migrated to the main weapon's mastery tree as tier-one variants. This would  not only clean up the armoury menu, but it would also reduce the amount of grind required.

For example, I tend to favor weapons that are shared between multiple classes to optimize my mastery gain, but that means I rarely use the Instigator or Oculus Carbines as the Vanguard, preferring the Melta simply because I share it with my Tactical. Furthermore, if I could equip a standard Carbine on my Vanguard and an instigator or Oculus on my Sniper, I would feel more free to take what weapon I need when I need it.