icon for wrapped listeners
remove TODOs
shorter lines
fix 5440 test after changes