Fix expandtab on noexpandtab
Use separate highlight for ExtraWhitespace