this try-catch looks worrying. Should we log.warn and say it's deprecated use of remove, or would that just result in way too many log messages where folk pass in an immutable map? I'm guessing not that many warnings, given that previously it would have blown up...