Update after whitespace tolerance changes (only a few real changes)