Isolating the patch itself from reorganization/optimization of variables. No logic change intended. Change-Id: I9e9008d57b4948372af138fb47224ebcf9c48ceb Reviewed-on: https://gerrit.libreoffice.org/32480 Reviewed-by: Justin Luth <justin_luth@sil.org> Tested-by: Justin Luth <justin_luth@sil.org>