Modify do-sub-command macro