Unbreaking cmdline parsing after variable rename.