Add back (most of) our old arguments

Also remove VS Code ones that don't work.