Improve code highlighting on trailing whitspace and others