MULE-8013: Fixed review comments.