Update for syntax changes re enum<->raw