Reorder things in modern.h to silence warnings.
Reorder things in modern.h to silence warnings.

IreneKnapp/modern-data,IreneKnapp/modern-data,IreneKnapp/modern-data,IreneKnapp/modern-data,IreneKnapp/modern-data