Make eelType and evdwType scoped enums, + cleanup