Improved the whitespace content handling.