This fixes #7780.  These are all fixed now.