It would look more authentic if the rifles would be slinged (be let hanging) across the chest when a pistol (and rocket launcher I guess) is selected. The transition from the primary to secondary in CQB could become faster and look awesome.

Make a "pull at the back" animation when you go prone. When you stand up from prone the rifle will remain slinged on the back and if you select it the character will grab it from the back.