Tweak syntax and garbage collection