Even more improvements on whitespaces handling