This fixes #7874.  Everything is now moved and happy.