Crash recovery part 2.

All done except label indexes.

Change-Id: Ic21c47532ceaeec5c9ef23cbfc02cd59f7bc00f4