Use a more logical order.

[skip ci]