Well, PersistentMap/PersistentSortedMap still looks the same way on GitHub master. I'll see if I can find the time for a test case.