Fix and add comments. Use `map_default`.