Optional computation of fluct. props in g_energy. Fixes #954