Fixup for r165490: Use DenseMap instead of std::map. Simplify the loop in CollectFunc...