Fix application of --whitespace to final file/path