Reorder things in modern.h to silence warnings.