Re-order some definitions to group them.