Using various map implementations is now OK.
Builders for current implementations are streamlined.