Change . to - for the interface to the simulator.
Various cleanups.