Merged Windows+Cygwin build fixes for pml.