More refactoring of whitespace replacement into NameValue.