issue #22155: Work through some crazy vendor address stuff.
issue #22155: More work on crazy contortions to deal with vendor address strangeness.