Clarified the Emitter classes a bit.