Change from map of names and functors to vector of name and functors

Nicely described here: !1323 (comment 10036724)