More variable cleaning up.  I don't think I broke anything and my simple test case runs without crashing.

Signed-off-by: David Brainard <brainard@psych.upenn.edu>