More sensible case ordering