Add Getopt::Long options, adapt a few magic strings