Fix a few more event emitter bugs.
0.1.7