Improve handling of mapping between X and Windows formats.