Some minor emval simplifications