Depends on the whiff punishment, if it's the start of a string then it requires the +2. I didn't think of stun disadvantage punishment. The key is that the start of a string is delayed by 1 frame, and you always have to add 1 frame for the hit frame of any attack in the game.