Fix and simplify title whitespace normalization #1537