Follow-up work on USDA connector. And other code maintenance.