Pre-IOC rebuild commit.  (This rebuild is particulally risky, as it degrades SPI2_TX to implement USART3_TX)
Configuration.ioc rebuild complete.  (It appears this is the best state yet.  No hand-edits appear to be necessary.)