Add with-sub-command macro (WIP)