Clean up some randomness associated with trace_recovery_messages: don't

put the variable declaration in the middle of a bunch of externs,
and do use extern where it should be used.