This will avoid many conflicts if moving the codes for each command
group into separate files in later patches.