Better extra white space support.