> This is in contrast to a firearm

This changed long ago. Optic, light, IR illuminator, IR pointer, NVG/thermals. The rifle or carbine is now a component of the weapon system.