REDCORE-171 Improve packager to avoid unnecessary variables