Fix Windows environ[] = '' edge case.
Revert CANONICAL_HOST change in favor of fix.