Update to master. (use collections::treemap instead of extra::treemap)