Cleanup redundant treatment of what to do with spaces in names