Barring abolishment, a US Supreme Court decision that clearly outlines the parameters for giving the death penalty to a person with mental illness—much as it did for juveniles—would be a relatively easy fix, although there would presumably still be arguments about what constitutes sick enough and trying to decide who is, in fact, sick versus who is malingering.
Core issue over finance
