Actually as I understand it in early US history if you werent hanged for your particular crime then your rights were restored the moment you left the cell.
I think the intent always was if your not under arrest, or locked up then you would always have the right to bear arms even if per se something like a court house or whatever might have been a no go zone for arms.
Unfortunately there seems to be little political will power to acknowledge the constitution let alone repeal or otherwise nullify law contrary to our founding documents. Future nations that write constitution type documents need to ensure that the documents they write are at least 1000 pages long per right spelling out the limits of government power...
Might I also suggest the abolition of lawyers and the elimination of legal language beyond a short dictionary of terms with very specific meaning for use in contracts... Sort of a common english version of law...