Move rST local commands and add more match its.