In my opinion these two instances should not be covered by the same rule, or at the least the rule should allow the differentiation between possible impact on the shot in play or not. Again, judgement call. Call it a "Sportsmanship-related Act", and it can be positive, negative, or neutral...