MN10300: Tighten up the code using case ranges