minor format modifications to reduce diffs with latest wine sources to simplify updating.