This is ugly, until jb finds "a clever solution."

Fix for [1f579327] for Windows

[62bd7af8] and [182692ca]

This reverts commit e70077bf.
This was completely broken (NULL not defined).

This reverts commit 4bfba26a.
This broke strict C aliasing rules.

No major changes, but I prefer to stay close to upstream, for obvious reasons.