Hello,

I'm resending the GC-cleanup patch in a hopefully more readable form.
Han-Wen: let me know if it's alright.

Thanks,
Ludovic.