issue #20438: Get rid of cruft.
issue #20438: Rearrange so error trapping can work.