Re-order constants.
Upgraded to the current version of RTRlib.