refs #26 Clean up some more.