Re-order manifest constants a little.