More support for spaces in scheme names

I was still having trouble with spaces in scheme names. The extra quotes in the echo statements merely reflect reality. But if there's a waxsim failure, we need the extra quotes in the grep statement.