Move most extra args out of eval-config.nix