100% white-space patch. I omitted dynamic as Jim's working on that one.