More windows package tweaks.

Make sure subordinate packages are reinstalled.