r21826: reorder functions