I don't know (mainly because I haven't thought about it that hard) if the amended wording you've provided sufficiently covers the goal you're trying to achieve, but I do totally appreciate the sentiment behind it and agree with the principles.
I think overall Section 3 of the Penal Code - and...