I updated cl-calm to the latest version, which solves the issue with
ECL, and pushed the patches as 4ca869d151637382e8c74908e6d2671d9cea805c
and following.
Thanks.