Re-order case statement, no functional change