packages: drop more global variables
general: drop more global variables
packages: fix a nasty typo