Small syntactic changes to try make it build on Windows.