Bring declarations closer to where they're needed.