Windfall effects have incorrect count for NPC's with "instead" effects

[P-rus]

In a 'wheel' deck with Library of Leng and Jace's Archivist in play; I noticed the NPC's only drew 7, even though I had 24 cards in hand. I suspect that discarding to an alternate zone doesn't add to the NPC's card count. It's probably the same with Rest in Peace or cards that never hit the graveyard due to 'instead' effects. Interestingly, it did not affect me, I drew the proper number.

This sorely nerfs card-draw tax effects like Orcish Bowmasters or Smothering Tithe.

1.6.65 snapshot