Compacted more listeners and fixed the merge.