Improve usage of whitespace-mode