Fix a few memory leaks in #3281 (details in ticket).

2007-09-23, Jeff Connelly