More tweaks to he_energize.