Better support for whitespaces