Improve build-or-normalize-receiver logic.