"Modernize" the variable declarations #9
Description
The variables are all declared in blocks at the top of functions, which hasn't been required for ages. We really probably want to "clean up" the code and move the declarations to closer to the uses.