r11037: changes for sbcl mop / whitespace canonicalization