Yeah-- I feel that the research on this one is so strong that we basically ONLY punish for what does not take place intrinsically.
We don't offer rewards as inducements. Sometimes we will 'treat' in a "just because" kind of way. But that isn't the same thing.
I take privileges away for infractions-- but they aren't things which are "earned" with behavior that I want.
It's a subtle distinction, but it does serve to not dampen intrinsic motivation in those areas where it exists. It also tends to foster self-regulation rather than dependence on external rewards.