libstd: More treemap fixes