reorder constants (UPOLLET isn't fully supported)