Quick cleanup in an effort to simplify and track down a Windows crash.