Combined similar energy terms

to avoid matrix entry conflicts