Better CLI handling for the demo builder