New branch bug-3604074 with improved patch to correct fixempties() failure
to converge.