Issue #3 - Consolidated default arguments and options in command definitions.