Use that env var for add- scripts too
Include what in @ARGV was stray
Wrong method