Reapply "Fix JSClosure leak (#240)"
#242
+103
−28
Draft