More work to ensure tests still pass and things still work with old UG EntityManagerImpl and friends.