Remove spurrious warning.
Add leak detection.