Don't forget PoM, especially on a shorter cooldown now, will affect WHM's mana consumption due to extra Glare casts.