s3: Move a variable declaration to its only use