More support for spaces in scheme names