This fixes #4663.  I think I got all of them.