Clarify why some code is commented out.
Fix use-count tracking.

Also handle reused let names, and reenable test.