More accurate reply-to handling