Rearranged command definitions which use umisc# functions.