Simpler redo of Windows client port. Builds fine.