Fix some references to infra types (e.g. set, map).

This correctly distinguishes the infra value and the ES Map constructor

Author: jgraham