am: let command-line options override saved options