Integrated WITH-MODULE-STORAGE in DEFINE-HANDLER and DEFINE-COMMAND