Adjust for move of cond-let and consume to io.aviso/toolchest