Continuing on my great mission of code clean up.  It is not quite working right now, but should be able to fix up the little mistakes soon and carry on.

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