Clean-up: use t-w-r where appropriate, maybe fixing some actual leaks
4 files changed