Not really, but probably the best we can do.
Considering that any change to existing law would be used by the left, it is a terrible idea to even give them the opportunity.
Heck, they put out studies stating that conservatives are “terrorists”, even had West Point in on that act.