Same here... in fact, there look to be several places where we can save some perf by avoiding the `.ToDictionary()` step.