Follow-up Bug 5634: Ordering branches should be case independent