Fix broken EnergyHistory plotting

Line 593 expects EnergyHistory objects to be wrapped in a list, but line 580 did not ensure they are wrapped. Fixed this.

Also, for consistency

• added list wrapping to line 618
• deleted de-wrapping in line 594