Right.
If we were to use, as opposed to the current wording of “any mental disorder from which the offender suffers”, perhaps “any aspect of the offender's mental condition that is relevant for sentencing purposes”, would that assist you in terms of limiting the scope of...?