Added NullOrWhitespace emitter
Tidied up