Made the EHs a bit prettier.
Potential fix for #787, requires #188 to be retested.