Trying to improve the let case.

This more closely resembles what I had in mind, but it is still not
working. Back to debugging.