The attached patch is better.  Turns out I really didn’t understand
‘let*-values’, so it’s better to do this in the outer ‘let’.