flatten the comm listener a bit