Re-order conditional branches for greater clarity.