r8578: add ensure-keyword-{up,default-}case