- Issue #2156265 by sun: KeyValueFactory is swappable, add an interface and fix type-hints.