LOTS of updates to the Emitter. A bit more to clean up in there and then it'll be time to refactor it a bit so we don't have all the visitor methods in one place.