Cosmetics: fix spacing, and reorder some macros
Cosmetics: fix spacing, and reorder some macros

Tridify/oce,finetjul/oce,Tech-XCorp/oce,heartvalve/oce,finetjul/oce,BenoitPerrot/oce,mathstuf/oce,BenoitPerrot/oce,tpaviot/oce,heartvalve/oce,tpaviot/oce,Tridify/oce,finetjul/oce,finetjul/oce,BenoitPerrot/oce,tpaviot/oce,mathstuf/oce,EvgeneOskin/oce,Tridify/oce,Tech-XCorp/oce,EvgeneOskin/oce,EvgeneOskin/oce,Tech-XCorp/oce,heartvalve/oce,mathstuf/oce,heartvalve/oce,Tridify/oce,BenoitPerrot/oce,tpaviot/oce,Tech-XCorp/oce,Tridify/oce,heartvalve/oce,mathstuf/oce,Tech-XCorp/oce,EvgeneOskin/oce,BenoitPerrot/oce,EvgeneOskin/oce,tpaviot/oce,finetjul/oce,mathstuf/oce