Simplify impl and allow ee-generator to be driven 100% by command line.