Swap the order of the type params; Remove toMutableMap and toTreeMap; Update examples