WPS: Fixing CD binary data handling and outpup format selection.