Clean up let-binding infrastructure

1 job for master in 11 minutes and 28 seconds (queued for 6 seconds)