Fix deviations from spec revealed by attempted cygwin compile.