Rearranging commands, e.g. "diff data bag" -> "data bag diff"