Remove the toMaps, as per code review.