Not being a legislative drafter, I can't see my way through fixing it per se. I like the idea that the language can change, but once again, if you change a comma you start running into problems.
The bail provisions as they stand work the best way they can. Changing them is not going to prevent another tragedy. Another tragedy is going to happen.