Modify subcommand call structure to extendable.

redundant if clause?