All unit tests run successfully again; minor cleanup.