Replaced map_default with map_or.