Issue #119: further cleanup to make win32 packaging correct