Simplify impl and allow it to be driven 100% by command line.