A couple of eventful bugs...

Fixed a bug that prevented listeners from being added properly. This
prevented those listeners from being fired.
Fixed a bug where 1-time listeners were not being cleaned up.