Improve coverage for Emitter
Clean up formatting a bit in Emitter