* Fixed Rage Extractor and Counterbalance not taking X value into account for calculating converted mana costs.
* Fixed calculation of converted mana costs for spells on the stack  (fixes #459). Added test. Some minor formattings.