Remove unnecessary PROGN
Use alexandria:when-let* instead of a more clunky construct