am 5564317f: Genericize getting a raw dictionary

* commit '5564317f837164c67749423fa78f917ed2ae9e14':
  Genericize getting a raw dictionary