Tear emit stream / messages out of Entity class.

Trying to clean up the code a bit.