More cleanups to remove Everything.pm based globals