Split two commits that were wrongly combined.
Replace "Memory leak" warnings with close or abort.