Self-review, plus fixed a memory leak.