FLUID-4907: Improved the auxiliary builder and the message lookup based on the pull request's comments.