Push assignments to just before the returns from the function to
get it clearer what variables are actually needed.

Patches: 7.62.2, 7.62.3
Submitted by: Max Okumoto <okumoto@ucsd.edu>