Agreed, yeah... there's a lot more wrong with it than just that... But just being able to nominate your non-lethal intent and have it apply where applicable would be a good start.