Modify with-command-macro