I don't like it much either. But I don't see how to avoid it.
Would you please comment on the language of the 2nd amendment? On its face with the passive voice and no specified agent it seems to me not necessarily to pertain only to the Feds.
It's repetitive or reiterative of a power the people said they would fight to retain, using force if necessary.
Over time, the people have been conditioned to see their rights as coming from the government. The tables are turned. Suck it up. Shut up and get back to work. Etc.
The Presser Court got it right. The RKBA doesn't depend on the 2nd amendment, and the states aren't free to prohibit keep and bear arms - if the states do, the people are justified in mounting an armed rebellion, if petition for redress proves ineffective.