More work on EZCAD2.