Crash fix redux: Fix crash in dump next frame.

This time, with many less bad commits!