Modify subcommand call structure to extendable.

Don't merge yet!