Same motivation as in the parent commit: let's define variables later, ideally right when they are first initialized, so it's easier to figure out that they are properly initialized. error_id and r_tuple* were previously initialized, but I don't see why they would need to be. No functional change intended.