Finish removing the obnoxious --agent option.