That's the feedback I've submitted at every possible collection point as well. "Fighting non-lethally" as a toggle, that will just ensure that if damage is dealt to reduce a target to zero, fitting the normal requirements for it (you can't non-lethal with a fireball), that it will be non-lethal damage.