Entirely correct, and, since it has been incorporated into the US Code, the original act is not necessary and may be voided without having any impact upon anything.

BTW, not being presently a member of a "well regulated militia", under the meaning and intent of the 2nd Amendment, I believe that I have the legal right but not a "Constitutional" right to "keep and bear arms". I do have a few swords around the house.