IDI-104: Reorder defaults according to new 'best practices' recommendations.