TaskRegistry: reordering a few things