am 0e377135: Clean up DID configuration parsing.

* commit '0e377135cf8a38f2a8ec194b77bbb51dea0c0095':
  Clean up DID configuration parsing.