Removed unnecessary conversions to observable lists and maps.