EDA code improvements and cleanup.