Actually use the introduced let from a few commits back...