Oh just stop. WAR is changing, deal with it.

Both classes still will play differently, even after 2.1. PLD is still much more straightforward in its general design and usage.