Was in the process of converting all the energy stuff to 1.8.5, but the plug got pulled on that. This is just a clean up to homogenize with the ViennaRNA interface a bit better.