Updating CLI proposal based on Brian Warner's feedback