Merge "Simplify MessageRetrievalListener."