Some fixes, some progress.

Note to self: do not use moved-out objects.