Reorder commands, both implementation functions and parsing tests, to match help output order.