Mostly favoring unmodifiableMap and making sure to only wrap maps that aren't otherwise returned and so cannot be copied. MapMaker#immutableMap has to go next.